27615 2009-07-23 12:14:52 -0700 Fix false positives for switch statement indentation check in cpplint 2009-07-23 15:54:18 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 jpetsovits webkit-unassigned levin manyoso oldest_to_newest 134194 0 jpetsovits 2009-07-23 12:14:52 -0700 Mike Fenton brought to my attention that code like the following throws an indentation warning in cpplint: switch (blah) { default: break; } As far as I can see, the styleguide doesn't specifically allow these kinds of one-liners, but it also doesn't forbid them. And anyways, the error message for the indentation check would be wrong in this case anyways: "A case label should not be indented, but line up with its switch statement." The patch below fixes this issues by making the case label regex more permissive (hm... deja-vu?). It also adds more testcases and only ends the check when the (supposed) closing brace for the switch is actually on the same level of indentation as the switch statement itself. And a slight restructuring of comments and (el)ifs for better readability. 134202 1 33354 jpetsovits 2009-07-23 12:35:36 -0700 Created attachment 33354 Fix false positives for switch statement indentation check in cpplint 134220 2 levin 2009-07-23 13:18:40 -0700 I haven't looked at the patch in depth yet... but it feels like the it should be not only "return" but also "break" or even "continue". I think the intent is to not put an "else" if you don't need to. Ironic, huh ? :) 134298 3 manyoso 2009-07-23 15:54:18 -0700 Landed with r46294. 33354 2009-07-23 12:35:36 -0700 2009-07-23 14:43:31 -0700 Fix false positives for switch statement indentation check in cpplint 0001-Fix-false-positives-for-switch-statement-indentation.patch text/plain 5610 jpetsovits RnJvbSA0Zjk4ZDA0NmQ1ZTkwODZhNDY1N2IyYjQxMGYwY2NkNzkyNjg2YjVlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYWtvYiBQZXRzb3ZpdHMgPGpha29iLnBldHNvdml0c0B0b3Jj aG1vYmlsZS5jb20+CkRhdGU6IFRodSwgMjMgSnVsIDIwMDkgMTU6MzM6MjkgLTA0MDAKU3ViamVj dDogW1BBVENIXSBGaXggZmFsc2UgcG9zaXRpdmVzIGZvciBzd2l0Y2ggc3RhdGVtZW50IGluZGVu dGF0aW9uIGNoZWNrIGluIGNwcGxpbnQuCgotLS0KIFdlYktpdFRvb2xzL0NoYW5nZUxvZyAgICAg ICAgICAgICAgICAgICAgICAgICAgIHwgICAxNCArKysrKysrKysrCiBXZWJLaXRUb29scy9TY3Jp cHRzL21vZHVsZXMvY3BwbGludC5weSAgICAgICAgICB8ICAgMzAgKysrKysrKysrKysrKy0tLS0t LS0tLQogV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NwcGxpbnRfdW5pdHRlc3QucHkgfCAg IDE1ICsrKysrKysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDQ3IGluc2VydGlvbnMoKyksIDEyIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRv b2xzL0NoYW5nZUxvZwppbmRleCAzNGMwNDc4Li41M2UxNGRlIDEwMDY0NAotLS0gYS9XZWJLaXRU b29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMDktMDctMjMgIEpha29iIFBldHNvdml0cyAgPGpha29iLnBldHNvdml0c0B0b3JjaG1v YmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRml4IGZhbHNlIHBvc2l0aXZlcyBmb3Igc3dpdGNoIHN0YXRlbWVudCBpbmRlbnRhdGlvbiBj aGVjayBpbiBjcHBsaW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9Mjc2MTUKKworICAgICAgICBNYWtlcyBvbmUtbGluZSBjYXNlIHN0YXRlbWVudHMg KGUuZy4gImNhc2UgZm9vOiBiYXIoKTsiKSB3b3JrLgorICAgICAgICBBbHNvIGEgZmV3IGdlbmVy YWwgaW1wcm92ZW1lbnRzIHRvIHRoZSByb2J1c3RuZXNzIGFuZCByZWFkYWJpbGl0eSBvZgorICAg ICAgICB0aGUgY2hlY2ssIGFuZCBtb3JlIHRlc3QgY2FzZXMuCisKKyAgICAgICAgKiBTY3JpcHRz L21vZHVsZXMvY3BwbGludC5weToKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvY3BwbGludF91 bml0dGVzdC5weToKKwogMjAwOS0wNy0yMiAgU3RldmUgRmFsa2VuYnVyZyAgPHNmYWxrZW5AYXBw bGUuY29tPgogCiAgICAgICAgIENoZWNrcG9pbnQgbmV3IFdpbmRvd3MgbmlnaHRseSBsYXVuY2hl ci4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jcHBsaW50LnB5IGIv V2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NwcGxpbnQucHkKaW5kZXggMWRmOGE5Zi4uMzUx NjJjZSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NwcGxpbnQucHkK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NwcGxpbnQucHkKQEAgLTE3NjcsMjQg KzE3NjcsMzAgQEAgZGVmIGNoZWNrX3N3aXRjaF9pbmRlbnRhdGlvbihmaWxlbmFtZSwgY2xlYW5f bGluZXMsIGxpbmVfbnVtYmVyLCBlcnJvcik6CiAgICAgICAgIGN1cnJlbnRfaW5kZW50YXRpb24g PSBjdXJyZW50X2luZGVudGF0aW9uX21hdGNoLmdyb3VwKCdpbmRlbnRhdGlvbicpCiAgICAgICAg IHJlbWFpbmluZ19saW5lID0gY3VycmVudF9pbmRlbnRhdGlvbl9tYXRjaC5ncm91cCgncmVtYWlu aW5nX2xpbmUnKQogCi0gICAgICAgIGlmIHJlbWFpbmluZ19saW5lLnN0YXJ0c3dpdGgoJ30nKToK LSAgICAgICAgICAgIGJyZWFrICMgVGhlIGVuZCBvZiB0aGUgc3dpdGNoIHN0YXRlbWVudC4KLSAg ICAgICAgZWxpZiBtYXRjaChyJyhkZWZhdWx0fGNhc2VccysuKilccyo6XHMqJCcsIHJlbWFpbmlu Z19saW5lKToKKyAgICAgICAgIyBFbmQgdGhlIGNoZWNrIGF0IHRoZSBlbmQgb2YgdGhlIHN3aXRj aCBzdGF0ZW1lbnQuCisgICAgICAgIGlmIHJlbWFpbmluZ19saW5lLnN0YXJ0c3dpdGgoJ30nKSBh bmQgY3VycmVudF9pbmRlbnRhdGlvbiA9PSBzd2l0Y2hfaW5kZW50YXRpb246CisgICAgICAgICAg ICBicmVhaworICAgICAgICAjIENhc2UgYW5kIGRlZmF1bHQgYnJhbmNoZXMgc2hvdWxkIG5vdCBi ZSBpbmRlbnRlZC4gVGhlIHJlZ2V4cCBhbHNvCisgICAgICAgICMgY2F0Y2hlcyBzaW5nbGUtbGlu ZSBjYXNlcyBsaWtlICJkZWZhdWx0OiBicmVhazsiIGJ1dCBkb2VzIG5vdCB0cmlnZ2VyCisgICAg ICAgICMgb24gc3R1ZmYgbGlrZSAiRG9jdW1lbnQ6OkZvbygpOyIuCisgICAgICAgIGVsaWYgbWF0 Y2gocicoZGVmYXVsdHxjYXNlXHMrLiopXHMqOihbXjpdLiopPyQnLCByZW1haW5pbmdfbGluZSk6 CiAgICAgICAgICAgICBpZiBjdXJyZW50X2luZGVudGF0aW9uICE9IHN3aXRjaF9pbmRlbnRhdGlv bjoKICAgICAgICAgICAgICAgICBlcnJvcihmaWxlbmFtZSwgbGluZV9udW1iZXIgKyBsaW5lX29m ZnNldCwgJ3doaXRlc3BhY2UvaW5kZW50JywgNCwKICAgICAgICAgICAgICAgICAgICAgICAnQSBj YXNlIGxhYmVsIHNob3VsZCBub3QgYmUgaW5kZW50ZWQsIGJ1dCBsaW5lIHVwIHdpdGggaXRzIHN3 aXRjaCBzdGF0ZW1lbnQuJykKICAgICAgICAgICAgICAgICAjIERvbid0IHRocm93IGFuIGVycm9y IGZvciBtdWx0aXBsZSBiYWRseSBpbmRlbnRlZCBsYWJlbHMsCiAgICAgICAgICAgICAgICAgIyBv bmUgc2hvdWxkIGJlIGVub3VnaCB0byBmaWd1cmUgb3V0IHRoZSBwcm9ibGVtLgogICAgICAgICAg ICAgICAgIGJyZWFrCi0gICAgICAgIGVsaWYgbm90IG1hdGNoKHInXHcrXHMqOlxzKiQnLCByZW1h aW5pbmdfbGluZSk6Ci0gICAgICAgICAgICAjIEl0J3Mgbm90IGEgZ290byBsYWJlbCAod2hpY2gg d2UgZG9uJ3QgY2FyZSBhYm91dCksIHNvIGNoZWNrIGlmCi0gICAgICAgICAgICAjIGl0J3MgaW5k ZW50ZWQgYXQgbGVhc3QgYXMgZmFyIGFzIHRoZSBzd2l0Y2ggcGx1cyA0IHNwYWNlcy4KLSAgICAg ICAgICAgIGlmIG5vdCBjdXJyZW50X2luZGVudGF0aW9uLnN0YXJ0c3dpdGgoaW5uZXJfaW5kZW50 YXRpb24pOgotICAgICAgICAgICAgICAgIGVycm9yKGZpbGVuYW1lLCBsaW5lX251bWJlciArIGxp bmVfb2Zmc2V0LCAnd2hpdGVzcGFjZS9pbmRlbnQnLCA0LAotICAgICAgICAgICAgICAgICAgICAg ICdOb24tbGFiZWwgY29kZSBpbnNpZGUgc3dpdGNoIHN0YXRlbWVudHMgc2hvdWxkIGJlIGluZGVu dGVkLicpCi0gICAgICAgICAgICAgICAgIyBEb24ndCB0aHJvdyBhbiBlcnJvciBmb3IgbXVsdGlw bGUgYmFkbHkgaW5kZW50ZWQgc3RhdGVtZW50cywKLSAgICAgICAgICAgICAgICAjIG9uZSBzaG91 bGQgYmUgZW5vdWdoIHRvIGZpZ3VyZSBvdXQgdGhlIHByb2JsZW0uCi0gICAgICAgICAgICAgICAg YnJlYWsKKyAgICAgICAgIyBXZSBpZ25vcmUgZ290byBsYWJlbHMgYXQgdGhlIHZlcnkgYmVnaW5u aW5nIG9mIGEgbGluZS4KKyAgICAgICAgZWxpZiBtYXRjaChyJ1x3K1xzKjpccyokJywgcmVtYWlu aW5nX2xpbmUpOgorICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgIyBJdCdzIG5vdCBhIGdv dG8gbGFiZWwsIHNvIGNoZWNrIGlmIGl0J3MgaW5kZW50ZWQgYXQgbGVhc3QgYXMgZmFyIGFzCisg ICAgICAgICMgdGhlIHN3aXRjaCBzdGF0ZW1lbnQgcGx1cyBvbmUgbW9yZSBsZXZlbCBvZiBpbmRl bnRhdGlvbi4KKyAgICAgICAgZWxpZiBub3QgY3VycmVudF9pbmRlbnRhdGlvbi5zdGFydHN3aXRo KGlubmVyX2luZGVudGF0aW9uKToKKyAgICAgICAgICAgIGVycm9yKGZpbGVuYW1lLCBsaW5lX251 bWJlciArIGxpbmVfb2Zmc2V0LCAnd2hpdGVzcGFjZS9pbmRlbnQnLCA0LAorICAgICAgICAgICAg ICAgICAgJ05vbi1sYWJlbCBjb2RlIGluc2lkZSBzd2l0Y2ggc3RhdGVtZW50cyBzaG91bGQgYmUg aW5kZW50ZWQuJykKKyAgICAgICAgICAgICMgRG9uJ3QgdGhyb3cgYW4gZXJyb3IgZm9yIG11bHRp cGxlIGJhZGx5IGluZGVudGVkIHN0YXRlbWVudHMsCisgICAgICAgICAgICAjIG9uZSBzaG91bGQg YmUgZW5vdWdoIHRvIGZpZ3VyZSBvdXQgdGhlIHByb2JsZW0uCisgICAgICAgICAgICBicmVhawog CiAgICAgICAgIGlmIGVuY291bnRlcmVkX25lc3RlZF9zd2l0Y2g6CiAgICAgICAgICAgICBicmVh awpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NwcGxpbnRfdW5pdHRl c3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludF91bml0dGVzdC5weQpp bmRleCA1ODcwNGU2Li40MTc3NDdhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvY3BwbGludF91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVs ZXMvY3BwbGludF91bml0dGVzdC5weQpAQCAtMjgyOCw2ICsyODI4LDEyIEBAIGNsYXNzIFdlYktp dFN0eWxlVGVzdChDcHBsaW50VGVzdEJhc2UpOgogICAgICAgICAgICAgJycpCiAgICAgICAgIHNl bGYuYXNzZXJ0X211bHRpX2xpbmVfbGludCgKICAgICAgICAgICAgICcgICAgc3dpdGNoIChjb25k aXRpb24pIHtcbicKKyAgICAgICAgICAgICcgICAgY2FzZSBmb29Db25kaXRpb246IGJyZWFrO1xu JworICAgICAgICAgICAgJyAgICBkZWZhdWx0OiByZXR1cm47XG4nCisgICAgICAgICAgICAnICAg IH1cbicsCisgICAgICAgICAgICAnJykKKyAgICAgICAgc2VsZi5hc3NlcnRfbXVsdGlfbGluZV9s aW50KAorICAgICAgICAgICAgJyAgICBzd2l0Y2ggKGNvbmRpdGlvbikge1xuJwogICAgICAgICAg ICAgJyAgICAgICAgY2FzZSBmb29Db25kaXRpb246XG4nCiAgICAgICAgICAgICAnICAgICAgICBj YXNlIGJhckNvbmRpdGlvbjpcbicKICAgICAgICAgICAgICcgICAgICAgICAgICBpKys7XG4nCkBA IC0yODM5LDYgKzI4NDUsMTUgQEAgY2xhc3MgV2ViS2l0U3R5bGVUZXN0KENwcGxpbnRUZXN0QmFz ZSk6CiAgICAgICAgICAgICAnICBbd2hpdGVzcGFjZS9pbmRlbnRdIFs0XScpCiAgICAgICAgIHNl bGYuYXNzZXJ0X211bHRpX2xpbmVfbGludCgKICAgICAgICAgICAgICcgICAgc3dpdGNoIChjb25k aXRpb24pIHtcbicKKyAgICAgICAgICAgICcgICAgICAgIGNhc2UgZm9vQ29uZGl0aW9uOlxuJwor ICAgICAgICAgICAgJyAgICAgICAgICAgIGJyZWFrO1xuJworICAgICAgICAgICAgJyAgICBkZWZh dWx0OlxuJworICAgICAgICAgICAgJyAgICAgICAgICAgIGktLTtcbicKKyAgICAgICAgICAgICcg ICAgfVxuJywKKyAgICAgICAgICAgICdBIGNhc2UgbGFiZWwgc2hvdWxkIG5vdCBiZSBpbmRlbnRl ZCwgYnV0IGxpbmUgdXAgd2l0aCBpdHMgc3dpdGNoIHN0YXRlbWVudC4nCisgICAgICAgICAgICAn ICBbd2hpdGVzcGFjZS9pbmRlbnRdIFs0XScpCisgICAgICAgIHNlbGYuYXNzZXJ0X211bHRpX2xp bmVfbGludCgKKyAgICAgICAgICAgICcgICAgc3dpdGNoIChjb25kaXRpb24pIHtcbicKICAgICAg ICAgICAgICcgICAgY2FzZSBmb29Db25kaXRpb246XG4nCiAgICAgICAgICAgICAnICAgIGNhc2Ug YmFyQ29uZGl0aW9uOlxuJwogICAgICAgICAgICAgJyAgICAgICAgc3dpdGNoIChvdGhlckNvbmRp dGlvbikge1xuJwotLSAKMS42LjMuMwoK