138845 2014-11-18 14:15:07 -0800 Web Inspector: Improve basic JavaScript completion in inline <script>s 2014-11-19 10:32:24 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1049586 0 joepeck 2014-11-18 14:15:07 -0800 * SUMMARY Basic JavaScript completion does not work in editable inline <script>s. There is an uncaught exception: CONSOLE ERROR TypeError: undefined is not an object (evaluating 'mainToken.state.lexical.type') It looks like we should be using mainToken.state.localState when inside a JavaScript mode inside of an HTML mode. * TEST 1. <script> 2. (function() { 3. var object = {}; 4. 6. })() 7. </script> * STEPS TO REPRODUCE 1. Inspect the test page 2. Start editing on line 4 3. Type "un" => expected "undefined" to come up as a completion suggestion 4. Type "obj" => expected local variable "object" to come up as a completion suggestion 5. Type "i" => expected built-in suggestions like "if", "in", and "instanceof" * NOTES - Should not regress editing inside JavaScript resources. 1049588 1 webkit-bug-importer 2014-11-18 14:15:39 -0800 <rdar://problem/19020769> 1049589 2 241811 joepeck 2014-11-18 14:17:02 -0800 Created attachment 241811 [PATCH] Proposed Fix 1049809 3 241811 timothy 2014-11-19 09:51:42 -0800 Comment on attachment 241811 [PATCH] Proposed Fix Nice! 1049829 4 241811 commit-queue 2014-11-19 10:32:21 -0800 Comment on attachment 241811 [PATCH] Proposed Fix Clearing flags on attachment: 241811 Committed r176324: <http://trac.webkit.org/changeset/176324> 1049830 5 commit-queue 2014-11-19 10:32:24 -0800 All reviewed patches have been landed. Closing bug. 241811 2014-11-18 14:17:02 -0800 2014-11-19 10:32:21 -0800 [PATCH] Proposed Fix completion.patch text/plain 3547 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDg5NWExNjIuLjcwMWZkZWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE0LTExLTE4ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW1wcm92 ZSBiYXNpYyBKYXZhU2NyaXB0IGNvbXBsZXRpb24gaW4gaW5saW5lIDxzY3JpcHQ+cworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4ODQ1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JDb21wbGV0aW9uQ29udHJvbGxlci5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Db2RlTWlycm9yQ29tcGxldGlvbkNvbnRyb2xsZXIucHJvdG90eXBlLl9n ZW5lcmF0ZUphdmFTY3JpcHRDb21wbGV0aW9ucyk6CisgICAgICAgIEZpeCB1cCBDb2RlTWlycm9y IG1vZGUgaGFuZGxpbmcgZm9yIEphdmFTY3JpcHQgY29tcGxldGlvbiB3aGVuIGluc2lkZSBvZiBt aXhlZCBtb2RlCisgICAgICAgIGlucHV0IChodG1sKS4gQWxzbyBhZGQgY29tcGxldGlvbiBmb3Ig Q29kZU1pcnJvcidzIGxvY2FsVmFycyBsaXN0LgorCisyMDE0LTExLTE4ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogRGVidWdn ZXIgc2hvdWxkIG5vdCBtdXRhdGUgdmFyaWFibGUgd2hlbiBob3ZlcmluZyBtb3VzZSBvdmVyICsr biBleHByZXNzaW9uCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzg4MzkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvQ29kZU1pcnJvckNvbXBsZXRpb25Db250cm9sbGVyLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ29kZU1pcnJvckNv bXBsZXRpb25Db250cm9sbGVyLmpzCmluZGV4IGQyZmY0NWYuLjhiMjdiNTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJy b3JDb21wbGV0aW9uQ29udHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9Db2RlTWlycm9yQ29tcGxldGlvbkNvbnRyb2xsZXIuanMK QEAgLTU3NCwxMSArNTc0LDEzIEBAIFdlYkluc3BlY3Rvci5Db2RlTWlycm9yQ29tcGxldGlvbkNv bnRyb2xsZXIucHJvdG90eXBlID0gewogCiAgICAgICAgIGNvbnN0IHByZWZpeCA9IHRoaXMuX3By ZWZpeDsKIAotICAgICAgICBjb25zdCBkZWNsYXJpbmdWYXJpYWJsZSA9IG1haW5Ub2tlbi5zdGF0 ZS5sZXhpY2FsLnR5cGUgPT09ICJ2YXJkZWYiOwotICAgICAgICBjb25zdCBpbnNpZGVTd2l0Y2gg PSBtYWluVG9rZW4uc3RhdGUubGV4aWNhbC5wcmV2ID8gbWFpblRva2VuLnN0YXRlLmxleGljYWwu cHJldi5pbmZvID09PSAic3dpdGNoIiA6IGZhbHNlOwotICAgICAgICBjb25zdCBpbnNpZGVCbG9j ayA9IG1haW5Ub2tlbi5zdGF0ZS5sZXhpY2FsLnByZXYgPyBtYWluVG9rZW4uc3RhdGUubGV4aWNh bC5wcmV2LnR5cGUgPT09ICJ9IiA6IGZhbHNlOwotICAgICAgICBjb25zdCBpbnNpZGVQYXJlbnRo ZXNpcyA9IG1haW5Ub2tlbi5zdGF0ZS5sZXhpY2FsLnR5cGUgPT09ICIpIjsKLSAgICAgICAgY29u c3QgaW5zaWRlQnJhY2tldHMgPSBtYWluVG9rZW4uc3RhdGUubGV4aWNhbC50eXBlID09PSAiXSI7 CisgICAgICAgIHZhciBsb2NhbFN0YXRlID0gbWFpblRva2VuLnN0YXRlLmxvY2FsU3RhdGUgPyBt YWluVG9rZW4uc3RhdGUubG9jYWxTdGF0ZSA6IG1haW5Ub2tlbi5zdGF0ZTsKKworICAgICAgICBj b25zdCBkZWNsYXJpbmdWYXJpYWJsZSA9IGxvY2FsU3RhdGUubGV4aWNhbC50eXBlID09PSAidmFy ZGVmIjsKKyAgICAgICAgY29uc3QgaW5zaWRlU3dpdGNoID0gbG9jYWxTdGF0ZS5sZXhpY2FsLnBy ZXYgPyBsb2NhbFN0YXRlLmxleGljYWwucHJldi5pbmZvID09PSAic3dpdGNoIiA6IGZhbHNlOwor ICAgICAgICBjb25zdCBpbnNpZGVCbG9jayA9IGxvY2FsU3RhdGUubGV4aWNhbC5wcmV2ID8gbG9j YWxTdGF0ZS5sZXhpY2FsLnByZXYudHlwZSA9PT0gIn0iIDogZmFsc2U7CisgICAgICAgIGNvbnN0 IGluc2lkZVBhcmVudGhlc2lzID0gbG9jYWxTdGF0ZS5sZXhpY2FsLnR5cGUgPT09ICIpIjsKKyAg ICAgICAgY29uc3QgaW5zaWRlQnJhY2tldHMgPSBsb2NhbFN0YXRlLmxleGljYWwudHlwZSA9PT0g Il0iOwogCiAgICAgICAgIGNvbnN0IGFsbEtleXdvcmRzID0gWyJicmVhayIsICJjYXNlIiwgImNh dGNoIiwgImNvbnN0IiwgImNvbnRpbnVlIiwgImRlYnVnZ2VyIiwgImRlZmF1bHQiLCAiZGVsZXRl IiwgImRvIiwgImVsc2UiLCAiZmFsc2UiLCAiZmluYWxseSIsICJmb3IiLCAiZnVuY3Rpb24iLCAi aWYiLCAiaW4iLAogICAgICAgICAgICAgIkluZmluaXR5IiwgImluc3RhbmNlb2YiLCAiTmFOIiwg Im5ldyIsICJudWxsIiwgInJldHVybiIsICJzd2l0Y2giLCAidGhpcyIsICJ0aHJvdyIsICJ0cnVl IiwgInRyeSIsICJ0eXBlb2YiLCAidW5kZWZpbmVkIiwgInZhciIsICJ2b2lkIiwgIndoaWxlIiwg IndpdGgiXTsKQEAgLTYyMiwxMyArNjI0LDE3IEBAIFdlYkluc3BlY3Rvci5Db2RlTWlycm9yQ29t cGxldGlvbkNvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIH0KIAotICAgICAgICAgICAgdmFyIGNvbnRleHQgPSBtYWluVG9rZW4uc3RhdGUuY29u dGV4dDsKKyAgICAgICAgICAgIHZhciBjb250ZXh0ID0gbG9jYWxTdGF0ZS5jb250ZXh0OwogICAg ICAgICAgICAgd2hpbGUgKGNvbnRleHQpIHsKLSAgICAgICAgICAgICAgICBmaWx0ZXJWYXJpYWJs ZXMoY29udGV4dC52YXJzKTsKKyAgICAgICAgICAgICAgICBpZiAoY29udGV4dC52YXJzKQorICAg ICAgICAgICAgICAgICAgICBmaWx0ZXJWYXJpYWJsZXMoY29udGV4dC52YXJzKTsKICAgICAgICAg ICAgICAgICBjb250ZXh0ID0gY29udGV4dC5wcmV2OwogICAgICAgICAgICAgfQogCi0gICAgICAg ICAgICBmaWx0ZXJWYXJpYWJsZXMobWFpblRva2VuLnN0YXRlLmdsb2JhbFZhcnMpOworICAgICAg ICAgICAgaWYgKGxvY2FsU3RhdGUubG9jYWxWYXJzKQorICAgICAgICAgICAgICAgIGZpbHRlclZh cmlhYmxlcyhsb2NhbFN0YXRlLmxvY2FsVmFycyk7CisgICAgICAgICAgICBpZiAobG9jYWxTdGF0 ZS5nbG9iYWxWYXJzKQorICAgICAgICAgICAgICAgIGZpbHRlclZhcmlhYmxlcyhsb2NhbFN0YXRl Lmdsb2JhbFZhcnMpOwogICAgICAgICB9CiAKICAgICAgICAgc3dpdGNoIChzdWZmaXguc3Vic3Ry aW5nKDAsIDEpKSB7Cg==