152218 2015-12-12 20:12:59 -0800 Web Inspector: CodeMirrorTokenTrackingController handles symbols in class definitions incorrectly 2015-12-14 10:29:45 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1148772 0 mattbaker 2015-12-12 20:12:59 -0800 * SUMMARY CodeMirrorTokenTrackingController handles symbols in class definitions incorrectly. CodeMirror throws an exception when hovering a class contractor or method definition. When walking tokens, we should be using `state.localState` instead of `state`, when available. Additionally, walking tokens while checking for object literal shorthand properties should halt if an open parenthesis is found. * REDUCTION <html> <script> class Foo { constructor() {} bar() {} }; debugger; </script> </html> * STEPS TO REPRODUCE 1. Inspect the above html 2. Reload the page, inspector pauses on `debugger` statement 3. Hover over the constructor or method in class Foo => Inspector crashes: External/CodeMirror/javascript.js:646:33: CONSOLE ERROR TypeError: state.tokenize is not a function. (In 'state.tokenize(stream, state)', 'state.tokenize' is undefined) 1148773 1 267252 mattbaker 2015-12-12 20:17:21 -0800 Created attachment 267252 [Patch] Proposed Fix 1148777 2 267252 commit-queue 2015-12-12 21:10:08 -0800 Comment on attachment 267252 [Patch] Proposed Fix Clearing flags on attachment: 267252 Committed r194013: <http://trac.webkit.org/changeset/194013> 1148778 3 commit-queue 2015-12-12 21:10:12 -0800 All reviewed patches have been landed. Closing bug. 1149007 4 267252 joepeck 2015-12-14 10:29:20 -0800 Comment on attachment 267252 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=267252&action=review > Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js:520 > WebInspector.walkTokens(this._codeMirror, mode, position, function(tokenType, string) { > if (tokenType) > return false; > + if (string === "(") > + return false; > if (string === "," || string === "}") { > shorthand = true; > return false; I thought we agreed on just checking for whitespace. return tokenType === null; 1149008 5 webkit-bug-importer 2015-12-14 10:29:45 -0800 <rdar://problem/23883794> 267252 2015-12-12 20:17:21 -0800 2015-12-12 21:10:08 -0800 [Patch] Proposed Fix bug-152218-20151212201650.patch text/plain 3059 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0MDEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi NzE0Y2IwMDE0MjBkZGQ4YThlY2NmMzE3MDIxODlkNzAxOTljMTliLi5lN2EyZThlODliNmQ5NmM0 NTdjNDkxYzQ0ODQ5MDhhNjAxMjkxZDQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxNS0xMi0xMiAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9s bGVyIGhhbmRsZXMgc3ltYm9scyBpbiBjbGFzcyBkZWZpbml0aW9ucyBpbmNvcnJlY3RseQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyMjE4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JUb2tlblRyYWNraW5nQ29udHJvbGxlci5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Db2RlTWlycm9yVG9rZW5UcmFja2luZ0NvbnRyb2xsZXIucHJv dG90eXBlLl9wcm9jZXNzSmF2YVNjcmlwdEV4cHJlc3Npb24pOgorICAgICAgICBTdG9wIGNoZWNr aW5nIGZvciBvYmplY3QgbGl0ZXJhbCBzaG9ydGhhbmQgcHJvcGVydHkgaWYgYW4gb3BlbiBwYXJl bnRoZXNpcyBpcyBmb3VuZC4KKyAgICAgICAgVGhpcyBjaGVjayBiZWNhbWUgbmVjZXNzYXJ5IHdp dGggdGhlIGludHJvZHVjdGlvbiBvZiBFUzYgY2xhc3Mgc3ludGF4LgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9yQWRkaXRpb25zLmpzOgorICAgICAgICBVc2UgbG9j YWxTdGF0ZSB3aGVuIGF2YWlsYWJsZSwgdG8gcHJldmVudCBwYXNzaW5nIGEgc3RhdGUgdGhhdCBk b2Vzbid0IGRlZmluZSBhIHRva2VuaXplIHByb3BlcnR5LgorCiAyMDE1LTEyLTEyICBKb3NlcGgg UGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjE5 MTYxMyk6IFdlYiBJbnNwZWN0b3I6IENhbid0IHR5cGUgc3BhY2VzIHdoZW4gZWRpdGluZyBET00g bm9kZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Nv bnRyb2xsZXJzL0NvZGVNaXJyb3JUb2tlblRyYWNraW5nQ29udHJvbGxlci5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JUb2tlblRy YWNraW5nQ29udHJvbGxlci5qcwppbmRleCBiNjAwMjRiYWM4YTkxZjZmOTI2YjI0MDlhZDI4ZTdk NmNmYjAxN2YzLi5iMmUyM2M1OTI1OTdiNmFmMzAxNDNkM2M3NzZmYjlmMDE5M2U3NTUyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9D b2RlTWlycm9yVG9rZW5UcmFja2luZ0NvbnRyb2xsZXIuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ29kZU1pcnJvclRva2VuVHJhY2tpbmdD b250cm9sbGVyLmpzCkBAIC01MTMsNiArNTEzLDggQEAgV2ViSW5zcGVjdG9yLkNvZGVNaXJyb3JU b2tlblRyYWNraW5nQ29udHJvbGxlciA9IGNsYXNzIENvZGVNaXJyb3JUb2tlblRyYWNraW5nQ28K ICAgICAgICAgICAgIFdlYkluc3BlY3Rvci53YWxrVG9rZW5zKHRoaXMuX2NvZGVNaXJyb3IsIG1v ZGUsIHBvc2l0aW9uLCBmdW5jdGlvbih0b2tlblR5cGUsIHN0cmluZykgewogICAgICAgICAgICAg ICAgIGlmICh0b2tlblR5cGUpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICAgICAgICAgICAgICBpZiAoc3RyaW5nID09PSAiKCIpCisgICAgICAgICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICAgICAgICAgICAgICBpZiAoc3RyaW5nID09PSAiLCIgfHwgc3RyaW5n ID09PSAifSIpIHsKICAgICAgICAgICAgICAgICAgICAgc2hvcnRoYW5kID0gdHJ1ZTsKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1pcnJvckFkZGl0aW9ucy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvZGVNaXJyb3JBZGRpdGlvbnMu anMKaW5kZXggYmVhYWRkYjdlZWE0ZmI2ZGQyNjNlMzdiNWNhMWRmZWM1YTg1ZTIxOC4uNzk1NDBj ZjY4Yjk5MmM0NDg1MzU3NGVlY2NmYWMyZmFlODc2ZThiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1pcnJvckFkZGl0aW9ucy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db2RlTWlycm9y QWRkaXRpb25zLmpzCkBAIC02MjcsOCArNjI3LDEwIEBAIFdlYkluc3BlY3Rvci5jb21wYXJlQ29k ZU1pcnJvclBvc2l0aW9ucyA9IGZ1bmN0aW9uKGEsIGIpCiBXZWJJbnNwZWN0b3Iud2Fsa1Rva2Vu cyA9IGZ1bmN0aW9uKGNtLCBtb2RlLCBpbml0aWFsUG9zaXRpb24sIGNhbGxiYWNrKQogewogICAg IGxldCBzdGF0ZSA9IENvZGVNaXJyb3IuY29weVN0YXRlKG1vZGUsIGNtLmdldFRva2VuQXQoaW5p dGlhbFBvc2l0aW9uKS5zdGF0ZSk7Ci0gICAgbGV0IGxpbmVDb3VudCA9IGNtLmxpbmVDb3VudCgp OworICAgIGlmIChzdGF0ZS5sb2NhbFN0YXRlKQorICAgICAgICBzdGF0ZSA9IHN0YXRlLmxvY2Fs U3RhdGU7CiAKKyAgICBsZXQgbGluZUNvdW50ID0gY20ubGluZUNvdW50KCk7CiAgICAgbGV0IGFi b3J0ID0gZmFsc2U7CiAgICAgZm9yIChsaW5lTnVtYmVyID0gaW5pdGlhbFBvc2l0aW9uLmxpbmU7 ICFhYm9ydCAmJiBsaW5lTnVtYmVyIDwgbGluZUNvdW50OyArK2xpbmVOdW1iZXIpIHsKICAgICAg ICAgbGV0IGxpbmUgPSBjbS5nZXRMaW5lKGxpbmVOdW1iZXIpOwo=