提交 cf02de82 编写于 作者: M Martin Aeschlimann

[html] Format document create tab identities. Fixes #13563

上级 04d334b1
......@@ -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 => {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册