182545 2018-02-06 11:53:06 -0800 Web Inspector: Rename String.prototype.trimEnd to avoid conflicts with native trimEnd 2018-02-06 19:08:23 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev bburg commit-queue inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1396881 0 nvasilyev 2018-02-06 11:53:06 -0800 trimEnd just landed in JSC (bug 182233). Just like `trim` removes whitespace at the beginning and the end of a string, trimEnd removes whitespace only at the end. In Utilities.js we have: String.prototype.trimEnd(maxLength) String.prototype.trimMiddle(maxLength) String.prototype.truncate(maxLength) Our trimEnd truncates a string to a specified maxLength. I suggest to rename: 1. trimEnd to truncateEnd 2. trimMiddle to truncateMiddle 1396954 1 bburg 2018-02-06 14:43:39 -0800 (In reply to Nikita Vasilyev from comment #0) > trimEnd just landed in JSC (bug 182233). Just like `trim` removes whitespace > at the beginning and the end of a string, > trimEnd removes whitespace only at the end. > > In Utilities.js we have: > > String.prototype.trimEnd(maxLength) > String.prototype.trimMiddle(maxLength) > String.prototype.truncate(maxLength) > > Our trimEnd truncates a string to a specified maxLength. > > I suggest to rename: > 1. trimEnd to truncateEnd > 2. trimMiddle to truncateMiddle Sounds okay to me. 1397008 2 333235 nvasilyev 2018-02-06 16:38:42 -0800 Created attachment 333235 Patch 1397019 3 333235 bburg 2018-02-06 16:59:18 -0800 Comment on attachment 333235 Patch r=me with EWS 1397050 4 333235 commit-queue 2018-02-06 19:05:59 -0800 Comment on attachment 333235 Patch Clearing flags on attachment: 333235 Committed r228214: <https://trac.webkit.org/changeset/228214> 1397051 5 commit-queue 2018-02-06 19:06:00 -0800 All reviewed patches have been landed. Closing bug. 1397052 6 webkit-bug-importer 2018-02-06 19:08:23 -0800 <rdar://problem/37298532> 333235 2018-02-06 16:38:42 -0800 2018-02-06 19:05:59 -0800 Patch patch.txt text/plain 9897 nvasilyev ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlN2M5MWJhLi5mY2JkODdmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTgtMDIt MDYgIE5pa2l0YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogUmVuYW1lIFN0cmluZy5wcm90b3R5cGUudHJpbUVuZCB0byBhdm9pZCBjb25m bGljdHMgd2l0aCBuYXRpdmUgdHJpbUVuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTgyNTQ1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvdW5pdC10ZXN0cy9zdHJpbmctdXRpbGl0aWVz LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvdW5pdC10ZXN0cy9zdHJpbmctdXRp bGl0aWVzLmh0bWw6CisKIDIwMTgtMDItMDUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCB1bnNraXAgZmV0Y2gtZXZlbnQtcmVzcG9uZC13aXRo LXBhcnRpYWwtc3RyZWFtLmh0dHBzLmh0bWwgYXMgaXQgbm8gbG9uZ2VyIHRpbWVzIG91dApkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvc3RyaW5nLXV0aWxpdGll cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9zdHJpbmct dXRpbGl0aWVzLWV4cGVjdGVkLnR4dAppbmRleCAyNWFmNWIxLi5kNjhjMzBlIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9zdHJpbmctdXRpbGl0aWVzLWV4cGVj dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9zdHJpbmctdXRp bGl0aWVzLWV4cGVjdGVkLnR4dApAQCAtNDYsMyArNDYsMTMgQEAgUEFTUzogTGFzdCBsaW5lIG9m IGEgdGhyZWUgbGluZSBzdHJpbmcgc2hvdWxkIGJlIHRoZSB0aGlyZCBsaW5lLgogUEFTUzogTGFz dCBsaW5lIG9mIGEgc3RyaW5nIHdpdGggYSB0cmFsaW5nIGxpbmUgYnJlYWsgc2hvdWxkIGJlIGVt cHR5LgogUEFTUzogTGFzdCBsaW5lIG9mIGFuIGVtcHR5IHN0cmluZyBpcyB0aGUgc2FtZSBlbXB0 eSBzdHJpbmcuCiAKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBTdHJpbmcucHJvdG90eXBlLnRydW5j YXRlTWlkZGxlCitQQVNTOiBTdHJpbmcgc3RheXMgdGhlIHNhbWUuCitQQVNTOiBFbGxpcHNpcyBp cyBpbnNlcnRlZCBpbiB0aGUgbWlkZGxlLgorUEFTUzogRWxsaXBzaXMgaXMgaW5zZXJ0ZWQgYWZ0 ZXIgdGhlIHNlY29uZCBjaGFyYWN0ZXIuCisKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBTdHJpbmcu cHJvdG90eXBlLnRydW5jYXRlRW5kCitQQVNTOiBTdHJpbmcgc3RheXMgdGhlIHNhbWUuCitQQVNT OiBFbGxpcHNpcyBpcyBpbnNlcnRlZCBpbiB0aGUgbWlkZGxlLgorUEFTUzogRWxsaXBzaXMgaXMg aW5zZXJ0ZWQgYWZ0ZXIgdGhlIHRoaXJkIGNoYXJhY3Rlci4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvc3RyaW5nLXV0aWxpdGllcy5odG1sIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvc3RyaW5nLXV0aWxpdGllcy5odG1sCmluZGV4IDRm ZTIxNzYuLjE3MDc0OTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRl c3RzL3N0cmluZy11dGlsaXRpZXMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5p dC10ZXN0cy9zdHJpbmctdXRpbGl0aWVzLmh0bWwKQEAgLTEsNiArMSw3IEBACiA8IWRvY3R5cGUg aHRtbD4KIDxodG1sPgogPGhlYWQ+Cis8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+CiA8c2NyaXB0IHNy Yz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzL2luc3BlY3Rvci10ZXN0Lmpz Ij48L3NjcmlwdD4KIDxzY3JpcHQ+CiBmdW5jdGlvbiB0ZXN0KCkKQEAgLTc4LDYgKzc5LDI4IEBA IGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICB9CiAgICAgfSk7CiAKKyAgICBzdWl0ZS5hZGRUZXN0 Q2FzZSh7CisgICAgICAgIG5hbWU6ICJTdHJpbmcucHJvdG90eXBlLnRydW5jYXRlTWlkZGxlIiwK KyAgICAgICAgdGVzdCgpIHsKKyAgICAgICAgICAgIGNvbnN0IGVsbGlwc2lzID0gIlx1MjAyNiI7 CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKCJhYmNkZWYiLnRydW5jYXRl TWlkZGxlKDYpLCAiYWJjZGVmIiwgIlN0cmluZyBzdGF5cyB0aGUgc2FtZS4iKTsKKyAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoImFiY2RlZiIudHJ1bmNhdGVNaWRkbGUoNSks IGBhYiR7ZWxsaXBzaXN9ZWZgLCAiRWxsaXBzaXMgaXMgaW5zZXJ0ZWQgaW4gdGhlIG1pZGRsZS4i KTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoImFiY2RlZiIudHJ1bmNh dGVNaWRkbGUoNCksIGBhYiR7ZWxsaXBzaXN9ZmAsICJFbGxpcHNpcyBpcyBpbnNlcnRlZCBhZnRl ciB0aGUgc2Vjb25kIGNoYXJhY3Rlci4iKTsKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAg ICAgICB9CisgICAgfSk7CisKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6 ICJTdHJpbmcucHJvdG90eXBlLnRydW5jYXRlRW5kIiwKKyAgICAgICAgdGVzdCgpIHsKKyAgICAg ICAgICAgIGNvbnN0IGVsbGlwc2lzID0gIlx1MjAyNiI7CisgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmV4cGVjdEVxdWFsKCJhYmNkZWYiLnRydW5jYXRlRW5kKDYpLCAiYWJjZGVmIiwgIlN0cmlu ZyBzdGF5cyB0aGUgc2FtZS4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1 YWwoImFiY2RlZiIudHJ1bmNhdGVFbmQoNSksICJhYmNkIiArIGVsbGlwc2lzLCAiRWxsaXBzaXMg aXMgaW5zZXJ0ZWQgaW4gdGhlIG1pZGRsZS4iKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3Qu ZXhwZWN0RXF1YWwoImFiY2RlZiIudHJ1bmNhdGVFbmQoNCksICJhYmMiICsgZWxsaXBzaXMsICJF bGxpcHNpcyBpcyBpbnNlcnRlZCBhZnRlciB0aGUgdGhpcmQgY2hhcmFjdGVyLiIpOworICAgICAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICB9KTsKKwogICAgIHN1aXRlLnJ1blRl c3RDYXNlc0FuZEZpbmlzaCgpOwogfQogPC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpp bmRleCA0YTE0ZGZhLi4yYzI2OTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwzNCBAQAorMjAxOC0wMi0wNiAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNv bT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW5hbWUgU3RyaW5nLnByb3RvdHlwZS50cmlt RW5kIHRvIGF2b2lkIGNvbmZsaWN0cyB3aXRoIG5hdGl2ZSB0cmltRW5kCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODI1NDUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWU6CisgICAgICAgIC0gdHJp bUVuZCB0byB0cnVuY2F0ZUVuZAorICAgICAgICAtIHRyaW1NaWRkbGUgdG8gdHJ1bmNhdGVNaWRk bGUKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanM6CisgICAgICAg IChTdHJpbmcucHJvdG90eXBlLnRyaW1NaWRkbGUpOiBEZWxldGVkLgorICAgICAgICAoU3RyaW5n LnByb3RvdHlwZS50cmltRW5kKTogRGVsZXRlZC4KKyAgICAgICAgKFN0cmluZy5wcm90b3R5cGUu dHJ1bmNhdGVNaWRkbGUpOiBBZGRlZC4KKyAgICAgICAgKFN0cmluZy5wcm90b3R5cGUudHJ1bmNh dGVFbmQpOiBBZGRlZC4KKyAgICAgICAgVXNlIHN0cmljdCBtb2RlLiBTY3JpY3QgbW9kZSBhbGxv d3MgYHRoaXNgIHRvIGJlIGEgcHJpbWl0aXZlIChhIHN0cmluZywgaW4gb3VyIGNhc2UpLgorICAg ICAgICBJbiBub24tc3RyaWN0IG1vZGUsIGB0aGlzYCBpcyBhbHdheXMgYW4gb2JqZWN0LiBXaXRo b3V0IHRoZSBzdHJpY3QgbW9kZSwKKyAgICAgICAgImEiLnRydW5jYXRlRW5kKDQyKSAhPT0gImEi LCBiZWNhdXNlIHRydW5jYXRlRW5kIHJldHVybnMgYSBzdHJpbmcgb2JqZWN0LgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudC5qczoKKyAgICAgICAgKFdJLkRP TVRyZWVFbGVtZW50LnByb3RvdHlwZS5fYnVpbGRBdHRyaWJ1dGVET00pOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnRQYXRoQ29tcG9uZW50LmpzOgorICAgICAg ICAoV0kuRE9NVHJlZUVsZW1lbnRQYXRoQ29tcG9uZW50KToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1NlYXJjaFJlc3VsdFRyZWVFbGVtZW50LmpzOgorICAgICAgICBSZW1vdmUgYW4g b2J2aW91cyBjb21tZW50LgorCisgICAgICAgIChXSS5TZWFyY2hSZXN1bHRUcmVlRWxlbWVudC50 cnVuY2F0ZUFuZEhpZ2hsaWdodFRpdGxlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qczoKKyAgICAgICAgKFdJLlNwcmVhZHNoZWV0U3R5 bGVQcm9wZXJ0eS5wcm90b3R5cGUuX3JlbmRlclZhbHVlKToKKwogMjAxOC0wMi0wMiAgRGV2aW4g Um91c3NvICA8d2Via2l0QGRldmlucm91c3NvLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9y OiBTdHlsZXMgUmVkZXNpZ246IFBhc3RpbmcgbXVsdGlwbGUgcHJvcGVydGllcyBzaG91bGQgY3Jl YXRlIHByb3BlcnRpZXMgaW5zdGVhZCBvZiBhIGJhZCBwcm9wZXJ0eQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcwppbmRleCA2 OTFkZDhlLi4yZTYzMzVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcwpAQCAtNTc5LDEwICs1NzksMTIgQEAgT2JqZWN0 LmRlZmluZVByb3BlcnR5KFN0cmluZy5wcm90b3R5cGUsICJpc1VwcGVyQ2FzZSIsCiAgICAgfQog fSk7CiAKLU9iamVjdC5kZWZpbmVQcm9wZXJ0eShTdHJpbmcucHJvdG90eXBlLCAidHJpbU1pZGRs ZSIsCitPYmplY3QuZGVmaW5lUHJvcGVydHkoU3RyaW5nLnByb3RvdHlwZSwgInRydW5jYXRlTWlk ZGxlIiwKIHsKICAgICB2YWx1ZShtYXhMZW5ndGgpCiAgICAgeworICAgICAgICAidXNlIHN0cmlj dCI7CisKICAgICAgICAgaWYgKHRoaXMubGVuZ3RoIDw9IG1heExlbmd0aCkKICAgICAgICAgICAg IHJldHVybiB0aGlzOwogICAgICAgICB2YXIgbGVmdEhhbGYgPSBtYXhMZW5ndGggPj4gMTsKQEAg LTU5MSwxMCArNTkzLDEyIEBAIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShTdHJpbmcucHJvdG90eXBl LCAidHJpbU1pZGRsZSIsCiAgICAgfQogfSk7CiAKLU9iamVjdC5kZWZpbmVQcm9wZXJ0eShTdHJp bmcucHJvdG90eXBlLCAidHJpbUVuZCIsCitPYmplY3QuZGVmaW5lUHJvcGVydHkoU3RyaW5nLnBy b3RvdHlwZSwgInRydW5jYXRlRW5kIiwKIHsKICAgICB2YWx1ZShtYXhMZW5ndGgpCiAgICAgewor ICAgICAgICAidXNlIHN0cmljdCI7CisKICAgICAgICAgaWYgKHRoaXMubGVuZ3RoIDw9IG1heExl bmd0aCkKICAgICAgICAgICAgIHJldHVybiB0aGlzOwogICAgICAgICByZXR1cm4gdGhpcy5zdWJz dHIoMCwgbWF4TGVuZ3RoIC0gMSkgKyBlbGxpcHNpczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMKaW5k ZXggYjkxMGZmMy4uZDNmODQzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanMKQEAgLTEyNzEsNyAr MTI3MSw3IEBAIFdJLkRPTVRyZWVFbGVtZW50ID0gY2xhc3MgRE9NVHJlZUVsZW1lbnQgZXh0ZW5k cyBXSS5UcmVlRWxlbWVudAogICAgICAgICAgICAgICAgIGF0dHJWYWx1ZUVsZW1lbnQudGV4dENv bnRlbnQgPSB2YWx1ZTsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgaWYg KHZhbHVlLnN0YXJ0c1dpdGgoImRhdGE6IikpCi0gICAgICAgICAgICAgICAgICAgIHZhbHVlID0g dmFsdWUudHJpbU1pZGRsZSg2MCk7CisgICAgICAgICAgICAgICAgICAgIHZhbHVlID0gdmFsdWUu dHJ1bmNhdGVNaWRkbGUoNjApOwogCiAgICAgICAgICAgICAgICAgYXR0clZhbHVlRWxlbWVudCA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImEiKTsKICAgICAgICAgICAgICAgICBhdHRyVmFsdWVF bGVtZW50LmhyZWYgPSByZXdyaXR0ZW5VUkw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVudFBhdGhDb21wb25lbnQuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVu dFBhdGhDb21wb25lbnQuanMKaW5kZXggOWVhMWVkOS4uMWMxNjFkNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnRQYXRo Q29tcG9uZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RPTVRyZWVFbGVtZW50UGF0aENvbXBvbmVudC5qcwpAQCAtNDUsMTIgKzQ1LDEyIEBAIFdJ LkRPTVRyZWVFbGVtZW50UGF0aENvbXBvbmVudCA9IGNsYXNzIERPTVRyZWVFbGVtZW50UGF0aENv bXBvbmVudCBleHRlbmRzIFdJLkhpCiAKICAgICAgICAgY2FzZSBOb2RlLlRFWFRfTk9ERToKICAg ICAgICAgICAgIGNsYXNzTmFtZSA9IFdJLkRPTVRyZWVFbGVtZW50UGF0aENvbXBvbmVudC5ET01U ZXh0Tm9kZUljb25TdHlsZUNsYXNzTmFtZTsKLSAgICAgICAgICAgIHRpdGxlID0gIlwiIiArIG5v ZGUubm9kZVZhbHVlKCkudHJpbUVuZCgzMikgKyAiXCIiOworICAgICAgICAgICAgdGl0bGUgPSAi XCIiICsgbm9kZS5ub2RlVmFsdWUoKS50cnVuY2F0ZUVuZCgzMikgKyAiXCIiOwogICAgICAgICAg ICAgYnJlYWs7CiAKICAgICAgICAgY2FzZSBOb2RlLkNPTU1FTlRfTk9ERToKICAgICAgICAgICAg IGNsYXNzTmFtZSA9IFdJLkRPTVRyZWVFbGVtZW50UGF0aENvbXBvbmVudC5ET01Db21tZW50SWNv blN0eWxlQ2xhc3NOYW1lOwotICAgICAgICAgICAgdGl0bGUgPSAiPCEtLSIgKyBub2RlLm5vZGVW YWx1ZSgpLnRyaW1FbmQoMzIpICsgIi0tPiI7CisgICAgICAgICAgICB0aXRsZSA9ICI8IS0tIiAr IG5vZGUubm9kZVZhbHVlKCkudHJ1bmNhdGVFbmQoMzIpICsgIi0tPiI7CiAgICAgICAgICAgICBi cmVhazsKIAogICAgICAgICBjYXNlIE5vZGUuRE9DVU1FTlRfVFlQRV9OT0RFOgpAQCAtNjUsNyAr NjUsNyBAQCBXSS5ET01UcmVlRWxlbWVudFBhdGhDb21wb25lbnQgPSBjbGFzcyBET01UcmVlRWxl bWVudFBhdGhDb21wb25lbnQgZXh0ZW5kcyBXSS5IaQogCiAgICAgICAgIGNhc2UgTm9kZS5DREFU QV9TRUNUSU9OX05PREU6CiAgICAgICAgICAgICBjbGFzc05hbWUgPSBXSS5ET01UcmVlRWxlbWVu dFBhdGhDb21wb25lbnQuRE9NQ2hhcmFjdGVyRGF0YUljb25TdHlsZUNsYXNzTmFtZTsKLSAgICAg ICAgICAgIHRpdGxlID0gIjwhW0NEQVRBWyIgKyBub2RlLnRyaW1FbmQoMzIpICsgIl1dPiI7Cisg ICAgICAgICAgICB0aXRsZSA9ICI8IVtDREFUQVsiICsgbm9kZS50cnVuY2F0ZUVuZCgzMikgKyAi XV0+IjsKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGNhc2UgTm9kZS5ET0NVTUVOVF9G UkFHTUVOVF9OT0RFOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU2VhcmNoUmVzdWx0VHJlZUVsZW1lbnQuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hSZXN1bHRUcmVlRWxlbWVudC5qcwppbmRl eCA0MTQxNDVhLi5hNDA4MjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9TZWFyY2hSZXN1bHRUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hSZXN1bHRUcmVlRWxlbWVu dC5qcwpAQCAtNTksOCArNTksNyBAQCBXSS5TZWFyY2hSZXN1bHRUcmVlRWxlbWVudCA9IGNsYXNz IFNlYXJjaFJlc3VsdFRyZWVFbGVtZW50IGV4dGVuZHMgV0kuR2VuZXJhbFRyZQogICAgICAgICB9 IGVsc2UKICAgICAgICAgICAgIG1vZGlmaWVkVGl0bGUgPSB0aXRsZTsKIAotICAgICAgICAvLyBU cnVuY2F0ZSB0aGUgdGFpbCBvZiB0aGUgdGl0bGUgc28gdGhlIHRvb2x0aXAgaXNuJ3Qgc28gbGFy Z2UuCi0gICAgICAgIG1vZGlmaWVkVGl0bGUgPSBtb2RpZmllZFRpdGxlLnRyaW1FbmQoc2VhcmNo VGVybUluZGV4ICsgc2VhcmNoVGVybS5sZW5ndGggKyBjaGFyYWN0ZXJzVG9TaG93QWZ0ZXJTZWFy Y2hNYXRjaCk7CisgICAgICAgIG1vZGlmaWVkVGl0bGUgPSBtb2RpZmllZFRpdGxlLnRydW5jYXRl RW5kKHNlYXJjaFRlcm1JbmRleCArIHNlYXJjaFRlcm0ubGVuZ3RoICsgY2hhcmFjdGVyc1RvU2hv d0FmdGVyU2VhcmNoTWF0Y2gpOwogCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KG1vZGlmaWVkVGl0 bGUuc3Vic3RyaW5nKHNlYXJjaFRlcm1JbmRleCwgc2VhcmNoVGVybUluZGV4ICsgc2VhcmNoVGVy bS5sZW5ndGgpLnRvTG93ZXJDYXNlKCkgPT09IHNlYXJjaFRlcm0udG9Mb3dlckNhc2UoKSk7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Nw cmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0U3R5bGVQcm9wZXJ0eS5qcwppbmRleCAyOTVkNDg2Li45 Yjc0NWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TcHJlYWRzaGVldFN0eWxlUHJvcGVydHkuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5LmpzCkBAIC0z MzYsNyArMzM2LDcgQEAgV0kuU3ByZWFkc2hlZXRTdHlsZVByb3BlcnR5ID0gY2xhc3MgU3ByZWFk c2hlZXRTdHlsZVByb3BlcnR5IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICBpZiAoY2xh c3NOYW1lKSB7CiAgICAgICAgICAgICAgICAgbGV0IHNwYW4gPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJzcGFuIik7CiAgICAgICAgICAgICAgICAgc3Bhbi5jbGFzc0xpc3QuYWRkKGNsYXNzTmFt ZSk7Ci0gICAgICAgICAgICAgICAgc3Bhbi50ZXh0Q29udGVudCA9IHRva2VuLnZhbHVlLnRyaW1N aWRkbGUobWF4VmFsdWVMZW5ndGgpOworICAgICAgICAgICAgICAgIHNwYW4udGV4dENvbnRlbnQg PSB0b2tlbi52YWx1ZS50cnVuY2F0ZU1pZGRsZShtYXhWYWx1ZUxlbmd0aCk7CiAgICAgICAgICAg ICAgICAgcmV0dXJuIHNwYW47CiAgICAgICAgICAgICB9CiAK