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

[html] files.insertFinalNewline affects embedded styles (#179118)

Browse Source
This commit is contained in:
Martin Aeschlimann
2023-04-04 12:55:17 +02:00
committed by GitHub
parent f481836a89
commit 92b87b0fd5
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/html-language-features/server/src/modes/formatting.ts
View File

@@ -54,7 +54,11 @@ export async function format(languageModes: LanguageModes, document: TextDocumen
// perform a html format and apply changes to a new document
const htmlMode = languageModes.getMode('html')!;
const htmlEdits = await htmlMode.format!(document, formatRange, formattingOptions, settings);
const htmlFormattedContent = TextDocument.applyEdits(document, htmlEdits);
let htmlFormattedContent = TextDocument.applyEdits(document, htmlEdits);
if (formattingOptions.insertFinalNewline && endOffset === content.length && !htmlFormattedContent.endsWith('\n')) {
htmlFormattedContent = htmlFormattedContent + '\n';
htmlEdits.push(TextEdit.insert(endPos, '\n'));
}
const newDocument = TextDocument.create(document.uri + '.tmp', document.languageId, document.version, htmlFormattedContent);
try {
// run embedded formatters on html formatted content: - formatters see correct initial indent

3
extensions/html-language-features/server/src/modes/htmlMode.ts
View File

@@ -49,9 +49,6 @@ export function getHTMLMode(htmlLanguageService: HTMLLanguageService, workspace:
} else {
formatSettings.contentUnformatted = 'script';
}
if (formatParams.insertFinalNewline) {
formatSettings.endWithNewline = true;
}
merge(formatParams, formatSettings);
return htmlLanguageService.format(document, range, formatSettings);
},