27567 2009-07-22 15:00:22 -0700 False positives in namespace indentation checks 2009-07-22 23:05:19 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 jpetsovits webkit-unassigned manyoso simon.maxime oldest_to_newest 133926 0 jpetsovits 2009-07-22 15:00:22 -0700 Yong Li discovered a false positive for the namespace indentation check in implementation files, triggered by this piece of code: """ namespace WebCore { PlatformMenuDescriptionType::PlatformMenuDescriptionType() : hMenu(::CreatePopupMenu()) , itemCount(0) { } """ It turns out that the regular expression skipping goto labels was too permissive, and thus treated the line with the constructor's signature as label, skipping it and (then correctly) causing the error for the indented second line. Not cool, sorry for that bug. This patch improves on the concerned code, makes the unit tests more demanding, and fixes the bug. Please review! 133929 1 33298 jpetsovits 2009-07-22 15:02:12 -0700 Created attachment 33298 Fix false positives in namespace indentation checks 133933 2 33298 manyoso 2009-07-22 15:09:59 -0700 Comment on attachment 33298 Fix false positives in namespace indentation checks Next time put more detail in the ChangeLog as you did in the bug report. Also, I'd like a comment for the added regex. 133942 3 33300 jpetsovits 2009-07-22 15:20:06 -0700 Created attachment 33300 Fix false positives in namespace indentation checks (try 2) Better patch, more verbosely describing what is being done. (No changes in functionality, though.) 133948 4 manyoso 2009-07-22 15:31:35 -0700 Landed with r46248. 134030 5 simon.maxime 2009-07-22 23:05:19 -0700 *** Bug 27559 has been marked as a duplicate of this bug. *** 33298 2009-07-22 15:02:12 -0700 2009-07-22 15:20:06 -0700 Fix false positives in namespace indentation checks 0001-Fix-false-positives-in-namespace-indentation-checks.patch text/plain 3150 jpetsovits RnJvbSAwYmZjYzI5YjFkYWRkOGY4YWRmYjQxMWI5OTNiN2JjNDIzMzRmZmQ0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYWtvYiBQZXRzb3ZpdHMgPGpha29iLnBldHNvdml0c0B0b3Jj aG1vYmlsZS5jb20+CkRhdGU6IFdlZCwgMjIgSnVsIDIwMDkgMTg6MDE6NDAgLTA0MDAKU3ViamVj dDogW1BBVENIXSBGaXggZmFsc2UgcG9zaXRpdmVzIGluIG5hbWVzcGFjZSBpbmRlbnRhdGlvbiBj aGVja3MuCgotLS0KIFdlYktpdFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAg ICAgIHwgICAxMCArKysrKysrKysrCiBXZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGlu dC5weSAgICAgICAgICB8ICAgIDIgKy0KIFdlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jcHBs aW50X3VuaXR0ZXN0LnB5IHwgICAxNCArKysrKysrKysrKystLQogMyBmaWxlcyBjaGFuZ2VkLCAy MyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCA2ODkyNDE4Li5jMzNmZmIy IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDctMjIgIEpha29iIFBldHNvdml0cyAgPGph a29iLnBldHNvdml0c0B0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGZhbHNlIHBvc2l0aXZlcyBpbiBuYW1lc3BhY2Ug aW5kZW50YXRpb24gY2hlY2tzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Mjc1NjcKKworICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9jcHBsaW50LnB5 OgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9jcHBsaW50X3VuaXR0ZXN0LnB5OgorCiAyMDA5 LTA3LTIyICBQZXRlciBLYXN0aW5nICA8cGthc3RpbmdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEYXZpZCBLaWx6ZXIuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvY3BwbGludC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jcHBsaW50 LnB5CmluZGV4IDEwNjM5Y2MuLmZjZjEzMGIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Njcmlw dHMvbW9kdWxlcy9jcHBsaW50LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9j cHBsaW50LnB5CkBAIC0xNzA5LDcgKzE3MDksNyBAQCBkZWYgY2hlY2tfbmFtZXNwYWNlX2luZGVu dGF0aW9uKGZpbGVuYW1lLCBjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGZpbGVfZXh0ZW5zaQog ICAgICAgICAgICAgbGluZV9vZmZzZXQgKz0gMQogCiAgICAgICAgICAgICAjIFNraXAgbm90IG9u bHkgZW1wdHkgbGluZXMgYnV0IGFsc28gdGhvc2Ugd2l0aCAoZ290bykgbGFiZWxzLgotICAgICAg ICAgICAgaWYgY3VycmVudF9saW5lLnN0cmlwKCkgPT0gJycgb3IgbWF0Y2gocidcdytccyo6Jywg Y3VycmVudF9saW5lKToKKyAgICAgICAgICAgIGlmIGN1cnJlbnRfbGluZS5zdHJpcCgpID09ICcn IG9yIG1hdGNoKHInXHcrXHMqOihbXHNcL10uKik/JCcsIGN1cnJlbnRfbGluZSk6CiAgICAgICAg ICAgICAgICAgY29udGludWUKIAogICAgICAgICAgICAgcmVtYWluaW5nX2xpbmUgPSBjdXJyZW50 X2xpbmVbbGVuKG5hbWVzcGFjZV9pbmRlbnRhdGlvbik6XQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvU2NyaXB0cy9tb2R1bGVzL2NwcGxpbnRfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3Jp cHRzL21vZHVsZXMvY3BwbGludF91bml0dGVzdC5weQppbmRleCA2ZmQwZTk0Li42OTk2YzdjIDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludF91bml0dGVzdC5w eQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludF91bml0dGVzdC5weQpA QCAtMjc1NCw5ICsyNzU0LDExIEBAIGNsYXNzIFdlYktpdFN0eWxlVGVzdChDcHBsaW50VGVzdEJh c2UpOgogICAgICAgICAjICAgIG9yIC5tbSksIGNvZGUgaW5zaWRlIGEgbmFtZXNwYWNlIHNob3Vs ZCBub3QgYmUgaW5kZW50ZWQuCiAgICAgICAgIHNlbGYuYXNzZXJ0X211bHRpX2xpbmVfbGludCgK ICAgICAgICAgICAgICduYW1lc3BhY2UgV2ViQ29yZSB7XG5cbicKLSAgICAgICAgICAgICdib29s IERvY3VtZW50OjpGb28oKVxuJworICAgICAgICAgICAgJ0RvY3VtZW50OjpGb28oKVxuJworICAg ICAgICAgICAgJyAgICA6IGZvbyhiYXIpXG4nCisgICAgICAgICAgICAnICAgICwgYm9vKGZhcilc bicKICAgICAgICAgICAgICd7XG4nCi0gICAgICAgICAgICAnICAgIHJldHVybiB0cnVlO1xuJwor ICAgICAgICAgICAgJyAgICBzdHVmZigpO1xuJwogICAgICAgICAgICAgJ30nLAogICAgICAgICAg ICAgJycsCiAgICAgICAgICAgICAnZm9vLmNwcCcpCkBAIC0yNzY5LDEwICsyNzcxLDE4IEBAIGNs YXNzIFdlYktpdFN0eWxlVGVzdChDcHBsaW50VGVzdEJhc2UpOgogICAgICAgICAgICAgJ2Zvby5j cHAnKQogICAgICAgICBzZWxmLmFzc2VydF9tdWx0aV9saW5lX2xpbnQoCiAgICAgICAgICAgICAn ICAgIG5hbWVzcGFjZSBXZWJDb3JlIHtcblxuJworICAgICAgICAgICAgJ3N0YXJ0OiAgLy8gUG9p bnRsZXNzIGNvZGUsIGJ1dCB0ZXN0cyB0aGUgbGFiZWwgcmVnZXguXG4nCisgICAgICAgICAgICAn ICAgIGdvdG8gc3RhcnQ7XG4nCisgICAgICAgICAgICAnICAgIH0nLAorICAgICAgICAgICAgJycs CisgICAgICAgICAgICAnZm9vLmNwcCcpCisgICAgICAgIHNlbGYuYXNzZXJ0X211bHRpX2xpbmVf bGludCgKKyAgICAgICAgICAgICcgICAgbmFtZXNwYWNlIFdlYkNvcmUge1xuXG4nCiAgICAgICAg ICAgICAnICAgIHZvaWQgRG9jdW1lbnQ6OkZvbygpXG4nCiAgICAgICAgICAgICAnICAgIHtcbicK ICAgICAgICAgICAgICdzdGFydDogIC8vIGluZmluaXRlIGxvb3BzIGFyZSBmdW4hXG4nCiAgICAg ICAgICAgICAnICAgICAgICBnb3RvIHN0YXJ0O1xuJworICAgICAgICAgICAgJyAgICB9JwogICAg ICAgICAgICAgJyAgICB9JywKICAgICAgICAgICAgICcnLAogICAgICAgICAgICAgJ2Zvby5jcHAn KQotLSAKMS42LjMuMwoK 33300 2009-07-22 15:20:06 -0700 2009-07-22 15:28:08 -0700 Fix false positives in namespace indentation checks (try 2) 0001-Fix-false-positives-in-namespace-indentation-checks.patch text/plain 3539 jpetsovits RnJvbSBkMzc5YjY5MWI4MzJlMWI5OTFkZWIyZjdhYjc1OWQ4YzFmOGVhY2ViIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYWtvYiBQZXRzb3ZpdHMgPGpha29iLnBldHNvdml0c0B0b3Jj aG1vYmlsZS5jb20+CkRhdGU6IFdlZCwgMjIgSnVsIDIwMDkgMTg6MTg6MTIgLTA0MDAKU3ViamVj dDogW1BBVENIXSBGaXggZmFsc2UgcG9zaXRpdmVzIGluIG5hbWVzcGFjZSBpbmRlbnRhdGlvbiBj aGVja3MuCgotLS0KIFdlYktpdFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAg ICAgIHwgICAxOCArKysrKysrKysrKysrKysrKysKIFdlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9jcHBsaW50LnB5ICAgICAgICAgIHwgICAgNCArKystCiBXZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvY3BwbGludF91bml0dGVzdC5weSB8ICAgMTMgKysrKysrKysrKystLQogMyBmaWxlcyBj aGFuZ2VkLCAzMiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCA2ODkyNDE4 Li40ZWY1NTY2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0 VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDktMDctMjIgIEpha29iIFBldHNv dml0cyAgPGpha29iLnBldHNvdml0c0B0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGZhbHNlIHBvc2l0aXZlcyBpbiBu YW1lc3BhY2UgaW5kZW50YXRpb24gY2hlY2tzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc1NjcKKworICAgICAgICBUaGUgcmVndWxhciBleHByZXNz aW9uIGRldGVjdGluZyBnb3RvIGxhYmVscyAoaW4gb3JkZXIKKyAgICAgICAgdG8gc2tpcCB0aG9z ZSkgd2FzIHRvbyBwZXJtaXNzaXZlLCB3aGljaCBjYXVzZWQgb3RoZXIKKyAgICAgICAgY29kZSBs aWtlICJGb286OkJhcigpIiB0byBiZSB0cmVhdGVkIGFzIGEgbGFiZWwgdG9vLAorICAgICAgICB0 aGVyZWJ5IG5vdCBzdG9wcGluZyB0aGUgcHJvY2Vzc2luZyBsb29wIGFzIGV4cGVjdGVkLgorCisg ICAgICAgIE5vdyBjb21lcyB3aXRoIGEgc3RyaWN0ZXIgcmVnZXhwLCBhbmQgbW9yZSBkZW1hbmRp bmcKKyAgICAgICAgdGVzdCBjYXNlcyB0byBjaGVjayBmb3IgdGhlc2UgaXNzdWVzLgorCisgICAg ICAgICogU2NyaXB0cy9tb2R1bGVzL2NwcGxpbnQucHk6CisgICAgICAgICogU2NyaXB0cy9tb2R1 bGVzL2NwcGxpbnRfdW5pdHRlc3QucHk6CisKIDIwMDktMDctMjIgIFBldGVyIEthc3RpbmcgIDxw a2FzdGluZ0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIEtpbHplci4K ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jcHBsaW50LnB5IGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NwcGxpbnQucHkKaW5kZXggMTA2MzljYy4uZGI4NmMy ZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NwcGxpbnQucHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NwcGxpbnQucHkKQEAgLTE3MDksNyArMTcw OSw5IEBAIGRlZiBjaGVja19uYW1lc3BhY2VfaW5kZW50YXRpb24oZmlsZW5hbWUsIGNsZWFuX2xp bmVzLCBsaW5lX251bWJlciwgZmlsZV9leHRlbnNpCiAgICAgICAgICAgICBsaW5lX29mZnNldCAr PSAxCiAKICAgICAgICAgICAgICMgU2tpcCBub3Qgb25seSBlbXB0eSBsaW5lcyBidXQgYWxzbyB0 aG9zZSB3aXRoIChnb3RvKSBsYWJlbHMuCi0gICAgICAgICAgICBpZiBjdXJyZW50X2xpbmUuc3Ry aXAoKSA9PSAnJyBvciBtYXRjaChyJ1x3K1xzKjonLCBjdXJyZW50X2xpbmUpOgorICAgICAgICAg ICAgIyBUaGUgZ290byBsYWJlbCByZWdleHAgYWNjZXB0cyBzcGFjZXMgb3IgdGhlIGJlZ2lubmlu ZyBvZiBhCisgICAgICAgICAgICAjIGNvbW1lbnQgKGlmIGFueXRoaW5nKSBhZnRlciB0aGUgaW5p dGlhbCBjb2xvbi4KKyAgICAgICAgICAgIGlmIGN1cnJlbnRfbGluZS5zdHJpcCgpID09ICcnIG9y IG1hdGNoKHInXHcrXHMqOihbXHNcL10uKik/JCcsIGN1cnJlbnRfbGluZSk6CiAgICAgICAgICAg ICAgICAgY29udGludWUKIAogICAgICAgICAgICAgcmVtYWluaW5nX2xpbmUgPSBjdXJyZW50X2xp bmVbbGVuKG5hbWVzcGFjZV9pbmRlbnRhdGlvbik6XQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy9tb2R1bGVzL2NwcGxpbnRfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvY3BwbGludF91bml0dGVzdC5weQppbmRleCA2ZmQwZTk0Li5iM2RhNjViIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludF91bml0dGVzdC5weQor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludF91bml0dGVzdC5weQpAQCAt Mjc1NCw5ICsyNzU0LDExIEBAIGNsYXNzIFdlYktpdFN0eWxlVGVzdChDcHBsaW50VGVzdEJhc2Up OgogICAgICAgICAjICAgIG9yIC5tbSksIGNvZGUgaW5zaWRlIGEgbmFtZXNwYWNlIHNob3VsZCBu b3QgYmUgaW5kZW50ZWQuCiAgICAgICAgIHNlbGYuYXNzZXJ0X211bHRpX2xpbmVfbGludCgKICAg ICAgICAgICAgICduYW1lc3BhY2UgV2ViQ29yZSB7XG5cbicKLSAgICAgICAgICAgICdib29sIERv Y3VtZW50OjpGb28oKVxuJworICAgICAgICAgICAgJ0RvY3VtZW50OjpGb28oKVxuJworICAgICAg ICAgICAgJyAgICA6IGZvbyhiYXIpXG4nCisgICAgICAgICAgICAnICAgICwgYm9vKGZhcilcbicK ICAgICAgICAgICAgICd7XG4nCi0gICAgICAgICAgICAnICAgIHJldHVybiB0cnVlO1xuJworICAg ICAgICAgICAgJyAgICBzdHVmZigpO1xuJwogICAgICAgICAgICAgJ30nLAogICAgICAgICAgICAg JycsCiAgICAgICAgICAgICAnZm9vLmNwcCcpCkBAIC0yNzY5LDYgKzI3NzEsMTMgQEAgY2xhc3Mg V2ViS2l0U3R5bGVUZXN0KENwcGxpbnRUZXN0QmFzZSk6CiAgICAgICAgICAgICAnZm9vLmNwcCcp CiAgICAgICAgIHNlbGYuYXNzZXJ0X211bHRpX2xpbmVfbGludCgKICAgICAgICAgICAgICcgICAg bmFtZXNwYWNlIFdlYkNvcmUge1xuXG4nCisgICAgICAgICAgICAnc3RhcnQ6ICAvLyBQb2ludGxl c3MgY29kZSwgYnV0IHRlc3RzIHRoZSBsYWJlbCByZWdleHAuXG4nCisgICAgICAgICAgICAnICAg IGdvdG8gc3RhcnQ7XG4nCisgICAgICAgICAgICAnICAgIH0nLAorICAgICAgICAgICAgJycsCisg ICAgICAgICAgICAnZm9vLmNwcCcpCisgICAgICAgIHNlbGYuYXNzZXJ0X211bHRpX2xpbmVfbGlu dCgKKyAgICAgICAgICAgICcgICAgbmFtZXNwYWNlIFdlYkNvcmUge1xuXG4nCiAgICAgICAgICAg ICAnICAgIHZvaWQgRG9jdW1lbnQ6OkZvbygpXG4nCiAgICAgICAgICAgICAnICAgIHtcbicKICAg ICAgICAgICAgICdzdGFydDogIC8vIGluZmluaXRlIGxvb3BzIGFyZSBmdW4hXG4nCi0tIAoxLjYu My4zCgo=