diff --git a/extensions/html/server/src/htmlServerMain.ts b/extensions/html/server/src/htmlServerMain.ts index 40c1cbe8746ee212a54d902e353a7979a8d3e72c..741bc8307faab64366eff63a480c0da0faeb27ae 100644 --- a/extensions/html/server/src/htmlServerMain.ts +++ b/extensions/html/server/src/htmlServerMain.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { createConnection, IConnection, TextDocuments, InitializeParams, InitializeResult } from 'vscode-languageserver'; +import { createConnection, IConnection, TextDocuments, InitializeParams, InitializeResult, FormattingOptions } from 'vscode-languageserver'; import { HTMLDocument, getLanguageService, CompletionConfiguration, HTMLFormatConfiguration, DocumentContext } from 'vscode-html-languageservice'; import { getLanguageModelCache } from './languageModelCache'; @@ -97,7 +97,7 @@ function merge(src: any, dst: any): any { return dst; } -function getFormattingOptions(formatParams: any) { +function getFormattingOptions(formatParams: FormattingOptions) { let formatSettings = languageSettings && languageSettings.format; if (!formatSettings) { return formatParams; @@ -107,12 +107,12 @@ function getFormattingOptions(formatParams: any) { connection.onDocumentFormatting(formatParams => { let document = documents.get(formatParams.textDocument.uri); - return languageService.format(document, null, getFormattingOptions(formatParams)); + return languageService.format(document, null, getFormattingOptions(formatParams.options)); }); connection.onDocumentRangeFormatting(formatParams => { let document = documents.get(formatParams.textDocument.uri); - return languageService.format(document, formatParams.range, getFormattingOptions(formatParams)); + return languageService.format(document, formatParams.range, getFormattingOptions(formatParams.options)); }); connection.onDocumentLinks(documentLinkParam => {