From b7e2ef6de289468b1e767fdbb10ecd92ba06f895 Mon Sep 17 00:00:00 2001 From: Piotr Semenov Date: Fri, 20 May 2016 18:39:34 +0300 Subject: [PATCH] [FIX] Bug: NOLINT, NOLINTNEXTLINE has no effect for "};". --- cpplint/cpplint.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cpplint/cpplint.py b/cpplint/cpplint.py index 94913206f..079f61d57 100755 --- a/cpplint/cpplint.py +++ b/cpplint/cpplint.py @@ -3884,6 +3884,14 @@ def CheckTrailingSemicolon(filename, clean_lines, linenum, error): # outputting warnings for the matching closing brace, if there are # nested blocks with trailing semicolons, we will get the error # messages in reversed order. + + # We need to check the line forward for NOLINT + raw_lines = clean_lines.raw_lines + ParseNolintSuppressions(filename, raw_lines[endlinenum-1], endlinenum-1, + error) + ParseNolintSuppressions(filename, raw_lines[endlinenum], endlinenum, + error) + error(filename, endlinenum, 'readability/braces', 4, "You don't need a ; after a }")