[clang-tools-extra] r371375 - [clangd] Replace HighlightingKind::NumKinds with LastKind. NFC
Ilya Biryukov via cfe-commits
cfe-commits at lists.llvm.org
Mon Sep 9 01:57:18 PDT 2019
Author: ibiryukov
Date: Mon Sep 9 01:57:17 2019
New Revision: 371375
URL: http://llvm.org/viewvc/llvm-project?rev=371375&view=rev
Log:
[clangd] Replace HighlightingKind::NumKinds with LastKind. NFC
Summary:
The latter simplifies the client code by avoiding the need to handle it
as a separate case statement.
Reviewers: hokein
Reviewed By: hokein
Subscribers: nridge, MaskRay, jkorous, arphaman, kadircet, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D67277
Modified:
clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp
clang-tools-extra/trunk/clangd/SemanticHighlighting.cpp
clang-tools-extra/trunk/clangd/SemanticHighlighting.h
Modified: clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp?rev=371375&r1=371374&r2=371375&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp (original)
+++ clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp Mon Sep 9 01:57:17 2019
@@ -87,7 +87,7 @@ CompletionItemKindBitset defaultCompleti
std::vector<std::vector<std::string>> buildHighlightScopeLookupTable() {
std::vector<std::vector<std::string>> LookupTable;
// HighlightingKind is using as the index.
- for (int KindValue = 0; KindValue < (int)HighlightingKind::NumKinds;
+ for (int KindValue = 0; KindValue <= (int)HighlightingKind::LastKind;
++KindValue)
LookupTable.push_back({toTextMateScope((HighlightingKind)(KindValue))});
return LookupTable;
Modified: clang-tools-extra/trunk/clangd/SemanticHighlighting.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/SemanticHighlighting.cpp?rev=371375&r1=371374&r2=371375&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/SemanticHighlighting.cpp (original)
+++ clang-tools-extra/trunk/clangd/SemanticHighlighting.cpp Mon Sep 9 01:57:17 2019
@@ -383,9 +383,8 @@ llvm::raw_ostream &operator<<(llvm::raw_
return OS << "Primitive";
case HighlightingKind::Macro:
return OS << "Macro";
- case HighlightingKind::NumKinds:
- llvm_unreachable("NumKinds is not a valid HighlightingKind");
}
+ llvm_unreachable("invalid HighlightingKind");
}
std::vector<LineHighlightings>
@@ -511,8 +510,6 @@ llvm::StringRef toTextMateScope(Highligh
return "storage.type.primitive.cpp";
case HighlightingKind::Macro:
return "entity.name.function.preprocessor.cpp";
- case HighlightingKind::NumKinds:
- llvm_unreachable("must not pass NumKinds to the function");
}
llvm_unreachable("unhandled HighlightingKind");
}
Modified: clang-tools-extra/trunk/clangd/SemanticHighlighting.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/SemanticHighlighting.h?rev=371375&r1=371374&r2=371375&view=diff
==============================================================================
--- clang-tools-extra/trunk/clangd/SemanticHighlighting.h (original)
+++ clang-tools-extra/trunk/clangd/SemanticHighlighting.h Mon Sep 9 01:57:17 2019
@@ -41,7 +41,7 @@ enum class HighlightingKind {
Primitive,
Macro,
- NumKinds,
+ LastKind = Macro
};
llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, HighlightingKind K);
More information about the cfe-commits
mailing list