[PATCH] D64634: [clangd] Fix duplicate highlighting tokens appearing in initializer lists
Johan Vikström via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Mon Jul 15 01:40:00 PDT 2019
jvikstrom updated this revision to Diff 209774.
jvikstrom added a comment.
Readded newline that was removed accidentaly.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D64634/new/
https://reviews.llvm.org/D64634
Files:
clang-tools-extra/clangd/SemanticHighlighting.cpp
clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp
Index: clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp
+++ clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp
@@ -166,6 +166,13 @@
$Variable[[AA]].$Field[[E]].$Field[[C]];
$Class[[A]]::$Variable[[S]] = 90;
}
+ )cpp",
+ R"cpp(
+ struct $Class[[AA]] {
+ int $Field[[A]];
+ }
+ int $Variable[[B]];
+ $Class[[AA]] $Variable[[A]]{$Variable[[B]]};
)cpp"};
for (const auto &TestCase : TestCases) {
checkHighlightings(TestCase);
Index: clang-tools-extra/clangd/SemanticHighlighting.cpp
===================================================================
--- clang-tools-extra/clangd/SemanticHighlighting.cpp
+++ clang-tools-extra/clangd/SemanticHighlighting.cpp
@@ -31,6 +31,15 @@
std::vector<HighlightingToken> collectTokens() {
Tokens.clear();
TraverseAST(Ctx);
+ // Initializer lists can give duplicates of tokens, therefore all tokens
+ // must be deduplicated.
+ llvm::sort(
+ Tokens,
+ [](const HighlightingToken &Lhs, const HighlightingToken &Rhs) -> bool {
+ return std::tie(Lhs.R, Lhs.Kind) < std::tie(Rhs.R, Rhs.Kind);
+ });
+ auto Last = std::unique(Tokens.begin(), Tokens.end());
+ Tokens.erase(Last, Tokens.end());
return Tokens;
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D64634.209774.patch
Type: text/x-patch
Size: 1444 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20190715/9822af0c/attachment-0001.bin>
More information about the cfe-commits
mailing list