Skip to content

[clangd] Fix bordering tokens wrong order #153179

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

Closed
timon-ul wants to merge 3 commits into from
Closed

[clangd] Fix bordering tokens wrong order #153179

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
d2c2ef6
[clangd] Fix bordering tokens wrong order
timon-ul Aug 12, 2025
340075a
Fixed formatting error
timon-ul Aug 12, 2025
97d6006
Merge branch 'main' into bordering-tokens-fix
timon-ul Aug 12, 2025
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: 8 additions & 2 deletions clang-tools-extra/clangd/Selection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,14 +1042,20 @@ pointBounds(unsigned Offset, const syntax::TokenBuffer &Tokens) {
const auto &SM = Tokens.sourceManager();
SourceLocation Loc = SM.getComposedLoc(SM.getMainFileID(), Offset);
llvm::SmallVector<std::pair<unsigned, unsigned>, 2> Result;
// Prefer right token over left.
llvm::SmallVector<std::pair<unsigned, unsigned>, 2> ResultLowPrio;
// Prefer right token over left, also non comma over comma.
for (const syntax::Token &Tok :
llvm::reverse(spelledTokensTouching(Loc, Tokens))) {
if (shouldIgnore(Tok))
continue;
unsigned Offset = Tokens.sourceManager().getFileOffset(Tok.location());
Result.emplace_back(Offset, Offset + Tok.length());
if (Tok.kind() == tok::comma) {
ResultLowPrio.emplace_back(Offset, Offset + Tok.length());
} else {
Result.emplace_back(Offset, Offset + Tok.length());
}
}
Result.append(ResultLowPrio);
if (Result.empty())
Result.emplace_back(Offset, Offset);
return Result;
Expand Down
2 changes: 1 addition & 1 deletion clang-tools-extra/clangd/unittests/CallHierarchyTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ TEST(CallHierarchy, HierarchyOnVar) {
TEST(CallHierarchy, HierarchyOnEnumConstant) {
// Tests that the call hierarchy works on enum constants.
Annotations Source(R"cpp(
enum class Coin { heads$Heads^ , tai$Tails^ls };
enum class Coin { heads$Heads^, tai$Tails^ls };
void caller() {
Coin::$CallerH[[heads]];
Coin::$CallerT[[tails]];
Expand Down