Fix #8106 - tidy up color higlighting on nav tree

[roobuilder] / src / Lsp.vala

diff --git a/src/Lsp.vala b/src/Lsp.vala
index 21ab644..97552c1 100644 (file)
--- a/src/Lsp.vala
+++ b/src/Lsp.vala
@@ -441,7 +441,8 @@ namespace Lsp {
                        owned get {
                                //GLib.debug("%s : %s", this.name, this.detail);
                                //var detail = this.detail == "" ? (this.kind.to_string() + ": " + this.name) : this.detail;
-                                return GLib.Markup.escape_text(this.detail + "\nline: " + this.range.start.line.to_string());
+                                return "" + this.kind.to_string().replace( "LSP_SYMBOL_KIND_", "" ) + "\n" + 
+                                       GLib.Markup.escape_text(this.detail + "\nline: " + this.range.start.line.to_string());
                                
                        }
                }
@@ -567,40 +568,8 @@ namespace Lsp {
         TypeParameter = 26;
         
         public string icon () { 
-                               
-                       switch (this) {
-                               
-                               // case         SymbolKind.Text: return "completion-snippet-symbolic";
-                               case    SymbolKind.Method: return "lang-method-symbolic";
-                               case    SymbolKind.Function: return "lang-function-symbolic";
-                               case    SymbolKind.Constructor: return "lang-method-symbolic";
-                               case    SymbolKind.Field: return "lang-struct-field-symbolic";
-                               case    SymbolKind.Variable: return "lang-variable-symbolic";
-                               case    SymbolKind.Class: return "lang-class-symbolic";
-                               case    SymbolKind.Interface: return "lang-class-symbolic";
-                               case    SymbolKind.Module: return "lang-namespace-symbolic";
-                               case    SymbolKind.Property:return "lang-struct-field-symbolic";
-                               //case  SymbolKind.Unit: return "lang-variable-symbolic";
-                               //case  SymbolKind.Value: return "lang-variable-symbolic";
-                               case    SymbolKind.Enum: return "lang-enum-symbolic";
-                               //case  SymbolKind.Keyword: return "completion-word-symbolic";
-                               //case  SymbolKind.Snippet: return "completion-snippet-symbolic";
-
-                               //case  SymbolKind.Color: return "lang-typedef-symbolic";
-                               case    SymbolKind.File:return "lang-typedef-symbolic";
-                               //case  SymbolKind.Reference: return "lang-typedef-symbolic";
-                               //case  SymbolKind.Folder:return "lang-typedef-symbolic";
-                               case    SymbolKind.EnumMember: return "lang-typedef-symbolic";
-                               case    SymbolKind.Constant:return "lang-typedef-symbolic";
-                               case    SymbolKind.Struct: return "lang-struct-symbolic";
-                               case    SymbolKind.Event:return "lang-typedef-symbolic";
-                               case    SymbolKind.Operator:return "lang-typedef-symbolic";
-                               case    SymbolKind.TypeParameter:return "lang-typedef-symbolic";
-                       
-                               default: 
-                                return "completion-snippet-symbolic";
-                                               
-                       }
+                       return "lang-" + this.to_string().replace( "LSP_SYMBOL_KIND_", "" ).down() + "-symbolic"; 
+                        
                }
                public int sort_key() {