Author: d0k Date: Tue Feb 14 06:47:56 2017 New Revision: 295049 URL: http://llvm.org/viewvc/llvm-project?rev=295049&view=rev Log: [clang-tidy] Add support for NOLINTNEXTLINE.
Reviewers: alexfh Subscribers: JDevlieghere, cfe-commits Differential Revision: https://reviews.llvm.org/D29899 Added: clang-tools-extra/trunk/test/clang-tidy/nolintnextline.cpp Modified: clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.cpp Modified: clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.cpp?rev=295049&r1=295048&r2=295049&view=diff ============================================================================== --- clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.cpp (original) +++ clang-tools-extra/trunk/clang-tidy/ClangTidyDiagnosticConsumer.cpp Tue Feb 14 06:47:56 2017 @@ -272,6 +272,7 @@ static bool LineIsMarkedWithNOLINT(Sourc if (Invalid) return false; + // Check if there's a NOLINT on this line. const char *P = CharacterData; while (*P != '\0' && *P != '\r' && *P != '\n') ++P; @@ -279,6 +280,34 @@ static bool LineIsMarkedWithNOLINT(Sourc // FIXME: Handle /\bNOLINT\b(\([^)]*\))?/ as cpplint.py does. if (RestOfLine.find("NOLINT") != StringRef::npos) return true; + + // Check if there's a NOLINTNEXTLINE on the previous line. + const char *BufBegin = + SM.getCharacterData(SM.getLocForStartOfFile(SM.getFileID(Loc)), &Invalid); + if (Invalid || P == BufBegin) + return false; + + // Scan backwards over the current line. + P = CharacterData; + while (P != BufBegin && *P != '\n') + --P; + + // If we reached the begin of the file there is no line before it. + if (P == BufBegin) + return false; + + // Skip over the newline. + --P; + const char *LineEnd = P; + + // Now we're on the previous line. Skip to the beginning of it. + while (P != BufBegin && *P != '\n') + --P; + + RestOfLine = StringRef(P, LineEnd - P + 1); + if (RestOfLine.find("NOLINTNEXTLINE") != StringRef::npos) + return true; + return false; } Added: clang-tools-extra/trunk/test/clang-tidy/nolintnextline.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/nolintnextline.cpp?rev=295049&view=auto ============================================================================== --- clang-tools-extra/trunk/test/clang-tidy/nolintnextline.cpp (added) +++ clang-tools-extra/trunk/test/clang-tidy/nolintnextline.cpp Tue Feb 14 06:47:56 2017 @@ -0,0 +1,33 @@ +class A { A(int i); }; +// CHECK-MESSAGES: :[[@LINE-1]]:11: warning: single-argument constructors must be marked explicit + +// NOLINTNEXTLINE +class B { B(int i); }; + +// NOLINTNEXTLINE(we-dont-care-about-categories-yet) +class C { C(int i); }; + + +// NOLINTNEXTLINE + +class D { D(int i); }; +// CHECK-MESSAGES: :[[@LINE-1]]:11: warning: single-argument constructors must be marked explicit + +// NOLINTNEXTLINE +// +class E { E(int i); }; +// CHECK-MESSAGES: :[[@LINE-1]]:11: warning: single-argument constructors must be marked explicit + +#define MACRO(X) class X { X(int i); }; +MACRO(F) +// CHECK-MESSAGES: :[[@LINE-1]]:7: warning: single-argument constructors must be marked explicit +// NOLINTNEXTLINE +MACRO(G) + +#define MACRO_NOARG class H { H(int i); }; +// NOLINTNEXTLINE +MACRO_NOARG + +// CHECK-MESSAGES: Suppressed 4 warnings (4 NOLINT) + +// RUN: %check_clang_tidy %s google-explicit-constructor %t -- _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
