feat: display macro name in outline (#1326)

sassoftware · Dec 18, 2024 · 2c988b6 · 2c988b6
1 parent b406018
commit 2c988b6
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/server/src/sas/LanguageServiceProvider.ts b/server/src/sas/LanguageServiceProvider.ts
@@ -170,7 +170,7 @@ export class LanguageServiceProvider {
       end: { line: block.endFoldingLine, character: block.endFoldingCol },
     };
     const docSymbol: DocumentSymbol = {
-      name: block.type === 1 ? this._getProcName(block.startLine) : block.name,
+      name: this._getSymbolName(block),
       kind: SymbolKinds[block.type],
       range,
       selectionRange: range,
@@ -247,26 +247,31 @@ export class LanguageServiceProvider {
     return this.syntaxProvider.lexer.syntaxDb.setLibService(fn);
   }
 
-  private _getProcName(line: number) {
+  private _getSymbolName(block: FoldingBlock) {
+    const line = block.startLine;
     const tokens = this.syntaxProvider.getSyntax(line);
-    for (let i = 0; i < tokens.length; i++) {
+    for (let i = 2; i < tokens.length; i++) {
       const token = tokens[i];
-      if (token.style === "proc-name") {
+      if (token.start <= block.startCol) {
+        continue;
+      }
+      if (token.style === "proc-name" || token.style === "text") {
         const end =
           i === tokens.length - 1
             ? this.model.getColumnCount(line)
             : tokens[i + 1].start;
-        return (
-          "PROC " +
-          this.model
-            .getText({
-              start: { line, column: token.start },
-              end: { line, column: end },
-            })
-            .toUpperCase()
-        );
+        const tokenText = this.model.getText({
+          start: { line, column: token.start },
+          end: { line, column: end },
+        });
+        if (tokenText.trim() === "") {
+          continue;
+        }
+        return `${block.name} ${
+          token.style === "proc-name" ? tokenText.toUpperCase() : tokenText
+        }`;
       }
     }
-    return "";
+    return block.name;
   }
 }