142010 2015-02-25 00:10:33 -0800 Web Inspector: Improve Regex/Error output in Object Tree and Previews 2015-02-25 07:10:27 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1071991 0 joepeck 2015-02-25 00:10:33 -0800 * SUMMARY Improve Regex/Error output in Object Tree and Previews. - Regex objects: - show lots of properties in previews that are not particularly useful - show as black in previews, instead of orange - show as black in object tree, instead of orange, when expanded to show properties => the formatted value (orange) "/foo/g" would be nicer always when visible - Error objects: - show lots of properties in previews that are not particularly useful - should be expandable to show properties 1071992 1 webkit-bug-importer 2015-02-25 00:11:04 -0800 <rdar://problem/19950119> 1071994 2 247319 joepeck 2015-02-25 00:16:13 -0800 Created attachment 247319 [PATCH] Proposed Fix RegExps look way better with this. 1071996 3 247320 joepeck 2015-02-25 00:23:31 -0800 Created attachment 247320 [PATCH] Proposed Fix Even better, this applies the same "titleElement" improvement to ObjectTree without preview. This makes it so: js> dir(null) js> dir(100) js> dir(true) And friends show an Object Tree with a formatted value in the title, instead of black text. 1072050 4 247320 timothy 2015-02-25 06:26:26 -0800 Comment on attachment 247320 [PATCH] Proposed Fix Nice! 1072055 5 247320 commit-queue 2015-02-25 07:10:23 -0800 Comment on attachment 247320 [PATCH] Proposed Fix Clearing flags on attachment: 247320 Committed r180625: <http://trac.webkit.org/changeset/180625> 1072056 6 commit-queue 2015-02-25 07:10:27 -0800 All reviewed patches have been landed. Closing bug. 247319 2015-02-25 00:16:13 -0800 2015-02-25 00:23:31 -0800 [PATCH] Proposed Fix regex.patch text/plain 5900 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGI5MmVlMGYuLjg2NTBmMzUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE1LTAyLTI1ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW1wcm92 ZSBSZWdleC9FcnJvciBvdXRwdXQgaW4gT2JqZWN0IFRyZWUgYW5kIFByZXZpZXdzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDIwMTAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvT2JqZWN0UHJldmlld1ZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0 UHJldmlld1ZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFByZXZpZXdWaWV3LnBy b3RvdHlwZS5faW5pdFRpdGxlRWxlbWVudCk6CisgICAgICAgIFNpbmNlIHNvbWUgb2JqZWN0IHR5 cGVzIG1heSBiZSBmb3JtYXR0ZWQgYXMgc2ltcGxlIHZhbHVlcywgZW5zdXJlIHRoZXkgZ2V0Cisg ICAgICAgIHRoZSBmb3JtYXR0ZWQgc3R5bGUgZXZlbiBpbiB0aGUgdGl0bGUgdmlldy4KKworICAg ICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFByZXZpZXdWaWV3LnByb3RvdHlwZS5fYXBwZW5kUHJl dmlldyk6CisgICAgICAgIFRob3NlIG9iamVjdCB0eXBlcyB0aGF0IGNhbiBiZSBmb3JtYXR0ZWQg YXMgc2ltcGxlIHZhbHVlcyBzaG91bGQgc2tpcAorICAgICAgICB0byB0aGUgdmFsdWUgZm9ybWF0 dGluZyBwaGFzZS4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFByZXZpZXdWaWV3LnBy b3RvdHlwZS5fYXBwZW5kUHJvcGVydHlQcmV2aWV3cyk6CisgICAgICAgIERvIG5vdCBzaG93IHBy b3BlcnR5IHByZXZpZXdzIGZvciBlcnJvciBvYmplY3RzLiBBbHdheXMgYXNzdW1lIGxvc3N5Cisg ICAgICAgIHNvIHRoYXQgaXQgY2FuIGJlIGV4cGFuZGVkLgorCiAyMDE1LTAyLTI0ICBKb3NlcGgg UGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog SW1wcm92ZSBQcm9wZXJ0eVBhdGggZGlzcGxheSBzdHJpbmdzIGZvciBnZXR0ZXJzIC8gdmFsdWVz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9P YmplY3RQcmV2aWV3Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL09iamVjdFByZXZpZXdWaWV3LmpzCmluZGV4IDg5YTZjNWEuLjI3ZjgyZWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFBy ZXZpZXdWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL09iamVjdFByZXZpZXdWaWV3LmpzCkBAIC00MSw4ICs0MSw4IEBAIFdlYkluc3BlY3Rvci5P YmplY3RQcmV2aWV3VmlldyA9IGZ1bmN0aW9uKHByZXZpZXcsIG1vZGUpCiAKICAgICB0aGlzLl90 aXRsZUVsZW1lbnQgPSB0aGlzLl9lbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoInNwYW4iKSk7CiAgICAgdGhpcy5fdGl0bGVFbGVtZW50LmNsYXNzTmFtZSA9ICJ0aXRs ZSI7Ci0gICAgdGhpcy5fdGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gcHJldmlldy5kZXNjcmlw dGlvbiB8fCAiIjsKICAgICB0aGlzLl90aXRsZUVsZW1lbnQuaGlkZGVuID0gdHJ1ZTsKKyAgICB0 aGlzLl9pbml0VGl0bGVFbGVtZW50KCk7CiAKICAgICBpZiAodGhpcy5fbG9zc2xlc3MpCiAgICAg ICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LmFkZCgibG9zc2xlc3MiKTsKQEAgLTkzLDYgKzkz LDE1IEBAIFdlYkluc3BlY3Rvci5PYmplY3RQcmV2aWV3Vmlldy5wcm90b3R5cGUgPSB7CiAKICAg ICAvLyBQcml2YXRlCiAKKyAgICBfaW5pdFRpdGxlRWxlbWVudDogZnVuY3Rpb24oKQorICAgIHsK KyAgICAgICAgLy8gRGlzcGxheSBudWxsIC8gcmVnZXhwcyBhcyBzaW1wbGUgZm9ybWF0dGVkIHZh bHVlcyBldmVuIGluIHRpdGxlLgorICAgICAgICBpZiAodGhpcy5fcHJldmlldy5zdWJ0eXBlID09 PSAicmVnZXhwIiB8fCB0aGlzLl9wcmV2aWV3LnN1YnR5cGUgPT09ICJudWxsIikKKyAgICAgICAg ICAgIHRoaXMuX3RpdGxlRWxlbWVudC5hcHBlbmRDaGlsZChXZWJJbnNwZWN0b3IuRm9ybWF0dGVk VmFsdWUuY3JlYXRlRWxlbWVudEZvck9iamVjdFByZXZpZXcodGhpcy5fcHJldmlldykpOworICAg ICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLl90aXRsZUVsZW1lbnQudGV4dENvbnRlbnQgPSB0 aGlzLl9wcmV2aWV3LmRlc2NyaXB0aW9uIHx8ICIiOworICAgIH0sCisKICAgICBfbnVtYmVyT2ZQ cm9wZXJ0aWVzVG9TaG93SW5Nb2RlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4g dGhpcy5fbW9kZSA9PT0gV2ViSW5zcGVjdG9yLk9iamVjdFByZXZpZXdWaWV3Lk1vZGUuQnJpZWYg PyAzIDogSW5maW5pdHk7CkBAIC0xMDAsMjAgKzEwOSwyOCBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0 UHJldmlld1ZpZXcucHJvdG90eXBlID0gewogCiAgICAgX2FwcGVuZFByZXZpZXc6IGZ1bmN0aW9u KGVsZW1lbnQsIHByZXZpZXcpCiAgICAgewotICAgICAgICAvLyBDbGFzcyBuYW1lIGZvciBub24t YXJyYXkgb2JqZWN0IHR5cGVzLgotICAgICAgICBpZiAocHJldmlldy50eXBlID09PSAib2JqZWN0 IiAmJiBwcmV2aWV3LnN1YnR5cGUgIT09ICJudWxsIiAmJiBwcmV2aWV3LnN1YnR5cGUgIT09ICJh cnJheSIgJiYgcHJldmlldy5kZXNjcmlwdGlvbiAhPT0gIk9iamVjdCIpIHsKLSAgICAgICAgICAg IHZhciBuYW1lRWxlbWVudCA9IGVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgic3BhbiIpKTsKLSAgICAgICAgICAgIG5hbWVFbGVtZW50LmNsYXNzTmFtZSA9ICJvYmpl Y3QtcHJldmlldy1uYW1lIjsKLSAgICAgICAgICAgIG5hbWVFbGVtZW50LnRleHRDb250ZW50ID0g cHJldmlldy5kZXNjcmlwdGlvbiArICIgIjsKKyAgICAgICAgdmFyIGRpc3BsYXlPYmplY3RBc1Zh bHVlID0gZmFsc2U7CisgICAgICAgIGlmIChwcmV2aWV3LnR5cGUgPT09ICJvYmplY3QiKSB7Cisg ICAgICAgICAgICBpZiAocHJldmlldy5zdWJ0eXBlID09PSAicmVnZXhwIiB8fCBwcmV2aWV3LnN1 YnR5cGUgPT09ICJudWxsIikgeworICAgICAgICAgICAgICAgIC8vIERpc3BsYXkgbnVsbCAvIHJl Z2V4cHMgYXMgc2ltcGxlIGZvcm1hdHRlZCB2YWx1ZXMuCisgICAgICAgICAgICAgICAgZGlzcGxh eU9iamVjdEFzVmFsdWUgPSB0cnVlOworICAgICAgICAgICAgfSAgZWxzZSBpZiAocHJldmlldy5z dWJ0eXBlICE9PSAiYXJyYXkiICYmIHByZXZpZXcuZGVzY3JpcHRpb24gIT09ICJPYmplY3QiKSB7 CisgICAgICAgICAgICAgICAgLy8gQ2xhc3MgbmFtZXMgZm9yIG90aGVyIG5vbi1hcnJheSAvIG5v bi1iYXNpYy1PYmplY3QgdHlwZXMuCisgICAgICAgICAgICAgICAgdmFyIG5hbWVFbGVtZW50ID0g ZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIikpOworICAg ICAgICAgICAgICAgIG5hbWVFbGVtZW50LmNsYXNzTmFtZSA9ICJvYmplY3QtcHJldmlldy1uYW1l IjsKKyAgICAgICAgICAgICAgICBuYW1lRWxlbWVudC50ZXh0Q29udGVudCA9IHByZXZpZXcuZGVz Y3JpcHRpb24gKyAiICI7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KIAogICAgICAgICAvLyBD b250ZW50LgogICAgICAgICB2YXIgYm9keUVsZW1lbnQgPSBlbGVtZW50LmFwcGVuZENoaWxkKGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKSk7CiAgICAgICAgIGJvZHlFbGVtZW50LmNsYXNz TmFtZSA9ICJvYmplY3QtcHJldmlldy1ib2R5IjsKLSAgICAgICAgaWYgKHByZXZpZXcuY29sbGVj dGlvbkVudHJ5UHJldmlld3MpCi0gICAgICAgICAgICByZXR1cm4gdGhpcy5fYXBwZW5kRW50cnlQ cmV2aWV3cyhib2R5RWxlbWVudCwgcHJldmlldyk7Ci0gICAgICAgIGlmIChwcmV2aWV3LnByb3Bl cnR5UHJldmlld3MpCi0gICAgICAgICAgICByZXR1cm4gdGhpcy5fYXBwZW5kUHJvcGVydHlQcmV2 aWV3cyhib2R5RWxlbWVudCwgcHJldmlldyk7CisgICAgICAgIGlmICghZGlzcGxheU9iamVjdEFz VmFsdWUpIHsKKyAgICAgICAgICAgIGlmIChwcmV2aWV3LmNvbGxlY3Rpb25FbnRyeVByZXZpZXdz KQorICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLl9hcHBlbmRFbnRyeVByZXZpZXdzKGJvZHlF bGVtZW50LCBwcmV2aWV3KTsKKyAgICAgICAgICAgIGlmIChwcmV2aWV3LnByb3BlcnR5UHJldmll d3MpCisgICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2FwcGVuZFByb3BlcnR5UHJldmlld3Mo Ym9keUVsZW1lbnQsIHByZXZpZXcpOworICAgICAgICB9CiAgICAgICAgIHJldHVybiB0aGlzLl9h cHBlbmRWYWx1ZVByZXZpZXcoYm9keUVsZW1lbnQsIHByZXZpZXcpOwogICAgIH0sCiAKQEAgLTE0 NiwxMSArMTYzLDEzIEBAIFdlYkluc3BlY3Rvci5PYmplY3RQcmV2aWV3Vmlldy5wcm90b3R5cGUg PSB7CiAKICAgICBfYXBwZW5kUHJvcGVydHlQcmV2aWV3czogZnVuY3Rpb24oZWxlbWVudCwgcHJl dmlldykKICAgICB7Ci0gICAgICAgIC8vIERvIG5vdCBzaG93IGVtcHR5IHByb3BlcnRpZXMgcHJl dmlldyBmb3IgRGF0ZSBwcmV2aWV3cy4KLSAgICAgICAgdmFyIGlzRGF0ZSA9IHByZXZpZXcuc3Vi dHlwZSA9PT0gImRhdGUiOwotICAgICAgICB2YXIgbnVtUHJvcGVydGllcyA9IHByZXZpZXcucHJv cGVydHlQcmV2aWV3cy5sZW5ndGg7Ci0gICAgICAgIGlmICghbnVtUHJvcGVydGllcyAmJiBpc0Rh dGUpCi0gICAgICAgICAgICByZXR1cm4gcHJldmlldy5sb3NzbGVzczsKKyAgICAgICAgLy8gRG8g bm90IHNob3cgRXJyb3IgcHJvcGVydGllcyBpbiBwcmV2aWV3cy4gVGhleSBhcmUgbW9yZSB1c2Vm dWwgaW4gZnVsbCB2aWV3cy4KKyAgICAgICAgaWYgKHByZXZpZXcuc3VidHlwZSA9PT0gImVycm9y IikKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICAvLyBEbyBub3Qgc2hvdyBE YXRlIHByb3BlcnRpZXMgaW4gcHJldmlld3MuIElmIHRoZXJlIGFyZSBhbnkgcHJvcGVydGllcywg c2hvdyB0aGVtIGluIGZ1bGwgdmlldy4KKyAgICAgICAgaWYgKHByZXZpZXcuc3VidHlwZSA9PT0g ImRhdGUiKQorICAgICAgICAgICAgcmV0dXJuICFwcmV2aWV3LnByb3BlcnR5UHJldmlld3MubGVu Z3RoOwogCiAgICAgICAgIHZhciBpc0FycmF5ID0gcHJldmlldy5zdWJ0eXBlID09PSAiYXJyYXki OwogCkBAIC0xNTgsNyArMTc3LDcgQEAgV2ViSW5zcGVjdG9yLk9iamVjdFByZXZpZXdWaWV3LnBy b3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIgbnVtYmVyQWRkZWQgPSAwOwogICAgICAgICB2YXIg bGltaXQgPSB0aGlzLl9udW1iZXJPZlByb3BlcnRpZXNUb1Nob3dJbk1vZGUoKTsKLSAgICAgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCBudW1Qcm9wZXJ0aWVzICYmIG51bWJlckFkZGVkIDwgbGltaXQ7 ICsraSkgeworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHByZXZpZXcucHJvcGVydHlQcmV2 aWV3cy5sZW5ndGggJiYgbnVtYmVyQWRkZWQgPCBsaW1pdDsgKytpKSB7CiAgICAgICAgICAgICB2 YXIgcHJvcGVydHkgPSBwcmV2aWV3LnByb3BlcnR5UHJldmlld3NbaV07CiAKICAgICAgICAgICAg IC8vIEZJWE1FOiBCZXR0ZXIgaGFuZGxlIGdldHRlci9zZXR0ZXIgYWNjZXNzb3JzLiBTaG91bGQg d2Ugc2hvdyBnZXR0ZXJzIGluIHByZXZpZXdzPwo= 247320 2015-02-25 00:23:31 -0800 2015-02-25 07:10:23 -0800 [PATCH] Proposed Fix better-regex-title.patch text/plain 7046 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGI5MmVlMGYuLjZlNjEyZTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE1LTAyLTI1ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW1wcm92 ZSBSZWdleC9FcnJvciBvdXRwdXQgaW4gT2JqZWN0IFRyZWUgYW5kIFByZXZpZXdzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDIwMTAKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvT2JqZWN0UHJldmlld1ZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT2JqZWN0 UHJldmlld1ZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFByZXZpZXdWaWV3LnBy b3RvdHlwZS5faW5pdFRpdGxlRWxlbWVudCk6CisgICAgICAgIFNpbmNlIHNvbWUgb2JqZWN0IHR5 cGVzIG1heSBiZSBmb3JtYXR0ZWQgYXMgc2ltcGxlIHZhbHVlcywgZW5zdXJlIHRoZXkgZ2V0Cisg ICAgICAgIHRoZSBmb3JtYXR0ZWQgc3R5bGUgZXZlbiBpbiB0aGUgdGl0bGUgdmlldy4KKworICAg ICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFByZXZpZXdWaWV3LnByb3RvdHlwZS5fYXBwZW5kUHJl dmlldyk6CisgICAgICAgIFRob3NlIG9iamVjdCB0eXBlcyB0aGF0IGNhbiBiZSBmb3JtYXR0ZWQg YXMgc2ltcGxlIHZhbHVlcyBzaG91bGQgc2tpcAorICAgICAgICB0byB0aGUgdmFsdWUgZm9ybWF0 dGluZyBwaGFzZS4KKworICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFByZXZpZXdWaWV3LnBy b3RvdHlwZS5fYXBwZW5kUHJvcGVydHlQcmV2aWV3cyk6CisgICAgICAgIERvIG5vdCBzaG93IHBy b3BlcnR5IHByZXZpZXdzIGZvciBlcnJvciBvYmplY3RzLiBBbHdheXMgYXNzdW1lIGxvc3N5Cisg ICAgICAgIHNvIHRoYXQgaXQgY2FuIGJlIGV4cGFuZGVkLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9PYmplY3RUcmVlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmpl Y3RUcmVlVmlldyk6CisgICAgICAgIE1ha2UgYSBzaW1pbGlhciBpbXByb3ZlbWVudCBmb3IgT2Jq ZWN0VHJlZSB0aXRsZXMgd2hlbiBwcmV2aWV3cyBhcmUKKyAgICAgICAgdW5hdmFpbGFibGUuIFRo aXMgd2lsbCBtYWtlIGRpcih2YWx1ZSkgc2hvdyBhIHN0eWxpemVkIHZhbHVlIGluIHRoZQorICAg ICAgICB0aXRsZSBvZiB0aGUgT2JqZWN0IFRyZWUuCisKIDIwMTUtMDItMjQgIEpvc2VwaCBQZWNv cmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbXBy b3ZlIFByb3BlcnR5UGF0aCBkaXNwbGF5IHN0cmluZ3MgZm9yIGdldHRlcnMgLyB2YWx1ZXMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVj dFByZXZpZXdWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvT2JqZWN0UHJldmlld1ZpZXcuanMKaW5kZXggODlhNmM1YS4uMjdmODJlZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0UHJldmll d1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv T2JqZWN0UHJldmlld1ZpZXcuanMKQEAgLTQxLDggKzQxLDggQEAgV2ViSW5zcGVjdG9yLk9iamVj dFByZXZpZXdWaWV3ID0gZnVuY3Rpb24ocHJldmlldywgbW9kZSkKIAogICAgIHRoaXMuX3RpdGxl RWxlbWVudCA9IHRoaXMuX2VsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgic3BhbiIpKTsKICAgICB0aGlzLl90aXRsZUVsZW1lbnQuY2xhc3NOYW1lID0gInRpdGxlIjsK LSAgICB0aGlzLl90aXRsZUVsZW1lbnQudGV4dENvbnRlbnQgPSBwcmV2aWV3LmRlc2NyaXB0aW9u IHx8ICIiOwogICAgIHRoaXMuX3RpdGxlRWxlbWVudC5oaWRkZW4gPSB0cnVlOworICAgIHRoaXMu X2luaXRUaXRsZUVsZW1lbnQoKTsKIAogICAgIGlmICh0aGlzLl9sb3NzbGVzcykKICAgICAgICAg dGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJsb3NzbGVzcyIpOwpAQCAtOTMsNiArOTMsMTUg QEAgV2ViSW5zcGVjdG9yLk9iamVjdFByZXZpZXdWaWV3LnByb3RvdHlwZSA9IHsKIAogICAgIC8v IFByaXZhdGUKIAorICAgIF9pbml0VGl0bGVFbGVtZW50OiBmdW5jdGlvbigpCisgICAgeworICAg ICAgICAvLyBEaXNwbGF5IG51bGwgLyByZWdleHBzIGFzIHNpbXBsZSBmb3JtYXR0ZWQgdmFsdWVz IGV2ZW4gaW4gdGl0bGUuCisgICAgICAgIGlmICh0aGlzLl9wcmV2aWV3LnN1YnR5cGUgPT09ICJy ZWdleHAiIHx8IHRoaXMuX3ByZXZpZXcuc3VidHlwZSA9PT0gIm51bGwiKQorICAgICAgICAgICAg dGhpcy5fdGl0bGVFbGVtZW50LmFwcGVuZENoaWxkKFdlYkluc3BlY3Rvci5Gb3JtYXR0ZWRWYWx1 ZS5jcmVhdGVFbGVtZW50Rm9yT2JqZWN0UHJldmlldyh0aGlzLl9wcmV2aWV3KSk7CisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIHRoaXMuX3RpdGxlRWxlbWVudC50ZXh0Q29udGVudCA9IHRoaXMu X3ByZXZpZXcuZGVzY3JpcHRpb24gfHwgIiI7CisgICAgfSwKKwogICAgIF9udW1iZXJPZlByb3Bl cnRpZXNUb1Nob3dJbk1vZGU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlz Ll9tb2RlID09PSBXZWJJbnNwZWN0b3IuT2JqZWN0UHJldmlld1ZpZXcuTW9kZS5CcmllZiA/IDMg OiBJbmZpbml0eTsKQEAgLTEwMCwyMCArMTA5LDI4IEBAIFdlYkluc3BlY3Rvci5PYmplY3RQcmV2 aWV3Vmlldy5wcm90b3R5cGUgPSB7CiAKICAgICBfYXBwZW5kUHJldmlldzogZnVuY3Rpb24oZWxl bWVudCwgcHJldmlldykKICAgICB7Ci0gICAgICAgIC8vIENsYXNzIG5hbWUgZm9yIG5vbi1hcnJh eSBvYmplY3QgdHlwZXMuCi0gICAgICAgIGlmIChwcmV2aWV3LnR5cGUgPT09ICJvYmplY3QiICYm IHByZXZpZXcuc3VidHlwZSAhPT0gIm51bGwiICYmIHByZXZpZXcuc3VidHlwZSAhPT0gImFycmF5 IiAmJiBwcmV2aWV3LmRlc2NyaXB0aW9uICE9PSAiT2JqZWN0IikgewotICAgICAgICAgICAgdmFy IG5hbWVFbGVtZW50ID0gZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJzcGFuIikpOwotICAgICAgICAgICAgbmFtZUVsZW1lbnQuY2xhc3NOYW1lID0gIm9iamVjdC1w cmV2aWV3LW5hbWUiOwotICAgICAgICAgICAgbmFtZUVsZW1lbnQudGV4dENvbnRlbnQgPSBwcmV2 aWV3LmRlc2NyaXB0aW9uICsgIiAiOworICAgICAgICB2YXIgZGlzcGxheU9iamVjdEFzVmFsdWUg PSBmYWxzZTsKKyAgICAgICAgaWYgKHByZXZpZXcudHlwZSA9PT0gIm9iamVjdCIpIHsKKyAgICAg ICAgICAgIGlmIChwcmV2aWV3LnN1YnR5cGUgPT09ICJyZWdleHAiIHx8IHByZXZpZXcuc3VidHlw ZSA9PT0gIm51bGwiKSB7CisgICAgICAgICAgICAgICAgLy8gRGlzcGxheSBudWxsIC8gcmVnZXhw cyBhcyBzaW1wbGUgZm9ybWF0dGVkIHZhbHVlcy4KKyAgICAgICAgICAgICAgICBkaXNwbGF5T2Jq ZWN0QXNWYWx1ZSA9IHRydWU7CisgICAgICAgICAgICB9ICBlbHNlIGlmIChwcmV2aWV3LnN1YnR5 cGUgIT09ICJhcnJheSIgJiYgcHJldmlldy5kZXNjcmlwdGlvbiAhPT0gIk9iamVjdCIpIHsKKyAg ICAgICAgICAgICAgICAvLyBDbGFzcyBuYW1lcyBmb3Igb3RoZXIgbm9uLWFycmF5IC8gbm9uLWJh c2ljLU9iamVjdCB0eXBlcy4KKyAgICAgICAgICAgICAgICB2YXIgbmFtZUVsZW1lbnQgPSBlbGVt ZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKSk7CisgICAgICAg ICAgICAgICAgbmFtZUVsZW1lbnQuY2xhc3NOYW1lID0gIm9iamVjdC1wcmV2aWV3LW5hbWUiOwor ICAgICAgICAgICAgICAgIG5hbWVFbGVtZW50LnRleHRDb250ZW50ID0gcHJldmlldy5kZXNjcmlw dGlvbiArICIgIjsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIC8vIENvbnRl bnQuCiAgICAgICAgIHZhciBib2R5RWxlbWVudCA9IGVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgic3BhbiIpKTsKICAgICAgICAgYm9keUVsZW1lbnQuY2xhc3NOYW1l ID0gIm9iamVjdC1wcmV2aWV3LWJvZHkiOwotICAgICAgICBpZiAocHJldmlldy5jb2xsZWN0aW9u RW50cnlQcmV2aWV3cykKLSAgICAgICAgICAgIHJldHVybiB0aGlzLl9hcHBlbmRFbnRyeVByZXZp ZXdzKGJvZHlFbGVtZW50LCBwcmV2aWV3KTsKLSAgICAgICAgaWYgKHByZXZpZXcucHJvcGVydHlQ cmV2aWV3cykKLSAgICAgICAgICAgIHJldHVybiB0aGlzLl9hcHBlbmRQcm9wZXJ0eVByZXZpZXdz KGJvZHlFbGVtZW50LCBwcmV2aWV3KTsKKyAgICAgICAgaWYgKCFkaXNwbGF5T2JqZWN0QXNWYWx1 ZSkgeworICAgICAgICAgICAgaWYgKHByZXZpZXcuY29sbGVjdGlvbkVudHJ5UHJldmlld3MpCisg ICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2FwcGVuZEVudHJ5UHJldmlld3MoYm9keUVsZW1l bnQsIHByZXZpZXcpOworICAgICAgICAgICAgaWYgKHByZXZpZXcucHJvcGVydHlQcmV2aWV3cykK KyAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5fYXBwZW5kUHJvcGVydHlQcmV2aWV3cyhib2R5 RWxlbWVudCwgcHJldmlldyk7CisgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHRoaXMuX2FwcGVu ZFZhbHVlUHJldmlldyhib2R5RWxlbWVudCwgcHJldmlldyk7CiAgICAgfSwKIApAQCAtMTQ2LDEx ICsxNjMsMTMgQEAgV2ViSW5zcGVjdG9yLk9iamVjdFByZXZpZXdWaWV3LnByb3RvdHlwZSA9IHsK IAogICAgIF9hcHBlbmRQcm9wZXJ0eVByZXZpZXdzOiBmdW5jdGlvbihlbGVtZW50LCBwcmV2aWV3 KQogICAgIHsKLSAgICAgICAgLy8gRG8gbm90IHNob3cgZW1wdHkgcHJvcGVydGllcyBwcmV2aWV3 IGZvciBEYXRlIHByZXZpZXdzLgotICAgICAgICB2YXIgaXNEYXRlID0gcHJldmlldy5zdWJ0eXBl ID09PSAiZGF0ZSI7Ci0gICAgICAgIHZhciBudW1Qcm9wZXJ0aWVzID0gcHJldmlldy5wcm9wZXJ0 eVByZXZpZXdzLmxlbmd0aDsKLSAgICAgICAgaWYgKCFudW1Qcm9wZXJ0aWVzICYmIGlzRGF0ZSkK LSAgICAgICAgICAgIHJldHVybiBwcmV2aWV3Lmxvc3NsZXNzOworICAgICAgICAvLyBEbyBub3Qg c2hvdyBFcnJvciBwcm9wZXJ0aWVzIGluIHByZXZpZXdzLiBUaGV5IGFyZSBtb3JlIHVzZWZ1bCBp biBmdWxsIHZpZXdzLgorICAgICAgICBpZiAocHJldmlldy5zdWJ0eXBlID09PSAiZXJyb3IiKQor ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIC8vIERvIG5vdCBzaG93IERhdGUg cHJvcGVydGllcyBpbiBwcmV2aWV3cy4gSWYgdGhlcmUgYXJlIGFueSBwcm9wZXJ0aWVzLCBzaG93 IHRoZW0gaW4gZnVsbCB2aWV3LgorICAgICAgICBpZiAocHJldmlldy5zdWJ0eXBlID09PSAiZGF0 ZSIpCisgICAgICAgICAgICByZXR1cm4gIXByZXZpZXcucHJvcGVydHlQcmV2aWV3cy5sZW5ndGg7 CiAKICAgICAgICAgdmFyIGlzQXJyYXkgPSBwcmV2aWV3LnN1YnR5cGUgPT09ICJhcnJheSI7CiAK QEAgLTE1OCw3ICsxNzcsNyBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0UHJldmlld1ZpZXcucHJvdG90 eXBlID0gewogCiAgICAgICAgIHZhciBudW1iZXJBZGRlZCA9IDA7CiAgICAgICAgIHZhciBsaW1p dCA9IHRoaXMuX251bWJlck9mUHJvcGVydGllc1RvU2hvd0luTW9kZSgpOwotICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IG51bVByb3BlcnRpZXMgJiYgbnVtYmVyQWRkZWQgPCBsaW1pdDsgKytp KSB7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcHJldmlldy5wcm9wZXJ0eVByZXZpZXdz Lmxlbmd0aCAmJiBudW1iZXJBZGRlZCA8IGxpbWl0OyArK2kpIHsKICAgICAgICAgICAgIHZhciBw cm9wZXJ0eSA9IHByZXZpZXcucHJvcGVydHlQcmV2aWV3c1tpXTsKIAogICAgICAgICAgICAgLy8g RklYTUU6IEJldHRlciBoYW5kbGUgZ2V0dGVyL3NldHRlciBhY2Nlc3NvcnMuIFNob3VsZCB3ZSBz aG93IGdldHRlcnMgaW4gcHJldmlld3M/CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVlVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVWaWV3LmpzCmluZGV4IDk2MzUz ZDAuLjk3MTgyNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL09iamVjdFRyZWVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVWaWV3LmpzCkBAIC00OSw3ICs0OSw3IEBAIFdl Ykluc3BlY3Rvci5PYmplY3RUcmVlVmlldyA9IGZ1bmN0aW9uKG9iamVjdCwgbW9kZSwgZm9yY2VF eHBhbmRpbmcpCiAgICAgfSBlbHNlIHsKICAgICAgICAgdGhpcy5fdGl0bGVFbGVtZW50ID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwogICAgICAgICB0aGlzLl90aXRsZUVsZW1lbnQu Y2xhc3NOYW1lID0gInRpdGxlIjsKLSAgICAgICAgdGhpcy5fdGl0bGVFbGVtZW50LnRleHRDb250 ZW50ID0gdGhpcy5fb2JqZWN0LmRlc2NyaXB0aW9uIHx8ICIiOworICAgICAgICB0aGlzLl90aXRs ZUVsZW1lbnQuYXBwZW5kQ2hpbGQoV2ViSW5zcGVjdG9yLkZvcm1hdHRlZFZhbHVlLmNyZWF0ZUVs ZW1lbnRGb3JSZW1vdGVPYmplY3QodGhpcy5fb2JqZWN0KSk7CiAgICAgICAgIHRoaXMuX3RpdGxl RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2hhbmRsZVByZXZpZXdPclRp dGxlRWxlbWVudENsaWNrLmJpbmQodGhpcykpOwogICAgICAgICB0aGlzLl9lbGVtZW50LmFwcGVu ZENoaWxkKHRoaXMuX3RpdGxlRWxlbWVudCk7CiAgICAgfQo=