Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-01-28 20:41:07 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[clangd] Better handling \n in the synthesized diagnostic message.

Browse Source 
The newline-eof fix was rendered as "insert '...'", this patch
special-case it.

Reviewed By: sammccall

Differential Revision: https://reviews.llvm.org/D117294
This commit is contained in:
Haojian Wu 2022-01-17 09:17:55 +01:00
parent 00b77d917c
commit 64c108c9e4
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang-tools-extra/clangd/Diagnostics.cpp
View File

@ -631,7 +631,10 @@ void StoreDiags::EndSourceFile() {
/// the result is not too large and does not contain newlines.
static void writeCodeToFixMessage(llvm::raw_ostream &OS, llvm::StringRef Code) {
constexpr unsigned MaxLen = 50;
if (Code == "\n") {
OS << "\\n";
return;
}
// Only show the first line if there are many.
llvm::StringRef R = Code.split('\n').first;
// Shorten the message if it's too long.

9
clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
View File

@ -623,6 +623,15 @@ n]] = 10; // error-ok
Fix(Source.range(), "ident", "change 'ide\\…' to 'ident'"))));
}
TEST(DiagnosticTest, NewLineFixMessage) {
Annotations Source("int a;[[]]");
TestTU TU = TestTU::withCode(Source.code());
TU.ExtraArgs = {"-Wnewline-eof"};
EXPECT_THAT(
*TU.build().getDiagnostics(),
ElementsAre(WithFix((Fix(Source.range(), "\n", "insert '\\n'")))));
}
TEST(DiagnosticTest, ClangTidySuppressionCommentTrumpsWarningAsError) {
Annotations Main(R"cpp(
int main() {