Skip to content

[sourcekit] Retain semantic annotations across queries #32628

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 2 commits into from
Jul 1, 2020
Merged

[sourcekit] Retain semantic annotations across queries #32628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a86eacc
[sourcekit] Retain semantic annotations across queries
benlangmuir Jun 30, 2020
223b5ed
[test] use %diff to fix Windows test
benlangmuir Jun 30, 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
10 changes: 10 additions & 0 deletions test/SourceKit/Sema/sema_annotations_saved.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
func foo() {}
foo()

// RUN: %sourcekitd-test -req=open %s -- %s \
// RUN: == -req=edit -offset=0 -replace="" -length=0 %s \
// RUN: == -req=edit -offset=0 -replace="" -length=0 %s \
// RUN: == -req=edit -pos=3:1 -replace="foo()" -length=0 %s \
// RUN: == -req=edit -offset=0 -replace="" -length=0 %s \
// RUN: == -req=edit -offset=0 -replace="" -length=0 %s > %t.response
// RUN: %diff -u %s.response %t.response
66 changes: 66 additions & 0 deletions test/SourceKit/Sema/sema_annotations_saved.swift.response
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
key.annotations: [
{
key.kind: source.lang.swift.ref.function.free,
key.offset: 14,
key.length: 3
}
],
key.diagnostic_stage: source.diagnostic.stage.swift.sema,
key.syntaxmap: [
],
key.substructure: [
]
}
{
key.annotations: [
{
key.kind: source.lang.swift.ref.function.free,
key.offset: 14,
key.length: 3
}
],
key.diagnostic_stage: source.diagnostic.stage.swift.sema,
key.syntaxmap: [
],
key.substructure: [
]
}
{
key.annotations: [
{
key.kind: source.lang.swift.ref.function.free,
key.offset: 14,
key.length: 3
},
{
key.kind: source.lang.swift.ref.function.free,
key.offset: 20,
key.length: 3
}
],
key.diagnostic_stage: source.diagnostic.stage.swift.sema,
key.syntaxmap: [
],
key.substructure: [
]
}
{
key.annotations: [
{
key.kind: source.lang.swift.ref.function.free,
key.offset: 14,
key.length: 3
},
{
key.kind: source.lang.swift.ref.function.free,
key.offset: 20,
key.length: 3
}
],
key.diagnostic_stage: source.diagnostic.stage.swift.sema,
key.syntaxmap: [
],
key.substructure: [
]
}
20 changes: 11 additions & 9 deletions tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ class SwiftDocumentSemanticInfo :
}

private:
std::vector<SwiftSemanticToken> takeSemanticTokens(
std::vector<SwiftSemanticToken> getSemanticTokens(
ImmutableTextSnapshotRef NewSnapshot);

Optional<std::vector<DiagnosticEntryInfo>> getSemanticDiagnostics(
Expand Down Expand Up @@ -760,26 +760,28 @@ void SwiftDocumentSemanticInfo::readSemanticInfo(

llvm::sys::ScopedLock L(Mtx);

Tokens = takeSemanticTokens(NewSnapshot);
Tokens = getSemanticTokens(NewSnapshot);
Diags = getSemanticDiagnostics(NewSnapshot, ParserDiags);
}

std::vector<SwiftSemanticToken>
SwiftDocumentSemanticInfo::takeSemanticTokens(
SwiftDocumentSemanticInfo::getSemanticTokens(
ImmutableTextSnapshotRef NewSnapshot) {

llvm::sys::ScopedLock L(Mtx);

if (SemaToks.empty())
return {};

auto result = SemaToks;

// Adjust the position of the tokens.
TokSnapshot->foreachReplaceUntil(NewSnapshot,
[&](ReplaceImmutableTextUpdateRef Upd) -> bool {
if (SemaToks.empty())
if (result.empty())
return false;

auto ReplaceBegin = std::lower_bound(SemaToks.begin(), SemaToks.end(),
auto ReplaceBegin = std::lower_bound(result.begin(), result.end(),
Upd->getByteOffset(),
[&](const SwiftSemanticToken &Tok, unsigned StartOffset) -> bool {
return Tok.ByteOffset+Tok.Length < StartOffset;
Expand All @@ -789,7 +791,7 @@ SwiftDocumentSemanticInfo::takeSemanticTokens(
if (Upd->getLength() == 0) {
ReplaceEnd = ReplaceBegin;
} else {
ReplaceEnd = std::upper_bound(ReplaceBegin, SemaToks.end(),
ReplaceEnd = std::upper_bound(ReplaceBegin, result.end(),
Upd->getByteOffset() + Upd->getLength(),
[&](unsigned EndOffset, const SwiftSemanticToken &Tok) -> bool {
return EndOffset < Tok.ByteOffset;
Expand All @@ -800,14 +802,14 @@ SwiftDocumentSemanticInfo::takeSemanticTokens(
int Delta = InsertLen - Upd->getLength();
if (Delta != 0) {
for (std::vector<SwiftSemanticToken>::iterator
I = ReplaceEnd, E = SemaToks.end(); I != E; ++I)
I = ReplaceEnd, E = result.end(); I != E; ++I)
I->ByteOffset += Delta;
}
SemaToks.erase(ReplaceBegin, ReplaceEnd);
result.erase(ReplaceBegin, ReplaceEnd);
return true;
});

return std::move(SemaToks);
return result;
}

Optional<std::vector<DiagnosticEntryInfo>>
Expand Down