Merge pull request #193 from bollwyvl/handle-no-document-symbol

Handle less-specified initialization
redhat-developer · Oct 23, 2019 · 9a1c4fe · 9a1c4fe
2 parents b51c7d0 + 8fc85c0
commit 9a1c4fe
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/server.ts b/src/server.ts
@@ -347,9 +347,18 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
     if (params.rootUri) {
         workspaceRoot = URI.parse(params.rootUri);
     }
-    workspaceFolders = params.workspaceFolders;
-    hierarchicalDocumentSymbolSupport = !!capabilities.textDocument.documentSymbol.hierarchicalDocumentSymbolSupport;
-    clientDynamicRegisterSupport = !!(capabilities.textDocument.rangeFormatting && capabilities.textDocument.rangeFormatting.dynamicRegistration);
+    workspaceFolders = params.workspaceFolders || [];
+
+    hierarchicalDocumentSymbolSupport = !!(
+      capabilities.textDocument &&
+      capabilities.textDocument.documentSymbol &&
+      capabilities.textDocument.documentSymbol.hierarchicalDocumentSymbolSupport
+    );
+    clientDynamicRegisterSupport = !!(
+      capabilities.textDocument &&
+      capabilities.textDocument.rangeFormatting &&
+      capabilities.textDocument.rangeFormatting.dynamicRegistration
+    );
 
     return {
         capabilities: {