Adding missing conversion from DocumentSymbol

TypeFox · Sep 3, 2018 · 6d6f321 · 6d6f321
1 parent 6305d31
commit 6d6f321
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/monaco-converter.ts b/src/monaco-converter.ts
@@ -477,10 +477,23 @@ export class ProtocolToMonacoConverter {
         };
     }
 
-    asDocumentSymbolResult(values: SymbolInformation[] | DocumentSymbol[]): monaco.languages.DocumentSymbol[] {
+    asDocumentSymbolInformation(value: DocumentSymbol) : monaco.languages.DocumentSymbol {
+        return {
+            name: value.name,
+            detail: value.detail || "",
+            kind: this.asSymbolKind(value.kind),
+            containerName: "",
+            range: this.asRange(value.range),
+            selectionRange: this.asRange(value.selectionRange),
+            children: value.children
+                ? value.children.map(c => this.asDocumentSymbolInformation(c))
+                : []
+        };
+    }
+
+    asDocumentSymbol(values: SymbolInformation[] | DocumentSymbol[]): monaco.languages.DocumentSymbol[] {
         if (DocumentSymbol.is(values[0])) {
-            // FIXME when Monaco supports DocumentSymbol
-            return [];
+            return (values as DocumentSymbol[]).map(s => this.asDocumentSymbolInformation(s));
         }
         return this.asSymbolInformations(values as SymbolInformation[]);
     }

diff --git a/src/monaco-languages.ts b/src/monaco-languages.ts
@@ -234,7 +234,7 @@ export class MonacoLanguages implements Languages {
                     return [];
                 }
                 const params = this.m2p.asDocumentSymbolParams(model);
-                return provider.provideDocumentSymbols(params, token).then(result => this.p2m.asDocumentSymbolResult(result))
+                return provider.provideDocumentSymbols(params, token).then(result => this.p2m.asDocumentSymbol(result))
             }
         }
     }