200770 2019-08-15 09:25:31 -0700 Web Inspector: CodeMirror still inserts a tab even when "Prefer indent using" is set to "Spaces" 2019-08-15 12:33:17 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes ross.kirsling webkit-bug-importer oldest_to_newest 1561571 0 hi 2019-08-15 09:25:31 -0700 # STEPS TO REPRODUCE: 1. inspect any page 2. go to any resource that is editable 3. press tab ↹ => \t inserted instead of " " (4) 1561572 1 376384 hi 2019-08-15 09:26:45 -0700 Created attachment 376384 Patch 1561580 2 ross.kirsling 2019-08-15 09:50:28 -0700 Is this better than having WI make Tab execute `insertSoftTab` and specify `options.tabSize` appropriately? 1561582 3 hi 2019-08-15 09:55:54 -0700 (In reply to Ross Kirsling from comment #2) > Is this better than having WI make Tab execute `insertSoftTab` and specify `options.tabSize` appropriately? I didn't even know that was a thing! I'll give it a shot =D 1561584 4 376387 hi 2019-08-15 09:59:01 -0700 Created attachment 376387 Patch 1561602 5 376387 ross.kirsling 2019-08-15 10:23:35 -0700 Comment on attachment 376387 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376387&action=review It's still a bit sad to me, but I guess it's how we've got to do it: https://github.com/codemirror/CodeMirror/pull/4317 > Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js:624 > + CodeMirror.commands.insertTab = function(cm) { Maybe it'd still be better to overwrite `defaultTab`, so that you don't have to store `original`? > Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js:625 > + if (WI.settings.indentWithTabs.value) I think this can be `cm.options.indentWithTabs`, given all this: https://github.com/WebKit/webkit/blob/master/Source/WebInspectorUI/UserInterface/Views/CodeMirrorEditor.js#L36-L58 1561606 6 376387 hi 2019-08-15 10:29:58 -0700 Comment on attachment 376387 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376387&action=review >> Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js:624 >> + CodeMirror.commands.insertTab = function(cm) { > > Maybe it'd still be better to overwrite `defaultTab`, so that you don't have to store `original`? I'd rather not, as that would require that I duplicate the `if (cm.somethingSelected()) { cm.indentSelection("add") }` logic, which adds complexity and potential confusion each time we update CodeMirror. >> Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js:625 >> + if (WI.settings.indentWithTabs.value) > > I think this can be `cm.options.indentWithTabs`, given all this: > https://github.com/WebKit/webkit/blob/master/Source/WebInspectorUI/UserInterface/Views/CodeMirrorEditor.js#L36-L58 Good point. I'll switch. 1561607 7 376390 hi 2019-08-15 10:31:44 -0700 Created attachment 376390 Patch 1561613 8 ross.kirsling 2019-08-15 10:36:17 -0700 (In reply to Devin Rousso from comment #6) > I'd rather not, as that would require that I duplicate the `if > (cm.somethingSelected()) { cm.indentSelection("add") }` logic, which adds > complexity and potential confusion each time we update CodeMirror. Even with this solution though, I wonder if a comment would be in order to encourage us to keep an eye on it across CodeMirror updates? (Maybe we could link to the PR as a justification for why we had to go this route.) 1561614 9 376390 ross.kirsling 2019-08-15 10:36:31 -0700 Comment on attachment 376390 Patch r=me otherwise 1561639 10 376396 hi 2019-08-15 11:13:48 -0700 Created attachment 376396 Patch 1561691 11 376396 commit-queue 2019-08-15 12:32:21 -0700 Comment on attachment 376396 Patch Clearing flags on attachment: 376396 Committed r248739: <https://trac.webkit.org/changeset/248739> 1561692 12 commit-queue 2019-08-15 12:32:22 -0700 All reviewed patches have been landed. Closing bug. 1561693 13 webkit-bug-importer 2019-08-15 12:33:17 -0700 <rdar://problem/54358187> 376384 2019-08-15 09:26:45 -0700 2019-08-15 09:58:57 -0700 Patch bug-200770-20190815092644.patch text/plain 1668 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ2MTZiMDMxMDk0NjgwOGQ2YzRhYTYxMzgyNjhj OWVjOTUzMjkyNWUuLjhkYjM1NzM0MTA1NjM1MGI4MWE2NjFkOThlNTY1MGUyYzdhYmRmZDYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA4LTE1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD b2RlTWlycm9yIHN0aWxsIGluc2VydHMgYSB0YWIgZXZlbiB3aGVuICJQcmVmZXIgaW5kZW50IHVz aW5nIiBpcyBzZXQgdG8gIlNwYWNlcyIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwMDc3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yQWRkaXRpb25z LmpzOgorICAgICAgICBSZW1hcCB0aGUgYGluc2VydFRhYmAgY29tbWFuZCB0byB1c2UgYFdJLmlu ZGVudFN0cmluZ2AgKHdoaWNoIGRldGVybWluZXMgd2hldGhlciB0byB1c2UgdGFicworICAgICAg ICBvciBzcGFjZXMpIGluc3RlYWQgb2YgYWx3YXlzIGluc2VydGluZyBhIHRhYiAoIlx0IikuCisK IDIwMTktMDgtMTQgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IEVsZW1lbnRzOiBDb21wdXRlZDogbW92ZSB0aGUgQm94IE1vZGVsIHNl Y3Rpb24gdG8gdGhlIHRvcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ29kZU1pcnJvckFkZGl0aW9ucy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvZGVNaXJyb3JBZGRpdGlvbnMuanMKaW5kZXggNDYz MTRhMWU3OGQ3ODIzMjIwNjZhZGUzMTE3MTJkNzE1Mjg2MGU5Zi4uNjBlMjhiNGU1ZDdmZDAwMDdk NWY0OTE5Yzg0NzczMDc5ZTEyMjBiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1pcnJvckFkZGl0aW9ucy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yQWRkaXRpb25zLmpz CkBAIC02MTksNiArNjE5LDEwIEBACiAgICAgICAgIGZhbGx0aHJvdWdoOiBtYWMgPyAibWFjRGVm YXVsdCIgOiAicGNEZWZhdWx0IgogICAgIH07CiAKKyAgICBDb2RlTWlycm9yLmNvbW1hbmRzLmlu c2VydFRhYiA9IGZ1bmN0aW9uKGNtKSB7CisgICAgICAgIGNtLnJlcGxhY2VTZWxlY3Rpb24oV0ku aW5kZW50U3RyaW5nKCkpOworICAgIH07CisKICAgICAvLyBSZWdpc3RlciBzb21lIGV4dHJhIE1J TUUtdHlwZXMgZm9yIENvZGVNaXJyb3IuIFRoZXNlIGFyZSBpbiBhZGRpdGlvbiB0byB0aGUKICAg ICAvLyBvbmVzIENvZGVNaXJyb3IgYWxyZWFkeSByZWdpc3RlcnMsIGxpa2UgdGV4dC9odG1sLCB0 ZXh0L2phdmFzY3JpcHQsIGV0Yy4KICAgICB2YXIgZXh0cmFYTUxUeXBlcyA9IFsidGV4dC94bWwi LCAidGV4dC94c2wiXTsK 376387 2019-08-15 09:59:01 -0700 2019-08-15 10:31:43 -0700 Patch bug-200770-20190815095859.patch text/plain 1925 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ2MTZiMDMxMDk0NjgwOGQ2YzRhYTYxMzgyNjhj OWVjOTUzMjkyNWUuLjgzNDZlZDczYWFiMTFiZWEzMjcwMmFmMjdjMzUzNTc5YzA0NjA0MzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTA4LTE1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD b2RlTWlycm9yIHN0aWxsIGluc2VydHMgYSB0YWIgZXZlbiB3aGVuICJQcmVmZXIgaW5kZW50IHVz aW5nIiBpcyBzZXQgdG8gIlNwYWNlcyIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwMDc3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yQWRkaXRpb25z LmpzOgorICAgICAgICBSZW1hcCB0aGUgYGluc2VydFRhYmAgY29tbWFuZCB0byB1c2UgYGluc2Vy dFNvZnRUYWJgIHdoZW4gIlByZWZlciBpbmRlbnQgdXNpbmciIGlzIHNldCB0bworICAgICAgICAi U3BhY2VzIiBzbyB0aGF0IENvZGVNaXJyb3IgaW5zZXJ0cyB0aGUgbnVtYmVyIG9mIHNwYWNlcyB0 aGF0IHdvdWxkIG1hdGNoIGEgdGFiICgiXHQiKSBiZWluZworICAgICAgICBpbnNlcnRlZCBhdCB0 aGUgc2FtZSBzcG90LgorCiAyMDE5LTA4LTE0ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxl LmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBFbGVtZW50czogQ29tcHV0ZWQ6IG1vdmUg dGhlIEJveCBNb2RlbCBzZWN0aW9uIHRvIHRoZSB0b3AKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvZGVNaXJyb3JBZGRpdGlvbnMuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yQWRkaXRp b25zLmpzCmluZGV4IDQ2MzE0YTFlNzhkNzgyMzIyMDY2YWRlMzExNzEyZDcxNTI4NjBlOWYuLjE4 NjZkZjE5ZDIyNGRkZGY3ZmM2OTFhNWNmMDEwOTQ3NzAxZDM4YmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvZGVNaXJyb3JBZGRpdGlvbnMu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1p cnJvckFkZGl0aW9ucy5qcwpAQCAtNjE5LDYgKzYxOSwxNiBAQAogICAgICAgICBmYWxsdGhyb3Vn aDogbWFjID8gIm1hY0RlZmF1bHQiIDogInBjRGVmYXVsdCIKICAgICB9OwogCisgICAgeworICAg ICAgICBsZXQgb3JpZ2luYWwgPSBDb2RlTWlycm9yLmNvbW1hbmRzLmluc2VydFRhYjsKKyAgICAg ICAgQ29kZU1pcnJvci5jb21tYW5kcy5pbnNlcnRUYWIgPSBmdW5jdGlvbihjbSkgeworICAgICAg ICAgICAgaWYgKFdJLnNldHRpbmdzLmluZGVudFdpdGhUYWJzLnZhbHVlKQorICAgICAgICAgICAg ICAgIG9yaWdpbmFsKGNtKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBDb2Rl TWlycm9yLmNvbW1hbmRzLmluc2VydFNvZnRUYWIoY20pOworICAgICAgICB9OworICAgIH0KKwog ICAgIC8vIFJlZ2lzdGVyIHNvbWUgZXh0cmEgTUlNRS10eXBlcyBmb3IgQ29kZU1pcnJvci4gVGhl c2UgYXJlIGluIGFkZGl0aW9uIHRvIHRoZQogICAgIC8vIG9uZXMgQ29kZU1pcnJvciBhbHJlYWR5 IHJlZ2lzdGVycywgbGlrZSB0ZXh0L2h0bWwsIHRleHQvamF2YXNjcmlwdCwgZXRjLgogICAgIHZh ciBleHRyYVhNTFR5cGVzID0gWyJ0ZXh0L3htbCIsICJ0ZXh0L3hzbCJdOwo= 376390 2019-08-15 10:31:44 -0700 2019-08-15 11:13:46 -0700 Patch bug-200770-20190815103143.patch text/plain 1918 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ2MTZiMDMxMDk0NjgwOGQ2YzRhYTYxMzgyNjhj OWVjOTUzMjkyNWUuLjgzNDZlZDczYWFiMTFiZWEzMjcwMmFmMjdjMzUzNTc5YzA0NjA0MzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTA4LTE1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD b2RlTWlycm9yIHN0aWxsIGluc2VydHMgYSB0YWIgZXZlbiB3aGVuICJQcmVmZXIgaW5kZW50IHVz aW5nIiBpcyBzZXQgdG8gIlNwYWNlcyIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwMDc3MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yQWRkaXRpb25z LmpzOgorICAgICAgICBSZW1hcCB0aGUgYGluc2VydFRhYmAgY29tbWFuZCB0byB1c2UgYGluc2Vy dFNvZnRUYWJgIHdoZW4gIlByZWZlciBpbmRlbnQgdXNpbmciIGlzIHNldCB0bworICAgICAgICAi U3BhY2VzIiBzbyB0aGF0IENvZGVNaXJyb3IgaW5zZXJ0cyB0aGUgbnVtYmVyIG9mIHNwYWNlcyB0 aGF0IHdvdWxkIG1hdGNoIGEgdGFiICgiXHQiKSBiZWluZworICAgICAgICBpbnNlcnRlZCBhdCB0 aGUgc2FtZSBzcG90LgorCiAyMDE5LTA4LTE0ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxl LmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBFbGVtZW50czogQ29tcHV0ZWQ6IG1vdmUg dGhlIEJveCBNb2RlbCBzZWN0aW9uIHRvIHRoZSB0b3AKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvZGVNaXJyb3JBZGRpdGlvbnMuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yQWRkaXRp b25zLmpzCmluZGV4IDQ2MzE0YTFlNzhkNzgyMzIyMDY2YWRlMzExNzEyZDcxNTI4NjBlOWYuLmFj MzZmYzg2OTA0ZmViN2ZjZWNkODM1MWFhOWRjZjJkNTc4MTE2NWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvZGVNaXJyb3JBZGRpdGlvbnMu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1p cnJvckFkZGl0aW9ucy5qcwpAQCAtNjE5LDYgKzYxOSwxNiBAQAogICAgICAgICBmYWxsdGhyb3Vn aDogbWFjID8gIm1hY0RlZmF1bHQiIDogInBjRGVmYXVsdCIKICAgICB9OwogCisgICAgeworICAg ICAgICBsZXQgb3JpZ2luYWwgPSBDb2RlTWlycm9yLmNvbW1hbmRzLmluc2VydFRhYjsKKyAgICAg ICAgQ29kZU1pcnJvci5jb21tYW5kcy5pbnNlcnRUYWIgPSBmdW5jdGlvbihjbSkgeworICAgICAg ICAgICAgaWYgKGNtLm9wdGlvbnMuaW5kZW50V2l0aFRhYnMpCisgICAgICAgICAgICAgICAgb3Jp Z2luYWwoY20pOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIENvZGVNaXJyb3Iu Y29tbWFuZHMuaW5zZXJ0U29mdFRhYihjbSk7CisgICAgICAgIH07CisgICAgfQorCiAgICAgLy8g UmVnaXN0ZXIgc29tZSBleHRyYSBNSU1FLXR5cGVzIGZvciBDb2RlTWlycm9yLiBUaGVzZSBhcmUg aW4gYWRkaXRpb24gdG8gdGhlCiAgICAgLy8gb25lcyBDb2RlTWlycm9yIGFscmVhZHkgcmVnaXN0 ZXJzLCBsaWtlIHRleHQvaHRtbCwgdGV4dC9qYXZhc2NyaXB0LCBldGMuCiAgICAgdmFyIGV4dHJh WE1MVHlwZXMgPSBbInRleHQveG1sIiwgInRleHQveHNsIl07Cg== 376396 2019-08-15 11:13:48 -0700 2019-08-15 12:32:21 -0700 Patch bug-200770-20190815111347.patch text/plain 2024 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ2MTZiMDMxMDk0NjgwOGQ2YzRhYTYxMzgyNjhj OWVjOTUzMjkyNWUuLjlhZmIxNDg5MDNiOGNmY2FkYzEyZTUxNTMxZTAyYzI0ODUxODIxZWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTA4LTE1ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD b2RlTWlycm9yIHN0aWxsIGluc2VydHMgYSB0YWIgZXZlbiB3aGVuICJQcmVmZXIgaW5kZW50IHVz aW5nIiBpcyBzZXQgdG8gIlNwYWNlcyIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwMDc3MAorCisgICAgICAgIFJldmlld2VkIGJ5IFJvc3MgS2lyc2xp bmcuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvZGVNaXJyb3JBZGRpdGlvbnMu anM6CisgICAgICAgIFJlbWFwIHRoZSBgaW5zZXJ0VGFiYCBjb21tYW5kIHRvIHVzZSBgaW5zZXJ0 U29mdFRhYmAgd2hlbiAiUHJlZmVyIGluZGVudCB1c2luZyIgaXMgc2V0IHRvCisgICAgICAgICJT cGFjZXMiIHNvIHRoYXQgQ29kZU1pcnJvciBpbnNlcnRzIHRoZSBudW1iZXIgb2Ygc3BhY2VzIHRo YXQgd291bGQgbWF0Y2ggYSB0YWIgKCJcdCIpIGJlaW5nCisgICAgICAgIGluc2VydGVkIGF0IHRo ZSBzYW1lIHNwb3QuCisKIDIwMTktMDgtMTQgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUu Y29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEVsZW1lbnRzOiBDb21wdXRlZDogbW92ZSB0 aGUgQm94IE1vZGVsIHNlY3Rpb24gdG8gdGhlIHRvcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1pcnJvckFkZGl0aW9ucy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvZGVNaXJyb3JBZGRpdGlv bnMuanMKaW5kZXggNDYzMTRhMWU3OGQ3ODIzMjIwNjZhZGUzMTE3MTJkNzE1Mjg2MGU5Zi4uODM2 M2I0MDViNDZjZTM3OTBkYWVlYzI3NjAyZjdlMzI1NzUxYzUwZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1pcnJvckFkZGl0aW9ucy5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWly cm9yQWRkaXRpb25zLmpzCkBAIC02MTksNiArNjE5LDE3IEBACiAgICAgICAgIGZhbGx0aHJvdWdo OiBtYWMgPyAibWFjRGVmYXVsdCIgOiAicGNEZWZhdWx0IgogICAgIH07CiAKKyAgICB7CisgICAg ICAgIC8vIENvZGVNaXJyb3IncyBkZWZhdWx0IGJlaGF2aW9yIGlzIHRvIGFsd2F5cyBpbnNlcnQg YSB0YWIgKCJcdCIpIHJlZ2FyZGxlc3Mgb2YgYGluZGVudFdpdGhUYWJzYC4KKyAgICAgICAgbGV0 IG9yaWdpbmFsID0gQ29kZU1pcnJvci5jb21tYW5kcy5pbnNlcnRUYWI7CisgICAgICAgIENvZGVN aXJyb3IuY29tbWFuZHMuaW5zZXJ0VGFiID0gZnVuY3Rpb24oY20pIHsKKyAgICAgICAgICAgIGlm IChjbS5vcHRpb25zLmluZGVudFdpdGhUYWJzKQorICAgICAgICAgICAgICAgIG9yaWdpbmFsKGNt KTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBDb2RlTWlycm9yLmNvbW1hbmRz Lmluc2VydFNvZnRUYWIoY20pOworICAgICAgICB9OworICAgIH0KKwogICAgIC8vIFJlZ2lzdGVy IHNvbWUgZXh0cmEgTUlNRS10eXBlcyBmb3IgQ29kZU1pcnJvci4gVGhlc2UgYXJlIGluIGFkZGl0 aW9uIHRvIHRoZQogICAgIC8vIG9uZXMgQ29kZU1pcnJvciBhbHJlYWR5IHJlZ2lzdGVycywgbGlr ZSB0ZXh0L2h0bWwsIHRleHQvamF2YXNjcmlwdCwgZXRjLgogICAgIHZhciBleHRyYVhNTFR5cGVz ID0gWyJ0ZXh0L3htbCIsICJ0ZXh0L3hzbCJdOwo=