feat: LSP document symbols

Author: n-WN

server/src/server.ts

@@ -12,7 +12,10 @@ import {
 	TextDocumentSyncKind,
 	InitializeResult,
 	Hover,
-	MarkupKind
+	MarkupKind,
+	DocumentSymbol,
+	SymbolKind,
+	Range
 } from 'vscode-languageserver/node';
 
 import {
@@ -131,6 +134,15 @@ connection.onInitialize((params: InitializeParams) => {
 	return result;
 });
 
+connection.onDocumentSymbol(params => {
+	const document = documents.get(params.textDocument.uri);
+	if (!document) {
+		return [];
+	}
+
+	return parseDocumentSymbols(document);
+});
+
 connection.onInitialized(() => {
 	if (hasConfigurationCapability) {
 		// Register for all configuration changes.
@@ -455,4 +467,99 @@ connection.onHover(
 documents.listen(connection);
 
 // Listen on the connection
-connection.listen();
+connection.listen();
+
+interface SymbolMatch {
+	name: string;
+	detail: string;
+	kind: SymbolKind;
+}
+
+function matchSymbol(line: string): SymbolMatch | undefined {
+	const defMatch = line.match(/^def\s+([\w\.]+)\s*\(([^)]*)\)\s*:?/);
+	if (defMatch) {
+		const [, name, params] = defMatch;
+		return {
+			name,
+			detail: `(${params.trim()})`,
+			kind: SymbolKind.Function
+		};
+	}
+
+	const classMatch = line.match(/^class\s+([\w\.]+)\s*(\([^)]*\))?\s*:?/);
+	if (classMatch) {
+		const [, name, bases = ''] = classMatch;
+		return {
+			name,
+			detail: bases.trim(),
+			kind: SymbolKind.Class
+		};
+	}
+
+	const assignmentMatch = line.match(/^([A-Za-z_]\w*)\s*=\s*.+/);
+	if (assignmentMatch) {
+		const [, name] = assignmentMatch;
+		return {
+			name,
+			detail: 'assignment',
+			kind: SymbolKind.Variable
+		};
+	}
+
+	return undefined;
+}
+
+function buildRange(line: number, indent: number, length: number): Range {
+	return {
+		start: { line, character: indent },
+		end: { line, character: length }
+	};
+}
+
+function parseDocumentSymbols(textDocument: TextDocument): DocumentSymbol[] {
+	const rootSymbols: DocumentSymbol[] = [];
+	const stack: Array<{ indent: number; symbol: DocumentSymbol }> = [];
+
+	for (let line = 0; line < textDocument.lineCount; line++) {
+		const lineText = textDocument.getText({
+			start: { line, character: 0 },
+			end: { line: line + 1, character: 0 }
+		});
+		const content = lineText.replace(/\n$/, '');
+		const trimmed = content.trim();
+
+		if (!trimmed || trimmed.startsWith('#')) {
+			continue;
+		}
+
+		const symbolMatch = matchSymbol(trimmed);
+		if (!symbolMatch) {
+			continue;
+		}
+
+		const indent = content.length - content.trimStart().length;
+		const range = buildRange(line, indent, content.length);
+		const symbol: DocumentSymbol = {
+			name: symbolMatch.name,
+			detail: symbolMatch.detail,
+			kind: symbolMatch.kind,
+			range,
+			selectionRange: range,
+			children: []
+		};
+
+		while (stack.length && indent <= stack[stack.length - 1].indent) {
+			stack.pop();
+		}
+
+		if (stack.length) {
+			stack[stack.length - 1].symbol.children?.push(symbol);
+		} else {
+			rootSymbols.push(symbol);
+		}
+
+		stack.push({ indent, symbol });
+	}
+
+	return rootSymbols;
+}

src/extension.ts

@@ -11,80 +11,6 @@ import {
 
 let client: LanguageClient;
 
-class SageDocumentSymbolProvider implements vscode.DocumentSymbolProvider {
-    provideDocumentSymbols(document: vscode.TextDocument): vscode.ProviderResult<vscode.DocumentSymbol[]> {
-        const rootSymbols: vscode.DocumentSymbol[] = [];
-        const stack: Array<{ indent: number; symbol: vscode.DocumentSymbol }> = [];
-
-        for (let line = 0; line < document.lineCount; line++) {
-            const lineText = document.lineAt(line);
-            const trimmed = lineText.text.trim();
-
-            if (!trimmed || trimmed.startsWith('#')) {
-                continue;
-            }
-
-            const match = this.matchSymbol(trimmed);
-            if (!match) {
-                continue;
-            }
-
-            const indent = lineText.firstNonWhitespaceCharacterIndex;
-            const { name, detail, kind } = match;
-            const range = new vscode.Range(line, indent, line, lineText.range.end.character);
-            const symbol = new vscode.DocumentSymbol(name, detail, kind, range, range);
-
-            while (stack.length && indent <= stack[stack.length - 1].indent) {
-                stack.pop();
-            }
-
-            if (stack.length) {
-                stack[stack.length - 1].symbol.children.push(symbol);
-            } else {
-                rootSymbols.push(symbol);
-            }
-
-            stack.push({ indent, symbol });
-        }
-
-        return rootSymbols;
-    }
-
-    private matchSymbol(line: string): { name: string; detail: string; kind: vscode.SymbolKind } | undefined {
-        const defMatch = line.match(/^def\s+([\w\.]+)\s*\(([^)]*)\)\s*:?/);
-        if (defMatch) {
-            const [, name, params] = defMatch;
-            return {
-                name,
-                detail: `(${params.trim()})`,
-                kind: vscode.SymbolKind.Function,
-            };
-        }
-
-        const classMatch = line.match(/^class\s+([\w\.]+)\s*(\([^)]*\))?\s*:?/);
-        if (classMatch) {
-            const [, name, bases = ''] = classMatch;
-            return {
-                name,
-                detail: bases.trim(),
-                kind: vscode.SymbolKind.Class,
-            };
-        }
-
-        const assignmentMatch = line.match(/^([A-Za-z_]\w*)\s*=\s*.+/);
-        if (assignmentMatch) {
-            const [, name] = assignmentMatch;
-            return {
-                name,
-                detail: 'assignment',
-                kind: vscode.SymbolKind.Variable,
-            };
-        }
-
-        return undefined;
-    }
-}
-
 export function activate(context: vscode.ExtensionContext) {
     // Register the run command first to ensure it's available even if language server fails
     const runDisposable = vscode.commands.registerCommand('runsagemathfile.run', () => {
@@ -155,12 +81,7 @@ export function activate(context: vscode.ExtensionContext) {
         }
     });
 
-    const symbolProvider = vscode.languages.registerDocumentSymbolProvider(
-        { language: 'sage' },
-        new SageDocumentSymbolProvider()
-    );
-
-    context.subscriptions.push(runDisposable, restartDisposable, symbolProvider);
+    context.subscriptions.push(runDisposable, restartDisposable);
 
     // Start the Language Server asynchronously to avoid blocking command registration
     startLanguageServer(context).catch(error => {