Skip to content

[CodeCompletion] Avoid suggesting duplicated module names #31892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2020
Merged

[CodeCompletion] Avoid suggesting duplicated module names #31892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions lib/IDE/CodeCompletion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6196,6 +6196,8 @@ void CodeCompletionCallbacksImpl::doneParsing() {
break;
}

llvm::SmallPtrSet<Identifier, 8> seenModuleNames;

for (auto &Request: Lookup.RequestedCachedResults) {
// Use the current SourceFile as the DeclContext so that we can use it to
// perform qualified lookup, and to get the correct visibility for
Expand Down Expand Up @@ -6248,7 +6250,9 @@ void CodeCompletionCallbacksImpl::doneParsing() {
return; // already handled.
RequestedModules.push_back({std::move(K), TheModule,
Request.OnlyTypes, Request.OnlyPrecedenceGroups});
if (Request.IncludeModuleQualifier)

if (Request.IncludeModuleQualifier &&
seenModuleNames.insert(TheModule->getName()).second)
Lookup.addModuleName(TheModule);
}
};
Expand All @@ -6263,8 +6267,10 @@ void CodeCompletionCallbacksImpl::doneParsing() {
Lookup.getToplevelCompletions(Request.OnlyTypes);

// Add the qualifying module name
if (Request.IncludeModuleQualifier)
Lookup.addModuleName(CurDeclContext->getParentModule());
auto curModule = CurDeclContext->getParentModule();
if (Request.IncludeModuleQualifier &&
seenModuleNames.insert(curModule->getName()).second)
Lookup.addModuleName(curModule);

// Add results for all imported modules.
ModuleDecl::ImportFilter ImportFilter;
Expand Down
2 changes: 2 additions & 0 deletions test/IDE/Inputs/mock-sdk/OverlayTest.framework/Headers/OverlayTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#include <OverlayTest/Overlayed.h>

13 changes: 13 additions & 0 deletions test/IDE/Inputs/mock-sdk/OverlayTest.framework/Headers/Overlayed.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

#ifndef OVERLAYED_H
#define OVERLAYED_H

struct __attribute__((swift_name("Overlayed"))) OVOverlayed {
double x, y, z;
};

double OVOverlayedInOriginalFunc(struct OVOverlayed s) __attribute__((swift_name("Overlayed.inOriginalFunc(self:)")));

struct OVOverlayed createOverlayed();

#endif
7 changes: 7 additions & 0 deletions test/IDE/Inputs/mock-sdk/OverlayTest.framework/Modules/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
framework module OverlayTest {
umbrella header "OverlayTest.h"

export *
module * { export * }
}

10 changes: 10 additions & 0 deletions test/IDE/Inputs/mock-sdk/OverlayTest.swiftinterface
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// swift-interface-format-version: 1.0
// swift-module-flags: -module-name OverlayTest

@_exported import OverlayTest

public extension Overlayed {
public func inOverlayFunc() {}
}

public func createOverlayedInOverlay() -> Overlayed
37 changes: 37 additions & 0 deletions test/IDE/complete_overlaymodule.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// RUN: %target-swift-ide-test -code-completion -source-filename %s -I %S/Inputs/mock-sdk -F %S/Inputs/mock-sdk -code-completion-token=TYPE_GLOBAL | %FileCheck %s --check-prefix=TYPE_GLOBAL
// RUN: %target-swift-ide-test -code-completion -source-filename %s -I %S/Inputs/mock-sdk -F %S/Inputs/mock-sdk -code-completion-token=EXPR_GLOBAL | %FileCheck %s --check-prefix=EXPR_GLOBAL
// RUN: %target-swift-ide-test -code-completion -source-filename %s -I %S/Inputs/mock-sdk -F %S/Inputs/mock-sdk -code-completion-token=EXPR_MEMBER | %FileCheck %s --check-prefix=EXPR_MEMBER

import OverlayTest

func testGlobalType() {
let _: #^TYPE_GLOBAL^#
// TYPE_GLOBAL: Begin completions
// TYPE_GLOBAL-NOT: OverlayTest[#Module#]
// TYPE_GLOBAL-DAG: Decl[Module]/None: OverlayTest[#Module#];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the -NOT above and below means this -DAG can't be reordered past them, but its not a problem if swift-ide-test is sorting the results and this is already the right order.

Copy link
Member Author

@rintaro rintaro May 19, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I think you are right. Also, swift-idea-test doesn't sort the results (but is stable). Do you know a better way to check this? Is possible, I want to avoid 2 FileCheck invocations for these checks.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Outputting to a file and running file check for the negative and positive checks separately is all I can think of, sorry 🙁

// TYPE_GLOBAL-NOT: OverlayTest[#Module#]
// TYPE_GLOBAL-DAG: Decl[Struct]/OtherModule[OverlayTest.Overlayed]: Overlayed[#Overlayed#];
// TYPE_GLOBAL: End completions
}
func testGlobalExpr() {
let _ = #^EXPR_GLOBAL^#
// EPXR_GLOBAL: Begin completions
// EXPR_GLOBAL-NOT: OverlayTest[#Module#]
// EXPR_GLOBAL-DAG: Decl[Module]/None: OverlayTest[#Module#];
// EXPR_GLOBAL-NOT: OverlayTest[#Module#]
// EXPR_GLOBAL-DAG: Decl[Struct]/OtherModule[OverlayTest.Overlayed]: Overlayed[#Overlayed#];
// EXPR_GLOBAL-DAG: Decl[FreeFunction]/OtherModule[OverlayTest]: createOverlayedInOverlay()[#Overlayed#];
// EXPR_GLOBAL-DAG: Decl[FreeFunction]/OtherModule[OverlayTest.Overlayed]: createOverlayed()[#Overlayed#];
// EPXR_GLOBAL: End completions
}
func testGlobalExpr(value: Overlayed) {
value.#^EXPR_MEMBER^#
// EXPR_MEMBER: Begin completions, 6 items
// EXPR_MEMBER-DAG: Keyword[self]/CurrNominal: self[#Overlayed#]; name=self
// EXPR_MEMBER-DAG: Decl[InstanceVar]/CurrNominal: x[#Double#]; name=x
// EXPR_MEMBER-DAG: Decl[InstanceVar]/CurrNominal: y[#Double#]; name=y
// EXPR_MEMBER-DAG: Decl[InstanceVar]/CurrNominal: z[#Double#]; name=z
// EXPR_MEMBER-DAG: Decl[InstanceMethod]/CurrNominal: inOverlayFunc()[#Void#]; name=inOverlayFunc()
// EXPR_MEMBER-DAG: Decl[InstanceMethod]/CurrNominal: inOriginalFunc()[#Double#]; name=inOriginalFunc()
// EXPR_MEMBER: End completions
}