200800 2019-08-15 17:12:12 -0700 Web Inspector: JavaScript formatting of single statement arrow function can be poor 2019-08-16 19:07:17 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue inspector-bugzilla-changes joepeck ross.kirsling webkit-bug-importer oldest_to_newest 1561840 0 joepeck 2019-08-15 17:12:12 -0700 JavaScript formatting of single statement arrow function can be poor Test: ``` () => { 1 } () => { for(x of []); } () => { try{1}catch{2} } ``` Expected: ``` () => {1} () => { for (x of []) ; } () => { try { 1 } catch { 2 } } ``` Actual: ``` () => {1} () => {for (x of []) ; } () => {try { 1 } catch { 2 } } ``` 1561845 1 376447 joepeck 2019-08-15 17:28:01 -0700 Created attachment 376447 [PATCH] Proposed Fix 1561846 2 376447 joepeck 2019-08-15 17:28:42 -0700 Comment on attachment 376447 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=376447&action=review > Source/WebInspectorUI/UserInterface/Workers/Formatter/EsprimaFormatter.js:309 > + let isSingleStatementArrowFunctionWithUnlikelyNewlineContent = node.parent.type === "ArrowFunctionExpression" && node.body.length === 1 && !this._isLikelyToHaveNewline(node.body[0]); Perhaps a better name is "WithUnlikelyMultilineContent" 1561847 3 376448 joepeck 2019-08-15 17:29:31 -0700 Created attachment 376448 [PATCH] Proposed Fix 1562099 4 376448 ross.kirsling 2019-08-16 11:11:48 -0700 Comment on attachment 376448 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=376448&action=review Seems like a reasonable improvement. I agree with your renaming suggestion too. > Source/WebInspectorUI/UserInterface/Workers/Formatter/EsprimaFormatter.js:196 > + if (nodeType === "ExpressionStatement") > + return false; This shouldn't be necessary. (Unless it's meant as an optimization? But in that case it'd be incomplete, and you'd probably want to opt for a switch...) > Source/WebInspectorUI/UserInterface/Workers/Formatter/EsprimaFormatter.js:206 > + || nodeType === "FunctionDeclaration" "ClassDeclaration" too, right? 1562110 5 joepeck 2019-08-16 11:43:35 -0700 (In reply to Ross Kirsling from comment #4) > Comment on attachment 376448 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=376448&action=review > > Seems like a reasonable improvement. I agree with your renaming suggestion > too. > > > Source/WebInspectorUI/UserInterface/Workers/Formatter/EsprimaFormatter.js:196 > > + if (nodeType === "ExpressionStatement") > > + return false; > > This shouldn't be necessary. (Unless it's meant as an optimization? But in > that case it'd be incomplete, and you'd probably want to opt for a switch...) Yeah, I'll just remove this. I assumed the common case would be Expression and no need to check 10 things if its almost _always_ this. But I didn't measure and it seems unlikely to be important. > > > Source/WebInspectorUI/UserInterface/Workers/Formatter/EsprimaFormatter.js:206 > > + || nodeType === "FunctionDeclaration" > > "ClassDeclaration" too, right? Yep! Thanks 1562119 6 376515 joepeck 2019-08-16 12:08:28 -0700 Created attachment 376515 [PATCH] For Landing 1562137 7 376515 commit-queue 2019-08-16 12:51:05 -0700 Comment on attachment 376515 [PATCH] For Landing Clearing flags on attachment: 376515 Committed r248785: <https://trac.webkit.org/changeset/248785> 1562358 8 webkit-bug-importer 2019-08-16 19:07:17 -0700 <rdar://problem/54417189> 376447 2019-08-15 17:28:01 -0700 2019-08-15 17:29:31 -0700 [PATCH] Proposed Fix arrow-1.patch text/plain 5625 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmNWE5ZjRmN2ZhMS4uNTExZDBmNmY0ODMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAxOS0wOC0xNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IEphdmFTY3JpcHQgZm9ybWF0dGluZyBvZiBzaW5nbGUgc3RhdGVt ZW50IGFycm93IGZ1bmN0aW9uIGNhbiBiZSBwb29yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA4MDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mb3JtYXR0aW5nL3Jlc291cmNlcy9q YXZhc2NyaXB0LXRlc3RzL2Fycm93LWZ1bmN0aW9ucy1leHBlY3RlZC5qczoKKyAgICAgICAgKiBp bnNwZWN0b3IvZm9ybWF0dGluZy9yZXNvdXJjZXMvamF2YXNjcmlwdC10ZXN0cy9hcnJvdy1mdW5j dGlvbnMuanM6CisgICAgICAgIEFkZCBhIGZldyBhZGRpdGlvbmFsIGNvbXBsZXggc2luZ2xlIHN0 YXRlbWVudCBhcnJvdyBmdW5jdGlvbiB0ZXN0IGNhc2VzLgorCiAyMDE5LTA4LTE1ICBKb3NlcGgg UGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog VXBkYXRlIEVzcHJpbWEgdG8gc3VwcG9ydCBtb2Rlcm4gSmF2YVNjcmlwdCBsYW5ndWFnZSBmZWF0 dXJlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVzb3Vy Y2VzL2phdmFzY3JpcHQtdGVzdHMvYXJyb3ctZnVuY3Rpb25zLWV4cGVjdGVkLmpzIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVzb3VyY2VzL2phdmFzY3JpcHQtdGVzdHMvYXJy b3ctZnVuY3Rpb25zLWV4cGVjdGVkLmpzCmluZGV4IDdlNjZkNWU5NDhiLi4wMTZlYmJmMzQxMyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVzb3VyY2VzL2ph dmFzY3JpcHQtdGVzdHMvYXJyb3ctZnVuY3Rpb25zLWV4cGVjdGVkLmpzCisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9mb3JtYXR0aW5nL3Jlc291cmNlcy9qYXZhc2NyaXB0LXRlc3RzL2Fycm93 LWZ1bmN0aW9ucy1leHBlY3RlZC5qcwpAQCAtMzcsMyArMzcsMTUgQEAgZm9vKChhPTEsIGIsICkg PT4gYik7CiBhc3luYyB4ID0+IHgKIGFzeW5jICh4KSA9PiB4CiBhc3luYyAoeCkgPT4ge3h9CisK K2EgPT4geworICAgIGZvciAoYiBvZiBbXSkKKyAgICAgICAgOworfQorKCkgPT4geworICAgIHRy eSB7CisgICAgICAgIDEKKyAgICB9IGNhdGNoIHsKKyAgICAgICAgMgorICAgIH0KK30KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9mb3JtYXR0aW5nL3Jlc291cmNlcy9qYXZhc2Ny aXB0LXRlc3RzL2Fycm93LWZ1bmN0aW9ucy5qcyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9mb3Jt YXR0aW5nL3Jlc291cmNlcy9qYXZhc2NyaXB0LXRlc3RzL2Fycm93LWZ1bmN0aW9ucy5qcwppbmRl eCBlNmVkZmRlYTFjNi4uY2RhMWNjM2Y1MTYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9mb3JtYXR0aW5nL3Jlc291cmNlcy9qYXZhc2NyaXB0LXRlc3RzL2Fycm93LWZ1bmN0aW9u cy5qcworKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZm9ybWF0dGluZy9yZXNvdXJjZXMvamF2 YXNjcmlwdC10ZXN0cy9hcnJvdy1mdW5jdGlvbnMuanMKQEAgLTI3LDMgKzI3LDYgQEAgZm9vKChh PTEsYiwpPT5iKTsKIGFzeW5jIHg9PngKIGFzeW5jKHgpPT54CiBhc3luYyh4KT0+e3h9CisKK2E9 Pntmb3IoYiBvZltdKTt9CisoKT0+e3RyeXsxfWNhdGNoezJ9fQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VM b2cKaW5kZXggMTZmZmU3NTIxOGMuLmM0MTEwYjc0OTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOS0wOC0xNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jh cm9AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEphdmFTY3JpcHQgZm9ybWF0 dGluZyBvZiBzaW5nbGUgc3RhdGVtZW50IGFycm93IGZ1bmN0aW9uIGNhbiBiZSBwb29yCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA4MDAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvV29ya2Vycy9Gb3JtYXR0ZXIvRXNwcmltYUZvcm1hdHRlci5qczoKKyAgICAgICAgKEVzcHJp bWFGb3JtYXR0ZXIucHJvdG90eXBlLl9pc0xpa2VseVRvSGF2ZU5ld2xpbmUpOgorICAgICAgICAo RXNwcmltYUZvcm1hdHRlci5wcm90b3R5cGUuX2hhbmRsZVRva2VuQXROb2RlKToKKyAgICAgICAg QmV0dGVyIGhldXJpc3RpYyBmb3Igc2luZ2xlIHN0YXRlbWVudCBhcnJvdyBmdW5jdGlvbnMuCisK IDIwMTktMDgtMTUgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBVcGRhdGUgRXNwcmltYSB0byBzdXBwb3J0IG1vZGVybiBKYXZh U2NyaXB0IGxhbmd1YWdlIGZlYXR1cmVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Xb3JrZXJzL0Zvcm1hdHRlci9Fc3ByaW1hRm9ybWF0dGVyLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvV29ya2Vycy9Gb3JtYXR0ZXIvRXNw cmltYUZvcm1hdHRlci5qcwppbmRleCBiY2I3ODI0MzQzMy4uMWQ5YTQxNGM0NmQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1dvcmtlcnMvRm9ybWF0dGVy L0VzcHJpbWFGb3JtYXR0ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvV29ya2Vycy9Gb3JtYXR0ZXIvRXNwcmltYUZvcm1hdHRlci5qcwpAQCAtMTg5LDYgKzE4 OSwyNSBAQCBFc3ByaW1hRm9ybWF0dGVyID0gY2xhc3MgRXNwcmltYUZvcm1hdHRlcgogICAgICAg ICByZXR1cm4gKHBhcmVudC50eXBlID09PSAiRm9yU3RhdGVtZW50IiB8fCBwYXJlbnQudHlwZSA9 PT0gIkZvckluU3RhdGVtZW50IiB8fCBwYXJlbnQudHlwZSA9PT0gIkZvck9mU3RhdGVtZW50Iikg JiYgbm9kZSAhPT0gcGFyZW50LmJvZHk7CiAgICAgfQogCisgICAgX2lzTGlrZWx5VG9IYXZlTmV3 bGluZShub2RlKQorICAgIHsKKyAgICAgICAgbGV0IG5vZGVUeXBlID0gbm9kZS50eXBlOworICAg ICAgICBpZiAobm9kZVR5cGUgPT09ICJFeHByZXNzaW9uU3RhdGVtZW50IikKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgICAgICByZXR1cm4gbm9kZVR5cGUgPT09ICJJZlN0YXRlbWVu dCIKKyAgICAgICAgICAgIHx8IG5vZGVUeXBlID09PSAiRm9yU3RhdGVtZW50IgorICAgICAgICAg ICAgfHwgbm9kZVR5cGUgPT09ICJGb3JPZlN0YXRlbWVudCIKKyAgICAgICAgICAgIHx8IG5vZGVU eXBlID09PSAiRm9ySW5TdGF0ZW1lbnQiCisgICAgICAgICAgICB8fCBub2RlVHlwZSA9PT0gIldo aWxlU3RhdGVtZW50IgorICAgICAgICAgICAgfHwgbm9kZVR5cGUgPT09ICJEb1doaWxlU3RhdGVt ZW50IgorICAgICAgICAgICAgfHwgbm9kZVR5cGUgPT09ICJTd2l0Y2hTdGF0ZW1lbnQiCisgICAg ICAgICAgICB8fCBub2RlVHlwZSA9PT0gIlRyeVN0YXRlbWVudCIKKyAgICAgICAgICAgIHx8IG5v ZGVUeXBlID09PSAiRnVuY3Rpb25EZWNsYXJhdGlvbiIKKyAgICAgICAgICAgIHx8IG5vZGVUeXBl ID09PSAiQmxvY2tTdGF0ZW1lbnQiCisgICAgICAgICAgICB8fCBub2RlVHlwZSA9PT0gIldpdGhT dGF0ZW1lbnQiOworICAgIH0KKwogICAgIF9pc1JhbmdlV2hpdGVzcGFjZShmcm9tLCB0bykKICAg ICB7CiAgICAgICAgIGxldCBzdWJzdHJpbmcgPSB0aGlzLl9zb3VyY2VUZXh0LnN1YnN0cmluZyhm cm9tLCB0byk7CkBAIC0yODcsNyArMzA2LDcgQEAgRXNwcmltYUZvcm1hdHRlciA9IGNsYXNzIEVz cHJpbWFGb3JtYXR0ZXIKICAgICAgICAgfQogCiAgICAgICAgIGlmIChub2RlVHlwZSA9PT0gIkJs b2NrU3RhdGVtZW50IikgewotICAgICAgICAgICAgbGV0IGlzU2luZ2xlU3RhdGVtZW50QXJyb3dG dW5jdGlvbiA9IG5vZGUucGFyZW50LnR5cGUgPT09ICJBcnJvd0Z1bmN0aW9uRXhwcmVzc2lvbiIg JiYgbm9kZS5ib2R5Lmxlbmd0aCA9PT0gMTsKKyAgICAgICAgICAgIGxldCBpc1NpbmdsZVN0YXRl bWVudEFycm93RnVuY3Rpb25XaXRoVW5saWtlbHlOZXdsaW5lQ29udGVudCA9IG5vZGUucGFyZW50 LnR5cGUgPT09ICJBcnJvd0Z1bmN0aW9uRXhwcmVzc2lvbiIgJiYgbm9kZS5ib2R5Lmxlbmd0aCA9 PT0gMSAmJiAhdGhpcy5faXNMaWtlbHlUb0hhdmVOZXdsaW5lKG5vZGUuYm9keVswXSk7CiAgICAg ICAgICAgICBpZiAodG9rZW5WYWx1ZSA9PT0gInsiKSB7CiAgICAgICAgICAgICAgICAgLy8gQ2xh c3MgbWV0aG9kcyB3ZSBwdXQgdGhlIG9wZW5pbmcgYnJhY2Ugb24gaXRzIG93biBsaW5lLgogICAg ICAgICAgICAgICAgIGlmIChub2RlLnBhcmVudCAmJiBub2RlLnBhcmVudC5wYXJlbnQgJiYgbm9k ZS5wYXJlbnQucGFyZW50LnR5cGUgPT09ICJNZXRob2REZWZpbml0aW9uIiAmJiBub2RlLmJvZHku bGVuZ3RoKSB7CkBAIC0yOTgsMTMgKzMxNywxMyBAQCBFc3ByaW1hRm9ybWF0dGVyID0gY2xhc3Mg RXNwcmltYUZvcm1hdHRlcgogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kVG9rZW4odG9rZW5WYWx1ZSwg dG9rZW5PZmZzZXQpOwotICAgICAgICAgICAgICAgIGlmIChub2RlLmJvZHkubGVuZ3RoICYmICFp c1NpbmdsZVN0YXRlbWVudEFycm93RnVuY3Rpb24pCisgICAgICAgICAgICAgICAgaWYgKG5vZGUu Ym9keS5sZW5ndGggJiYgIWlzU2luZ2xlU3RhdGVtZW50QXJyb3dGdW5jdGlvbldpdGhVbmxpa2Vs eU5ld2xpbmVDb250ZW50KQogICAgICAgICAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZE5ld2xp bmUoKTsKICAgICAgICAgICAgICAgICBidWlsZGVyLmluZGVudCgpOwogICAgICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmICh0b2tlblZhbHVlID09PSAi fSIpIHsKLSAgICAgICAgICAgICAgICBpZiAobm9kZS5ib2R5Lmxlbmd0aCAmJiAhaXNTaW5nbGVT dGF0ZW1lbnRBcnJvd0Z1bmN0aW9uKQorICAgICAgICAgICAgICAgIGlmIChub2RlLmJvZHkubGVu Z3RoICYmICFpc1NpbmdsZVN0YXRlbWVudEFycm93RnVuY3Rpb25XaXRoVW5saWtlbHlOZXdsaW5l Q29udGVudCkKICAgICAgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmROZXdsaW5lKCk7CiAg ICAgICAgICAgICAgICAgYnVpbGRlci5kZWRlbnQoKTsKICAgICAgICAgICAgICAgICBidWlsZGVy LmFwcGVuZFRva2VuKHRva2VuVmFsdWUsIHRva2VuT2Zmc2V0KTsK 376448 2019-08-15 17:29:31 -0700 2019-08-16 12:08:12 -0700 [PATCH] Proposed Fix arrow-1.patch text/plain 5625 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmNWE5ZjRmN2ZhMS4uNTExZDBmNmY0ODMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAxOS0wOC0xNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IEphdmFTY3JpcHQgZm9ybWF0dGluZyBvZiBzaW5nbGUgc3RhdGVt ZW50IGFycm93IGZ1bmN0aW9uIGNhbiBiZSBwb29yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA4MDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mb3JtYXR0aW5nL3Jlc291cmNlcy9q YXZhc2NyaXB0LXRlc3RzL2Fycm93LWZ1bmN0aW9ucy1leHBlY3RlZC5qczoKKyAgICAgICAgKiBp bnNwZWN0b3IvZm9ybWF0dGluZy9yZXNvdXJjZXMvamF2YXNjcmlwdC10ZXN0cy9hcnJvdy1mdW5j dGlvbnMuanM6CisgICAgICAgIEFkZCBhIGZldyBhZGRpdGlvbmFsIGNvbXBsZXggc2luZ2xlIHN0 YXRlbWVudCBhcnJvdyBmdW5jdGlvbiB0ZXN0IGNhc2VzLgorCiAyMDE5LTA4LTE1ICBKb3NlcGgg UGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog VXBkYXRlIEVzcHJpbWEgdG8gc3VwcG9ydCBtb2Rlcm4gSmF2YVNjcmlwdCBsYW5ndWFnZSBmZWF0 dXJlcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVzb3Vy Y2VzL2phdmFzY3JpcHQtdGVzdHMvYXJyb3ctZnVuY3Rpb25zLWV4cGVjdGVkLmpzIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVzb3VyY2VzL2phdmFzY3JpcHQtdGVzdHMvYXJy b3ctZnVuY3Rpb25zLWV4cGVjdGVkLmpzCmluZGV4IDdlNjZkNWU5NDhiLi4wMTZlYmJmMzQxMyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVzb3VyY2VzL2ph dmFzY3JpcHQtdGVzdHMvYXJyb3ctZnVuY3Rpb25zLWV4cGVjdGVkLmpzCisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9mb3JtYXR0aW5nL3Jlc291cmNlcy9qYXZhc2NyaXB0LXRlc3RzL2Fycm93 LWZ1bmN0aW9ucy1leHBlY3RlZC5qcwpAQCAtMzcsMyArMzcsMTUgQEAgZm9vKChhPTEsIGIsICkg PT4gYik7CiBhc3luYyB4ID0+IHgKIGFzeW5jICh4KSA9PiB4CiBhc3luYyAoeCkgPT4ge3h9CisK K2EgPT4geworICAgIGZvciAoYiBvZiBbXSkKKyAgICAgICAgOworfQorKCkgPT4geworICAgIHRy eSB7CisgICAgICAgIDEKKyAgICB9IGNhdGNoIHsKKyAgICAgICAgMgorICAgIH0KK30KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9mb3JtYXR0aW5nL3Jlc291cmNlcy9qYXZhc2Ny aXB0LXRlc3RzL2Fycm93LWZ1bmN0aW9ucy5qcyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9mb3Jt YXR0aW5nL3Jlc291cmNlcy9qYXZhc2NyaXB0LXRlc3RzL2Fycm93LWZ1bmN0aW9ucy5qcwppbmRl eCBlNmVkZmRlYTFjNi4uY2RhMWNjM2Y1MTYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9mb3JtYXR0aW5nL3Jlc291cmNlcy9qYXZhc2NyaXB0LXRlc3RzL2Fycm93LWZ1bmN0aW9u cy5qcworKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZm9ybWF0dGluZy9yZXNvdXJjZXMvamF2 YXNjcmlwdC10ZXN0cy9hcnJvdy1mdW5jdGlvbnMuanMKQEAgLTI3LDMgKzI3LDYgQEAgZm9vKChh PTEsYiwpPT5iKTsKIGFzeW5jIHg9PngKIGFzeW5jKHgpPT54CiBhc3luYyh4KT0+e3h9CisKK2E9 Pntmb3IoYiBvZltdKTt9CisoKT0+e3RyeXsxfWNhdGNoezJ9fQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VM b2cKaW5kZXggMTZmZmU3NTIxOGMuLmM0MTEwYjc0OTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOS0wOC0xNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jh cm9AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEphdmFTY3JpcHQgZm9ybWF0 dGluZyBvZiBzaW5nbGUgc3RhdGVtZW50IGFycm93IGZ1bmN0aW9uIGNhbiBiZSBwb29yCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA4MDAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvV29ya2Vycy9Gb3JtYXR0ZXIvRXNwcmltYUZvcm1hdHRlci5qczoKKyAgICAgICAgKEVzcHJp bWFGb3JtYXR0ZXIucHJvdG90eXBlLl9pc0xpa2VseVRvSGF2ZU5ld2xpbmUpOgorICAgICAgICAo RXNwcmltYUZvcm1hdHRlci5wcm90b3R5cGUuX2hhbmRsZVRva2VuQXROb2RlKToKKyAgICAgICAg QmV0dGVyIGhldXJpc3RpYyBmb3Igc2luZ2xlIHN0YXRlbWVudCBhcnJvdyBmdW5jdGlvbnMuCisK IDIwMTktMDgtMTUgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBVcGRhdGUgRXNwcmltYSB0byBzdXBwb3J0IG1vZGVybiBKYXZh U2NyaXB0IGxhbmd1YWdlIGZlYXR1cmVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Xb3JrZXJzL0Zvcm1hdHRlci9Fc3ByaW1hRm9ybWF0dGVyLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvV29ya2Vycy9Gb3JtYXR0ZXIvRXNw cmltYUZvcm1hdHRlci5qcwppbmRleCBiY2I3ODI0MzQzMy4uMWQ5YTQxNGM0NmQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1dvcmtlcnMvRm9ybWF0dGVy L0VzcHJpbWFGb3JtYXR0ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvV29ya2Vycy9Gb3JtYXR0ZXIvRXNwcmltYUZvcm1hdHRlci5qcwpAQCAtMTg5LDYgKzE4 OSwyNSBAQCBFc3ByaW1hRm9ybWF0dGVyID0gY2xhc3MgRXNwcmltYUZvcm1hdHRlcgogICAgICAg ICByZXR1cm4gKHBhcmVudC50eXBlID09PSAiRm9yU3RhdGVtZW50IiB8fCBwYXJlbnQudHlwZSA9 PT0gIkZvckluU3RhdGVtZW50IiB8fCBwYXJlbnQudHlwZSA9PT0gIkZvck9mU3RhdGVtZW50Iikg JiYgbm9kZSAhPT0gcGFyZW50LmJvZHk7CiAgICAgfQogCisgICAgX2lzTGlrZWx5VG9IYXZlTmV3 bGluZShub2RlKQorICAgIHsKKyAgICAgICAgbGV0IG5vZGVUeXBlID0gbm9kZS50eXBlOworICAg ICAgICBpZiAobm9kZVR5cGUgPT09ICJFeHByZXNzaW9uU3RhdGVtZW50IikKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKworICAgICAgICByZXR1cm4gbm9kZVR5cGUgPT09ICJJZlN0YXRlbWVu dCIKKyAgICAgICAgICAgIHx8IG5vZGVUeXBlID09PSAiRm9yU3RhdGVtZW50IgorICAgICAgICAg ICAgfHwgbm9kZVR5cGUgPT09ICJGb3JPZlN0YXRlbWVudCIKKyAgICAgICAgICAgIHx8IG5vZGVU eXBlID09PSAiRm9ySW5TdGF0ZW1lbnQiCisgICAgICAgICAgICB8fCBub2RlVHlwZSA9PT0gIldo aWxlU3RhdGVtZW50IgorICAgICAgICAgICAgfHwgbm9kZVR5cGUgPT09ICJEb1doaWxlU3RhdGVt ZW50IgorICAgICAgICAgICAgfHwgbm9kZVR5cGUgPT09ICJTd2l0Y2hTdGF0ZW1lbnQiCisgICAg ICAgICAgICB8fCBub2RlVHlwZSA9PT0gIlRyeVN0YXRlbWVudCIKKyAgICAgICAgICAgIHx8IG5v ZGVUeXBlID09PSAiRnVuY3Rpb25EZWNsYXJhdGlvbiIKKyAgICAgICAgICAgIHx8IG5vZGVUeXBl ID09PSAiQmxvY2tTdGF0ZW1lbnQiCisgICAgICAgICAgICB8fCBub2RlVHlwZSA9PT0gIldpdGhT dGF0ZW1lbnQiOworICAgIH0KKwogICAgIF9pc1JhbmdlV2hpdGVzcGFjZShmcm9tLCB0bykKICAg ICB7CiAgICAgICAgIGxldCBzdWJzdHJpbmcgPSB0aGlzLl9zb3VyY2VUZXh0LnN1YnN0cmluZyhm cm9tLCB0byk7CkBAIC0yODcsNyArMzA2LDcgQEAgRXNwcmltYUZvcm1hdHRlciA9IGNsYXNzIEVz cHJpbWFGb3JtYXR0ZXIKICAgICAgICAgfQogCiAgICAgICAgIGlmIChub2RlVHlwZSA9PT0gIkJs b2NrU3RhdGVtZW50IikgewotICAgICAgICAgICAgbGV0IGlzU2luZ2xlU3RhdGVtZW50QXJyb3dG dW5jdGlvbiA9IG5vZGUucGFyZW50LnR5cGUgPT09ICJBcnJvd0Z1bmN0aW9uRXhwcmVzc2lvbiIg JiYgbm9kZS5ib2R5Lmxlbmd0aCA9PT0gMTsKKyAgICAgICAgICAgIGxldCBpc1NpbmdsZVN0YXRl bWVudEFycm93RnVuY3Rpb25XaXRoVW5saWtlbHlOZXdsaW5lQ29udGVudCA9IG5vZGUucGFyZW50 LnR5cGUgPT09ICJBcnJvd0Z1bmN0aW9uRXhwcmVzc2lvbiIgJiYgbm9kZS5ib2R5Lmxlbmd0aCA9 PT0gMSAmJiAhdGhpcy5faXNMaWtlbHlUb0hhdmVOZXdsaW5lKG5vZGUuYm9keVswXSk7CiAgICAg ICAgICAgICBpZiAodG9rZW5WYWx1ZSA9PT0gInsiKSB7CiAgICAgICAgICAgICAgICAgLy8gQ2xh c3MgbWV0aG9kcyB3ZSBwdXQgdGhlIG9wZW5pbmcgYnJhY2Ugb24gaXRzIG93biBsaW5lLgogICAg ICAgICAgICAgICAgIGlmIChub2RlLnBhcmVudCAmJiBub2RlLnBhcmVudC5wYXJlbnQgJiYgbm9k ZS5wYXJlbnQucGFyZW50LnR5cGUgPT09ICJNZXRob2REZWZpbml0aW9uIiAmJiBub2RlLmJvZHku bGVuZ3RoKSB7CkBAIC0yOTgsMTMgKzMxNywxMyBAQCBFc3ByaW1hRm9ybWF0dGVyID0gY2xhc3Mg RXNwcmltYUZvcm1hdHRlcgogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kVG9rZW4odG9rZW5WYWx1ZSwg dG9rZW5PZmZzZXQpOwotICAgICAgICAgICAgICAgIGlmIChub2RlLmJvZHkubGVuZ3RoICYmICFp c1NpbmdsZVN0YXRlbWVudEFycm93RnVuY3Rpb24pCisgICAgICAgICAgICAgICAgaWYgKG5vZGUu Ym9keS5sZW5ndGggJiYgIWlzU2luZ2xlU3RhdGVtZW50QXJyb3dGdW5jdGlvbldpdGhVbmxpa2Vs eU5ld2xpbmVDb250ZW50KQogICAgICAgICAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZE5ld2xp bmUoKTsKICAgICAgICAgICAgICAgICBidWlsZGVyLmluZGVudCgpOwogICAgICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmICh0b2tlblZhbHVlID09PSAi fSIpIHsKLSAgICAgICAgICAgICAgICBpZiAobm9kZS5ib2R5Lmxlbmd0aCAmJiAhaXNTaW5nbGVT dGF0ZW1lbnRBcnJvd0Z1bmN0aW9uKQorICAgICAgICAgICAgICAgIGlmIChub2RlLmJvZHkubGVu Z3RoICYmICFpc1NpbmdsZVN0YXRlbWVudEFycm93RnVuY3Rpb25XaXRoVW5saWtlbHlOZXdsaW5l Q29udGVudCkKICAgICAgICAgICAgICAgICAgICAgYnVpbGRlci5hcHBlbmROZXdsaW5lKCk7CiAg ICAgICAgICAgICAgICAgYnVpbGRlci5kZWRlbnQoKTsKICAgICAgICAgICAgICAgICBidWlsZGVy LmFwcGVuZFRva2VuKHRva2VuVmFsdWUsIHRva2VuT2Zmc2V0KTsK 376515 2019-08-16 12:08:28 -0700 2019-08-16 12:51:05 -0700 [PATCH] For Landing for-landing-2.patch text/plain 5627 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyYWNhMDMwMWI4Mi4uZTM1ZDI2ZDE3MTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAxOS0wOC0xNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IEphdmFTY3JpcHQgZm9ybWF0dGluZyBvZiBzaW5nbGUgc3RhdGVt ZW50IGFycm93IGZ1bmN0aW9uIGNhbiBiZSBwb29yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA4MDAKKworICAgICAgICBSZXZpZXdlZCBieSBSb3Nz IEtpcnNsaW5nLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVzb3VyY2VzL2ph dmFzY3JpcHQtdGVzdHMvYXJyb3ctZnVuY3Rpb25zLWV4cGVjdGVkLmpzOgorICAgICAgICAqIGlu c3BlY3Rvci9mb3JtYXR0aW5nL3Jlc291cmNlcy9qYXZhc2NyaXB0LXRlc3RzL2Fycm93LWZ1bmN0 aW9ucy5qczoKKyAgICAgICAgQWRkIGEgZmV3IGFkZGl0aW9uYWwgY29tcGxleCBzaW5nbGUgc3Rh dGVtZW50IGFycm93IGZ1bmN0aW9uIHRlc3QgY2FzZXMuCisKIDIwMTktMDgtMTYgIFJ1c3NlbGwg RXBzdGVpbiAgPHJlcHN0ZWluQGFwcGxlLmNvbT4KIAogICAgICAgICByZGFyOi8vNTI1NTc5MTYg KFJFR1JFU1NJT046IGZhc3QvY3NzL3BhaW50LW9yZGVyLmh0bWwgYW5kIGZhc3QvY3NzL3BhaW50 LW9yZGVyLXNoYWRvdy5odG1sIGFyZSBmYWlsaW5nKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVzb3VyY2VzL2phdmFzY3JpcHQtdGVzdHMvYXJyb3ctZnVu Y3Rpb25zLWV4cGVjdGVkLmpzIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Zvcm1hdHRpbmcvcmVz b3VyY2VzL2phdmFzY3JpcHQtdGVzdHMvYXJyb3ctZnVuY3Rpb25zLWV4cGVjdGVkLmpzCmluZGV4 IDdlNjZkNWU5NDhiLi4wMTZlYmJmMzQxMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2Zvcm1hdHRpbmcvcmVzb3VyY2VzL2phdmFzY3JpcHQtdGVzdHMvYXJyb3ctZnVuY3Rpb25z LWV4cGVjdGVkLmpzCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9mb3JtYXR0aW5nL3Jlc291 cmNlcy9qYXZhc2NyaXB0LXRlc3RzL2Fycm93LWZ1bmN0aW9ucy1leHBlY3RlZC5qcwpAQCAtMzcs MyArMzcsMTUgQEAgZm9vKChhPTEsIGIsICkgPT4gYik7CiBhc3luYyB4ID0+IHgKIGFzeW5jICh4 KSA9PiB4CiBhc3luYyAoeCkgPT4ge3h9CisKK2EgPT4geworICAgIGZvciAoYiBvZiBbXSkKKyAg ICAgICAgOworfQorKCkgPT4geworICAgIHRyeSB7CisgICAgICAgIDEKKyAgICB9IGNhdGNoIHsK KyAgICAgICAgMgorICAgIH0KK30KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9m b3JtYXR0aW5nL3Jlc291cmNlcy9qYXZhc2NyaXB0LXRlc3RzL2Fycm93LWZ1bmN0aW9ucy5qcyBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9mb3JtYXR0aW5nL3Jlc291cmNlcy9qYXZhc2NyaXB0LXRl c3RzL2Fycm93LWZ1bmN0aW9ucy5qcwppbmRleCBlNmVkZmRlYTFjNi4uY2RhMWNjM2Y1MTYgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9mb3JtYXR0aW5nL3Jlc291cmNlcy9qYXZh c2NyaXB0LXRlc3RzL2Fycm93LWZ1bmN0aW9ucy5qcworKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvZm9ybWF0dGluZy9yZXNvdXJjZXMvamF2YXNjcmlwdC10ZXN0cy9hcnJvdy1mdW5jdGlvbnMu anMKQEAgLTI3LDMgKzI3LDYgQEAgZm9vKChhPTEsYiwpPT5iKTsKIGFzeW5jIHg9PngKIGFzeW5j KHgpPT54CiBhc3luYyh4KT0+e3h9CisKK2E9Pntmb3IoYiBvZltdKTt9CisoKT0+e3RyeXsxfWNh dGNoezJ9fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKaW5kZXggYTNkZDI0N2RhYzQuLjVkODM4ODU5 MjhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOS0wOC0x NSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJ bnNwZWN0b3I6IEphdmFTY3JpcHQgZm9ybWF0dGluZyBvZiBzaW5nbGUgc3RhdGVtZW50IGFycm93 IGZ1bmN0aW9uIGNhbiBiZSBwb29yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDA4MDAKKworICAgICAgICBSZXZpZXdlZCBieSBSb3NzIEtpcnNsaW5n LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Xb3JrZXJzL0Zvcm1hdHRlci9Fc3ByaW1hRm9y bWF0dGVyLmpzOgorICAgICAgICAoRXNwcmltYUZvcm1hdHRlci5wcm90b3R5cGUuX2lzTGlrZWx5 VG9IYXZlTmV3bGluZSk6CisgICAgICAgIChFc3ByaW1hRm9ybWF0dGVyLnByb3RvdHlwZS5faGFu ZGxlVG9rZW5BdE5vZGUpOgorICAgICAgICBCZXR0ZXIgaGV1cmlzdGljIGZvciBzaW5nbGUgc3Rh dGVtZW50IGFycm93IGZ1bmN0aW9ucy4KKwogMjAxOS0wOC0xNiAgRGV2aW4gUm91c3NvICA8ZHJv dXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogcmVuYW1lICJJbnZhbGlk IENoYXJhY3RlcnMiIHRvICJJbnZpc2libGUgQ2hhcmFjdGVycyIgZm9yIGNsYXJpdHkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1dvcmtlcnMvRm9ybWF0 dGVyL0VzcHJpbWFGb3JtYXR0ZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Xb3JrZXJzL0Zvcm1hdHRlci9Fc3ByaW1hRm9ybWF0dGVyLmpzCmluZGV4IGJjYjc4MjQz NDMzLi41MjdlMWFlZDc5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvV29ya2Vycy9Gb3JtYXR0ZXIvRXNwcmltYUZvcm1hdHRlci5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Xb3JrZXJzL0Zvcm1hdHRlci9Fc3ByaW1h Rm9ybWF0dGVyLmpzCkBAIC0xODksNiArMTg5LDIzIEBAIEVzcHJpbWFGb3JtYXR0ZXIgPSBjbGFz cyBFc3ByaW1hRm9ybWF0dGVyCiAgICAgICAgIHJldHVybiAocGFyZW50LnR5cGUgPT09ICJGb3JT dGF0ZW1lbnQiIHx8IHBhcmVudC50eXBlID09PSAiRm9ySW5TdGF0ZW1lbnQiIHx8IHBhcmVudC50 eXBlID09PSAiRm9yT2ZTdGF0ZW1lbnQiKSAmJiBub2RlICE9PSBwYXJlbnQuYm9keTsKICAgICB9 CiAKKyAgICBfaXNMaWtlbHlUb0hhdmVOZXdsaW5lKG5vZGUpCisgICAgeworICAgICAgICBsZXQg bm9kZVR5cGUgPSBub2RlLnR5cGU7CisgICAgICAgIHJldHVybiBub2RlVHlwZSA9PT0gIklmU3Rh dGVtZW50IgorICAgICAgICAgICAgfHwgbm9kZVR5cGUgPT09ICJGb3JTdGF0ZW1lbnQiCisgICAg ICAgICAgICB8fCBub2RlVHlwZSA9PT0gIkZvck9mU3RhdGVtZW50IgorICAgICAgICAgICAgfHwg bm9kZVR5cGUgPT09ICJGb3JJblN0YXRlbWVudCIKKyAgICAgICAgICAgIHx8IG5vZGVUeXBlID09 PSAiV2hpbGVTdGF0ZW1lbnQiCisgICAgICAgICAgICB8fCBub2RlVHlwZSA9PT0gIkRvV2hpbGVT dGF0ZW1lbnQiCisgICAgICAgICAgICB8fCBub2RlVHlwZSA9PT0gIlN3aXRjaFN0YXRlbWVudCIK KyAgICAgICAgICAgIHx8IG5vZGVUeXBlID09PSAiVHJ5U3RhdGVtZW50IgorICAgICAgICAgICAg fHwgbm9kZVR5cGUgPT09ICJGdW5jdGlvbkRlY2xhcmF0aW9uIgorICAgICAgICAgICAgfHwgbm9k ZVR5cGUgPT09ICJDbGFzc0RlY2xhcmF0aW9uIgorICAgICAgICAgICAgfHwgbm9kZVR5cGUgPT09 ICJCbG9ja1N0YXRlbWVudCIKKyAgICAgICAgICAgIHx8IG5vZGVUeXBlID09PSAiV2l0aFN0YXRl bWVudCI7CisgICAgfQorCiAgICAgX2lzUmFuZ2VXaGl0ZXNwYWNlKGZyb20sIHRvKQogICAgIHsK ICAgICAgICAgbGV0IHN1YnN0cmluZyA9IHRoaXMuX3NvdXJjZVRleHQuc3Vic3RyaW5nKGZyb20s IHRvKTsKQEAgLTI4Nyw3ICszMDQsNyBAQCBFc3ByaW1hRm9ybWF0dGVyID0gY2xhc3MgRXNwcmlt YUZvcm1hdHRlcgogICAgICAgICB9CiAKICAgICAgICAgaWYgKG5vZGVUeXBlID09PSAiQmxvY2tT dGF0ZW1lbnQiKSB7Ci0gICAgICAgICAgICBsZXQgaXNTaW5nbGVTdGF0ZW1lbnRBcnJvd0Z1bmN0 aW9uID0gbm9kZS5wYXJlbnQudHlwZSA9PT0gIkFycm93RnVuY3Rpb25FeHByZXNzaW9uIiAmJiBu b2RlLmJvZHkubGVuZ3RoID09PSAxOworICAgICAgICAgICAgbGV0IGlzU2luZ2xlU3RhdGVtZW50 QXJyb3dGdW5jdGlvbldpdGhVbmxpa2VseU11bHRpbGluZUNvbnRlbnQgPSBub2RlLnBhcmVudC50 eXBlID09PSAiQXJyb3dGdW5jdGlvbkV4cHJlc3Npb24iICYmIG5vZGUuYm9keS5sZW5ndGggPT09 IDEgJiYgIXRoaXMuX2lzTGlrZWx5VG9IYXZlTmV3bGluZShub2RlLmJvZHlbMF0pOwogICAgICAg ICAgICAgaWYgKHRva2VuVmFsdWUgPT09ICJ7IikgewogICAgICAgICAgICAgICAgIC8vIENsYXNz IG1ldGhvZHMgd2UgcHV0IHRoZSBvcGVuaW5nIGJyYWNlIG9uIGl0cyBvd24gbGluZS4KICAgICAg ICAgICAgICAgICBpZiAobm9kZS5wYXJlbnQgJiYgbm9kZS5wYXJlbnQucGFyZW50ICYmIG5vZGUu cGFyZW50LnBhcmVudC50eXBlID09PSAiTWV0aG9kRGVmaW5pdGlvbiIgJiYgbm9kZS5ib2R5Lmxl bmd0aCkgewpAQCAtMjk4LDEzICszMTUsMTMgQEAgRXNwcmltYUZvcm1hdHRlciA9IGNsYXNzIEVz cHJpbWFGb3JtYXR0ZXIKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZFRva2VuKHRva2VuVmFsdWUsIHRv a2VuT2Zmc2V0KTsKLSAgICAgICAgICAgICAgICBpZiAobm9kZS5ib2R5Lmxlbmd0aCAmJiAhaXNT aW5nbGVTdGF0ZW1lbnRBcnJvd0Z1bmN0aW9uKQorICAgICAgICAgICAgICAgIGlmIChub2RlLmJv ZHkubGVuZ3RoICYmICFpc1NpbmdsZVN0YXRlbWVudEFycm93RnVuY3Rpb25XaXRoVW5saWtlbHlN dWx0aWxpbmVDb250ZW50KQogICAgICAgICAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZE5ld2xp bmUoKTsKICAgICAgICAgICAgICAgICBidWlsZGVyLmluZGVudCgpOwogICAgICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmICh0b2tlblZhbHVlID09PSAi fSIpIHsKLSAgICAgICAgICAgICAgICBpZiAobm9kZS5ib2R5Lmxlbmd0aCAmJiAhaXNTaW5nbGVT dGF0ZW1lbnRBcnJvd0Z1bmN0aW9uKQorICAgICAgICAgICAgICAgIGlmIChub2RlLmJvZHkubGVu Z3RoICYmICFpc1NpbmdsZVN0YXRlbWVudEFycm93RnVuY3Rpb25XaXRoVW5saWtlbHlNdWx0aWxp bmVDb250ZW50KQogICAgICAgICAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZE5ld2xpbmUoKTsK ICAgICAgICAgICAgICAgICBidWlsZGVyLmRlZGVudCgpOwogICAgICAgICAgICAgICAgIGJ1aWxk ZXIuYXBwZW5kVG9rZW4odG9rZW5WYWx1ZSwgdG9rZW5PZmZzZXQpOwo=