[clangd] Replace HighlightingKind::NumKinds with LastKind. NFC

ilya-biryukov · ilya-biryukov · commit 63d5d162377e · 2019-09-09T08:57:17.000Z
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 llvm-svn: 371375
diff --git a/clang-tools-extra/clangd/ClangdLSPServer.cpp b/clang-tools-extra/clangd/ClangdLSPServer.cpp
@@ -87,7 +87,7 @@ CompletionItemKindBitset defaultCompletionItemKinds() {
 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;
diff --git a/clang-tools-extra/clangd/SemanticHighlighting.cpp b/clang-tools-extra/clangd/SemanticHighlighting.cpp
@@ -383,9 +383,8 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, HighlightingKind K) {
     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(HighlightingKind Kind) {
     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");
 }
diff --git a/clang-tools-extra/clangd/SemanticHighlighting.h b/clang-tools-extra/clangd/SemanticHighlighting.h
@@ -41,7 +41,7 @@ enum class HighlightingKind {
   Primitive,
   Macro,
 
-  NumKinds,
+  LastKind = Macro
 };
 llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, HighlightingKind K);
 

Original file line number	Diff line number	Diff line change
`@@ -383,9 +383,8 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, HighlightingKind K) {`
`383`	`383`	`return OS << "Primitive";`
`384`	`384`	`case HighlightingKind::Macro:`
`385`	`385`	`return OS << "Macro";`
`386`		`- case HighlightingKind::NumKinds:`
`387`		`- llvm_unreachable("NumKinds is not a valid HighlightingKind");`
`388`	`386`	`}`
	`387`	`+ llvm_unreachable("invalid HighlightingKind");`
`389`	`388`	`}`
`390`	`389`
`391`	`390`	`std::vector<LineHighlightings>`
`@@ -511,8 +510,6 @@ llvm::StringRef toTextMateScope(HighlightingKind Kind) {`
`511`	`510`	`return "storage.type.primitive.cpp";`
`512`	`511`	`case HighlightingKind::Macro:`
`513`	`512`	`return "entity.name.function.preprocessor.cpp";`
`514`		`- case HighlightingKind::NumKinds:`
`515`		`- llvm_unreachable("must not pass NumKinds to the function");`
`516`	`513`	`}`
`517`	`514`	`llvm_unreachable("unhandled HighlightingKind");`
`518`	`515`	`}`