From 03052a5b526c430c7a6f087f48d74881c4674e53 Mon Sep 17 00:00:00 2001
From: Antoine <aaltorffer@orange.fr>
Date: Thu, 5 Jun 2025 21:20:40 +0200
Subject: [PATCH] Compatibility with symbol tree based server.

---
 src/shaderVariant.ts | 8 +++-----
 src/validator.ts     | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/shaderVariant.ts b/src/shaderVariant.ts
index 488ecbf..067f90b 100644
--- a/src/shaderVariant.ts
+++ b/src/shaderVariant.ts
@@ -381,14 +381,12 @@ export class ShaderVariantTreeDataProvider implements vscode.TreeDataProvider<Sh
         // Symbols might have changed, so request them as we use this to compute symbols.
         this.requestDocumentSymbol(file.uri);        
     }
-    public onDocumentSymbols(uri: vscode.Uri, symbols: vscode.SymbolInformation[]) {
+    public onDocumentSymbols(uri: vscode.Uri, symbols: vscode.DocumentSymbol[]) {
+        // TODO:TREE: need to recurse child as well.
         this.shaderEntryPointList.set(uri.path, symbols.filter(symbol => symbol.kind === vscode.SymbolKind.Function).map(symbol => {
             return {
                 entryPoint: symbol.name, 
-                range: new vscode.Range(
-                    new vscode.Position(symbol.location.range.start.line, symbol.location.range.start.character), 
-                    new vscode.Position(symbol.location.range.end.line, symbol.location.range.end.character)
-                )
+                range: symbol.selectionRange
             };
         }));
         // Solve async request for goto.
diff --git a/src/validator.ts b/src/validator.ts
index 7901e73..26484dc 100644
--- a/src/validator.ts
+++ b/src/validator.ts
@@ -140,7 +140,7 @@ function getMiddleware() : Middleware {
             const result = await next(document, token);
             if (result) {
                 // /!\ Type casting need to match server data sent. /!\ 
-                let resultArray = result as vscode.SymbolInformation[];
+                let resultArray = result as vscode.DocumentSymbol[];
                 sidebar.onDocumentSymbols(document.uri, resultArray);
             }
             return result;