146709 2015-07-07 21:43:05 -0700 Web Inspector: Pressing tab on a comment in the styles sidebar doesn't highlight the comment 2019-05-02 16:24:24 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 hi webkit-unassigned commit-queue graouts joepeck jonowells mattbaker nvasilyev samsunrock266 timothy webkit-bug-importer oldest_to_newest 1107662 0 hi 2015-07-07 21:43:05 -0700 In addition, pressing enter on a comment line or tab at the end of one adds a semicolon to the end, which it shouldn't. 1107663 1 webkit-bug-importer 2015-07-07 21:43:34 -0700 <rdar://problem/21718943> 1107664 2 256353 hi 2015-07-07 21:48:37 -0700 Created attachment 256353 Patch 1107671 3 256353 commit-queue 2015-07-07 22:28:22 -0700 Comment on attachment 256353 Patch Clearing flags on attachment: 256353 Committed r186490: <http://trac.webkit.org/changeset/186490> 1107672 4 commit-queue 2015-07-07 22:28:27 -0700 All reviewed patches have been landed. Closing bug. 256353 2015-07-07 21:48:37 -0700 2015-07-07 22:28:22 -0700 Patch bug-146709-20150707214738.patch text/plain 10432 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDEzZTYwMmZhMGIxMzUyOGEwMDk5ZDE0N2M3MGQw OTM0ZDY1MGFkZjMuLmQ2MmI1ZGRiNmI3MjkyODg5MzAyOTk1NDA1NjM1ZjA2OTc1YjdmMTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA3LTA3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBQ cmVzc2luZyB0YWIgb24gYSBjb21tZW50IGluIHRoZSBzdHlsZXMgc2lkZWJhciBkb2Vzbid0IGhp Z2hsaWdodCB0aGUgY29tbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTQ2NzA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0 RWRpdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0 RWRpdG9yLnByb3RvdHlwZS5zZWxlY3RGaXJzdFByb3BlcnR5KToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUuc2VsZWN0TGFzdFBy b3BlcnR5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVk aXRvci5wcm90b3R5cGUuX3RleHRBdEN1cnNvcklzQ29tbWVudCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlLl9oaWdobGlnaHRO ZXh0TmFtZU9yVmFsdWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRp b25UZXh0RWRpdG9yLnByb3RvdHlwZS5faGFuZGxlTW91c2VVcCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlLl9oYW5kbGVFbnRl cktleSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0 b3IucHJvdG90eXBlLl9pbnNlcnROZXdsaW5lQWZ0ZXJDdXJyZW50TGluZSk6CisgICAgICAgIERl dGVybWluZXMgaWYgdGhlIHRleHQgYXQgdGhlIGdpdmVuIGN1cnNvciBwb3NpdGlvbiBpbiB0aGUg Z2l2ZW4gbGluZSBpcyBhIGNvbW1lbnQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVE ZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBlLl9oYW5kbGVTaGlmdFRhYktleSk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IucHJvdG90eXBl Ll9oYW5kbGVUYWJLZXkpOgorCiAyMDE1LTA3LTA3ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5 QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBUaW1lbGluZSByZWNvcmQgYmFy cyBhcmUgbm90IHdoaXRlIHdoZW4gdGhlIHJvdyBpcyBzZWxlY3RlZCBmcm9tIHRoZSBzaWRlYmFy CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D U1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzCmluZGV4 IGMzOWMzODhkMGYxMGE4ODJmMjdjMjlmNzdkODgzNDYwYTEyODZmOGYuLjA4YjU0Njc3ZWU3NGM3 MjQ3NTUzOWViMzA4M2ZhYzYxZDc3M2M5NTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxl RGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzCkBAIC0zNTgsNyArMzU4LDkgQEAgV2ViSW5zcGVjdG9y LkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yID0gY2xhc3MgQ1NTU3R5bGVEZWNsYXJhdGlv blRleHRFZGl0b3IKICAgICAgICAgICAgIHRoaXMuY2xlYXJTZWxlY3Rpb24oKTsKIAogICAgICAg ICB2YXIgaW5kZXggPSBsaW5lLmluZGV4T2YoIjoiKTsKLSAgICAgICAgdGhpcy5fY29kZU1pcnJv ci5zZXRTZWxlY3Rpb24oe2xpbmU6IDAsIGNoOiAwfSwge2xpbmU6IDAsIGNoOiBpbmRleCA8IDAg PyB0cmltbWVkTGluZS5sZW5ndGggOiBpbmRleH0pOworICAgICAgICB2YXIgY3Vyc29yID0ge2xp bmU6IDAsIGNoOiAwfTsKKworICAgICAgICB0aGlzLl9jb2RlTWlycm9yLnNldFNlbGVjdGlvbihj dXJzb3IsIHtsaW5lOiAwLCBjaDogaW5kZXggPCAwIHx8IHRoaXMuX3RleHRBdEN1cnNvcklzQ29t bWVudCh0aGlzLl9jb2RlTWlycm9yLCBjdXJzb3IpID8gdHJpbW1lZExpbmUubGVuZ3RoIDogaW5k ZXh9KTsKICAgICB9CiAKICAgICBzZWxlY3RMYXN0UHJvcGVydHkoKQpAQCAtMzY3LDggKzM2OSwx OSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IgPSBjbGFzcyBD U1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvcgogICAgICAgICB2YXIgbGluZVRleHQgPSB0aGlz Ll9jb2RlTWlycm9yLmdldExpbmUobGluZSk7CiAgICAgICAgIHZhciB0cmltbWVkTGluZSA9IGxp bmVUZXh0LnRyaW1SaWdodCgpOwogCi0gICAgICAgIHZhciBjb2xvbiA9IC8oPzo6XHMqKS8uZXhl YyhsaW5lVGV4dCk7Ci0gICAgICAgIHRoaXMuX2NvZGVNaXJyb3Iuc2V0U2VsZWN0aW9uKHtsaW5l LCBjaDogY29sb24gPyBjb2xvbi5pbmRleCArIGNvbG9uWzBdLmxlbmd0aCA6IDB9LCB7bGluZSwg Y2g6IHRyaW1tZWRMaW5lLmxlbmd0aCAtIHRyaW1tZWRMaW5lLmVuZHNXaXRoKCI7Iil9KTsKKyAg ICAgICAgdmFyIGxhc3RBbmNob3I7CisgICAgICAgIHZhciBsYXN0SGVhZDsKKworICAgICAgICBp ZiAodGhpcy5fdGV4dEF0Q3Vyc29ySXNDb21tZW50KHRoaXMuX2NvZGVNaXJyb3IsIHtsaW5lLCBj aDogbGluZS5sZW5ndGh9KSkgeworICAgICAgICAgICAgbGFzdEFuY2hvciA9IDA7CisgICAgICAg ICAgICBsYXN0SGVhZCA9IGxpbmUubGVuZ3RoOworICAgICAgICB9IGVsc2UgeworICAgICAgICAg ICAgdmFyIGNvbG9uID0gLyg/OjpccyopLy5leGVjKGxpbmVUZXh0KTsKKyAgICAgICAgICAgIGxh c3RBbmNob3IgPSBjb2xvbiA/IGNvbG9uLmluZGV4ICsgY29sb25bMF0ubGVuZ3RoIDogMDsKKyAg ICAgICAgICAgIGxhc3RIZWFkID0gdHJpbW1lZExpbmUubGVuZ3RoIC0gdHJpbW1lZExpbmUuZW5k c1dpdGgoIjsiKTsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMuX2NvZGVNaXJyb3Iuc2V0U2Vs ZWN0aW9uKHtsaW5lLCBjaDogbGFzdEFuY2hvcn0sIHtsaW5lLCBjaDogbGFzdEhlYWR9KTsKICAg ICB9CiAKICAgICAvLyBQcm90ZWN0ZWQKQEAgLTM5NSwxNiArNDA4LDMzIEBAIFdlYkluc3BlY3Rv ci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvciA9IGNsYXNzIENTU1N0eWxlRGVjbGFyYXRp b25UZXh0RWRpdG9yCiAKICAgICAvLyBQcml2YXRlCiAKKyAgICBfdGV4dEF0Q3Vyc29ySXNDb21t ZW50KGNvZGVNaXJyb3IsIGN1cnNvcikKKyAgICB7CisgICAgICAgIHZhciB0b2tlbiA9IGNvZGVN aXJyb3IuZ2V0VG9rZW5UeXBlQXQoY3Vyc29yKTsKKyAgICAgICAgcmV0dXJuIHRva2VuICYmIHRv a2VuLmluY2x1ZGVzKCJjb21tZW50Iik7CisgICAgfQorCiAgICAgX2hpZ2hsaWdodE5leHROYW1l T3JWYWx1ZShjb2RlTWlycm9yLCBjdXJzb3IsIHRleHQpCiAgICAgewotICAgICAgICB2YXIgY29s b25JbmRleCA9IHRleHQuaW5kZXhPZigiOiIpOwotICAgICAgICB2YXIgc3Vic3RyaW5nSW5kZXgg PSBjb2xvbkluZGV4ID49IDAgJiYgY3Vyc29yLmNoID49IGNvbG9uSW5kZXggPyBjb2xvbkluZGV4 IDogMDsKKyAgICAgICAgdmFyIG5leHRBbmNob3I7CisgICAgICAgIHZhciBuZXh0SGVhZDsKKwor ICAgICAgICBpZiAodGhpcy5fdGV4dEF0Q3Vyc29ySXNDb21tZW50KGNvZGVNaXJyb3IsIGN1cnNv cikpIHsKKyAgICAgICAgICAgIG5leHRBbmNob3IgPSAwOworICAgICAgICAgICAgbmV4dEhlYWQg PSB0ZXh0Lmxlbmd0aDsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHZhciBjb2xvbklu ZGV4ID0gdGV4dC5pbmRleE9mKCI6Iik7CisgICAgICAgICAgICB2YXIgc3Vic3RyaW5nSW5kZXgg PSBjb2xvbkluZGV4ID49IDAgJiYgY3Vyc29yLmNoID49IGNvbG9uSW5kZXggPyBjb2xvbkluZGV4 IDogMDsKIAotICAgICAgICB2YXIgcmVnRXhwID0gLyg/OlteOjtcc11ccyopKy9nOwotICAgICAg ICByZWdFeHAubGFzdEluZGV4ID0gc3Vic3RyaW5nSW5kZXg7Ci0gICAgICAgIHZhciBtYXRjaCA9 IHJlZ0V4cC5leGVjKHRleHQpOworICAgICAgICAgICAgdmFyIHJlZ0V4cCA9IC8oPzpbXjo7XHNd XHMqKSsvZzsKKyAgICAgICAgICAgIHJlZ0V4cC5sYXN0SW5kZXggPSBzdWJzdHJpbmdJbmRleDsK KyAgICAgICAgICAgIHZhciBtYXRjaCA9IHJlZ0V4cC5leGVjKHRleHQpOwogCi0gICAgICAgIGNv ZGVNaXJyb3Iuc2V0U2VsZWN0aW9uKHtsaW5lOiBjdXJzb3IubGluZSwgY2g6IG1hdGNoLmluZGV4 fSwge2xpbmU6IGN1cnNvci5saW5lLCBjaDogbWF0Y2guaW5kZXggKyBtYXRjaFswXS5sZW5ndGh9 KTsKKyAgICAgICAgICAgIG5leHRBbmNob3IgPSBtYXRjaC5pbmRleDsKKyAgICAgICAgICAgIG5l eHRIZWFkID0gbmV4dEFuY2hvciArIG1hdGNoWzBdLmxlbmd0aDsKKyAgICAgICAgfQorCisgICAg ICAgIGNvZGVNaXJyb3Iuc2V0U2VsZWN0aW9uKHtsaW5lOiBjdXJzb3IubGluZSwgY2g6IG5leHRB bmNob3J9LCB7bGluZTogY3Vyc29yLmxpbmUsIGNoOiBuZXh0SGVhZH0pOwogICAgIH0KIAogICAg IF9oYW5kbGVNb3VzZURvd24oZXZlbnQpCkBAIC00MzUsOCArNDY1LDE0IEBAIFdlYkluc3BlY3Rv ci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvciA9IGNsYXNzIENTU1N0eWxlRGVjbGFyYXRp b25UZXh0RWRpdG9yCiAgICAgICAgIHZhciBjdXJzb3IgPSB0aGlzLl9jb2RlTWlycm9yLmNvb3Jk c0NoYXIoe2xlZnQ6IGV2ZW50LngsIHRvcDogZXZlbnQueX0pOwogICAgICAgICB2YXIgbGluZSA9 IHRoaXMuX2NvZGVNaXJyb3IuZ2V0TGluZShjdXJzb3IubGluZSk7CiAKLSAgICAgICAgaWYgKHRo aXMuX21vdXNlRG93bkN1cnNvclBvc2l0aW9uLmxpbmUgPT09IGN1cnNvci5saW5lICYmIHRoaXMu X21vdXNlRG93bkN1cnNvclBvc2l0aW9uLmNoID09PSBjdXJzb3IuY2gpCi0gICAgICAgICAgICB0 aGlzLl9jb2RlTWlycm9yLnJlcGxhY2VSYW5nZShsaW5lLnRyaW1SaWdodCgpLmVuZHNXaXRoKCI7 IikgPyAiXG4iIDogIjtcbiIsIGN1cnNvcik7CisgICAgICAgIGlmICh0aGlzLl9tb3VzZURvd25D dXJzb3JQb3NpdGlvbi5saW5lID09PSBjdXJzb3IubGluZSAmJiB0aGlzLl9tb3VzZURvd25DdXJz b3JQb3NpdGlvbi5jaCA9PT0gY3Vyc29yLmNoKSB7CisgICAgICAgICAgICB2YXIgcmVwbGFjZW1l bnQgPSAiXG4iOworCisgICAgICAgICAgICBpZiAoIWxpbmUudHJpbVJpZ2h0KCkuZW5kc1dpdGgo IjsiKSAmJiAhdGhpcy5fdGV4dEF0Q3Vyc29ySXNDb21tZW50KHRoaXMuX2NvZGVNaXJyb3IsIGN1 cnNvcikpCisgICAgICAgICAgICAgICAgcmVwbGFjZW1lbnQgPSAiOyIgKyByZXBsYWNlbWVudDsK KworICAgICAgICAgICAgdGhpcy5fY29kZU1pcnJvci5yZXBsYWNlUmFuZ2UocmVwbGFjZW1lbnQs IGN1cnNvcik7CisgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9tb3VzZURvd25DdXJzb3JQb3Np dGlvbiA9IG51bGw7CiAgICAgfQpAQCAtNDY5LDcgKzUwNSwxMiBAQCBXZWJJbnNwZWN0b3IuQ1NT U3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IgPSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uVGV4 dEVkaXRvcgogICAgICAgICAgICAgKytjdXJzb3IuY2g7CiAKICAgICAgICAgaWYgKGN1cnNvci5j aCA9PT0gdHJpbW1lZExpbmUubGVuZ3RoKSB7Ci0gICAgICAgICAgICBjb2RlTWlycm9yLnJlcGxh Y2VSYW5nZShoYXNFbmRpbmdTZW1pY29sb24gPyAiXG4iIDogIjtcbiIsIGN1cnNvcik7CisgICAg ICAgICAgICB2YXIgcmVwbGFjZW1lbnQgPSAiXG4iOworCisgICAgICAgICAgICBpZiAoIWhhc0Vu ZGluZ1NlbWljb2xvbiAmJiAhdGhpcy5fdGV4dEF0Q3Vyc29ySXNDb21tZW50KHRoaXMuX2NvZGVN aXJyb3IsIGN1cnNvcikpCisgICAgICAgICAgICAgICAgcmVwbGFjZW1lbnQgPSAiOyIgKyByZXBs YWNlbWVudDsKKworICAgICAgICAgICAgdGhpcy5fY29kZU1pcnJvci5yZXBsYWNlUmFuZ2UocmVw bGFjZW1lbnQsIGN1cnNvcik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAt NDg1LDcgKzUyNiwxMiBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0 b3IgPSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvcgogICAgICAgICBjdXJzb3Iu Y2ggPSB0cmltbWVkTGluZS5sZW5ndGg7CiAKICAgICAgICAgaWYgKGN1cnNvci5jaCkgewotICAg ICAgICAgICAgY29kZU1pcnJvci5yZXBsYWNlUmFuZ2UodHJpbW1lZExpbmUuZW5kc1dpdGgoIjsi KSA/ICJcbiIgOiAiO1xuIiwgY3Vyc29yKTsKKyAgICAgICAgICAgIHZhciByZXBsYWNlbWVudCA9 ICJcbiI7CisKKyAgICAgICAgICAgIGlmICghdHJpbW1lZExpbmUuZW5kc1dpdGgoIjsiKSAmJiAh dGhpcy5fdGV4dEF0Q3Vyc29ySXNDb21tZW50KHRoaXMuX2NvZGVNaXJyb3IsIGN1cnNvcikpCisg ICAgICAgICAgICAgICAgcmVwbGFjZW1lbnQgPSAiOyIgKyByZXBsYWNlbWVudDsKKworICAgICAg ICAgICAgdGhpcy5fY29kZU1pcnJvci5yZXBsYWNlUmFuZ2UocmVwbGFjZW1lbnQsIGN1cnNvcik7 CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtNTA3LDE1ICs1NTMsMjkgQEAg V2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yID0gY2xhc3MgQ1NTU3R5 bGVEZWNsYXJhdGlvblRleHRFZGl0b3IKICAgICAgICAgdmFyIGN1cnNvciA9IGNvZGVNaXJyb3Iu Z2V0Q3Vyc29yKCk7CiAgICAgICAgIHZhciBsaW5lID0gY29kZU1pcnJvci5nZXRMaW5lKGN1cnNv ci5saW5lKTsKICAgICAgICAgdmFyIHByZXZpb3VzTGluZSA9IGNvZGVNaXJyb3IuZ2V0TGluZShj dXJzb3IubGluZSAtIDEpOwotICAgICAgICB2YXIgdHJpbW1lZFByZXZpb3VzTGluZSA9IHByZXZp b3VzTGluZSA/IHByZXZpb3VzTGluZS50cmltUmlnaHQoKSA6ICIiOwogCiAgICAgICAgIGlmICgh bGluZSAmJiAhcHJldmlvdXNMaW5lICYmICFjdXJzb3IubGluZSkKICAgICAgICAgICAgIHJldHVy biBzd2l0Y2hSdWxlLmNhbGwodGhpcyk7CiAKLSAgICAgICAgaWYgKGN1cnNvci5jaCA9PT0gbGlu ZS5pbmRleE9mKCI6IikgfHwgbGluZS5pbmRleE9mKCI6IikgPCAwKSB7CisgICAgICAgIHZhciB0 cmltbWVkUHJldmlvdXNMaW5lID0gcHJldmlvdXNMaW5lID8gcHJldmlvdXNMaW5lLnRyaW1SaWdo dCgpIDogIiI7CisgICAgICAgIHZhciBwcmV2aW91c0FuY2hvcjsKKyAgICAgICAgdmFyIHByZXZp b3VzSGVhZDsKKyAgICAgICAgdmFyIGlzQ29tbWVudCA9IHRoaXMuX3RleHRBdEN1cnNvcklzQ29t bWVudChjb2RlTWlycm9yLCBjdXJzb3IpOworCisgICAgICAgIGlmIChjdXJzb3IuY2ggPT09IGxp bmUuaW5kZXhPZigiOiIpIHx8IGxpbmUuaW5kZXhPZigiOiIpIDwgMCB8fCBpc0NvbW1lbnQpIHsK ICAgICAgICAgICAgIGlmIChwcmV2aW91c0xpbmUpIHsKLSAgICAgICAgICAgICAgICB2YXIgY29s b24gPSAvKD86OlxzKikvLmV4ZWMocHJldmlvdXNMaW5lKTsKLSAgICAgICAgICAgICAgICBjb2Rl TWlycm9yLnNldFNlbGVjdGlvbih7bGluZTogY3Vyc29yLmxpbmUgLSAxLCBjaDogY29sb24gPyBj b2xvbi5pbmRleCArIGNvbG9uWzBdLmxlbmd0aCA6IDB9LCB7bGluZTogY3Vyc29yLmxpbmUgLSAx LCBjaDogdHJpbW1lZFByZXZpb3VzTGluZS5sZW5ndGggLSB0cmltbWVkUHJldmlvdXNMaW5lLmVu ZHNXaXRoKCI7Iil9KTsKKyAgICAgICAgICAgICAgICAtLWN1cnNvci5saW5lOworCisgICAgICAg ICAgICAgICAgaWYgKHRoaXMuX3RleHRBdEN1cnNvcklzQ29tbWVudChjb2RlTWlycm9yLCBjdXJz b3IpKSB7CisgICAgICAgICAgICAgICAgICAgIHByZXZpb3VzQW5jaG9yID0gMDsKKyAgICAgICAg ICAgICAgICAgICAgcHJldmlvdXNIZWFkID0gdHJpbW1lZFByZXZpb3VzTGluZS5sZW5ndGg7Cisg ICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgdmFyIGNvbG9uID0g Lyg/OjpccyopLy5leGVjKHByZXZpb3VzTGluZSk7CisgICAgICAgICAgICAgICAgICAgIHByZXZp b3VzQW5jaG9yID0gY29sb24gPyBjb2xvbi5pbmRleCArIGNvbG9uWzBdLmxlbmd0aCA6IDA7Cisg ICAgICAgICAgICAgICAgICAgIHByZXZpb3VzSGVhZCA9IHRyaW1tZWRQcmV2aW91c0xpbmUubGVu Z3RoIC0gdHJpbW1lZFByZXZpb3VzTGluZS5lbmRzV2l0aCgiOyIpOworICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICBjb2RlTWlycm9yLnNldFNlbGVj dGlvbih7bGluZTogY3Vyc29yLmxpbmUsIGNoOiBwcmV2aW91c0FuY2hvcn0sIHtsaW5lOiBjdXJz b3IubGluZSwgY2g6IHByZXZpb3VzSGVhZH0pOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgICAgIH0KIApAQCAtNTI3LDggKzU4NywxNiBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVE ZWNsYXJhdGlvblRleHRFZGl0b3IgPSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRv cgogICAgICAgICAgICAgcmV0dXJuIHN3aXRjaFJ1bGUuY2FsbCh0aGlzKTsKICAgICAgICAgfQog Ci0gICAgICAgIHZhciBtYXRjaCA9IC8oPzpbXjo7XHNdXHMqKSsvLmV4ZWMobGluZSk7Ci0gICAg ICAgIGNvZGVNaXJyb3Iuc2V0U2VsZWN0aW9uKHtsaW5lOiBjdXJzb3IubGluZSwgY2g6IG1hdGNo LmluZGV4fSwge2xpbmU6IGN1cnNvci5saW5lLCBjaDogbWF0Y2guaW5kZXggKyBtYXRjaFswXS5s ZW5ndGh9KTsKKyAgICAgICAgaWYgKGlzQ29tbWVudCkgeworICAgICAgICAgICAgcHJldmlvdXNB bmNob3IgPSAwOworICAgICAgICAgICAgcHJldmlvdXNIZWFkID0gbGluZS5sZW5ndGg7CisgICAg ICAgIH0gZWxzZSB7CisgICAgICAgICAgICB2YXIgbWF0Y2ggPSAvKD86W146O1xzXVxzKikrLy5l eGVjKGxpbmUpOworICAgICAgICAgICAgcHJldmlvdXNBbmNob3IgPSBtYXRjaC5pbmRleDsKKyAg ICAgICAgICAgIHByZXZpb3VzSGVhZCA9IHByZXZpb3VzQW5jaG9yICsgbWF0Y2hbMF0ubGVuZ3Ro OworICAgICAgICB9CisKKyAgICAgICAgY29kZU1pcnJvci5zZXRTZWxlY3Rpb24oe2xpbmU6IGN1 cnNvci5saW5lLCBjaDogcHJldmlvdXNBbmNob3J9LCB7bGluZTogY3Vyc29yLmxpbmUsIGNoOiBw cmV2aW91c0hlYWR9KTsKICAgICB9CiAKICAgICBfaGFuZGxlVGFiS2V5KGNvZGVNaXJyb3IpCkBA IC01NzgsNyArNjQ2LDcgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRp dG9yID0gY2xhc3MgQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IKIAogICAgICAgICAgICAg ICAgIHZhciByZXBsYWNlbWVudCA9ICIiOwogCi0gICAgICAgICAgICAgICAgaWYgKCFoYXNFbmRp bmdTZW1pY29sb24pCisgICAgICAgICAgICAgICAgaWYgKCFoYXNFbmRpbmdTZW1pY29sb24gJiYg IXRoaXMuX3RleHRBdEN1cnNvcklzQ29tbWVudChjb2RlTWlycm9yLCBjdXJzb3IpKQogICAgICAg ICAgICAgICAgICAgICByZXBsYWNlbWVudCArPSAiOyI7CiAKICAgICAgICAgICAgICAgICBpZiAo bGFzdExpbmUpCkBAIC01OTIsOCArNjYwLDcgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFy YXRpb25UZXh0RWRpdG9yID0gY2xhc3MgQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IKICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAg ICAgICAgIHZhciBjb2xvbiA9IG5leHRMaW5lLmluZGV4T2YoIjoiKTsKLSAgICAgICAgICAgICAg ICBjb2RlTWlycm9yLnNldFNlbGVjdGlvbih7bGluZTogY3Vyc29yLmxpbmUgKyAxLCBjaDogMH0s IHtsaW5lOiBjdXJzb3IubGluZSArIDEsIGNoOiBjb2xvbiA8IDAgPyB0cmltbWVkTmV4dExpbmUu bGVuZ3RoIDogY29sb259KTsKKyAgICAgICAgICAgICAgICB0aGlzLl9oaWdobGlnaHROZXh0TmFt ZU9yVmFsdWUoY29kZU1pcnJvciwge2xpbmU6IGN1cnNvci5saW5lICsgMSwgY2g6IDB9LCBuZXh0 TGluZSk7CiAgICAgICAgICAgICB9LmJpbmQodGhpcykpOwogCiAgICAgICAgICAgICByZXR1cm47 Cg==