hokein updated this revision to Diff 296961.
hokein added a comment.
Fix the test.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D89036/new/
https://reviews.llvm.org/D89036
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
@@ -705,11 +705,18 @@
$nested[[X::]]Nested n;
}
class Y : $base[[public ns::X]] {};
-int main() {
- ns::X *x;
+void test(ns::X *x, ns::X& ref_x) {
x$access[[->]]f();
auto& $type[[[]]a] = *x;
+
+ ns::X $incomplete[[var]];
+ $tag[[ref_x]]->f();
+ $use[[ns::X()]];
+ $sizeof[[sizeof]](ns::X);
+ for (auto it : $for[[ref_x]]);
}
+
+ns::X $return[[func]]() {}
)cpp");
auto TU = TestTU::withCode(Test.code());
TU.ExtraArgs.push_back("-std=c++17");
@@ -739,7 +746,37 @@
"incomplete type 'ns::X' where a complete type is
required"),
DiagName("incomplete_type"),
WithFix(Fix(Test.range("insert"), "#include \"x.h\"\n",
- "Add include \"x.h\" for symbol ns::X")))));
+ "Add include \"x.h\" for symbol ns::X"))),
+ AllOf(Diag(Test.range("incomplete"),
+ "variable has incomplete type 'ns::X'"),
+ DiagName("typecheck_decl_incomplete_type"),
+ WithFix(Fix(Test.range("insert"), "#include \"x.h\"\n",
+ "Add include \"x.h\" for symbol ns::X"))),
+ AllOf(
+ Diag(Test.range("tag"), "incomplete definition of type 'ns::X'"),
+ DiagName("typecheck_incomplete_tag"),
+ WithFix(Fix(Test.range("insert"), "#include \"x.h\"\n",
+ "Add include \"x.h\" for symbol ns::X"))),
+ AllOf(
+ Diag(Test.range("use"), "invalid use of incomplete type
'ns::X'"),
+ DiagName("invalid_incomplete_type_use"),
+ WithFix(Fix(Test.range("insert"), "#include \"x.h\"\n",
+ "Add include \"x.h\" for symbol ns::X"))),
+ AllOf(Diag(Test.range("sizeof"), "invalid application of 'sizeof' to
"
+ "an incomplete type 'ns::X'"),
+ DiagName("sizeof_alignof_incomplete_or_sizeless_type"),
+ WithFix(Fix(Test.range("insert"), "#include \"x.h\"\n",
+ "Add include \"x.h\" for symbol ns::X"))),
+ AllOf(Diag(Test.range("for"),
+ "cannot use incomplete type 'ns::X' as a range"),
+ DiagName("for_range_incomplete_type"),
+ WithFix(Fix(Test.range("insert"), "#include \"x.h\"\n",
+ "Add include \"x.h\" for symbol ns::X"))),
+ AllOf(Diag(Test.range("return"),
+ "incomplete result type 'ns::X' in function definition"),
+ DiagName("func_def_incomplete_result"),
+ WithFix(Fix(Test.range("insert"), "#include \"x.h\"\n",
+ "Add include \"x.h\" for symbol ns::X")))));
}
TEST(IncludeFixerTest, NoSuggestIncludeWhenNoDefinitionInHeader) {
Index: clang-tools-extra/clangd/IncludeFixer.cpp
===================================================================
--- clang-tools-extra/clangd/IncludeFixer.cpp
+++ clang-tools-extra/clangd/IncludeFixer.cpp
@@ -72,6 +72,12 @@
case diag::err_incomplete_base_class:
case diag::err_incomplete_member_access:
case diag::err_incomplete_type:
+ case diag::err_typecheck_decl_incomplete_type:
+ case diag::err_typecheck_incomplete_tag:
+ case diag::err_invalid_incomplete_type_use:
+ case diag::err_sizeof_alignof_incomplete_or_sizeless_type:
+ case diag::err_for_range_incomplete_type:
+ case diag::err_func_def_incomplete_result:
// Incomplete type diagnostics should have a QualType argument for the
// incomplete type.
for (unsigned Idx = 0; Idx < Info.getNumArgs(); ++Idx) {
Index: clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
+++ clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp
@@ -705,11 +705,18 @@
$nested[[X::]]Nested n;
}
class Y : $base[[public ns::X]] {};
-int main() {
- ns::X *x;
+void test(ns::X *x, ns::X& ref_x) {
x$access[[->]]f();
auto& $type[[[]]a] = *x;
+
+ ns::X $incomplete[[var]];
+ $tag[[ref_x]]->f();
+ $use[[ns::X()]];
+ $sizeof[[sizeof]](ns::X);
+ for (auto it : $for[[ref_x]]);
}
+
+ns::X $return[[func]]() {}
)cpp");
auto TU = TestTU::withCode(Test.code());
TU.ExtraArgs.push_back("-std=c++17");
@@ -739,7 +746,37 @@
"incomplete type 'ns::X' where a complete type is required"),
DiagName("incomplete_type"),
WithFix(Fix(Test.range("insert"), "#include \"x.h\"\n",
- "Add include \"x.h\" for symbol ns::X")))));
+ "Add include \"x.h\" for symbol ns::X"))),
+ AllOf(Diag(Test.range("incomplete"),
+ "variable has incomplete type 'ns::X'"),
+ DiagName("typecheck_decl_incomplete_type"),
+ WithFix(Fix(Test.range("insert"), "#include \"x.h\"\n",
+ "Add include \"x.h\" for symbol ns::X"))),
+ AllOf(
+ Diag(Test.range("tag"), "incomplete definition of type 'ns::X'"),
+ DiagName("typecheck_incomplete_tag"),
+ WithFix(Fix(Test.range("insert"), "#include \"x.h\"\n",
+ "Add include \"x.h\" for symbol ns::X"))),
+ AllOf(
+ Diag(Test.range("use"), "invalid use of incomplete type 'ns::X'"),
+ DiagName("invalid_incomplete_type_use"),
+ WithFix(Fix(Test.range("insert"), "#include \"x.h\"\n",
+ "Add include \"x.h\" for symbol ns::X"))),
+ AllOf(Diag(Test.range("sizeof"), "invalid application of 'sizeof' to "
+ "an incomplete type 'ns::X'"),
+ DiagName("sizeof_alignof_incomplete_or_sizeless_type"),
+ WithFix(Fix(Test.range("insert"), "#include \"x.h\"\n",
+ "Add include \"x.h\" for symbol ns::X"))),
+ AllOf(Diag(Test.range("for"),
+ "cannot use incomplete type 'ns::X' as a range"),
+ DiagName("for_range_incomplete_type"),
+ WithFix(Fix(Test.range("insert"), "#include \"x.h\"\n",
+ "Add include \"x.h\" for symbol ns::X"))),
+ AllOf(Diag(Test.range("return"),
+ "incomplete result type 'ns::X' in function definition"),
+ DiagName("func_def_incomplete_result"),
+ WithFix(Fix(Test.range("insert"), "#include \"x.h\"\n",
+ "Add include \"x.h\" for symbol ns::X")))));
}
TEST(IncludeFixerTest, NoSuggestIncludeWhenNoDefinitionInHeader) {
Index: clang-tools-extra/clangd/IncludeFixer.cpp
===================================================================
--- clang-tools-extra/clangd/IncludeFixer.cpp
+++ clang-tools-extra/clangd/IncludeFixer.cpp
@@ -72,6 +72,12 @@
case diag::err_incomplete_base_class:
case diag::err_incomplete_member_access:
case diag::err_incomplete_type:
+ case diag::err_typecheck_decl_incomplete_type:
+ case diag::err_typecheck_incomplete_tag:
+ case diag::err_invalid_incomplete_type_use:
+ case diag::err_sizeof_alignof_incomplete_or_sizeless_type:
+ case diag::err_for_range_incomplete_type:
+ case diag::err_func_def_incomplete_result:
// Incomplete type diagnostics should have a QualType argument for the
// incomplete type.
for (unsigned Idx = 0; Idx < Info.getNumArgs(); ++Idx) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
