136686 2014-09-09 16:17:34 -0700 Web Inspector: Fix obscure ESLint warnings and skip directories 2014-09-10 15:14:34 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 joepeck joepeck graouts joepeck jonowells timothy webkit-bug-importer oldest_to_newest 1034201 0 joepeck 2014-09-09 16:17:34 -0700 Some issues ESLint found that we should fix for consistency. Also caught at least one bug: --- UserInterface/Controllers/FormatterContentBuilder.js 199:53 error Infix operators must be spaced space-infix-ops UserInterface/Models/Color.js 434:32 error Infix operators must be spaced space-infix-ops 435:32 error Infix operators must be spaced space-infix-ops 625:17 error Infix operators must be spaced space-infix-ops UserInterface/Models/DOMNodeStyles.js 695:12 error Expression called with trailing whitespace before semicolon no-space-before-semi UserInterface/Views/DOMTreeElement.js 482:8 error Expected an assignment or function call and instead saw an expression no-unused-expressions 530:52 error Infix operators must be spaced space-infix-ops 965:27 error Infix operators must be spaced space-infix-ops 972:48 error Infix operators must be spaced space-infix-ops UserInterface/Views/CSSStyleDeclarationTextEditor.js 533:44 error Wrapping non-IIFE function literals in parens is unnecessary no-wrap-func UserInterface/Views/DOMTreeDataGridNode.js 89:1 error Unexpected blank line at end of file eol-last UserInterface/Views/LayerTreeDataGridNode.js 95:8 error Return statement should not contain assignment no-return-assign UserInterface/Views/TreeOutline.js 59:8 error Keyword "throw" must be followed by whitespace space-return-throw-case 101:8 error Keyword "throw" must be followed by whitespace space-return-throw-case 150:8 error Keyword "throw" must be followed by whitespace space-return-throw-case 188:8 error Keyword "throw" must be followed by whitespace space-return-throw-case 192:8 error Keyword "throw" must be followed by whitespace space-return-throw-case 872:63 error Invalid typeof comparison value valid-typeof UserInterface/Models/Breakpoint.js 354:68 error Expected an assignment or function call and instead saw an expression no-unused-expressions UserInterface/Views/EditingSupport.js 82:4 error Expected an assignment or function call and instead saw an expression no-unused-expressions 83:4 error Expected an assignment or function call and instead saw an expression no-unused-expressions 84:4 error Expected an assignment or function call and instead saw an expression no-unused-expressions 1034202 1 237871 joepeck 2014-09-09 16:20:03 -0700 Created attachment 237871 [PATCH] Proposed Fix This gets us down to just a handful of unique errors which we have all over the place. They should be tackled on their own. 1034429 2 joepeck 2014-09-10 15:14:34 -0700 <http://trac.webkit.org/changeset/173492> 237871 2014-09-09 16:20:03 -0700 2014-09-10 15:13:49 -0700 [PATCH] Proposed Fix eslint.patch text/plain 13877 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS8uZXNsaW50aWdub3JlIGIvU291cmNl L1dlYkluc3BlY3RvclVJLy5lc2xpbnRpZ25vcmUKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMC4uNTFlYmE2ZgotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS8uZXNsaW50aWdub3JlCkBAIC0wLDAgKzEsMyBAQAorTG9jYWxpemF0aW9ucworVG9vbHMKK1Vz ZXJJbnRlcmZhY2UvRXh0ZXJuYWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS8u ZXNsaW50cmMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvLmVzbGludHJjCmluZGV4IDNkNDhiNDQu LjY4NzJkNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS8uZXNsaW50cmMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJLy5lc2xpbnRyYwpAQCAtMjYsMTkgKzI2LDE4IEBACiB7 CiAgICAgImVudiI6IHsKICAgICAgICAgImJyb3dzZXIiOiB0cnVlLAotICAgICAgICAibm9kZSI6 IGZhbHNlCisgICAgICAgICJub2RlIjogZmFsc2UsCiAgICAgfSwKICAgICAiZ2xvYmFscyI6IHsK LSAgICAgICAgImNvbnNvbGUiOiB0cnVlLAogICAgICAgICAiQXBwbGljYXRpb25DYWNoZUFnZW50 IjogdHJ1ZSwKKyAgICAgICAgIkNTU0FnZW50IjogdHJ1ZSwKICAgICAgICAgIkNvZGVNaXJyb3Ii OiB0cnVlLAogICAgICAgICAiQ29uc29sZUFnZW50IjogdHJ1ZSwKLSAgICAgICAgIkNTU0FnZW50 IjogdHJ1ZSwKLSAgICAgICAgIkRhdGFiYXNlQWdlbnQiOiB0cnVlLAotICAgICAgICAiRGVidWdn ZXJBZ2VudCI6IHRydWUsCiAgICAgICAgICJET01BZ2VudCI6IHRydWUsCiAgICAgICAgICJET01E ZWJ1Z2dlckFnZW50IjogdHJ1ZSwKICAgICAgICAgIkRPTVN0b3JhZ2VBZ2VudCI6IHRydWUsCisg ICAgICAgICJEYXRhYmFzZUFnZW50IjogdHJ1ZSwKKyAgICAgICAgIkRlYnVnZ2VyQWdlbnQiOiB0 cnVlLAogICAgICAgICAiRm9ybWF0dGVyIjogdHJ1ZSwKICAgICAgICAgIkluZGV4ZWREQkFnZW50 IjogdHJ1ZSwKICAgICAgICAgIkluc3BlY3RvckFnZW50IjogdHJ1ZSwKQEAgLTUzLDE3ICs1Miwz MCBAQAogICAgICAgICAiUnVudGltZUFnZW50IjogdHJ1ZSwKICAgICAgICAgIlRpbWVsaW5lQWdl bnQiOiB0cnVlLAogICAgICAgICAiV2ViSW5zcGVjdG9yIjogdHJ1ZSwKLSAgICAgICAgIldvcmtl ckFnZW50IjogdHJ1ZQorICAgICAgICAiV29ya2VyQWdlbnQiOiB0cnVlLAorICAgICAgICAiY29u c29sZSI6IHRydWUsCiAgICAgfSwKICAgICAicnVsZXMiOiB7Ci0gICAgICAgICJlcWVxZXEiOiAy LAotICAgICAgICAiY3VybHkiOiAwLAogICAgICAgICAiY29uc2lzdGVudC1yZXR1cm4iOiAyLAor ICAgICAgICAiY3VybHkiOiAwLAorICAgICAgICAiZXFlcWVxIjogMiwKKyAgICAgICAgIm5ldy1w YXJlbnMiOiAwLAorICAgICAgICAibm8tY29tbWEtZGFuZ2xlIjogMCwKKyAgICAgICAgIm5vLWNv bnNvbGUiOiAwLAorICAgICAgICAibm8tY29uc3RhbnQtY29uZGl0aW9uIjogMCwKKyAgICAgICAg Im5vLWNvbnN0YW50LWNvbmRpdGlvbiI6IDAsCiAgICAgICAgICJuby1leHRyYS1zZW1pIjogMiwK LSAgICAgICAgInF1b3RlcyI6IFsyLCAiZG91YmxlIl0sCisgICAgICAgICJuby1wcm90byI6IDAs CisgICAgICAgICJuby1yZXR1cm4tYXNzaWduIjogMiwKICAgICAgICAgIm5vLXRyYWlsaW5nLXNw YWNlcyI6IDIsCiAgICAgICAgICJuby11bmRlcnNjb3JlLWRhbmdsZSI6IDAsCi0gICAgICAgICJu ZXctcGFyZW5zIjogMCwKLSAgICAgICAgInNlbWkiOiAyCisgICAgICAgICJuby11bnVzZWQtZXhw cmVzc2lvbnMiOiAyLAorICAgICAgICAibm8td3JhcC1mdW5jIjogMiwKKyAgICAgICAgInF1b3Rl cyI6IFsyLCAiZG91YmxlIl0sCisgICAgICAgICJzZW1pIjogMiwKKyAgICAgICAgInNwYWNlLWlu Zml4LW9wcyI6IDIsCisgICAgICAgICJzcGFjZS1yZXR1cm4tdGhyb3ctY2FzZSI6IDIsCisgICAg ICAgICJzdHJpY3QiOiAwLAorICAgICAgICAidmFsaWQtdHlwZW9mIjogMiwKICAgICB9CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYklu c3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBiNTQyNzE5Li5mZWNiYWFiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0MSBAQAogMjAxNC0wOS0wOSAgSm9zZXBoIFBlY29yYXJv ICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEZpeCBvYnNj dXJlIEVTTGludCB3YXJuaW5ncyBhbmQgc2tpcCBkaXJlY3RvcmllcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2Njg2CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiAuZXNsaW50aWdub3JlOiBBZGRlZC4K KyAgICAgICAgU2tpcCBkaXJlY3RvcmllcyB3ZSBkbyBub3Qgd2FudCBFU0xpbnQgdG8gcHJvY2Vz cy4KKworICAgICAgICAqIC5lc2xpbnRyYzoKKyAgICAgICAgQWRkIHJ1bGVzIHdlJ3ZlIHNlZW4g YW5kIHNvcnQgc2VjdGlvbnMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L0Zvcm1hdHRlckNvbnRlbnRCdWlsZGVyLmpzOgorICAgICAgICAoRm9ybWF0dGVyQ29udGVudEJ1 aWxkZXIucHJvdG90eXBlLl9hcHBlbmRJbmRlbnQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv TW9kZWxzL0NvbG9yLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGVT dHlsZXMuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NTm9kZVN0eWxlcy5wcm90b3R5cGUu X3BhcnNlU3R5bGVEZWNsYXJhdGlvblBheWxvYWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuanM6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9ET01UcmVlRGF0YUdyaWROb2RlLmpzOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvRE9NVHJlZUVsZW1lbnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9N VHJlZUVsZW1lbnQucHJvdG90eXBlLm9uZGVsZXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E T01UcmVlRWxlbWVudC5wcm90b3R5cGUuX2luc2VydEluTGFzdEF0dHJpYnV0ZVBvc2l0aW9uKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90b3R5cGUuX2Rpc3RpbmN0 Q2xvc2luZ1RhZ0VsZW1lbnQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRWRpdGlu Z1N1cHBvcnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWRpdGluZ0NvbmZpZyk6CisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRyZWVEYXRhR3JpZE5vZGUuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuTGF5ZXJUcmVlRGF0YUdyaWROb2RlLnByb3RvdHlwZS5fbWFrZU91 dGxldCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qczoKKyAg ICAgICAgKFRyZWVPdXRsaW5lLnByb3RvdHlwZS5hcHBlbmRDaGlsZCk6CisgICAgICAgIChUcmVl T3V0bGluZS5wcm90b3R5cGUuaW5zZXJ0Q2hpbGQpOgorICAgICAgICAoVHJlZU91dGxpbmUucHJv dG90eXBlLnJlbW92ZUNoaWxkQXRJbmRleCk6CisgICAgICAgIChUcmVlT3V0bGluZS5wcm90b3R5 cGUucmVtb3ZlQ2hpbGQpOgorICAgICAgICAoVHJlZUVsZW1lbnQucHJvdG90eXBlLmV4cGFuZFJl Y3Vyc2l2ZWx5KToKKyAgICAgICAgRml4IGxpbnRlciBpc3N1ZXMuCisKKzIwMTQtMDktMDkgIEpv c2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVj dG9yOiBGaXggRVNMaW50IGNvbnNpc3RlbnQtcmV0dXJuIHdhcm5pbmdzCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY2ODIKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRm9ybWF0dGVy Q29udGVudEJ1aWxkZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9D b250cm9sbGVycy9Gb3JtYXR0ZXJDb250ZW50QnVpbGRlci5qcwppbmRleCBmNTMyZDVjLi4zYzM2 YTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250 cm9sbGVycy9Gb3JtYXR0ZXJDb250ZW50QnVpbGRlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Gb3JtYXR0ZXJDb250ZW50QnVpbGRlci5q cwpAQCAtMTk2LDcgKzE5Niw3IEBAIEZvcm1hdHRlckNvbnRlbnRCdWlsZGVyLnByb3RvdHlwZSA9 IHsKICAgICAgICAgY29uc3QgbWF4Q2FjaGVJbmRlbnQgPSAyMDsKICAgICAgICAgdmFyIG1heCA9 IE1hdGgubWluKHRoaXMuX2luZGVudCwgbWF4Q2FjaGVJbmRlbnQpOwogICAgICAgICBmb3IgKHZh ciBpID0gdGhpcy5faW5kZW50Q2FjaGUubGVuZ3RoOyBpIDw9IG1heDsgKytpKQotICAgICAgICAg ICAgdGhpcy5faW5kZW50Q2FjaGVbaV0gPSB0aGlzLl9pbmRlbnRDYWNoZVtpLTFdICsgdGhpcy5f aW5kZW50U3RyaW5nOworICAgICAgICAgICAgdGhpcy5faW5kZW50Q2FjaGVbaV0gPSB0aGlzLl9p bmRlbnRDYWNoZVtpIC0gMV0gKyB0aGlzLl9pbmRlbnRTdHJpbmc7CiAKICAgICAgICAgLy8gQXBw ZW5kIGluZGVudHMgYXMgbmVlZGVkLgogICAgICAgICB2YXIgaW5kZW50ID0gdGhpcy5faW5kZW50 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxz L0NvbG9yLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0Nv bG9yLmpzCmluZGV4IGNmYTdlOGIuLmZkZTE5NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Db2xvci5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ29sb3IuanMKQEAgLTQzMCw5ICs0MzAsOSBA QCBXZWJJbnNwZWN0b3IuQ29sb3IucHJvdG90eXBlID0gewogICAgICAgICAgICAgbCArIHMKICAg ICAgICAgXTsKICAgICAgICAgcmV0dXJuIFsKLSAgICAgICAgICAgIE1hdGgucm91bmQoc0FycmF5 WyB+fmggICAgJSA2IF0gKiAyNTUpLAotICAgICAgICAgICAgTWF0aC5yb3VuZChzQXJyYXlbICho fDE2KSAlIDYgXSAqIDI1NSksCi0gICAgICAgICAgICBNYXRoLnJvdW5kKHNBcnJheVsgKGh8OCkg ICUgNiBdICogMjU1KQorICAgICAgICAgICAgTWF0aC5yb3VuZChzQXJyYXlbIH5+aCAgICAgICUg NiBdICogMjU1KSwKKyAgICAgICAgICAgIE1hdGgucm91bmQoc0FycmF5WyAoaCB8IDE2KSAlIDYg XSAqIDI1NSksCisgICAgICAgICAgICBNYXRoLnJvdW5kKHNBcnJheVsgKGggfCA4KSAgJSA2IF0g KiAyNTUpCiAgICAgICAgIF07CiAgICAgfSwKIApAQCAtNjIyLDcgKzYyMiw3IEBAIFdlYkluc3Bl Y3Rvci5Db2xvci5yZ2IyaHN2ID0gZnVuY3Rpb24ociwgZywgYikKICAgICBpZiAobWF4ID09PSAw KQogICAgICAgICBzID0gMDsKICAgICBlbHNlCi0gICAgICAgIHMgPSAxIC0gKG1pbi9tYXgpOwor ICAgICAgICBzID0gMSAtIChtaW4gLyBtYXgpOwogCiAgICAgcmV0dXJuIFtoLCBzLCB2XTsKIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv RE9NTm9kZVN0eWxlcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01v ZGVscy9ET01Ob2RlU3R5bGVzLmpzCmluZGV4IGI0MmNmNzYuLmZkNDMzYzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlU3R5bGVz LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01O b2RlU3R5bGVzLmpzCkBAIC02OTIsNyArNjkyLDcgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGVTdHls ZXMucHJvdG90eXBlID0gewogCiAgICAgICAgIGlmIChwcmV2aW91c1N0eWxlRGVjbGFyYXRpb25z TWFwICE9PSB0aGlzLl9zdHlsZURlY2xhcmF0aW9uc01hcCkgewogICAgICAgICAgICAgLy8gSWYg dGhlIHByZXZpb3VzIGFuZCBjdXJyZW50IG1hcHMgZGlmZmVyIHRoZW4gbWFrZSBzdXJlIHRoZSBm b3VuZCBzdHlsZURlY2xhcmF0aW9uIGlzIGFkZGVkIHRvIHRoZSBjdXJyZW50IG1hcC4KLSAgICAg ICAgICAgIHN0eWxlRGVjbGFyYXRpb25zID0gbWFwS2V5ICYmIG1hcEtleSBpbiB0aGlzLl9zdHls ZURlY2xhcmF0aW9uc01hcCA/IHRoaXMuX3N0eWxlRGVjbGFyYXRpb25zTWFwW21hcEtleV0gOiBb XSA7CisgICAgICAgICAgICBzdHlsZURlY2xhcmF0aW9ucyA9IG1hcEtleSAmJiBtYXBLZXkgaW4g dGhpcy5fc3R5bGVEZWNsYXJhdGlvbnNNYXAgPyB0aGlzLl9zdHlsZURlY2xhcmF0aW9uc01hcFtt YXBLZXldIDogW107CiAKICAgICAgICAgICAgIGlmIChzdHlsZURlY2xhcmF0aW9uICYmICFzdHls ZURlY2xhcmF0aW9ucy5jb250YWlucyhzdHlsZURlY2xhcmF0aW9uKSkgewogICAgICAgICAgICAg ICAgIHN0eWxlRGVjbGFyYXRpb25zLnB1c2goc3R5bGVEZWNsYXJhdGlvbik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xh cmF0aW9uVGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzCmluZGV4IDYxNWMwOGQuLmFk ZTdlMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9y LmpzCkBAIC01MzAsOSArNTMwLDkgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25U ZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBpZiAoIW9ubHlWaXNpYmxlUHJvcGVy dGllcykgewogICAgICAgICAgICAgLy8gRmlsdGVyIGJhc2VkIG9uIG9wdGlvbnMgb25seSB3aGVu IGFsbCBwcm9wZXJ0aWVzIGFyZSB1c2VkLgotICAgICAgICAgICAgcHJvcGVydGllcyA9IHByb3Bl cnRpZXMuZmlsdGVyKChmdW5jdGlvbihwcm9wZXJ0eSkgeworICAgICAgICAgICAgcHJvcGVydGll cyA9IHByb3BlcnRpZXMuZmlsdGVyKGZ1bmN0aW9uKHByb3BlcnR5KSB7CiAgICAgICAgICAgICAg ICAgcmV0dXJuICFwcm9wZXJ0eS5pbXBsaWNpdCB8fCB0aGlzLl9zaG93c0ltcGxpY2l0UHJvcGVy dGllcyB8fCBwcm9wZXJ0eS5jYW5vbmljYWxOYW1lIGluIHRoaXMuX2Fsd2F5c1Nob3dQcm9wZXJ0 eU5hbWVzOwotICAgICAgICAgICAgfSkuYmluZCh0aGlzKSk7CisgICAgICAgICAgICB9LCB0aGlz KTsKIAogICAgICAgICAgICAgaWYgKHRoaXMuX3NvcnRQcm9wZXJ0aWVzKQogICAgICAgICAgICAg ICAgIHByb3BlcnRpZXMuc29ydChmdW5jdGlvbihhLCBiKSB7IHJldHVybiBhLm5hbWUubG9jYWxl Q29tcGFyZShiLm5hbWUpOyB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVEYXRhR3JpZE5vZGUuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRGF0YUdyaWROb2RlLmpzCmluZGV4 IDBhOTc4ZTMuLjY4M2E0YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVEYXRhR3JpZE5vZGUuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZURhdGFHcmlkTm9kZS5qcwpAQCAt ODYsNCArODYsMyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZURhdGFHcmlkTm9kZS5wcm90b3R5cGUg PSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVNpZGViYXJQYW5lbC5zaG93TWFpbkZy YW1lRE9NVHJlZSh0aGlzLl9kb21Ob2RlLCB0cnVlKTsKICAgICB9CiB9OwotCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01UcmVlRWxlbWVu dC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVF bGVtZW50LmpzCmluZGV4IDM4NjkxYWEuLmY0NDJjZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVFbGVtZW50Lmpz CkBAIC00NzksNyArNDc5LDEwIEBAIFdlYkluc3BlY3Rvci5ET01UcmVlRWxlbWVudC5wcm90b3R5 cGUgPSB7CiAgICAgb25kZWxldGU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZhciBzdGFy dFRhZ1RyZWVFbGVtZW50ID0gdGhpcy50cmVlT3V0bGluZS5maW5kVHJlZUVsZW1lbnQodGhpcy5y ZXByZXNlbnRlZE9iamVjdCk7Ci0gICAgICAgIHN0YXJ0VGFnVHJlZUVsZW1lbnQgPyBzdGFydFRh Z1RyZWVFbGVtZW50LnJlbW92ZSgpIDogdGhpcy5yZW1vdmUoKTsKKyAgICAgICAgaWYgKHN0YXJ0 VGFnVHJlZUVsZW1lbnQpCisgICAgICAgICAgICBzdGFydFRhZ1RyZWVFbGVtZW50LnJlbW92ZSgp OworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLnJlbW92ZSgpOwogICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICB9LAogCkBAIC01MjcsNyArNTMwLDcgQEAgV2ViSW5zcGVjdG9yLkRPTVRy ZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICB2YXIg bm9kZU5hbWUgPSB0YWcudGV4dENvbnRlbnQubWF0Y2goL148KC4qPyk+JC8pWzFdOwogICAgICAg ICAgICAgdGFnLnRleHRDb250ZW50ID0gIiI7Ci0gICAgICAgICAgICB0YWcuYXBwZW5kQ2hpbGQo ZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIjwiK25vZGVOYW1lKSk7CisgICAgICAgICAgICB0YWcu YXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIjwiICsgbm9kZU5hbWUpKTsKICAg ICAgICAgICAgIHRhZy5hcHBlbmRDaGlsZChub2RlKTsKICAgICAgICAgICAgIHRhZy5hcHBlbmRD aGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiPiIpKTsKICAgICAgICAgfQpAQCAtOTYyLDE0 ICs5NjUsMTQgQEAgV2ViSW5zcGVjdG9yLkRPTVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAg ICAgICAgLy8gaW4gdGhlIGNoaWxkIGVsZW1lbnQgbGlzdC4KICAgICAgICAgaWYgKHRoaXMuZXhw YW5kZWQpIHsKICAgICAgICAgICAgIHZhciBjbG9zZXJzID0gdGhpcy5fY2hpbGRyZW5MaXN0Tm9k ZS5xdWVyeVNlbGVjdG9yQWxsKCIuY2xvc2UiKTsKLSAgICAgICAgICAgIHJldHVybiBjbG9zZXJz W2Nsb3NlcnMubGVuZ3RoLTFdOworICAgICAgICAgICAgcmV0dXJuIGNsb3NlcnNbY2xvc2Vycy5s ZW5ndGggLSAxXTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIFJlbWFpbmluZyBjYXNlcyBhcmUg c2luZ2xlIGxpbmUgbm9uLWV4cGFuZGVkIGVsZW1lbnRzIHdpdGggYSBjbG9zaW5nCiAgICAgICAg IC8vIHRhZywgb3IgSFRNTCBlbGVtZW50cyB3aXRob3V0IGEgY2xvc2luZyB0YWcgKHN1Y2ggYXMg PGJyPikuIFJldHVybgogICAgICAgICAvLyBudWxsIGluIHRoZSBjYXNlIHdoZXJlIHRoZXJlIGlz bid0IGEgY2xvc2luZyB0YWcuCiAgICAgICAgIHZhciB0YWdzID0gdGhpcy5saXN0SXRlbUVsZW1l bnQuZ2V0RWxlbWVudHNCeUNsYXNzTmFtZSgiaHRtbC10YWciKTsKLSAgICAgICAgcmV0dXJuICh0 YWdzLmxlbmd0aCA9PT0gMSA/IG51bGwgOiB0YWdzW3RhZ3MubGVuZ3RoLTFdKTsKKyAgICAgICAg cmV0dXJuICh0YWdzLmxlbmd0aCA9PT0gMSA/IG51bGwgOiB0YWdzW3RhZ3MubGVuZ3RoIC0gMV0p OwogICAgIH0sCiAKICAgICB1cGRhdGVUaXRsZTogZnVuY3Rpb24ob25seVNlYXJjaFF1ZXJ5Q2hh bmdlZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0VkaXRpbmdTdXBwb3J0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRWRpdGluZ1N1cHBvcnQuanMKaW5kZXggMzZlOGZhZC4uYWM1ODY0NiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWRpdGluZ1N1 cHBvcnQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RWRpdGluZ1N1cHBvcnQuanMKQEAgLTc5LDkgKzc5LDYgQEAgV2ViSW5zcGVjdG9yLkVkaXRpbmdD b25maWcgPSBmdW5jdGlvbihjb21taXRIYW5kbGVyLCBjYW5jZWxIYW5kbGVyLCBjb250ZXh0KQog ICAgIHRoaXMuY29tbWl0SGFuZGxlciA9IGNvbW1pdEhhbmRsZXI7CiAgICAgdGhpcy5jYW5jZWxI YW5kbGVyID0gY2FuY2VsSGFuZGxlcjsKICAgICB0aGlzLmNvbnRleHQgPSBjb250ZXh0OwotICAg IHRoaXMucGFzdGVIYW5kbGVyOwotICAgIHRoaXMubXVsdGlsaW5lOwotICAgIHRoaXMuY3VzdG9t RmluaXNoSGFuZGxlcjsKICAgICB0aGlzLnNwZWxsY2hlY2sgPSBmYWxzZTsKIH07CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyVHJl ZURhdGFHcmlkTm9kZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0xheWVyVHJlZURhdGFHcmlkTm9kZS5qcwppbmRleCA3MTdiODU1Li4xNTFhNWEzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXllclRy ZWVEYXRhR3JpZE5vZGUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTGF5ZXJUcmVlRGF0YUdyaWROb2RlLmpzCkBAIC05Miw3ICs5Miw4IEBAIFdlYklu c3BlY3Rvci5MYXllclRyZWVEYXRhR3JpZE5vZGUucHJvdG90eXBlID0gewogCiAgICAgX21ha2VP dXRsZXQ6IGZ1bmN0aW9uKG5hbWUsIGVsZW1lbnQpCiAgICAgewotICAgICAgICByZXR1cm4gdGhp cy5fb3V0bGV0c1tuYW1lXSA9IGVsZW1lbnQ7CisgICAgICAgIHRoaXMuX291dGxldHNbbmFtZV0g PSBlbGVtZW50OworICAgICAgICByZXR1cm4gZWxlbWVudDsKICAgICB9LAogCiAgICAgX21ha2VO YW1lQ2VsbDogZnVuY3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcwppbmRleCA3NzE3NWJhLi41OTVlZTgz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9U cmVlT3V0bGluZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UcmVlT3V0bGluZS5qcwpAQCAtNTYsNyArNTYsNyBAQCBUcmVlT3V0bGluZS5wcm90b3R5 cGUuY29uc3RydWN0b3IgPSBUcmVlT3V0bGluZTsKIFRyZWVPdXRsaW5lLnByb3RvdHlwZS5hcHBl bmRDaGlsZCA9IGZ1bmN0aW9uKGNoaWxkKQogewogICAgIGlmICghY2hpbGQpCi0gICAgICAgIHRo cm93KCJjaGlsZCBjYW4ndCBiZSB1bmRlZmluZWQgb3IgbnVsbCIpOworICAgICAgICB0aHJvdyAi Y2hpbGQgY2FuJ3QgYmUgdW5kZWZpbmVkIG9yIG51bGwiOwogCiAgICAgdmFyIGxhc3RDaGlsZCA9 IHRoaXMuY2hpbGRyZW5bdGhpcy5jaGlsZHJlbi5sZW5ndGggLSAxXTsKICAgICBpZiAobGFzdENo aWxkKSB7CkBAIC05OCw3ICs5OCw3IEBAIFRyZWVPdXRsaW5lLnByb3RvdHlwZS5hcHBlbmRDaGls ZCA9IGZ1bmN0aW9uKGNoaWxkKQogVHJlZU91dGxpbmUucHJvdG90eXBlLmluc2VydENoaWxkID0g ZnVuY3Rpb24oY2hpbGQsIGluZGV4KQogewogICAgIGlmICghY2hpbGQpCi0gICAgICAgIHRocm93 KCJjaGlsZCBjYW4ndCBiZSB1bmRlZmluZWQgb3IgbnVsbCIpOworICAgICAgICB0aHJvdyAiY2hp bGQgY2FuJ3QgYmUgdW5kZWZpbmVkIG9yIG51bGwiOwogCiAgICAgdmFyIHByZXZpb3VzQ2hpbGQg PSAoaW5kZXggPiAwID8gdGhpcy5jaGlsZHJlbltpbmRleCAtIDFdIDogbnVsbCk7CiAgICAgaWYg KHByZXZpb3VzQ2hpbGQpIHsKQEAgLTE0Nyw3ICsxNDcsNyBAQCBUcmVlT3V0bGluZS5wcm90b3R5 cGUuaW5zZXJ0Q2hpbGQgPSBmdW5jdGlvbihjaGlsZCwgaW5kZXgpCiBUcmVlT3V0bGluZS5wcm90 b3R5cGUucmVtb3ZlQ2hpbGRBdEluZGV4ID0gZnVuY3Rpb24oY2hpbGRJbmRleCwgc3VwcHJlc3NP bkRlc2VsZWN0LCBzdXBwcmVzc1NlbGVjdFNpYmxpbmcpCiB7CiAgICAgaWYgKGNoaWxkSW5kZXgg PCAwIHx8IGNoaWxkSW5kZXggPj0gdGhpcy5jaGlsZHJlbi5sZW5ndGgpCi0gICAgICAgIHRocm93 KCJjaGlsZEluZGV4IG91dCBvZiByYW5nZSIpOworICAgICAgICB0aHJvdyAiY2hpbGRJbmRleCBv dXQgb2YgcmFuZ2UiOwogCiAgICAgdmFyIGNoaWxkID0gdGhpcy5jaGlsZHJlbltjaGlsZEluZGV4 XTsKICAgICB0aGlzLmNoaWxkcmVuLnNwbGljZShjaGlsZEluZGV4LCAxKTsKQEAgLTE4NSwxMSAr MTg1LDExIEBAIFRyZWVPdXRsaW5lLnByb3RvdHlwZS5yZW1vdmVDaGlsZEF0SW5kZXggPSBmdW5j dGlvbihjaGlsZEluZGV4LCBzdXBwcmVzc09uRGVzZWxlCiBUcmVlT3V0bGluZS5wcm90b3R5cGUu cmVtb3ZlQ2hpbGQgPSBmdW5jdGlvbihjaGlsZCwgc3VwcHJlc3NPbkRlc2VsZWN0LCBzdXBwcmVz c1NlbGVjdFNpYmxpbmcpCiB7CiAgICAgaWYgKCFjaGlsZCkKLSAgICAgICAgdGhyb3coImNoaWxk IGNhbid0IGJlIHVuZGVmaW5lZCBvciBudWxsIik7CisgICAgICAgIHRocm93ICJjaGlsZCBjYW4n dCBiZSB1bmRlZmluZWQgb3IgbnVsbCI7CiAKICAgICB2YXIgY2hpbGRJbmRleCA9IHRoaXMuY2hp bGRyZW4uaW5kZXhPZihjaGlsZCk7CiAgICAgaWYgKGNoaWxkSW5kZXggPT09IC0xKQotICAgICAg ICB0aHJvdygiY2hpbGQgbm90IGZvdW5kIGluIHRoaXMgbm9kZSdzIGNoaWxkcmVuIik7CisgICAg ICAgIHRocm93ICJjaGlsZCBub3QgZm91bmQgaW4gdGhpcyBub2RlJ3MgY2hpbGRyZW4iOwogCiAg ICAgdGhpcy5yZW1vdmVDaGlsZEF0SW5kZXgoY2hpbGRJbmRleCwgc3VwcHJlc3NPbkRlc2VsZWN0 LCBzdXBwcmVzc1NlbGVjdFNpYmxpbmcpOwogfTsKQEAgLTg2OSw3ICs4NjksNyBAQCBUcmVlRWxl bWVudC5wcm90b3R5cGUuZXhwYW5kUmVjdXJzaXZlbHkgPSBmdW5jdGlvbihtYXhEZXB0aCkKICAg ICAvLyBUaGUgSW5zcGVjdG9yIHVzZXMgVHJlZU91dGxpbmVzIHRvIHJlcHJlc2VudHMgb2JqZWN0 IHByb3BlcnRpZXMsIHNvIHJlY3Vyc2l2ZSBleHBhbnNpb24KICAgICAvLyBpbiBzb21lIGNhc2Ug Y2FuIGJlIGluZmluaXRlLCBzaW5jZSBKYXZhU2NyaXB0IG9iamVjdHMgY2FuIGhvbGQgY2lyY3Vs YXIgcmVmZXJlbmNlcy4KICAgICAvLyBTbyBkZWZhdWx0IHRvIGEgcmVjdXJzaW9uIGNhcCBvZiAz IGxldmVscywgc2luY2UgdGhhdCBnaXZlcyBmYWlybHkgZ29vZCByZXN1bHRzLgotICAgIGlmICh0 eXBlb2YgbWF4RGVwdGggPT09ICJ1bmRlZmluZWQiIHx8IHR5cGVvZiBtYXhEZXB0aCA9PT0gIm51 bGwiKQorICAgIGlmIChtYXhEZXB0aCA9PT0gdW5kZWZpbmVkKQogICAgICAgICBtYXhEZXB0aCA9 IDM7CiAKICAgICB3aGlsZSAoaXRlbSkgewo=