167949 2017-02-07 12:12:03 -0800 Web Inspector: Option+hover on -webkit-transform in Styles sidebar underlines only half the property 2017-02-09 11:30:43 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg hi bburg commit-queue graouts hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1274097 0 bburg 2017-02-07 12:12:03 -0800 Via Antoine Quint: "When you have a -wekit-transform property in the Styles sidebar and you hold down Cmd while hovering over it, the text is only partially underlined as the string is split in two tokens." 1274098 1 bburg 2017-02-07 12:12:18 -0800 <rdar://problem/14057565> 1274099 2 bburg 2017-02-07 12:13:32 -0800 Joe said in radar: "So this is because CodeMirror is splitting it up into 2 tokens, 1 vendor prefix and 1 actual property. We can make CodeMirrorTokenTrackingController smarter here, and treat both as 1 "token" for the Cmd+Hover mode." 1274584 3 300969 hi 2017-02-08 14:44:23 -0800 Created attachment 300969 Patch 1274645 4 300969 joepeck 2017-02-08 16:57:45 -0800 Comment on attachment 300969 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300969&action=review > Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js:351 > + let preceedingTokenPosition = Object.shallowCopy(position); > + preceedingTokenPosition.ch = tokenInfo.token.start - 1; This might need to sanity check some things: What if tokenInfo.token.start was 0. Then this would set ch to -1. Would that cause a problem? 1274653 5 300969 hi 2017-02-08 17:09:31 -0800 Comment on attachment 300969 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300969&action=review >> Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js:351 >> + preceedingTokenPosition.ch = tokenInfo.token.start - 1; > > This might need to sanity check some things: What if tokenInfo.token.start was 0. Then this would set ch to -1. Would that cause a problem? So I just tried this, and it appears to work fine. I think that CodeMirror will create an "empty" token if the position is invalid. Either way, I also check that the token exists and has a type, so it should cover both cases. 1274761 6 300969 joepeck 2017-02-08 22:18:17 -0800 Comment on attachment 300969 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300969&action=review r=me >>> Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js:351 >>> + preceedingTokenPosition.ch = tokenInfo.token.start - 1; >> >> This might need to sanity check some things: What if tokenInfo.token.start was 0. Then this would set ch to -1. Would that cause a problem? > > So I just tried this, and it appears to work fine. I think that CodeMirror will create an "empty" token if the position is invalid. Either way, I also check that the token exists and has a type, so it should cover both cases. I just want to make sure it doesn't throw an exception. I see now that CodeMirror clips positions to ensure they are in bounds (clipPos and clipToLen). > Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js:354 > + if (preceedingToken && preceedingToken.type && preceedingToken.type.includes("meta")) { Includes "meta" could false trigger if the type was something was something like "not-meta". But we seem to do this style elsewhere and meta is pretty unique =). 1274795 7 301027 hi 2017-02-09 02:32:42 -0800 Created attachment 301027 Patch So I just realized that I forgot to include a check for if the user highlights the meta token instead of the non-meta token. These changes now cover both. 1274928 8 301027 joepeck 2017-02-09 11:05:13 -0800 Comment on attachment 301027 Patch Nice. r=me 1274943 9 301027 commit-queue 2017-02-09 11:30:38 -0800 Comment on attachment 301027 Patch Clearing flags on attachment: 301027 Committed r211973: <http://trac.webkit.org/changeset/211973> 1274944 10 commit-queue 2017-02-09 11:30:43 -0800 All reviewed patches have been landed. Closing bug. 300969 2017-02-08 14:44:23 -0800 2017-02-09 02:32:42 -0800 Patch bug-167949-20170208144158.patch text/plain 2335 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ0ZDI3ZGNkYmRhYmY3ZGYyYTM1YzM0ODQwYjlm ODRiZjgzZDAwM2EuLmJmYTMzMmE0YTA2ZGYxNmFjZTVkZjkxM2QyMjdlZDQ3ZDliNmI3NDQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTAyLTA4ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IE9wdGlvbitob3ZlciBvbiAtd2Via2l0LXRyYW5zZm9ybSBpbiBTdHlsZXMgc2lkZWJh ciB1bmRlcmxpbmVzIG9ubHkgaGFsZiB0aGUgcHJvcGVydHkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2Nzk0OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9D b2RlTWlycm9yVG9rZW5UcmFja2luZ0NvbnRyb2xsZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyLnByb3RvdHlwZS5fdXBkYXRlSG92 ZXJlZFRva2VuSW5mbyk6CisgICAgICAgIEF0dGVtcHQgdG8gbWVyZ2UgdG9rZW5zIChzcGVjaWZp Y2FsbHkgdGhlIGB0ZXh0YCBhbmQgYHN0YXJ0YCB2YWx1ZXMpIGlmIHRoZSBwcmVjZWVkaW5nIHRv a2VuCisgICAgICAgIGlzIG9mIHRoZSB0eXBlICJtZXRhIi4KKwogMjAxNy0wMi0wNyAgRGV2aW4g Um91c3NvICA8ZGNyb3Vzc28rd2Via2l0QGdtYWlsLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBncmFkaWVudCBlZGl0b3Igc2hvdWxkIGFsbG93IHN3aXRjaGluZyB0aGUgdW5pdHMgb2Yg dGhlICdhbmdsZScgcGFyYW1ldGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Db250cm9sbGVycy9Db2RlTWlycm9yVG9rZW5UcmFja2luZ0NvbnRyb2xs ZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9D b2RlTWlycm9yVG9rZW5UcmFja2luZ0NvbnRyb2xsZXIuanMKaW5kZXggMGEwYjEzZjg2OGVmYjM4 ZGQwNzViNWM1ZTYxZjc3MjJhM2I1MDIyMy4uZWIxOGVlYTY2ZTBhNDZiNDkwYTQ0NDNmYjQ1ZGRm OGE0NzNlNDFjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJy b3JUb2tlblRyYWNraW5nQ29udHJvbGxlci5qcwpAQCAtMzQ3LDYgKzM0NywxNyBAQCBXZWJJbnNw ZWN0b3IuQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyID0gY2xhc3MgQ29kZU1pcnJv clRva2VuVHJhY2tpbmdDbwogICAgICAgICAvLyBXZSBoYXZlIGEgbmV3IGhvdmVyZWQgdG9rZW4u CiAgICAgICAgIHZhciB0b2tlbkluZm8gPSB0aGlzLl9wcmV2aW91c1Rva2VuSW5mbyA9IHRoaXMu X2dldFRva2VuSW5mb0ZvclBvc2l0aW9uKHBvc2l0aW9uKTsKIAorICAgICAgICBsZXQgcHJlY2Vl ZGluZ1Rva2VuUG9zaXRpb24gPSBPYmplY3Quc2hhbGxvd0NvcHkocG9zaXRpb24pOworICAgICAg ICBwcmVjZWVkaW5nVG9rZW5Qb3NpdGlvbi5jaCA9IHRva2VuSW5mby50b2tlbi5zdGFydCAtIDE7 CisKKyAgICAgICAgbGV0IHByZWNlZWRpbmdUb2tlbiA9IHRoaXMuX2NvZGVNaXJyb3IuZ2V0VG9r ZW5BdChwcmVjZWVkaW5nVG9rZW5Qb3NpdGlvbik7CisgICAgICAgIGlmIChwcmVjZWVkaW5nVG9r ZW4gJiYgcHJlY2VlZGluZ1Rva2VuLnR5cGUgJiYgcHJlY2VlZGluZ1Rva2VuLnR5cGUuaW5jbHVk ZXMoIm1ldGEiKSkgeworICAgICAgICAgICAgY29uc29sZS5hc3NlcnQodG9rZW5JbmZvLnRva2Vu LnN0YXJ0ID09PSBwcmVjZWVkaW5nVG9rZW4uZW5kKTsKKworICAgICAgICAgICAgdG9rZW5JbmZv LnRva2VuLnN0cmluZyA9IHByZWNlZWRpbmdUb2tlbi5zdHJpbmcgKyB0b2tlbkluZm8udG9rZW4u c3RyaW5nOworICAgICAgICAgICAgdG9rZW5JbmZvLnRva2VuLnN0YXJ0ID0gcHJlY2VlZGluZ1Rv a2VuLnN0YXJ0OworICAgICAgICB9CisKICAgICAgICAgaWYgKHRoaXMuX3Rva2VuSG92ZXJUaW1l cikKICAgICAgICAgICAgIGNsZWFyVGltZW91dCh0aGlzLl90b2tlbkhvdmVyVGltZXIpOwogCg== 301027 2017-02-09 02:32:42 -0800 2017-02-09 11:30:38 -0800 Patch 167949.diff text/plain 2884 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDQ0ZDI3ZGMuLjVhZTNiOTkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTAyLTA5ICBEZXZpbiBSb3Vzc28g IDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE9w dGlvbitob3ZlciBvbiAtd2Via2l0LXRyYW5zZm9ybSBpbiBTdHlsZXMgc2lkZWJhciB1bmRlcmxp bmVzIG9ubHkgaGFsZiB0aGUgcHJvcGVydHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE2Nzk0OQorCisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQ ZWNvcmFyby4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ29kZU1pcnJv clRva2VuVHJhY2tpbmdDb250cm9sbGVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvZGVN aXJyb3JUb2tlblRyYWNraW5nQ29udHJvbGxlci5wcm90b3R5cGUuX3VwZGF0ZUhvdmVyZWRUb2tl bkluZm8pOgorICAgICAgICBBdHRlbXB0IHRvIG1lcmdlIHRva2VucyAoc3BlY2lmaWNhbGx5IHRo ZSBgdGV4dGAgYW5kIGBzdGFydGAgdmFsdWVzKSBpZiB0aGUgZWl0aGVyIHRoZSAKKyAgICAgICAg cHJldmlvdXMgb3IgbmV4dCB0b2tlbiBpcyBvZiB0aGUgdHlwZSAibWV0YSIuCisKIDIwMTctMDIt MDcgIERldmluIFJvdXNzbyAgPGRjcm91c3NvK3dlYmtpdEBnbWFpbC5jb20+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogZ3JhZGllbnQgZWRpdG9yIHNob3VsZCBhbGxvdyBzd2l0Y2hpbmcgdGhl IHVuaXRzIG9mIHRoZSAnYW5nbGUnIHBhcmFtZXRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ29kZU1pcnJvclRva2VuVHJhY2tp bmdDb250cm9sbGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyLmpzCmluZGV4IDBhMGIx M2YuLjRkNGZkYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JUb2tlblRyYWNraW5nQ29udHJvbGxlci5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Db2RlTWly cm9yVG9rZW5UcmFja2luZ0NvbnRyb2xsZXIuanMKQEAgLTM0Nyw2ICszNDcsMzEgQEAgV2ViSW5z cGVjdG9yLkNvZGVNaXJyb3JUb2tlblRyYWNraW5nQ29udHJvbGxlciA9IGNsYXNzIENvZGVNaXJy b3JUb2tlblRyYWNraW5nQ28KICAgICAgICAgLy8gV2UgaGF2ZSBhIG5ldyBob3ZlcmVkIHRva2Vu LgogICAgICAgICB2YXIgdG9rZW5JbmZvID0gdGhpcy5fcHJldmlvdXNUb2tlbkluZm8gPSB0aGlz Ll9nZXRUb2tlbkluZm9Gb3JQb3NpdGlvbihwb3NpdGlvbik7CiAKKyAgICAgICAgaWYgKC9cYm1l dGFcYi8udGVzdCh0b2tlbi50eXBlKSkgeworICAgICAgICAgICAgbGV0IG5leHRUb2tlblBvc2l0 aW9uID0gT2JqZWN0LnNoYWxsb3dDb3B5KHBvc2l0aW9uKTsKKyAgICAgICAgICAgIG5leHRUb2tl blBvc2l0aW9uLmNoID0gdG9rZW5JbmZvLnRva2VuLmVuZCArIDE7CisKKyAgICAgICAgICAgIGxl dCBuZXh0VG9rZW4gPSB0aGlzLl9jb2RlTWlycm9yLmdldFRva2VuQXQobmV4dFRva2VuUG9zaXRp b24pOworICAgICAgICAgICAgaWYgKG5leHRUb2tlbiAmJiBuZXh0VG9rZW4udHlwZSAmJiAhL1xi bWV0YVxiLy50ZXN0KG5leHRUb2tlbi50eXBlKSkgeworICAgICAgICAgICAgICAgIGNvbnNvbGUu YXNzZXJ0KHRva2VuSW5mby50b2tlbi5lbmQgPT09IG5leHRUb2tlbi5zdGFydCk7CisKKyAgICAg ICAgICAgICAgICB0b2tlbkluZm8udG9rZW4udHlwZSA9IG5leHRUb2tlbi50eXBlOworICAgICAg ICAgICAgICAgIHRva2VuSW5mby50b2tlbi5zdHJpbmcgPSB0b2tlbkluZm8udG9rZW4uc3RyaW5n ICsgbmV4dFRva2VuLnN0cmluZzsKKyAgICAgICAgICAgICAgICB0b2tlbkluZm8udG9rZW4uZW5k ID0gbmV4dFRva2VuLmVuZDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSBlbHNlIHsKKyAgICAg ICAgICAgIGxldCBwcmV2aW91c1Rva2VuUG9zaXRpb24gPSBPYmplY3Quc2hhbGxvd0NvcHkocG9z aXRpb24pOworICAgICAgICAgICAgcHJldmlvdXNUb2tlblBvc2l0aW9uLmNoID0gdG9rZW5JbmZv LnRva2VuLnN0YXJ0IC0gMTsKKworICAgICAgICAgICAgbGV0IHByZXZpb3VzVG9rZW4gPSB0aGlz Ll9jb2RlTWlycm9yLmdldFRva2VuQXQocHJldmlvdXNUb2tlblBvc2l0aW9uKTsKKyAgICAgICAg ICAgIGlmIChwcmV2aW91c1Rva2VuICYmIHByZXZpb3VzVG9rZW4udHlwZSAmJiAvXGJtZXRhXGIv LnRlc3QocHJldmlvdXNUb2tlbi50eXBlKSkgeworICAgICAgICAgICAgICAgIGNvbnNvbGUuYXNz ZXJ0KHRva2VuSW5mby50b2tlbi5zdGFydCA9PT0gcHJldmlvdXNUb2tlbi5lbmQpOworCisgICAg ICAgICAgICAgICAgdG9rZW5JbmZvLnRva2VuLnN0cmluZyA9IHByZXZpb3VzVG9rZW4uc3RyaW5n ICsgdG9rZW5JbmZvLnRva2VuLnN0cmluZzsKKyAgICAgICAgICAgICAgICB0b2tlbkluZm8udG9r ZW4uc3RhcnQgPSBwcmV2aW91c1Rva2VuLnN0YXJ0OworICAgICAgICAgICAgfQorICAgICAgICB9 CisKICAgICAgICAgaWYgKHRoaXMuX3Rva2VuSG92ZXJUaW1lcikKICAgICAgICAgICAgIGNsZWFy VGltZW91dCh0aGlzLl90b2tlbkhvdmVyVGltZXIpOwogCg==