From a31bf208c8437f9d4c62d394464ccd223475021a Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Thu, 27 Oct 2016 16:47:27 +0200 Subject: [PATCH] onInitialize() should check if params.initializationOptions is null fiixes #12259 --- extensions/json/server/src/jsonServerMain.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/extensions/json/server/src/jsonServerMain.ts b/extensions/json/server/src/jsonServerMain.ts index b0afbb79f5d..d72825e0db0 100644 --- a/extensions/json/server/src/jsonServerMain.ts +++ b/extensions/json/server/src/jsonServerMain.ts @@ -56,7 +56,9 @@ const filesAssociationContribution = new FileAssociationContribution(); let workspaceRoot: URI; connection.onInitialize((params: InitializeParams): InitializeResult => { workspaceRoot = URI.parse(params.rootPath); - filesAssociationContribution.setLanguageIds(params.initializationOptions.languageIds); + if (params.initializationOptions) { + filesAssociationContribution.setLanguageIds(params.initializationOptions.languageIds); + } return { capabilities: { // Tell the client that the server works in FULL text document sync mode @@ -64,7 +66,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => { completionProvider: { resolveProvider: true, triggerCharacters: ['"', ':'] }, hoverProvider: true, documentSymbolProvider: true, - documentRangeFormattingProvider: params.initializationOptions['format.enable'] + documentRangeFormattingProvider: !params.initializationOptions || params.initializationOptions['format.enable'] } }; });