hokein created this revision.
hokein added a reviewer: kadircet.
Herald added subscribers: usaxena95, arphaman.
hokein requested review of this revision.
Herald added subscribers: MaskRay, ilya-biryukov.
Herald added a project: clang.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D95365
Files:
clang-tools-extra/clangd/IncludeFixer.cpp
clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
Index: clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
+++ clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
@@ -855,11 +855,13 @@
::$global[[Global]] glob;
}
+using Type = ns::$template[[Foo]]<int>;
)cpp");
auto TU = TestTU::withCode(Test.code());
auto Index = buildIndexWithSymbol(
{SymbolWithHeader{"ns::X", "unittest:///x.h", "\"x.h\""},
- SymbolWithHeader{"Global", "unittest:///global.h", "\"global.h\""}});
+ SymbolWithHeader{"Global", "unittest:///global.h", "\"global.h\""},
+ SymbolWithHeader{"ns::Foo", "unittest:///foo.h", "\"foo.h\""}});
TU.ExternalIndex = Index.get();
EXPECT_THAT(
@@ -884,7 +886,12 @@
"no type named 'Global' in the global namespace"),
DiagName("typename_nested_not_found"),
WithFix(Fix(Test.range("insert"), "#include \"global.h\"\n",
- "Add include \"global.h\" for symbol Global")))));
+ "Add include \"global.h\" for symbol Global"))),
+ AllOf(Diag(Test.range("template"),
+ "no template named 'Foo' in namespace 'ns'"),
+ DiagName("no_member_template"),
+ WithFix(Fix(Test.range("insert"), "#include \"foo.h\"\n",
+ "Add include \"foo.h\" for symbol ns::Foo")))));
}
TEST(IncludeFixerTest, MultipleMatchedSymbols) {
Index: clang-tools-extra/clangd/IncludeFixer.cpp
===================================================================
--- clang-tools-extra/clangd/IncludeFixer.cpp
+++ clang-tools-extra/clangd/IncludeFixer.cpp
@@ -100,6 +100,8 @@
case diag::err_undeclared_var_use_suggest:
case diag::err_no_member: // Could be no member in namespace.
case diag::err_no_member_suggest:
+ case diag::err_no_member_template:
+ case diag::err_no_member_template_suggest:
if (LastUnresolvedName) {
// Try to fix unresolved name caused by missing declaration.
// E.g.
Index: clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
+++ clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
@@ -855,11 +855,13 @@
::$global[[Global]] glob;
}
+using Type = ns::$template[[Foo]]<int>;
)cpp");
auto TU = TestTU::withCode(Test.code());
auto Index = buildIndexWithSymbol(
{SymbolWithHeader{"ns::X", "unittest:///x.h", "\"x.h\""},
- SymbolWithHeader{"Global", "unittest:///global.h", "\"global.h\""}});
+ SymbolWithHeader{"Global", "unittest:///global.h", "\"global.h\""},
+ SymbolWithHeader{"ns::Foo", "unittest:///foo.h", "\"foo.h\""}});
TU.ExternalIndex = Index.get();
EXPECT_THAT(
@@ -884,7 +886,12 @@
"no type named 'Global' in the global namespace"),
DiagName("typename_nested_not_found"),
WithFix(Fix(Test.range("insert"), "#include \"global.h\"\n",
- "Add include \"global.h\" for symbol Global")))));
+ "Add include \"global.h\" for symbol Global"))),
+ AllOf(Diag(Test.range("template"),
+ "no template named 'Foo' in namespace 'ns'"),
+ DiagName("no_member_template"),
+ WithFix(Fix(Test.range("insert"), "#include \"foo.h\"\n",
+ "Add include \"foo.h\" for symbol ns::Foo")))));
}
TEST(IncludeFixerTest, MultipleMatchedSymbols) {
Index: clang-tools-extra/clangd/IncludeFixer.cpp
===================================================================
--- clang-tools-extra/clangd/IncludeFixer.cpp
+++ clang-tools-extra/clangd/IncludeFixer.cpp
@@ -100,6 +100,8 @@
case diag::err_undeclared_var_use_suggest:
case diag::err_no_member: // Could be no member in namespace.
case diag::err_no_member_suggest:
+ case diag::err_no_member_template:
+ case diag::err_no_member_template_suggest:
if (LastUnresolvedName) {
// Try to fix unresolved name caused by missing declaration.
// E.g.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
