dgoldman created this revision.
dgoldman added a reviewer: kadircet.
Herald added a subscriber: arphaman.
Herald added a project: All.
dgoldman requested review of this revision.
Herald added subscribers: cfe-commits, MaskRay, ilya-biryukov.
Herald added a project: clang-tools-extra.
This will be disabled by default, hopefully we can enable for the next
major release.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D139446
Files:
clang-tools-extra/clangd/CodeComplete.h
clang-tools-extra/clangd/tool/ClangdMain.cpp
Index: clang-tools-extra/clangd/tool/ClangdMain.cpp
===================================================================
--- clang-tools-extra/clangd/tool/ClangdMain.cpp
+++ clang-tools-extra/clangd/tool/ClangdMain.cpp
@@ -264,6 +264,14 @@
"Never insert #include directives as part of code completion")),
};
+opt<bool> ImportInsertions{
+ "import-insertions",
+ cat(Features),
+ desc("If header insertion is enabled, add #import directives when "
+ "accepting code completions in Objective-C code"),
+ init(false),
+};
+
opt<bool> IncludeCleanerStdlib{
"include-cleaner-stdlib",
cat(Features),
@@ -906,6 +914,7 @@
Opts.CodeComplete.BundleOverloads = CompletionStyle != Detailed;
Opts.CodeComplete.ShowOrigins = ShowOrigins;
Opts.CodeComplete.InsertIncludes = HeaderInsertion;
+ Opts.CodeComplete.ImportInsertions = ImportInsertions;
if (!HeaderInsertionDecorators) {
Opts.CodeComplete.IncludeIndicator.Insert.clear();
Opts.CodeComplete.IncludeIndicator.NoInsert.clear();
Index: clang-tools-extra/clangd/CodeComplete.h
===================================================================
--- clang-tools-extra/clangd/CodeComplete.h
+++ clang-tools-extra/clangd/CodeComplete.h
@@ -70,6 +70,10 @@
NeverInsert,
} InsertIncludes = IncludeInsertion::IWYU;
+ /// Whether include insertions for Objective-C code should use #import
instead
+ /// of #include.
+ bool ImportInsertions = false;
+
/// A visual indicator to prepend to the completion label to indicate whether
/// completion result would trigger an #include insertion or not.
struct IncludeInsertionIndicator {
Index: clang-tools-extra/clangd/tool/ClangdMain.cpp
===================================================================
--- clang-tools-extra/clangd/tool/ClangdMain.cpp
+++ clang-tools-extra/clangd/tool/ClangdMain.cpp
@@ -264,6 +264,14 @@
"Never insert #include directives as part of code completion")),
};
+opt<bool> ImportInsertions{
+ "import-insertions",
+ cat(Features),
+ desc("If header insertion is enabled, add #import directives when "
+ "accepting code completions in Objective-C code"),
+ init(false),
+};
+
opt<bool> IncludeCleanerStdlib{
"include-cleaner-stdlib",
cat(Features),
@@ -906,6 +914,7 @@
Opts.CodeComplete.BundleOverloads = CompletionStyle != Detailed;
Opts.CodeComplete.ShowOrigins = ShowOrigins;
Opts.CodeComplete.InsertIncludes = HeaderInsertion;
+ Opts.CodeComplete.ImportInsertions = ImportInsertions;
if (!HeaderInsertionDecorators) {
Opts.CodeComplete.IncludeIndicator.Insert.clear();
Opts.CodeComplete.IncludeIndicator.NoInsert.clear();
Index: clang-tools-extra/clangd/CodeComplete.h
===================================================================
--- clang-tools-extra/clangd/CodeComplete.h
+++ clang-tools-extra/clangd/CodeComplete.h
@@ -70,6 +70,10 @@
NeverInsert,
} InsertIncludes = IncludeInsertion::IWYU;
+ /// Whether include insertions for Objective-C code should use #import instead
+ /// of #include.
+ bool ImportInsertions = false;
+
/// A visual indicator to prepend to the completion label to indicate whether
/// completion result would trigger an #include insertion or not.
struct IncludeInsertionIndicator {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
