Suggest add flags field, only care deprecated pragma for now

nim-works · Sep 12, 2023 · c3f4144 · c3f4144
1 parent 48eb265
commit c3f4144
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/compiler/ast/ast_parsed_types.nim b/compiler/ast/ast_parsed_types.nim
@@ -265,6 +265,8 @@ const
   pnkFloatKinds* = {pnkFloatLit..pnkFloat128Lit}
   pnkIntKinds* = {pnkCharLit..pnkUInt64Lit}
   pnkStrKinds* = {pnkStrLit..pnkTripleStrLit}
+  pnkDeclarativeDefs* = {pnkProcDef, pnkFuncDef, pnkMethodDef, pnkIteratorDef, pnkConverterDef}
+  pnkRoutineDefs* = pnkDeclarativeDefs + {pnkMacroDef, pnkTemplateDef}
 
 func len*(node: ParsedNode): int =
   ## Number of sons of the parsed node

diff --git a/compiler/front/options.nim b/compiler/front/options.nim
@@ -140,6 +140,9 @@ type
 
   CfileList* = seq[Cfile]
 
+  SuggestFlag* {.pure.} = enum
+    deprecated = 1
+
   Suggest* = ref object
     section*: IdeCmd
     qualifiedPath*: seq[string]
@@ -158,6 +161,7 @@ type
     scope*:int
     localUsages*, globalUsages*: int # usage counters
     tokenLen*: int
+    flags*: set[SuggestFlag]
 
   Suggestions* = seq[Suggest]
 

diff --git a/nimlsp/nimlsp.nim b/nimlsp/nimlsp.nim
@@ -393,18 +393,22 @@ proc main(ins: Stream, outs: Stream) =
               debugLog "Found outlines: ", syms[0..<min(syms.len, 10)],
                         if syms.len > 10: &" and {syms.len-10} more" else: ""
               var resp: JsonNode
+              var flags = newSeq[int]()
               if syms.len == 0:
                 resp = newJNull()
               else:
                 resp = newJarray()
                 for sym in syms.sortedByIt((it.line,it.column,it.quality)):
                   if sym.qualifiedPath.len != 2:
                     continue
+                  flags.setLen(0)
+                  for f in sym.flags:
+                    flags.add f.int
                   resp.add create(DocumentSymbol,
                     sym.qualifiedPath[^1],
                     some(sym.forth),
                     nimSymToLSPKind(sym.symKind).int,
-                    none(seq[int]),
+                    some(flags),
                     create(Range,
                         create(Position, sym.line-1, sym.column),
                         create(Position, sym.line-1, sym.column + sym.tokenLen)

diff --git a/nimlsp/nimlsppkg/nimsuggest.nim b/nimlsp/nimlsppkg/nimsuggest.nim
@@ -171,6 +171,16 @@ proc getName(node: ParsedNode): string =
       result.add t.ident.s
     result.add "`"
 
+proc processFlags(sug: Suggest; n: ParsedNode) =
+  var
+    identDeprecated: bool
+    colonDeprecated: bool
+  for s in n.sons:
+    identDeprecated = s.kind == pnkIdent and getName(s) == "deprecated"
+    colonDeprecated = s.kind == pnkExprColonExpr and getName(s[0]) == "deprecated" 
+    if identDeprecated or colonDeprecated:
+      sug.flags.incl SuggestFlag.deprecated
+
 proc parsedNodeToSugget(n: ParsedNode; moduleName: string): Suggest =
   if n.kind in {pnkError, pnkEmpty}: return
   if n.kind notin {pnkConstSection..pnkTypeDef, pnkIdentDefs}: return
@@ -179,6 +189,11 @@ proc parsedNodeToSugget(n: ParsedNode; moduleName: string): Suggest =
   var name = ""
 
   if n.kind in {pnkProcDef..pnkTypeDef, pnkIdentDefs}:
+    if n.kind in pnkRoutineDefs and n[pragmasPos].kind == pnkPragma:
+      processFlags(result, n[pragmasPos])
+    elif n[0].kind == pnkPragmaExpr and n[0][^1].kind == pnkPragma:
+      processFlags(result, n[0][^1])
+
     var node: ParsedNode = getSymNode(n[0])
     token = getToken(node)
     if node.kind != pnkError: