Skip to content

[6.2] [SourceKit] Fix raw identifier handling for semantic tokens #82950

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
Jul 11, 2025
Merged

[6.2] [SourceKit] Fix raw identifier handling for semantic tokens #82950

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
7 changes: 2 additions & 5 deletions lib/IDE/SourceEntityWalker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,11 +868,8 @@ bool SemaAnnotator::passCallAsFunctionReference(ValueDecl *D, SourceLoc Loc,

bool SemaAnnotator::
passReference(ValueDecl *D, Type Ty, DeclNameLoc Loc, ReferenceMetaData Data) {
SourceManager &SM = D->getASTContext().SourceMgr;
SourceLoc BaseStart = Loc.getBaseNameLoc(), BaseEnd = BaseStart;
if (BaseStart.isValid() && SM.extractText({BaseStart, 1}) == "`")
BaseEnd = Lexer::getLocForEndOfToken(SM, BaseStart.getAdvancedLoc(1));
return passReference(D, Ty, BaseStart, {BaseStart, BaseEnd}, Data);
SourceLoc BaseLoc = Loc.getBaseNameLoc();
return passReference(D, Ty, BaseLoc, BaseLoc, Data);
}

bool SemaAnnotator::
Expand Down
33 changes: 33 additions & 0 deletions test/SourceKit/SemanticTokens/raw_identifiers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// RUN: %empty-directory(%t)
// RUN: split-file %s %t
// RUN: %sourcekitd-test -req=semantic-tokens %t/main.swift -- %t/main.swift > %t/result.json
// RUN: diff -u %t/tokens.json %t/result.json

//--- main.swift
func `foo`(x: Int) {}
`foo`(x: 0)

func `foo bar baz`() {}
`foo bar baz`()

//--- tokens.json
{
key.semantic_tokens: [
{
key.kind: source.lang.swift.ref.struct,
key.offset: 14,
key.length: 3,
key.is_system: 1
},
{
key.kind: source.lang.swift.ref.function.free,
key.offset: 22,
key.length: 5
},
{
key.kind: source.lang.swift.ref.function.free,
key.offset: 59,
key.length: 13
}
]
}