Skip to content

[SourceKit] Enable ASTContext caching in other completion-like requests #32572

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 3 commits into from
Jun 30, 2020
Merged

[SourceKit] Enable ASTContext caching in other completion-like requests #32572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbec1eb
[SourceKit] Enable ASTContext caching in other completion-like requests
rintaro Jun 26, 2020
8307c6a
[SourceKit] Report 'key.reusingastcontext' in completion like requests
rintaro Jun 29, 2020
33336df
[SouceKit] Make "ASTContext reusing" optional
rintaro Jun 29, 2020
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
2 changes: 2 additions & 0 deletions include/swift/IDE/ConformingMethodList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class ConformingMethodListConsumer {
public:
virtual ~ConformingMethodListConsumer() {}
virtual void handleResult(const ConformingMethodListResult &result) = 0;
virtual void setReusingASTContext(bool flag) = 0;
};

/// Printing consumer
Expand All @@ -53,6 +54,7 @@ class PrintingConformingMethodListConsumer
PrintingConformingMethodListConsumer(llvm::raw_ostream &OS) : OS(OS) {}

void handleResult(const ConformingMethodListResult &result) override;
void setReusingASTContext(bool flag) override {}
};

/// Create a factory for code completion callbacks.
Expand Down
2 changes: 2 additions & 0 deletions include/swift/IDE/TypeContextInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class TypeContextInfoConsumer {
public:
virtual ~TypeContextInfoConsumer() {}
virtual void handleResults(ArrayRef<TypeContextInfoItem>) = 0;
virtual void setReusingASTContext(bool flag) = 0;
};

/// Printing consumer
Expand All @@ -48,6 +49,7 @@ class PrintingTypeContextInfoConsumer : public TypeContextInfoConsumer {
PrintingTypeContextInfoConsumer(llvm::raw_ostream &OS) : OS(OS) {}

void handleResults(ArrayRef<TypeContextInfoItem>) override;
void setReusingASTContext(bool flag) override {}
};

/// Create a factory for code completion callbacks.
Expand Down
9 changes: 8 additions & 1 deletion test/SourceKit/ConformingMethods/basic.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,12 @@ func testing(obj: C) {
let _ = obj.
}

// RUN: %sourcekitd-test -req=conformingmethods -pos=26:14 %s -req-opts=expectedtypes='$s8MyModule7Target2PD;$s8MyModule7Target1PD' -- -module-name MyModule %s > %t.response
// RUN: %sourcekitd-test -req=conformingmethods -pos=26:14 -repeat-request=2 %s -req-opts=expectedtypes='$s8MyModule7Target2PD;$s8MyModule7Target1PD' -- -module-name MyModule %s > %t.response
// RUN: %diff -u %s.response %t.response
// RUN: %sourcekitd-test -req=conformingmethods -pos=26:14 -repeat-request=2 %s -req-opts=expectedtypes='$s8MyModule7Target2PD;$s8MyModule7Target1PD',reuseastcontext=0 -- -module-name MyModule %s | %FileCheck %s --check-prefix=DISABLED

// DISABLED-NOT: key.reuseastcontext
// DISABLED: key.members: [
// DISABLED-NOT: key.reuseastcontext
// DISABLED: key.members: [
// DISABLED-NOT: key.reuseastcontext
21 changes: 21 additions & 0 deletions test/SourceKit/ConformingMethods/basic.swift.response
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,24 @@
}
]
}
{
key.typename: "C",
key.typeusr: "$s8MyModule1CCD",
key.members: [
{
key.name: "methodForTarget1()",
key.sourcetext: "methodForTarget1()",
key.description: "methodForTarget1()",
key.typename: "ConcreteTarget1",
key.typeusr: "$s8MyModule15ConcreteTarget1VD"
},
{
key.name: "methodForTarget2()",
key.sourcetext: "methodForTarget2()",
key.description: "methodForTarget2()",
key.typename: "ConcreteTarget2",
key.typeusr: "$s8MyModule15ConcreteTarget2VD"
}
],
key.reusingastcontext: 1
}
41 changes: 41 additions & 0 deletions test/SourceKit/Misc/mixed_completion_sequence.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
protocol Target1 {}
protocol Target2 {}
protocol Target3 {}

struct ConcreteTarget1 : Target1 {}
struct ConcreteTarget2 : Target2 {}
struct ConcreteTarget3 : Target3 {}

protocol P {
associatedtype Assoc
func protocolMethod(asc: Assoc) -> Self
}
extension P {
func protocolMethod(asc: Assoc) -> Self { return self }
}
enum MyEnum {
case foo, bar
}

