Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-22 03:09:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

single AutoInsertRequest message for both autoQuote and autoClose

Browse Source
This commit is contained in:
Martin Aeschlimann
2021-12-14 16:00:35 +01:00
parent 72287bfab6
commit 1f9d809e35
4 changed files with 63 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,23 +55,21 @@ export function getHTMLMode(htmlLanguageService: HTMLLanguageService, workspace:
async getFoldingRanges(document: TextDocument): Promise<FoldingRange[]> {
return htmlLanguageService.getFoldingRanges(document);
},
async doAutoQuote(document: TextDocument, position: Position, settings = workspace.settings) {
const htmlSettings = settings?.html;
const options = merge(htmlSettings?.suggest, {});
options.attributeDefaultValue = htmlSettings?.completion?.attributeDefaultValue ?? 'doublequotes';
async doAutoInsert(document: TextDocument, position: Position, kind: 'autoQuote' | 'autoClose', settings = workspace.settings) {
const offset = document.offsetAt(position);
const text = document.getText();
if (kind === 'autoQuote') {
if (offset > 0 && text.charAt(offset - 1) === '=') {
const htmlSettings = settings?.html;
const options = merge(htmlSettings?.suggest, {});
options.attributeDefaultValue = htmlSettings?.completion?.attributeDefaultValue ?? 'doublequotes';
const offset = document.offsetAt(position);
const text = document.getText();
if (offset > 0 && text.charAt(offset - 1) === '=') {
return htmlLanguageService.doQuoteComplete(document, position, htmlDocuments.get(document), options);
}
return null;
},
async doAutoClose(document: TextDocument, position: Position) {
const offset = document.offsetAt(position);
const text = document.getText();
if (offset > 0 && text.charAt(offset - 1).match(/[>\/]/g)) {
return htmlLanguageService.doTagComplete(document, position, htmlDocuments.get(document));
return htmlLanguageService.doQuoteComplete(document, position, htmlDocuments.get(document), options);
}
} else if (kind === 'autoClose') {
if (offset > 0 && text.charAt(offset - 1).match(/[>\/]/g)) {
return htmlLanguageService.doTagComplete(document, position, htmlDocuments.get(document));
}
}
return null;
},

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

@@ -72,8 +72,7 @@ export interface LanguageMode {
format?: (document: TextDocument, range: Range, options: FormattingOptions, settings?: Settings) => Promise<TextEdit[]>;
findDocumentColors?: (document: TextDocument) => Promise<ColorInformation[]>;
getColorPresentations?: (document: TextDocument, color: Color, range: Range) => Promise<ColorPresentation[]>;
doAutoQuote?: (document: TextDocument, position: Position) => Promise<string | null>;
doAutoClose?: (document: TextDocument, position: Position) => Promise<string | null>;
doAutoInsert?: (document: TextDocument, position: Position, kind: 'autoClose' | 'autoQuote') => Promise<string | null>;
findMatchingTagPosition?: (document: TextDocument, position: Position) => Promise<Position | null>;
getFoldingRanges?: (document: TextDocument) => Promise<FoldingRange[]>;
onDocumentRemoved(document: TextDocument): void;