[clangd] Disable typo correction when doing code completion.

Reviewers: ilya-biryukov

Reviewed By: ilya-biryukov

Subscribers: klimek, jkorous-apple, cfe-commits, ioeric

Differential Revision: https://reviews.llvm.org/D42491

llvm-svn: 323410

2 files changed, 11 insertions, 4 deletions

diff --git a/clang-tools-extra/clangd/CodeComplete.cpp b/clang-tools-extra/clangd/CodeComplete.cpp
index d0916aa30fd..f95d77b4966 100644
--- a/clang-tools-extra/clangd/CodeComplete.cpp
+++ b/clang-tools-extra/clangd/CodeComplete.cpp
@@ -379,10 +379,6 @@ std::vector<std::string> getQueryScopes(CodeCompletionContext &CCContext,
   // Qualified completion ("std::vec^"), we have two cases depending on whether
   // the qualifier can be resolved by Sema.
   if ((*SS)->isValid()) { // Resolved qualifier.
-    // FIXME: Disable Sema typo correction during code completion.
-    // The resolved qualifier might not perfectly match the written qualifier.
-    // e.g. "namespace clang { clangd::^ }", we will get "clang" declaration
-    // for completion "clangd::".
     return GetAllAccessibleScopes(CCContext).scopesForIndexQuery();
   }
 
@@ -678,6 +674,9 @@ bool semaCodeComplete(const Context &Ctx,
   auto &DiagOpts = Clang->getDiagnosticOpts();
   DiagOpts.IgnoreWarnings = true;
 
+  // Disable typo correction in Sema.
+  Clang->getLangOpts().SpellChecking = false;
+
   auto &FrontendOpts = Clang->getFrontendOpts();
   FrontendOpts.SkipFunctionBodies = true;
   FrontendOpts.CodeCompleteOpts = Options;
diff --git a/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp b/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp
index 7c166cc197b..f80bbc64097 100644
--- a/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp
+++ b/clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp
@@ -621,6 +621,14 @@ TEST(CompletionTest, DynamicIndexMultiFile) {
                                             Doc("Doooc"), Detail("void"))));
 }
 
+TEST(CodeCompleteTest, DisableTypoCorrection) {
+  auto Results = completions(R"cpp(
+     namespace clang { int v; }
+     void f() { clangd::^
+  )cpp");
+  EXPECT_TRUE(Results.items.empty());
+}
+
 SignatureHelp signatures(StringRef Text) {
   MockFSProvider FS;
   MockCompilationDatabase CDB;