Merge pull request #34 from antaalt/use-symbol-tree

Compatibility with updated API for DocumentSymbol

Author: antaalt

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.

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;