134001 2014-06-17 16:05:30 -0700 Web Inspector: PrettyPrinting regression on "var a=1" 2014-06-17 17:29:22 -0700 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 1016288 0 joepeck 2014-06-17 16:05:30 -0700 “var a=1;” prettyprints to “var a= 1;” but should pretty print to “var a = 1;” 1016291 1 webkit-bug-importer 2014-06-17 16:07:48 -0700 <rdar://problem/17350819> 1016293 2 joepeck 2014-06-17 16:08:31 -0700 Seems like shouldHaveSpaceBeforeToken is checking for operators, but assumes operators don't have a token, but maybe they do now, with the token name "operator". 1016299 3 233268 joepeck 2014-06-17 16:26:30 -0700 Created attachment 233268 [PATCH] Proposed Fix Makes JavaScript Pretty Printing tests pass in my checkout. 1016330 4 233268 commit-queue 2014-06-17 17:29:20 -0700 Comment on attachment 233268 [PATCH] Proposed Fix Clearing flags on attachment: 233268 Committed r170088: <http://trac.webkit.org/changeset/170088> 1016331 5 commit-queue 2014-06-17 17:29:22 -0700 All reviewed patches have been landed. Closing bug. 233268 2014-06-17 16:26:30 -0700 2014-06-17 17:29:20 -0700 [PATCH] Proposed Fix fix-prettyprint.patch text/plain 3437 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGIxYTYwZjQuLmE4MjI0OWMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA2LTE3ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUHJldHR5 UHJpbnRpbmcgcmVncmVzc2lvbiBvbiAidmFyIGE9MSIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDAwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXZpb3VzbHkgb3BlcmF0b3JzIGRpZCBub3QgZ2V0 IGEgdG9rZW4gdHlwZS4gQWZ0ZXIgYSBDb2RlTWlycm9yCisgICAgICAgIHVwZGF0ZSB0aGV5IG5v dyBoYXZlIGEgdG9rZW4gdHlwZSBvZiAib3BlcmF0b3IiLgorCisgICAgICAgICogVG9vbHMvUHJl dHR5UHJpbnRpbmcvQ29kZU1pcnJvckZvcm1hdHRlcnMuanM6CisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9Db2RlTWlycm9yRm9ybWF0dGVycy5qczoKKwogMjAxNC0wNi0xMCAgQnJpYW4g Si4gQnVyZyAgPGJ1cmdAY3Mud2FzaGluZ3Rvbi5lZHU+CiAKICAgICAgICAgV2ViIEluc3BlY3Rv cjogcmVjb3JkaW5nIGlzIG92ZXJ1c2VkIGFzIGJvdGggbm91biBhbmQgdmVyYiBpbiBUaW1lbGlu ZU1hbmFnZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Ub29scy9QcmV0dHlQ cmludGluZy9Db2RlTWlycm9yRm9ybWF0dGVycy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9U b29scy9QcmV0dHlQcmludGluZy9Db2RlTWlycm9yRm9ybWF0dGVycy5qcwppbmRleCAyOTZkMGU3 Li5hNDA3NWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVG9vbHMvUHJldHR5 UHJpbnRpbmcvQ29kZU1pcnJvckZvcm1hdHRlcnMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1Rvb2xzL1ByZXR0eVByaW50aW5nL0NvZGVNaXJyb3JGb3JtYXR0ZXJzLmpzCkBAIC0zNSwx NCArMzUsMTggQEAgQ29kZU1pcnJvci5leHRlbmRNb2RlKCJqYXZhc2NyaXB0IiwgewogICAgICAg ICAgICAgICAgIHJldHVybiBsYXN0VG9rZW4gJiYgL1xia2V5d29yZFxiLy50ZXN0KGxhc3RUb2tl bikgJiYgKGxhc3RDb250ZW50ICE9PSAiZnVuY3Rpb24iICYmIGxhc3RDb250ZW50ICE9PSAidHlw ZW9mIiAmJiBsYXN0Q29udGVudCAhPT0gImluc3RhbmNlb2YiKTsKICAgICAgICAgICAgIGlmIChj b250ZW50ID09PSAiOiIpIC8vIFRlcm5hcnkuCiAgICAgICAgICAgICAgICAgcmV0dXJuIChzdGF0 ZS5sZXhpY2FsLnR5cGUgPT09ICJzdGF0IiB8fCBzdGF0ZS5sZXhpY2FsLnR5cGUgPT09ICIpIik7 CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKworICAgICAgICBpZiAoaXND b21tZW50KQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICAgICAgaWYgKC9cYm9wZXJh dG9yXGIvLnRlc3QodG9rZW4pKSB7CiAgICAgICAgICAgICBpZiAoY29udGVudCA9PT0gIiEiKSAv LyBVbmFyeSAhIHNob3VsZCBub3QgYmUgY29uZnVzZWQgd2l0aCAiIT0iLgogICAgICAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICAgIHJldHVybiAiKy0vKiYmfHwhPT09Kz0tPT49 PD0/Ii5pbmRleE9mKGNvbnRlbnQpID49IDA7IC8vIE9wZXJhdG9ycy4KICAgICAgICAgfQogCi0g ICAgICAgIGlmIChpc0NvbW1lbnQpCi0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLQogICAgICAg ICBpZiAoL1xia2V5d29yZFxiLy50ZXN0KHRva2VuKSkgeyAvLyBNb3N0IGtleXdvcmRzIHJlcXVp cmUgc3BhY2VzIGJlZm9yZSB0aGVtLCB1bmxlc3MgYSAnfScgY2FuIGNvbWUgYmVmb3JlIGl0Lgog ICAgICAgICAgICAgaWYgKGNvbnRlbnQgPT09ICJlbHNlIiB8fCBjb250ZW50ID09PSAiY2F0Y2gi IHx8IGNvbnRlbnQgPT09ICJmaW5hbGx5IikKICAgICAgICAgICAgICAgICByZXR1cm4gbGFzdENv bnRlbnQgPT09ICJ9IjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NvZGVNaXJyb3JGb3JtYXR0ZXJzLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1pcnJvckZvcm1hdHRlcnMuanMKaW5kZXggMjk2 ZDBlNy4uYTQwNzVkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ29kZU1pcnJvckZvcm1hdHRlcnMuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29kZU1pcnJvckZvcm1hdHRlcnMuanMKQEAgLTM1 LDE0ICszNSwxOCBAQCBDb2RlTWlycm9yLmV4dGVuZE1vZGUoImphdmFzY3JpcHQiLCB7CiAgICAg ICAgICAgICAgICAgcmV0dXJuIGxhc3RUb2tlbiAmJiAvXGJrZXl3b3JkXGIvLnRlc3QobGFzdFRv a2VuKSAmJiAobGFzdENvbnRlbnQgIT09ICJmdW5jdGlvbiIgJiYgbGFzdENvbnRlbnQgIT09ICJ0 eXBlb2YiICYmIGxhc3RDb250ZW50ICE9PSAiaW5zdGFuY2VvZiIpOwogICAgICAgICAgICAgaWYg KGNvbnRlbnQgPT09ICI6IikgLy8gVGVybmFyeS4KICAgICAgICAgICAgICAgICByZXR1cm4gKHN0 YXRlLmxleGljYWwudHlwZSA9PT0gInN0YXQiIHx8IHN0YXRlLmxleGljYWwudHlwZSA9PT0gIiki KTsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChp c0NvbW1lbnQpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgICAgICBpZiAoL1xib3Bl cmF0b3JcYi8udGVzdCh0b2tlbikpIHsKICAgICAgICAgICAgIGlmIChjb250ZW50ID09PSAiISIp IC8vIFVuYXJ5ICEgc2hvdWxkIG5vdCBiZSBjb25mdXNlZCB3aXRoICIhPSIuCiAgICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgcmV0dXJuICIrLS8qJiZ8fCE9PT0rPS09 Pj08PT8iLmluZGV4T2YoY29udGVudCkgPj0gMDsgLy8gT3BlcmF0b3JzLgogICAgICAgICB9CiAK LSAgICAgICAgaWYgKGlzQ29tbWVudCkKLSAgICAgICAgICAgIHJldHVybiB0cnVlOwotCiAgICAg ICAgIGlmICgvXGJrZXl3b3JkXGIvLnRlc3QodG9rZW4pKSB7IC8vIE1vc3Qga2V5d29yZHMgcmVx dWlyZSBzcGFjZXMgYmVmb3JlIHRoZW0sIHVubGVzcyBhICd9JyBjYW4gY29tZSBiZWZvcmUgaXQu CiAgICAgICAgICAgICBpZiAoY29udGVudCA9PT0gImVsc2UiIHx8IGNvbnRlbnQgPT09ICJjYXRj aCIgfHwgY29udGVudCA9PT0gImZpbmFsbHkiKQogICAgICAgICAgICAgICAgIHJldHVybiBsYXN0 Q29udGVudCA9PT0gIn0iOwo=