Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 11:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

[html] add formatter

Browse Source
This commit is contained in:
Martin Aeschlimann
2016-09-09 15:26:03 +02:00
parent bb9a0f89ad
commit 49dfae7e00
10 changed files with 1738 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
extensions/html/server/src/htmlServerMain.ts
View File

@@ -36,8 +36,8 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
// Tell the client that the server works in FULL text document sync mode
textDocumentSync: documents.syncKind,
completionProvider: { resolveProvider: false, triggerCharacters: ['"', ':'] },
hoverProvider: true,
documentSymbolProvider: true,
// hoverProvider: true,
// documentSymbolProvider: true,
documentRangeFormattingProvider: true,
documentFormattingProvider: true
}
@@ -138,15 +138,32 @@ connection.onCompletion(textDocumentPosition => {
// return languageService.findDocumentSymbols(document, htmlDocument);
// });
// connection.onDocumentFormatting(formatParams => {
// let document = documents.get(formatParams.textDocument.uri);
// return languageService.format(document, null, formatParams.options);
// });
function merge(src: any, dst: any) : any {
for (var key in src) {
if (src.hasOwnProperty(key)) {
dst[key] = src[key];
}
}
return dst;
}
// connection.onDocumentRangeFormatting(formatParams => {
// let document = documents.get(formatParams.textDocument.uri);
// return languageService.format(document, formatParams.range, formatParams.options);
// });
function getFormattingOptions(formatParams : any) {
let formatSettings = languageSettings && languageSettings.format;
if (!formatSettings) {
return formatParams;
}
return merge(formatParams, merge(formatSettings, {}));
}
connection.onDocumentFormatting(formatParams => {
let document = documents.get(formatParams.textDocument.uri);
return languageService.format(document, null, getFormattingOptions(formatParams));
});
connection.onDocumentRangeFormatting(formatParams => {
let document = documents.get(formatParams.textDocument.uri);
return languageService.format(document, formatParams.range, getFormattingOptions(formatParams));
});
// Listen on the connection
connection.listen();