class C : P {
typealias Assoc = String
static func staticMethod() -> Self {}
func instanceMethod(x: MyEnum) -> C {}
func methodForTarget1() -> ConcreteTarget1 {}
func methodForTarget2() -> ConcreteTarget2 {}
}

func testing(obj: C) {
let _ = obj.
}
func testing(obj: C) {
let _ = obj.instanceMethod(x: )
}


// RUN: %sourcekitd-test \
// RUN: -req=complete -pos=29:14 %s -- %s -module-name MyModule == \
// RUN: -req=conformingmethods -pos=29:14 -req-opts=expectedtypes='$s8MyModule7Target2PD;$s8MyModule7Target1PD' %s -- %s -module-name MyModule == \
// RUN: -req=typecontextinfo -pos=32:33 %s -- %s -module-name MyModule == \
// RUN: -req=complete -pos=29:14 %s -- %s -module-name MyModule > %t.response
// RUN: %diff -u %s.response %t.response
215 changes: 215 additions & 0 deletions test/SourceKit/Misc/mixed_completion_sequence.swift.response
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
{
key.results: [
{
key.kind: source.lang.swift.decl.function.operator.infix,
key.name: "!==",
key.sourcetext: " !== <#T##AnyObject?#>",
key.description: "!==",
key.typename: "Bool",
key.context: source.codecompletion.context.othermodule,
key.typerelation: source.codecompletion.typerelation.unknown,
key.num_bytes_to_erase: 0,
key.is_system: 1,
key.modulename: "Swift"
},
{
key.kind: source.lang.swift.decl.function.operator.infix,
key.name: "===",
key.sourcetext: " === <#T##AnyObject?#>",
key.description: "===",
key.typename: "Bool",
key.context: source.codecompletion.context.othermodule,
key.typerelation: source.codecompletion.typerelation.unknown,
key.num_bytes_to_erase: 0,
key.is_system: 1,
key.modulename: "Swift"
},
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "instanceMethod(x:)",
key.sourcetext: ".instanceMethod(x: <#T##MyEnum#>)",
key.description: "instanceMethod(x: MyEnum)",
key.typename: "C",
key.context: source.codecompletion.context.thisclass,
key.typerelation: source.codecompletion.typerelation.unknown,
key.num_bytes_to_erase: 0,
key.associated_usrs: "s:8MyModule1CC14instanceMethod1xAcA0A4EnumO_tF",
key.modulename: "MyModule"
},
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "methodForTarget1()",
key.sourcetext: ".methodForTarget1()",
key.description: "methodForTarget1()",
key.typename: "ConcreteTarget1",
key.context: source.codecompletion.context.thisclass,
key.typerelation: source.codecompletion.typerelation.unknown,
key.num_bytes_to_erase: 0,
key.associated_usrs: "s:8MyModule1CC16methodForTarget1AA08ConcreteE0VyF",
key.modulename: "MyModule"
},
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "methodForTarget2()",
key.sourcetext: ".methodForTarget2()",
key.description: "methodForTarget2()",
key.typename: "ConcreteTarget2",
key.context: source.codecompletion.context.thisclass,
key.typerelation: source.codecompletion.typerelation.unknown,
key.num_bytes_to_erase: 0,
key.associated_usrs: "s:8MyModule1CC16methodForTarget2AA08ConcreteE0VyF",
key.modulename: "MyModule"
},
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "protocolMethod(asc:)",
key.sourcetext: ".protocolMethod(asc: <#T##String#>)",
key.description: "protocolMethod(asc: String)",
key.typename: "C",
key.context: source.codecompletion.context.superclass,
key.typerelation: source.codecompletion.typerelation.unknown,
key.num_bytes_to_erase: 0,
key.associated_usrs: "s:8MyModule1PPAAE14protocolMethod3ascx5AssocQz_tF",
key.modulename: "MyModule"
},
{
key.kind: source.lang.swift.keyword,
key.name: "self",
key.sourcetext: ".self",
key.description: "self",
key.typename: "C",
key.context: source.codecompletion.context.thisclass,
key.typerelation: source.codecompletion.typerelation.unknown,
key.num_bytes_to_erase: 0
}
]
}
{
key.typename: "C",
key.typeusr: "$s8MyModule1CCD",
key.members: [
{
key.name: "methodForTarget1()",
key.sourcetext: "methodForTarget1()",
key.description: "methodForTarget1()",
key.typename: "ConcreteTarget1",
key.typeusr: "$s8MyModule15ConcreteTarget1VD"
},
{
key.name: "methodForTarget2()",
key.sourcetext: "methodForTarget2()",
key.description: "methodForTarget2()",
key.typename: "ConcreteTarget2",
key.typeusr: "$s8MyModule15ConcreteTarget2VD"
}
],
key.reusingastcontext: 1
}
{
key.results: [
{
key.typename: "MyEnum",
key.typeusr: "$s8MyModule0A4EnumOD",
key.implicitmembers: [
{
key.name: "foo",
key.sourcetext: "foo",
key.description: "foo"
},
{
key.name: "bar",
key.sourcetext: "bar",
key.description: "bar"
}
]
}
],
key.reusingastcontext: 1
}
{
key.results: [
{
key.kind: source.lang.swift.decl.function.operator.infix,
key.name: "!==",
key.sourcetext: " !== <#T##AnyObject?#>",
key.description: "!==",
key.typename: "Bool",
key.context: source.codecompletion.context.othermodule,
key.typerelation: source.codecompletion.typerelation.unknown,
key.num_bytes_to_erase: 0,
key.is_system: 1,
key.modulename: "Swift"
},
{
key.kind: source.lang.swift.decl.function.operator.infix,
key.name: "===",
key.sourcetext: " === <#T##AnyObject?#>",
key.description: "===",
key.typename: "Bool",
key.context: source.codecompletion.context.othermodule,
key.typerelation: source.codecompletion.typerelation.unknown,
key.num_bytes_to_erase: 0,
key.is_system: 1,
key.modulename: "Swift"
},
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "instanceMethod(x:)",
key.sourcetext: ".instanceMethod(x: <#T##MyEnum#>)",
key.description: "instanceMethod(x: MyEnum)",
key.typename: "C",
key.context: source.codecompletion.context.thisclass,
key.typerelation: source.codecompletion.typerelation.unknown,
key.num_bytes_to_erase: 0,
key.associated_usrs: "s:8MyModule1CC14instanceMethod1xAcA0A4EnumO_tF",
key.modulename: "MyModule"
},
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "methodForTarget1()",
key.sourcetext: ".methodForTarget1()",
key.description: "methodForTarget1()",
key.typename: "ConcreteTarget1",
key.context: source.codecompletion.context.thisclass,
key.typerelation: source.codecompletion.typerelation.unknown,
key.num_bytes_to_erase: 0,
key.associated_usrs: "s:8MyModule1CC16methodForTarget1AA08ConcreteE0VyF",
key.modulename: "MyModule"
},
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "methodForTarget2()",
key.sourcetext: ".methodForTarget2()",
key.description: "methodForTarget2()",
key.typename: "ConcreteTarget2",
key.context: source.codecompletion.context.thisclass,
key.typerelation: source.codecompletion.typerelation.unknown,
key.num_bytes_to_erase: 0,
key.associated_usrs: "s:8MyModule1CC16methodForTarget2AA08ConcreteE0VyF",
key.modulename: "MyModule"
},
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "protocolMethod(asc:)",
key.sourcetext: ".protocolMethod(asc: <#T##String#>)",
key.description: "protocolMethod(asc: String)",
key.typename: "C",
key.context: source.codecompletion.context.superclass,
key.typerelation: source.codecompletion.typerelation.unknown,
key.num_bytes_to_erase: 0,
key.associated_usrs: "s:8MyModule1PPAAE14protocolMethod3ascx5AssocQz_tF",
key.modulename: "MyModule"
},
{
key.kind: source.lang.swift.keyword,
key.name: "self",
key.sourcetext: ".self",
key.description: "self",
key.typename: "C",
key.context: source.codecompletion.context.thisclass,
key.typerelation: source.codecompletion.typerelation.unknown,
key.num_bytes_to_erase: 0
}
],
key.reusingastcontext: 1
}
9 changes: 8 additions & 1 deletion test/SourceKit/TypeContextInfo/typecontext_basic.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,12 @@ func test(obj: C) {
let _ = obj.foo(x:
}

// RUN: %sourcekitd-test -req=typecontextinfo -pos=25:22 %s -- %s > %t.response
// RUN: %sourcekitd-test -req=typecontextinfo -repeat-request=2 -pos=25:22 %s -- %s > %t.response
// RUN: %diff -u %s.response %t.response
// RUN: %sourcekitd-test -req=typecontextinfo -repeat-request=2 -pos=25:22 %s -req-opts=reuseastcontext=0 -- %s | %FileCheck %s --check-prefix=DISABLED

// DISABLED-NOT: key.reuseastcontext
// DISABLED: key.results: [
// DISABLED-NOT: key.reuseastcontext
// DISABLED: key.results: [
// DISABLED-NOT: key.reuseastcontext
Loading