30426 2009-10-15 21:33:21 -0700 WebKitTools/Scripts/check-webkit-style incorrect complains about unindented code within namespaces in header files 2009-10-15 22:03:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jamesr webkit-unassigned commit-queue levin oldest_to_newest 154996 0 jamesr 2009-10-15 21:33:21 -0700 The WebKit style guide now says that code inside namespaces should not be indented even if it's inside a header file (thank $Deity)! However, check-webkit-style is out of date and still whines about it. 154998 1 41265 jamesr 2009-10-15 21:39:49 -0700 Created attachment 41265 Fixes the script 155002 2 levin 2009-10-15 21:51:04 -0700 fyi, I just r+ a fix for the same issue (namespace indentation) that was pretty minimal in scope (https://bugs.webkit.org/show_bug.cgi?id=30426). I still think there is a lot of value on what you did here with some fixes as mentioned above. You can still basically replace the code as you are doing. 155003 3 levin 2009-10-15 21:51:33 -0700 Ugh. Ignore my previous comment. It was meant for another bug. 155007 4 41265 commit-queue 2009-10-15 22:03:50 -0700 Comment on attachment 41265 Fixes the script Clearing flags on attachment: 41265 Committed r49669: <http://trac.webkit.org/changeset/49669> 155008 5 commit-queue 2009-10-15 22:03:53 -0700 All reviewed patches have been landed. Closing bug. 41265 2009-10-15 21:39:49 -0700 2009-10-15 22:03:50 -0700 Fixes the script fix_cws.diff text/plain 6639 jamesr ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1NjAwYTM2Li4zMzZiMjE0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMTAt MTUgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlcyBjaGVjay13ZWJraXQtc3R5 bGUgdG8gcmVmbGVjdCB0aGF0IGNvZGUgaW5zaWRlIGEgbmFtZXNwYWNlIHNob3VsZCBub3QgYmUg aW5kZW50ZWQsIGV2ZW4gaW4gYSBoZWFkZXIgZmlsZS4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA0MjYKKworICAgICAgICAqIFNjcmlwdHMvbW9k dWxlcy9jcHBfc3R5bGUucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL2NwcF9zdHlsZV91 bml0dGVzdC5weToKKwogMjAwOS0xMC0xMyAgQW5kcmFzIEJlY3NpICA8YmVjc2kuYW5kcmFzQHN0 dWQudS1zemVnZWQuaHU+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwX3N0eWxlLnB5IGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NwcF9zdHlsZS5weQppbmRleCAwYzlkZmEwLi40M2Ux ODY2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwX3N0eWxlLnB5 CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jcHBfc3R5bGUucHkKQEAgLTE3MDEs NDcgKzE3MDEsMjYgQEAgZGVmIGNoZWNrX25hbWVzcGFjZV9pbmRlbnRhdGlvbihmaWxlbmFtZSwg Y2xlYW5fbGluZXMsIGxpbmVfbnVtYmVyLCBmaWxlX2V4dGVuc2kKIAogICAgIG5hbWVzcGFjZV9p bmRlbnRhdGlvbiA9IG5hbWVzcGFjZV9tYXRjaC5ncm91cCgnbmFtZXNwYWNlX2luZGVudGF0aW9u JykKIAotICAgIGlzX2hlYWRlcl9maWxlID0gZmlsZV9leHRlbnNpb24gPT0gJ2gnCi0gICAgaXNf aW1wbGVtZW50YXRpb25fZmlsZSA9IG5vdCBpc19oZWFkZXJfZmlsZQogICAgIGxpbmVfb2Zmc2V0 ID0gMAogCi0gICAgaWYgaXNfaGVhZGVyX2ZpbGU6Ci0gICAgICAgIGlubmVyX2luZGVudGF0aW9u ID0gbmFtZXNwYWNlX2luZGVudGF0aW9uICsgJyAnICogNAotCi0gICAgICAgIGZvciBjdXJyZW50 X2xpbmUgaW4gY2xlYW5fbGluZXMucmF3X2xpbmVzW2xpbmVfbnVtYmVyICsgMTpdOgotICAgICAg ICAgICAgbGluZV9vZmZzZXQgKz0gMQotCi0gICAgICAgICAgICAjIFNraXAgbm90IG9ubHkgZW1w dHkgbGluZXMgYnV0IGFsc28gdGhvc2Ugd2l0aCBwcmVwcm9jZXNzb3IgZGlyZWN0aXZlcy4KLSAg ICAgICAgICAgICMgR290byBsYWJlbHMgZG9uJ3Qgb2NjdXIgaW4gaGVhZGVyIGZpbGVzLCBzbyBu byBuZWVkIHRvIGNoZWNrIGZvciB0aG9zZS4KLSAgICAgICAgICAgIGlmIGN1cnJlbnRfbGluZS5z dHJpcCgpID09ICcnIG9yIGN1cnJlbnRfbGluZS5zdGFydHN3aXRoKCcjJyk6Ci0gICAgICAgICAg ICAgICAgY29udGludWUKLQotICAgICAgICAgICAgaWYgbm90IGN1cnJlbnRfbGluZS5zdGFydHN3 aXRoKGlubmVyX2luZGVudGF0aW9uKToKLSAgICAgICAgICAgICAgICAjIElmIHNvbWV0aGluZyB1 bmluZGVudGVkIHdhcyBkaXNjb3ZlcmVkLCBtYWtlIHN1cmUgaXQncyBhIGNsb3NpbmcgYnJhY2Uu Ci0gICAgICAgICAgICAgICAgaWYgbm90IGN1cnJlbnRfbGluZS5zdGFydHN3aXRoKG5hbWVzcGFj ZV9pbmRlbnRhdGlvbiArICd9Jyk6Ci0gICAgICAgICAgICAgICAgICAgIGVycm9yKGZpbGVuYW1l LCBsaW5lX251bWJlciArIGxpbmVfb2Zmc2V0LCAnd2hpdGVzcGFjZS9pbmRlbnQnLCA0LAotICAg ICAgICAgICAgICAgICAgICAgICAgICAnSW4gYSBoZWFkZXIsIGNvZGUgaW5zaWRlIGEgbmFtZXNw YWNlIHNob3VsZCBiZSBpbmRlbnRlZC4nKQotICAgICAgICAgICAgICAgIGJyZWFrCi0KLSAgICBp ZiBpc19pbXBsZW1lbnRhdGlvbl9maWxlOgotICAgICAgICBmb3IgY3VycmVudF9saW5lIGluIGNs ZWFuX2xpbmVzLnJhd19saW5lc1tsaW5lX251bWJlciArIDE6XToKLSAgICAgICAgICAgIGxpbmVf b2Zmc2V0ICs9IDEKKyAgICBmb3IgY3VycmVudF9saW5lIGluIGNsZWFuX2xpbmVzLnJhd19saW5l c1tsaW5lX251bWJlciArIDE6XToKKyAgICAgICAgbGluZV9vZmZzZXQgKz0gMQogCi0gICAgICAg ICAgICAjIFNraXAgbm90IG9ubHkgZW1wdHkgbGluZXMgYnV0IGFsc28gdGhvc2Ugd2l0aCAoZ290 bykgbGFiZWxzLgotICAgICAgICAgICAgIyBUaGUgZ290byBsYWJlbCByZWdleHAgYWNjZXB0cyBz cGFjZXMgb3IgdGhlIGJlZ2lubmluZyBvZiBhCi0gICAgICAgICAgICAjIGNvbW1lbnQgKGlmIGFu eXRoaW5nKSBhZnRlciB0aGUgaW5pdGlhbCBjb2xvbi4KLSAgICAgICAgICAgIGlmIGN1cnJlbnRf bGluZS5zdHJpcCgpID09ICcnIG9yIG1hdGNoKHInXHcrXHMqOihbXHNcL10uKik/JCcsIGN1cnJl bnRfbGluZSk6Ci0gICAgICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgIyBTa2lwIG5vdCBv bmx5IGVtcHR5IGxpbmVzIGJ1dCBhbHNvIHRob3NlIHdpdGggKGdvdG8pIGxhYmVscy4KKyAgICAg ICAgIyBUaGUgZ290byBsYWJlbCByZWdleHAgYWNjZXB0cyBzcGFjZXMgb3IgdGhlIGJlZ2lubmlu ZyBvZiBhCisgICAgICAgICMgY29tbWVudCAoaWYgYW55dGhpbmcpIGFmdGVyIHRoZSBpbml0aWFs IGNvbG9uLgorICAgICAgICBpZiBjdXJyZW50X2xpbmUuc3RyaXAoKSA9PSAnJyBvciBtYXRjaChy J1x3K1xzKjooW1xzXC9dLiopPyQnLCBjdXJyZW50X2xpbmUpOgorICAgICAgICAgICAgY29udGlu dWUKIAotICAgICAgICAgICAgcmVtYWluaW5nX2xpbmUgPSBjdXJyZW50X2xpbmVbbGVuKG5hbWVz cGFjZV9pbmRlbnRhdGlvbik6XQotICAgICAgICAgICAgaWYgbm90IG1hdGNoKHInXFMnLCByZW1h aW5pbmdfbGluZSk6Ci0gICAgICAgICAgICAgICAgZXJyb3IoZmlsZW5hbWUsIGxpbmVfbnVtYmVy ICsgbGluZV9vZmZzZXQsICd3aGl0ZXNwYWNlL2luZGVudCcsIDQsCi0gICAgICAgICAgICAgICAg ICAgICAgJ0luIGFuIGltcGxlbWVudGF0aW9uIGZpbGUsIGNvZGUgaW5zaWRlIGEgbmFtZXNwYWNl IHNob3VsZCBub3QgYmUgaW5kZW50ZWQuJykKKyAgICAgICAgcmVtYWluaW5nX2xpbmUgPSBjdXJy ZW50X2xpbmVbbGVuKG5hbWVzcGFjZV9pbmRlbnRhdGlvbik6XQorICAgICAgICBpZiBub3QgbWF0 Y2gocidcUycsIHJlbWFpbmluZ19saW5lKToKKyAgICAgICAgICAgIGVycm9yKGZpbGVuYW1lLCBs aW5lX251bWJlciArIGxpbmVfb2Zmc2V0LCAnd2hpdGVzcGFjZS9pbmRlbnQnLCA0LAorICAgICAg ICAgICAgICAgICAgJ0NvZGUgaW5zaWRlIGEgbmFtZXNwYWNlIHNob3VsZCBub3QgYmUgaW5kZW50 ZWQuJykKIAotICAgICAgICAgICAgIyBKdXN0IGNoZWNrIHRoZSBmaXJzdCBub24tZW1wdHkgbGlu ZSBpbiBhbnkgY2FzZSwgYmVjYXVzZQotICAgICAgICAgICAgIyBvdGhlcndpc2Ugd2Ugd291bGQg bmVlZCB0byBjb3VudCBvcGVuZWQgYW5kIGNsb3NlZCBicmFjZXMsCi0gICAgICAgICAgICAjIHdo aWNoIGlzIG9idmlvdXNseSBhIGxvdCBtb3JlIGNvbXBsaWNhdGVkLgotICAgICAgICAgICAgYnJl YWsKKyAgICAgICAgIyBKdXN0IGNoZWNrIHRoZSBmaXJzdCBub24tZW1wdHkgbGluZSBpbiBhbnkg Y2FzZSwgYmVjYXVzZQorICAgICAgICAjIG90aGVyd2lzZSB3ZSB3b3VsZCBuZWVkIHRvIGNvdW50 IG9wZW5lZCBhbmQgY2xvc2VkIGJyYWNlcywKKyAgICAgICAgIyB3aGljaCBpcyBvYnZpb3VzbHkg YSBsb3QgbW9yZSBjb21wbGljYXRlZC4KKyAgICAgICAgYnJlYWsKIAogCiBkZWYgY2hlY2tfdXNp bmdfc3RkKGZpbGVuYW1lLCBjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGVycm9yKToKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jcHBfc3R5bGVfdW5pdHRlc3QucHkg Yi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwX3N0eWxlX3VuaXR0ZXN0LnB5CmluZGV4 IDMyMjM1NmUuLjBhZDhlMDUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9jcHBfc3R5bGVfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVz L2NwcF9zdHlsZV91bml0dGVzdC5weQpAQCAtMjgwNiwyOSArMjgwNiwyOSBAQCBjbGFzcyBXZWJL aXRTdHlsZVRlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAgICAgICAgICAgICAnV2VpcmQgbnVtYmVy IG9mIHNwYWNlcyBhdCBsaW5lLXN0YXJ0LiAgQXJlIHlvdSB1c2luZyBhIDQtc3BhY2UgaW5kZW50 PyAgW3doaXRlc3BhY2UvaW5kZW50XSBbM10nKQogICAgICAgICAjIEZJWE1FOiBObyB0ZXN0cyBm b3IgOC1zcGFjZXMuCiAKLSAgICAgICAgIyAzLiBJbiBhIGhlYWRlciwgY29kZSBpbnNpZGUgYSBu YW1lc3BhY2Ugc2hvdWxkIGJlIGluZGVudGVkLgorICAgICAgICAjIDMuIEluIGEgaGVhZGVyLCBj b2RlIGluc2lkZSBhIG5hbWVzcGFjZSBzaG91bGQgbm90IGJlIGluZGVudGVkLgogICAgICAgICBz ZWxmLmFzc2VydF9tdWx0aV9saW5lX2xpbnQoCiAgICAgICAgICAgICAnbmFtZXNwYWNlIFdlYkNv cmUge1xuXG4nCi0gICAgICAgICAgICAnICAgIGNsYXNzIERvY3VtZW50IHtcbicKLSAgICAgICAg ICAgICcgICAgICAgIGludCBteVZhcmlhYmxlO1xuJwotICAgICAgICAgICAgJyAgICB9O1xuJwor ICAgICAgICAgICAgJ2NsYXNzIERvY3VtZW50IHtcbicKKyAgICAgICAgICAgICcgICAgaW50IG15 VmFyaWFibGU7XG4nCisgICAgICAgICAgICAnfTtcbicKICAgICAgICAgICAgICd9JywKICAgICAg ICAgICAgICcnLAogICAgICAgICAgICAgJ2Zvby5oJykKICAgICAgICAgc2VsZi5hc3NlcnRfbXVs dGlfbGluZV9saW50KAogICAgICAgICAgICAgJ25hbWVzcGFjZSBPdXRlck5hbWVzcGFjZSB7XG4n Ci0gICAgICAgICAgICAnICAgIG5hbWVzcGFjZSBJbm5lck5hbWVzcGFjZSB7XG4nCi0gICAgICAg ICAgICAnICAgICAgICBjbGFzcyBEb2N1bWVudCB7XG4nCi0gICAgICAgICAgICAnICAgICAgICB9 O1xuJwotICAgICAgICAgICAgJyAgICB9O1xuJworICAgICAgICAgICAgJ25hbWVzcGFjZSBJbm5l ck5hbWVzcGFjZSB7XG4nCisgICAgICAgICAgICAnY2xhc3MgRG9jdW1lbnQge1xuJworICAgICAg ICAgICAgJ307XG4nCisgICAgICAgICAgICAnfTtcbicKICAgICAgICAgICAgICd9JywKICAgICAg ICAgICAgICcnLAogICAgICAgICAgICAgJ2Zvby5oJykKICAgICAgICAgc2VsZi5hc3NlcnRfbXVs dGlfbGluZV9saW50KAogICAgICAgICAgICAgJ25hbWVzcGFjZSBXZWJDb3JlIHtcbicKICAgICAg ICAgICAgICcjaWYgMFxuJwotICAgICAgICAgICAgJyAgICBjbGFzcyBEb2N1bWVudCB7XG4nCi0g ICAgICAgICAgICAnICAgIH07XG4nCisgICAgICAgICAgICAnY2xhc3MgRG9jdW1lbnQge1xuJwor ICAgICAgICAgICAgJ307XG4nCiAgICAgICAgICAgICAnI2VuZGlmXG4nCiAgICAgICAgICAgICAn fScsCiAgICAgICAgICAgICAnJywKQEAgLTI4MzgsOCArMjgzOCw3IEBAIGNsYXNzIFdlYktpdFN0 eWxlVGVzdChDcHBTdHlsZVRlc3RCYXNlKToKICAgICAgICAgICAgICdjbGFzcyBEb2N1bWVudCB7 XG4nCiAgICAgICAgICAgICAnfTtcbicKICAgICAgICAgICAgICd9JywKLSAgICAgICAgICAgICdJ biBhIGhlYWRlciwgY29kZSBpbnNpZGUgYSBuYW1lc3BhY2Ugc2hvdWxkIGJlIGluZGVudGVkLicK LSAgICAgICAgICAgICcgIFt3aGl0ZXNwYWNlL2luZGVudF0gWzRdJywKKyAgICAgICAgICAgICcn LAogICAgICAgICAgICAgJ2Zvby5oJykKIAogICAgICAgICAjIDQuIEluIGFuIGltcGxlbWVudGF0 aW9uIGZpbGUgKGZpbGVzIHdpdGggdGhlIGV4dGVuc2lvbiAuY3BwLCAuYwpAQCAtMjg4MSw3ICsy ODgwLDcgQEAgY2xhc3MgV2ViS2l0U3R5bGVUZXN0KENwcFN0eWxlVGVzdEJhc2UpOgogICAgICAg ICAgICAgJ25hbWVzcGFjZSBXZWJDb3JlIHtcbicKICAgICAgICAgICAgICcgICAgRG9jdW1lbnQ6 OkZvbygpIHsgfVxuJwogICAgICAgICAgICAgJ30nLAotICAgICAgICAgICAgJ0luIGFuIGltcGxl bWVudGF0aW9uIGZpbGUsIGNvZGUgaW5zaWRlIGEgbmFtZXNwYWNlIHNob3VsZCBub3QgYmUgaW5k ZW50ZWQuJworICAgICAgICAgICAgJ0NvZGUgaW5zaWRlIGEgbmFtZXNwYWNlIHNob3VsZCBub3Qg YmUgaW5kZW50ZWQuJwogICAgICAgICAgICAgJyAgW3doaXRlc3BhY2UvaW5kZW50XSBbNF0nLAog ICAgICAgICAgICAgJ2Zvby5jcHAnKQogCkBAIC0zMjQ2LDcgKzMyNDUsNyBAQCBjbGFzcyBXZWJL aXRTdHlsZVRlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAgICAgICAgICAgICAnJykKICAgICAgICAg c2VsZi5hc3NlcnRfbXVsdGlfbGluZV9saW50KAogICAgICAgICAgICAgJ25hbWVzcGFjZSBXZWJD b3JlIHtcbicKLSAgICAgICAgICAgICcgICAgaW50IGZvbztcbicKKyAgICAgICAgICAgICdpbnQg Zm9vO1xuJwogICAgICAgICAgICAgJ307XG4nLAogICAgICAgICAgICAgJycpCiAgICAgICAgIHNl bGYuYXNzZXJ0X211bHRpX2xpbmVfbGludCgK