Remove constant tag

Author: chouzz

clang-tools-extra/clangd/AST.cpp

@@ -228,6 +228,8 @@ bool isConst(const Decl *D) {
     if (CMD->isConst())
       return true;
   }
+  if (const auto *FD = llvm::dyn_cast<FunctionDecl>(D))
+    return isConst(FD->getReturnType());
   return false;
 }
 
@@ -240,6 +242,8 @@ bool isStatic(const Decl *D) {
     return OPD->isClassProperty();
   if (const auto *OMD = llvm::dyn_cast<ObjCMethodDecl>(D))
     return OMD->isClassMethod();
+  if (const auto *FD = llvm::dyn_cast<FunctionDecl>(D))
+    return FD->isStatic();
   return false;
 }
 

clang-tools-extra/clangd/FindSymbols.cpp

@@ -193,29 +193,31 @@ std::vector<SymbolTag> getSymbolTags(const NamedDecl &ND) {
   if (ND.isDeprecated())
     Tags.push_back(SymbolTag::Deprecated);
   if (isConst(&ND))
-    Tags.push_back(SymbolTag::Constant);
+    Tags.push_back(SymbolTag::ReadOnly);
   if (isStatic(&ND))
     Tags.push_back(SymbolTag::Static);
   if (isVirtual(&ND))
     Tags.push_back(SymbolTag::Virtual);
-  if (!isa<UnresolvedUsingValueDecl>(ND))
-    Tags.push_back(SymbolTag::Declaration);
+  if (isAbstract(&ND))
+    Tags.push_back(SymbolTag::Abstract);
+
   if (isUniqueDefinition(&ND))
     Tags.push_back(SymbolTag::Definition);
-  if (const FieldDecl *FD = dyn_cast<FieldDecl>(&ND)) {
-    switch (FD->getAccess()) {
-    case AS_public:
-      Tags.push_back(SymbolTag::Public);
-      break;
-    case AS_protected:
-      Tags.push_back(SymbolTag::Protected);
-      break;
-    case AS_private:
-      Tags.push_back(SymbolTag::Private);
-      break;
-    default:
-      break;
-    }
+  else if (!isa<UnresolvedUsingValueDecl>(ND))
+    Tags.push_back(SymbolTag::Declaration);
+
+  switch (ND.getAccess()) {
+  case AS_public:
+    Tags.push_back(SymbolTag::Public);
+    break;
+  case AS_protected:
+    Tags.push_back(SymbolTag::Protected);
+    break;
+  case AS_private:
+    Tags.push_back(SymbolTag::Private);
+    break;
+  default:
+    break;
   }
 
   return Tags;

clang-tools-extra/clangd/Protocol.h

@@ -1105,7 +1105,7 @@ struct CodeAction {
 llvm::json::Value toJSON(const CodeAction &);
 
 enum class SymbolTag { 
-  Deprecated = 1 ,
+  Deprecated = 1,
   Private = 2,
   Package = 3,
   Protected = 4,
@@ -1116,16 +1116,15 @@ enum class SymbolTag {
   Abstract = 9,
   Final = 10,
   Sealed = 11,
-  Constant = 12,
-  Transient = 13,
-  Volatile = 14,
-  Synchronized = 15,
-  Virtual = 16,
-  Nullable = 17,
-  NonNull = 18,
-  Declaration = 19,
-  Definition = 20,
-  ReadOnly = 21,
+  Transient = 12,
+  Volatile = 13,
+  Synchronized = 14,
+  Virtual = 15,
+  Nullable = 16,
+  NonNull = 17,
+  Declaration = 18,
+  Definition = 19,
+  ReadOnly = 20,
 };
 llvm::json::Value toJSON(SymbolTag);
 /// Represents programming constructs like variables, classes, interfaces etc.