192946 2018-12-20 12:34:41 -0800 Web Inspector: Autoformat doesn't work on icloud.com (javascript-packed.js) 2018-12-20 15:17:03 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1490004 0 joepeck 2018-12-20 12:34:41 -0800 Autoformat doesn't work on icloud.com (javascript-packed.js) Steps to Reproduce: 1. Inspect iCloud.com 2. Open javascript-packed.js => Doesn't auto-format Notes: • The file starts out with: 7300+ characters that are unminified license / header doc characters. This causes our isTextLikelyMinified to fail. 1490006 1 joepeck 2018-12-20 12:35:24 -0800 <rdar://problem/42546126> 1490012 2 357851 joepeck 2018-12-20 12:46:30 -0800 Created attachment 357851 [PATCH] Proposed Fix I still think the best solution might be to auto format if any line is longer than 250 characters, or something like that. But a start/end check of 2500 characters seems reasonable. We can bring that back to 5000 if there is a counterexample. 1490020 3 357851 hi 2018-12-20 13:05:09 -0800 Comment on attachment 357851 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=357851&action=review rs=me, nice test > LayoutTests/inspector/formatting/is-text-likely-minified.html:111 > + let sampleHeader = ` NIT: const. > LayoutTests/inspector/formatting/is-text-likely-minified.html:127 > + let longHeaderSource = sampleHeader.repeat(10) + jQueryMinifiedSourceFragment; NIT: const. > LayoutTests/inspector/formatting/is-text-likely-minified.html:129 > + name: "JQuerySnippet.Minified", Use a different name, like "JQuerySnippet.MinifiedWithHeader". NIT: jQuery is stylized as "jQuery" not "JQuery", so we might want to follow that. > Source/WebInspectorUI/UserInterface/Base/Utilities.js:1621 > + for (let i = start; i < end; i++) { NIT: ++i > Source/WebInspectorUI/UserInterface/Base/Utilities.js:1623 > if (char === " ") Should we care about \r as well? 1490095 4 joepeck 2018-12-20 15:10:10 -0800 > > Source/WebInspectorUI/UserInterface/Base/Utilities.js:1623 > > if (char === " ") > > Should we care about \r as well? Interesting. Yes probably but it is very rare to have only \r line endings. 1490097 5 joepeck 2018-12-20 15:17:03 -0800 https://trac.webkit.org/r239467 357851 2018-12-20 12:46:30 -0800 2018-12-20 15:16:58 -0800 [PATCH] Proposed Fix format-1.patch text/plain 6492 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5OTA5MjE0ODI5Yi4uMzdkNzg4OGIzMjggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAxOC0xMi0yMCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IEF1dG9mb3JtYXQgZG9lc24ndCB3b3JrIG9uIGljbG91ZC5jb20g KGphdmFzY3JpcHQtcGFja2VkLmpzKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTkyOTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZm9ybWF0dGluZy9pcy10ZXh0LWxpa2VseS1taW5p ZmllZC1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2Zvcm1hdHRpbmcvaXMtdGV4 dC1saWtlbHktbWluaWZpZWQuaHRtbDoKKyAgICAgICAgQWRkIGEgdGVzdCBmb3IgYSBsb25nIGhl YWRlciBkb2MgYXQgdGhlIHN0YXJ0IGJ1dCBtaW5pZmllZCBjb250ZW50IGF0IHRoZSBlbmQuCisK IDIwMTgtMTItMTggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBtM3U4IGNvbnRlbnQgbm90IHNob3duLCBpdCBzaG91bGQgYmUg dGV4dApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Zvcm1hdHRpbmcvaXMtdGV4 dC1saWtlbHktbWluaWZpZWQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Zv cm1hdHRpbmcvaXMtdGV4dC1saWtlbHktbWluaWZpZWQtZXhwZWN0ZWQudHh0CmluZGV4IDA5ZTQw NjU2YWM2Li4xMGY5MTVlMjgzZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Zv cm1hdHRpbmcvaXMtdGV4dC1saWtlbHktbWluaWZpZWQtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9mb3JtYXR0aW5nL2lzLXRleHQtbGlrZWx5LW1pbmlmaWVkLWV4cGVj dGVkLnR4dApAQCAtMTEsMyArMTEsNiBAQCBQQVNTOiBqUXVlcnkgc25pcHBldCBzaG91bGQgYmUg Y2xhc3NpZmllZCBhcyB1bm1pbmlmaWVkLgogLS0gUnVubmluZyB0ZXN0IGNhc2U6IEpRdWVyeVNu aXBwZXQuTWluaWZpZWQKIFBBU1M6IGpRdWVyeSBzbmlwcGV0IHNob3VsZCBiZSBjbGFzc2lmaWVk IGFzIG1pbmlmaWVkLgogCistLSBSdW5uaW5nIHRlc3QgY2FzZTogSlF1ZXJ5U25pcHBldC5NaW5p ZmllZAorUEFTUzogU291cmNlIHdpdGggbGVhZGluZyB1bm1pbmlmaWVkIGJ1dCB0cmFpbGluZyBt aW5pZmllZCBzb3VyY2Ugc2hvdWxkIGJlIGNsYXNzaWZpZWQgYXMgbWluaWZpZWQuCisKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9mb3JtYXR0aW5nL2lzLXRleHQtbGlrZWx5LW1p bmlmaWVkLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZm9ybWF0dGluZy9pcy10ZXh0LWxp a2VseS1taW5pZmllZC5odG1sCmluZGV4IDQyOTI1YWZjMWQ5Li4zZjdiNWFhZmVlYyAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Zvcm1hdHRpbmcvaXMtdGV4dC1saWtlbHktbWlu aWZpZWQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZm9ybWF0dGluZy9pcy10ZXh0 LWxpa2VseS1taW5pZmllZC5odG1sCkBAIC01LDEzICs1LDEzIEBACiA8c2NyaXB0PgogZnVuY3Rp b24gdGVzdCgpCiB7Ci0gICAgbGV0IHN1aXRlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVBc3luY1N1 aXRlKCJGb3JtYXR0aW5nLmlzTGlrZWx5TWluaWZpZWQiKTsKKyAgICBsZXQgc3VpdGUgPSBJbnNw ZWN0b3JUZXN0LmNyZWF0ZVN5bmNTdWl0ZSgiRm9ybWF0dGluZy5pc0xpa2VseU1pbmlmaWVkIik7 CiAKICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAgIG5hbWU6ICJKYXZhU2NyaXB0U2hv cnRTbmlwcGV0LlVubWluaWZpZWQiLAotICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgewor ICAgICAgICB0ZXN0KCkgewogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KCFp c1RleHRMaWtlbHlNaW5pZmllZCgidmFyIHggPSA0MjtcbnZhciB5ID0gMjQ7XG4iKSwgIlRoaXMg c21hbGwgSmF2YVNjcmlwdCBzbmlwcGV0IHNob3VsZCBiZSBjbGFzc2lmaWVkIGFzIHVubWluaWZp ZWQuIik7Ci0gICAgICAgICAgICByZXNvbHZlKCk7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICAgICAgfQogICAgIH0pOwogCkBAIC05MSw5ICs5MSw5IEBAIHZhciBzdXBwb3J0ID0ge307 YDsKIAogICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKICAgICAgICAgbmFtZTogIkpRdWVyeVNuaXBw ZXQuVW5taW5pZmllZCIsCi0gICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAg IHRlc3QoKSB7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoIWlzVGV4dExp a2VseU1pbmlmaWVkKGpxdWVyeVNvdXJjZUZyYWdtZW50KSwgImpRdWVyeSBzbmlwcGV0IHNob3Vs ZCBiZSBjbGFzc2lmaWVkIGFzIHVubWluaWZpZWQuIik7Ci0gICAgICAgICAgICByZXNvbHZlKCk7 CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQogICAgIH0pOwogCkBAIC0xMDIs MTIgKzEwMiwzNyBAQCB2YXIgc3VwcG9ydCA9IHt9O2A7CiAKICAgICBzdWl0ZS5hZGRUZXN0Q2Fz ZSh7CiAgICAgICAgIG5hbWU6ICJKUXVlcnlTbmlwcGV0Lk1pbmlmaWVkIiwKLSAgICAgICAgdGVz dChyZXNvbHZlLCByZWplY3QpIHsKKyAgICAgICAgdGVzdCgpIHsKICAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuZXhwZWN0VGhhdChpc1RleHRMaWtlbHlNaW5pZmllZChqUXVlcnlNaW5pZmllZFNv dXJjZUZyYWdtZW50KSwgImpRdWVyeSBzbmlwcGV0IHNob3VsZCBiZSBjbGFzc2lmaWVkIGFzIG1p bmlmaWVkLiIpOwotICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICAgICAgcmV0dXJuIHRy dWU7CiAgICAgICAgIH0KICAgICB9KTsKIAorICAgIGxldCBzYW1wbGVIZWFkZXIgPSBgCisvKiEK KyAqIGpRdWVyeSBKYXZhU2NyaXB0IExpYnJhcnkgdjMuMS4wCisgKiBodHRwczovL2pxdWVyeS5j b20vCisgKgorICogSW5jbHVkZXMgU2l6emxlLmpzCisgKiBodHRwczovL3NpenpsZWpzLmNvbS8K KyAqCisgKiBDb3B5cmlnaHQgalF1ZXJ5IEZvdW5kYXRpb24gYW5kIG90aGVyIGNvbnRyaWJ1dG9y cworICogUmVsZWFzZWQgdW5kZXIgdGhlIE1JVCBsaWNlbnNlCisgKiBodHRwczovL2pxdWVyeS5v cmcvbGljZW5zZQorICoKKyAqIERhdGU6IDIwMTYtMDctMDdUMjE6NDRaCisgKi8KKyBgOworCisg ICAgbGV0IGxvbmdIZWFkZXJTb3VyY2UgPSBzYW1wbGVIZWFkZXIucmVwZWF0KDEwKSArIGpRdWVy eU1pbmlmaWVkU291cmNlRnJhZ21lbnQ7CisgICAgc3VpdGUuYWRkVGVzdENhc2UoeworICAgICAg ICBuYW1lOiAiSlF1ZXJ5U25pcHBldC5NaW5pZmllZCIsCisgICAgICAgIHRlc3QoKSB7CisgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoaXNUZXh0TGlrZWx5TWluaWZpZWQobG9u Z0hlYWRlclNvdXJjZSksICJTb3VyY2Ugd2l0aCBsZWFkaW5nIHVubWluaWZpZWQgYnV0IHRyYWls aW5nIG1pbmlmaWVkIHNvdXJjZSBzaG91bGQgYmUgY2xhc3NpZmllZCBhcyBtaW5pZmllZC4iKTsK KyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAgfSkKKwogICAgIHN1aXRl LnJ1blRlc3RDYXNlc0FuZEZpbmlzaCgpOwogfQogICAgIDwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9D aGFuZ2VMb2cKaW5kZXggMzI3ZTNiNWE2MTEuLmE4ZTNlZTYzZGE2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxOC0xMi0yMCAgSm9zZXBoIFBlY29yYXJvICA8 cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEF1dG9mb3JtYXQg ZG9lc24ndCB3b3JrIG9uIGljbG91ZC5jb20gKGphdmFzY3JpcHQtcGFja2VkLmpzKQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyOTQ2CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80MjU0NjEyNj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanM6Cisg ICAgICAgICh3aGl0ZXNwYWNlUmF0aW8pOgorICAgICAgICAoaXNUZXh0TGlrZWx5TWluaWZpZWQp OgorICAgICAgICBDaGVjayB0aGUgZmlyc3QgMjUwMCBhbmQgdGhlIGxhc3QgMjUwMCBjaGFyYWN0 ZXJzIHdoaXRlc3BhY2UgcmF0aW8uCisgICAgICAgIElmIGVpdGhlciBpcyBiZWxvdyAyMCUgdGhl biB0cmVhdCBhcyBtaW5pZmllZC4KKwogMjAxOC0xMi0xOSAgSm9zZXBoIFBlY29yYXJvICA8cGVj b3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIElUTUxLaXQgSW5zcGVjdG9yOiBDb21wdXRlZCBT dHlsZSBCb3ggTW9kZWwgc2VjdGlvbiB0aHJvd3MgZXhjZXB0aW9ucwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcwppbmRleCA5 NGY1YTZhNjIwMi4uOWJmMDg5NDNkYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCkBAIC0xNjEzLDE3ICsxNjEzLDEz IEBAIGZ1bmN0aW9uIGlzRnVuY3Rpb25TdHJpbmdOYXRpdmVDb2RlKHN0cikKICAgICByZXR1cm4g c3RyLmVuZHNXaXRoKCJ7XG4gICAgW25hdGl2ZSBjb2RlXVxufSIpOwogfQogCi1mdW5jdGlvbiBp c1RleHRMaWtlbHlNaW5pZmllZChjb250ZW50KQorZnVuY3Rpb24gd2hpdGVzcGFjZVJhdGlvKGNv bnRlbnQsIHN0YXJ0LCBlbmQpCiB7Ci0gICAgY29uc3QgYXV0b0Zvcm1hdE1heENoYXJhY3RlcnNU b0NoZWNrID0gNTAwMDsKLSAgICBjb25zdCBhdXRvRm9ybWF0V2hpdGVzcGFjZVJhdGlvID0gMC4y OwotCiAgICAgbGV0IHdoaXRlc3BhY2VTY29yZSA9IDA7Ci0gICAgbGV0IHNpemUgPSBNYXRoLm1p bihhdXRvRm9ybWF0TWF4Q2hhcmFjdGVyc1RvQ2hlY2ssIGNvbnRlbnQubGVuZ3RoKTsKKyAgICBs ZXQgc2l6ZSA9IGVuZCAtIHN0YXJ0OwogCi0gICAgZm9yIChsZXQgaSA9IDA7IGkgPCBzaXplOyBp KyspIHsKKyAgICBmb3IgKGxldCBpID0gc3RhcnQ7IGkgPCBlbmQ7IGkrKykgewogICAgICAgICBs ZXQgY2hhciA9IGNvbnRlbnRbaV07Ci0KICAgICAgICAgaWYgKGNoYXIgPT09ICIgIikKICAgICAg ICAgICAgIHdoaXRlc3BhY2VTY29yZSsrOwogICAgICAgICBlbHNlIGlmIChjaGFyID09PSAiXHQi KQpAQCAtMTYzMyw3ICsxNjI5LDI4IEBAIGZ1bmN0aW9uIGlzVGV4dExpa2VseU1pbmlmaWVkKGNv bnRlbnQpCiAgICAgfQogCiAgICAgbGV0IHJhdGlvID0gd2hpdGVzcGFjZVNjb3JlIC8gc2l6ZTsK LSAgICByZXR1cm4gcmF0aW8gPCBhdXRvRm9ybWF0V2hpdGVzcGFjZVJhdGlvOworICAgIHJldHVy biByYXRpbzsKK30KKworZnVuY3Rpb24gaXNUZXh0TGlrZWx5TWluaWZpZWQoY29udGVudCkKK3sK KyAgICBjb25zdCBhdXRvRm9ybWF0TWF4Q2hhcmFjdGVyc1RvQ2hlY2sgPSAyNTAwOworICAgIGNv bnN0IGF1dG9Gb3JtYXRXaGl0ZXNwYWNlUmF0aW8gPSAwLjI7CisKKyAgICBpZiAoY29udGVudC5s ZW5ndGggPD0gYXV0b0Zvcm1hdE1heENoYXJhY3RlcnNUb0NoZWNrKSB7CisgICAgICAgIGxldCBy YXRpbyA9IHdoaXRlc3BhY2VSYXRpbyhjb250ZW50LCAwLCBjb250ZW50Lmxlbmd0aCk7CisgICAg ICAgIHJldHVybiByYXRpbyA8IGF1dG9Gb3JtYXRXaGl0ZXNwYWNlUmF0aW87CisgICAgfQorCisg ICAgbGV0IHN0YXJ0UmF0aW8gPSB3aGl0ZXNwYWNlUmF0aW8oY29udGVudCwgMCwgYXV0b0Zvcm1h dE1heENoYXJhY3RlcnNUb0NoZWNrKTsKKyAgICBpZiAoc3RhcnRSYXRpbyA8IGF1dG9Gb3JtYXRX aGl0ZXNwYWNlUmF0aW8pCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgbGV0IGVuZFJhdGlv ID0gd2hpdGVzcGFjZVJhdGlvKGNvbnRlbnQsIGNvbnRlbnQubGVuZ3RoIC0gYXV0b0Zvcm1hdE1h eENoYXJhY3RlcnNUb0NoZWNrLCBjb250ZW50Lmxlbmd0aCkKKyAgICBpZiAoZW5kUmF0aW8gPCBh dXRvRm9ybWF0V2hpdGVzcGFjZVJhdGlvKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHJl dHVybiBmYWxzZTsKIH0KIAogZnVuY3Rpb24gZG91YmxlUXVvdGVkU3RyaW5nKHN0cikK