Merge branch 'MaskRay:master' into make-didChangeConfiguration-use-its-parameter

Author: rherilier

CMakeLists.txt

@@ -201,7 +201,6 @@ target_sources(ccls PRIVATE
   src/filesystem.cc
   src/fuzzy_match.cc
   src/main.cc
-  src/include_complete.cc
   src/indexer.cc
   src/log.cc
   src/lsp.cc

src/clang_tu.cc

@@ -163,12 +163,7 @@ buildCompilerInvocation(const std::string &main, std::vector<const char *> args,
     return nullptr;
   const llvm::opt::ArgStringList &cc_args = cmd.getArguments();
   auto ci = std::make_unique<CompilerInvocation>();
-#if LLVM_VERSION_MAJOR >= 10 // rC370122
   if (!CompilerInvocation::CreateFromArgs(*ci, cc_args, *diags))
-#else
-  if (!CompilerInvocation::CreateFromArgs(
-          *ci, cc_args.data(), cc_args.data() + cc_args.size(), *diags))
-#endif
     return nullptr;
 
   ci->getDiagnosticOpts().IgnoreWarnings = true;
@@ -189,9 +184,7 @@ buildCompilerInvocation(const std::string &main, std::vector<const char *> args,
   auto &isec = ci->getFrontendOpts().Inputs;
   if (isec.size())
     isec[0] = FrontendInputFile(main, isec[0].getKind(), isec[0].isSystem());
-#if LLVM_VERSION_MAJOR >= 10 // llvmorg-11-init-2414-g75f09b54429
   ci->getPreprocessorOpts().DisablePragmaDebugCrash = true;
-#endif
   // clangSerialization has an unstable format. Disable PCH reading/writing
   // to work around PCH mismatch problems.
   ci->getPreprocessorOpts().ImplicitPCHInclude.clear();

src/clang_tu.hh

@@ -10,13 +10,6 @@
 #include <clang/Basic/SourceManager.h>
 #include <clang/Frontend/CompilerInstance.h>
 
-#if LLVM_VERSION_MAJOR < 8
-// D52783 Lift VFS from clang to llvm
-namespace llvm {
-namespace vfs = clang::vfs;
-}
-#endif
-
 #if LLVM_VERSION_MAJOR < 14 // llvmorg-14-init-3863-g601102d282d5
 #define isAsciiIdentifierContinue isIdentifierBody
 #endif

src/config.hh

@@ -117,6 +117,8 @@ struct Config {
     bool hierarchicalDocumentSymbolSupport = true;
     // TextDocumentClientCapabilities.definition.linkSupport
     bool linkSupport = true;
+    // ClientCapabilities.workspace.semanticTokens.refreshSupport
+    bool semanticTokensRefresh = true;
 
     // If false, disable snippets and complete just the identifier part.
     // TextDocumentClientCapabilities.completion.completionItem.snippetSupport
@@ -226,8 +228,9 @@ struct Config {
     // Disable semantic highlighting for files larger than the size.
     int64_t largeFileSize = 2 * 1024 * 1024;
 
-    // true: LSP line/character; false: position
-    bool lsRanges = false;
+    // If non-zero, enable rainbow semantic tokens by assinging an extra modifier
+    // indicating the rainbow ID to each symbol.
+    int rainbow = 0;
 
     // Like index.{whitelist,blacklist}, don't publish semantic highlighting to
     // blacklisted files.
@@ -342,7 +345,7 @@ REFLECT_STRUCT(Config::Completion, caseSensitivity, detailedLabel,
                maxNum, placeholder);
 REFLECT_STRUCT(Config::Diagnostics, blacklist, onChange, onOpen, onSave,
                spellChecking, whitelist)
-REFLECT_STRUCT(Config::Highlight, largeFileSize, lsRanges, blacklist, whitelist)
+REFLECT_STRUCT(Config::Highlight, largeFileSize, rainbow, blacklist, whitelist)
 REFLECT_STRUCT(Config::Index::Name, suppressUnwrittenScope);
 REFLECT_STRUCT(Config::Index, blacklist, comments, initialNoLinkage,
                initialBlacklist, initialWhitelist, maxInitializerLines,

src/enum.inc

@@ -0,0 +1,36 @@
+#ifndef TOKEN_MODIFIER
+#define TOKEN_MODIFIER(name, str)
+#endif
+// vscode
+TOKEN_MODIFIER(Declaration, "declaration")
+TOKEN_MODIFIER(Definition, "definition")
+TOKEN_MODIFIER(Static, "static")
+
+// ccls extensions
+TOKEN_MODIFIER(Read, "read")
+TOKEN_MODIFIER(Write, "write")
+TOKEN_MODIFIER(ClassScope, "classScope")
+TOKEN_MODIFIER(FunctionScope, "functionScope")
+TOKEN_MODIFIER(NamespaceScope, "namespaceScope")
+
+// Rainbow semantic tokens
+TOKEN_MODIFIER(Id0, "id0")
+TOKEN_MODIFIER(Id1, "id1")
+TOKEN_MODIFIER(Id2, "id2")
+TOKEN_MODIFIER(Id3, "id3")
+TOKEN_MODIFIER(Id4, "id4")
+TOKEN_MODIFIER(Id5, "id5")
+TOKEN_MODIFIER(Id6, "id6")
+TOKEN_MODIFIER(Id7, "id7")
+TOKEN_MODIFIER(Id8, "id8")
+TOKEN_MODIFIER(Id9, "id9")
+TOKEN_MODIFIER(Id10, "id10")
+TOKEN_MODIFIER(Id11, "id11")
+TOKEN_MODIFIER(Id12, "id12")
+TOKEN_MODIFIER(Id13, "id13")
+TOKEN_MODIFIER(Id14, "id14")
+TOKEN_MODIFIER(Id15, "id15")
+TOKEN_MODIFIER(Id16, "id16")
+TOKEN_MODIFIER(Id17, "id17")
+TOKEN_MODIFIER(Id18, "id18")
+TOKEN_MODIFIER(Id19, "id19")