[CodeCompletion] For submodules, also use ASTContext to collect their visibility.

Author: nkcsgexi

include/swift/ClangImporter/ClangImporter.h

@@ -255,12 +255,11 @@ class ClangImporter final : public ClangModuleLoader {
   /// Dump Swift lookup tables.
   void dumpSwiftLookupTables();
 
-  /// Given the path of a Clang module, collect the names of all its submodules
-  /// and their corresponding visibility. Calling this function does not load the
-  /// module.
-  void collectSubModuleNamesAndVisibility(
+  /// Given the path of a Clang module, collect the names of all its submodules.
+  /// Calling this function does not load the module.
+  void collectSubModuleNames(
       ArrayRef<std::pair<Identifier, SourceLoc>> path,
-      std::vector<std::pair<std::string, bool>> &namesVisiblePairs);
+      std::vector<std::string> &names);
 
   /// Given a Clang module, decide whether this module is imported already.
   static bool isModuleImported(const clang::Module *M);

include/swift/Parse/CodeCompletionCallbacks.h

@@ -176,7 +176,7 @@ class CodeCompletionCallbacks {
   virtual void completePoundAvailablePlatform() = 0;
 
   /// Complete the import decl with importable modules.
-  virtual void completeImportDecl(ArrayRef<std::pair<Identifier, SourceLoc>> Path) = 0;
+  virtual void completeImportDecl(std::vector<std::pair<Identifier, SourceLoc>> &Path) = 0;
 
   /// Complete unresolved members after dot.
   virtual void completeUnresolvedMember(UnresolvedMemberExpr *E,

lib/ClangImporter/ClangImporter.cpp

@@ -943,9 +943,9 @@ std::string ClangImporter::getBridgingHeaderContents(StringRef headerPath,
   return result;
 }
 
-void ClangImporter::collectSubModuleNamesAndVisibility(
+void ClangImporter::collectSubModuleNames(
     ArrayRef<std::pair<Identifier, SourceLoc>> path,
-    std::vector<std::pair<std::string, bool>> &namesVisiblePairs) {
+    std::vector<std::string> &names) {
   auto &clangHeaderSearch = Impl.getClangPreprocessor().getHeaderSearchInfo();
 
   // Look up the top-level module first.
@@ -962,9 +962,7 @@ void ClangImporter::collectSubModuleNamesAndVisibility(
   auto submoduleNameLength = submodule->getFullModuleName().length();
   for (auto sub : submodule->submodules()) {
     StringRef full = sub->getFullModuleName();
-    namesVisiblePairs.push_back(
-      std::make_pair(full.substr(submoduleNameLength + 1).str(),
-      isModuleImported(sub)));
+    names.push_back(full.substr(submoduleNameLength + 1).str());
   }
 }
 

lib/IDE/CodeCompletion.cpp

@@ -1233,7 +1233,7 @@ class CodeCompletionCallbacksImpl : public CodeCompletionCallbacks {
       SmallVectorImpl<StringRef> &Keywords) override;
 
   void completePoundAvailablePlatform() override;
-  void completeImportDecl(ArrayRef<std::pair<Identifier, SourceLoc>> Path) override;
+  void completeImportDecl(std::vector<std::pair<Identifier, SourceLoc>> &Path) override;
   void completeUnresolvedMember(UnresolvedMemberExpr *E,
                                 ArrayRef<StringRef> Identifiers,
                                 bool HasReturn) override;
@@ -4010,15 +4010,23 @@ void CodeCompletionCallbacksImpl::completeCaseStmtDotPrefix() {
 }
 
 void CodeCompletionCallbacksImpl::completeImportDecl(
-    ArrayRef<std::pair<Identifier, SourceLoc>> Path) {
+    std::vector<std::pair<Identifier, SourceLoc>> &Path) {
   Kind = CompletionKind::Import;
   CurDeclContext = P.CurDeclContext;
   DotLoc = Path.empty() ? SourceLoc() : Path.back().second;
   if (DotLoc.isInvalid())
     return;
   auto Importer = static_cast<ClangImporter *>(CurDeclContext->getASTContext().
                                                getClangModuleLoader());
-  Importer->collectSubModuleNamesAndVisibility(Path, SubModuleNameVisibilityPairs);
+  std::vector<std::string> SubNames;
+  Importer->collectSubModuleNames(Path, SubNames);
+  ASTContext &Ctx = CurDeclContext->getASTContext();
+  for (StringRef Sub : SubNames) {
+    Path.push_back(std::make_pair(Ctx.getIdentifier(Sub), SourceLoc()));
+    SubModuleNameVisibilityPairs.push_back(
+      std::make_pair(Sub.str(), Ctx.getLoadedModule(Path)));
+    Path.pop_back();
+  }
 }
 
 void CodeCompletionCallbacksImpl::completeUnresolvedMember(UnresolvedMemberExpr *E,

lib/Parse/ParseDecl.cpp

@@ -2258,7 +2258,7 @@ ParserResult<ImportDecl> Parser::parseDeclImport(ParseDeclOptions Flags,
     KindLoc = consumeToken();
   }
 
-  SmallVector<std::pair<Identifier, SourceLoc>, 8> ImportPath;
+  std::vector<std::pair<Identifier, SourceLoc>> ImportPath;
   do {
     if (Tok.is(tok::code_complete)) {
       consumeToken();

test/IDE/complete_import.swift

@@ -5,6 +5,7 @@
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT5 | FileCheck %s -check-prefix=CLANG_IMPORT5
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT6 | FileCheck %s -check-prefix=CLANG_IMPORT6
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT7 | FileCheck %s -check-prefix=CLANG_IMPORT7
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -code-completion-token=CLANG_IMPORT8 | FileCheck %s -check-prefix=CLANG_IMPORT8
 
 // REQUIRES: objc_interop
 
@@ -29,7 +30,15 @@ import #^CLANG_IMPORT2^#
 import Foo.#^CLANG_IMPORT3^#
 
 // CLANG_IMPORT3: Begin completions
-// CLANG_IMPORT3-NEXT: Decl[Module]/OtherModule[FooSub]/NotRecommended:   FooSub[#Module#]; name=FooSub
+// CLANG_IMPORT3-NEXT: Decl[Module]/OtherModule[FooSub]:   FooSub[#Module#]; name=FooSub
+
+import Foo.FooSub
+
+import Foo.#^CLANG_IMPORT8^#
+
+// FIXME: This should be marked as not recommended, holding for Swift's submodules support.
+// CLANG_IMPORT8: Begin completions
+// CLANG_IMPORT8-NEXT: Decl[Module]/OtherModule[FooSub]:   FooSub[#Module#]; name=FooSub
 
 import Foo#^CLANG_IMPORT4^#
 // CLANG_IMPORT4-NOT: Begin completions