Bug 155273 – check-webkit-style: fix false-positive warnings about @try/@catch blocks in Objective-C++ source files

• Component: Tools / Tests
• Status: RESOLVED FIXED

[David Kilzer (:ddkilzer)]

The check-webkit-style script emits false-positive warnings about @try/@catch blocks in Objective-C++ source files.

See Bug 155258 Comment #3.
<https://bugs.webkit.org/show_bug.cgi?id=155258#c3>

[David Kilzer (:ddkilzer)]

Created attachment 273497 [details]
Patch

[David Kilzer (:ddkilzer)]

Comment on attachment 273497 [details]
Patch

Oops, I see a problem with one of the regexes.

[David Kilzer (:ddkilzer)]

Created attachment 273500 [details]
Patch v2

[WebKit Commit Bot]

Comment on attachment 273500 [details]
Patch v2

Clearing flags on attachment: 273500

Committed r197912: <http://trac.webkit.org/changeset/197912>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[David Kilzer (:ddkilzer)]

Comment on attachment 273500 [details]
Patch v2

View in context: https://bugs.webkit.org/attachment.cgi?id=273500&action=review

> Tools/Scripts/webkitpy/style/checkers/cpp.py:2429
> -          and not search(r'\b(if|for|while|switch|NS_ENUM)\b', line)
> +          and not search(r'(\b(if|for|while|switch|NS_ENUM)|} @catch)\b', line)

For posterity r'(\b(if|for|while|switch|NS_ENUM|@catch)\b' doesn't work because the pattern '\b@catch\b' doesn't match '} @catch (NSException *exception){\n', presumably since '@' is not considered the start of a word.