diff --git a/clang-tools-extra/clangd/ParsedAST.cpp b/clang-tools-extra/clangd/ParsedAST.cpp --- a/clang-tools-extra/clangd/ParsedAST.cpp +++ b/clang-tools-extra/clangd/ParsedAST.cpp @@ -473,7 +473,7 @@ if (IsInsideMainFile && CTContext->shouldSuppressDiagnostic( DiagLevel, Info, TidySuppressedErrors, /*AllowIO=*/false, - /*EnableNolintBlocks=*/false)) { + /*EnableNolintBlocks=*/true)) { // FIXME: should we expose the suppression error (invalid use of // NOLINT comments)? return DiagnosticsEngine::Ignored; diff --git a/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp b/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp --- a/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp +++ b/clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp @@ -477,9 +477,8 @@ #define BAD2 BAD double h = BAD2; // NOLINT // NOLINTBEGIN - // FIXME: re-enable when NOLINTBEGIN suppresss block is enabled in clangd. - // double x = BAD2; - // double y = BAD2; + double x = BAD2; + double y = BAD2; // NOLINTEND // verify no crashes on unmatched nolints.