development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-12 06:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Await insertSnippet calls (#169570)

Browse source 
* await insertSnippet calls

Fixes #146171

* Exclude eslint file from PR
This commit is contained in:
Raymond Zhao 2022-12-19 12:09:07 -08:00 committed by GitHub
parent a5fa6125b0
commit 1846f69774
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
extensions/emmet/src/abbreviationActions.ts
View file

@ -240,10 +240,10 @@ export async function wrapWithAbbreviation(args: any): Promise<boolean> {
}
let currentValue = '';
function inputChanged(value: string): string {
async function inputChanged(value: string): Promise<string> {
if (value !== currentValue) {
currentValue = value;
makeChanges(value, true);
await makeChanges(value, true);
}
return '';
}
@ -622,26 +622,25 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
*
* @returns false if no snippet can be inserted.
*/
function expandAbbreviationInRange(editor: vscode.TextEditor, expandAbbrList: ExpandAbbreviationInput[], insertSameSnippet: boolean): Thenable<boolean> {
async function expandAbbreviationInRange(editor: vscode.TextEditor, expandAbbrList: ExpandAbbreviationInput[], insertSameSnippet: boolean): Promise<boolean> {
if (!expandAbbrList || expandAbbrList.length === 0) {
return Promise.resolve(false);
return false;
}
// Snippet to replace at multiple cursors are not the same
// `editor.insertSnippet` will have to be called for each instance separately
// We will not be able to maintain multiple cursors after snippet insertion
const insertPromises: Thenable<boolean>[] = [];
let insertedSnippetsCount = 0;
if (!insertSameSnippet) {
expandAbbrList.sort((a: ExpandAbbreviationInput, b: ExpandAbbreviationInput) => { return b.rangeToReplace.start.compareTo(a.rangeToReplace.start); }).forEach((expandAbbrInput: ExpandAbbreviationInput) => {
expandAbbrList.sort((a: ExpandAbbreviationInput, b: ExpandAbbreviationInput) => { return b.rangeToReplace.start.compareTo(a.rangeToReplace.start); });
for (const expandAbbrInput of expandAbbrList) {
const expandedText = expandAbbr(expandAbbrInput);
if (expandedText) {
insertPromises.push(editor.insertSnippet(new vscode.SnippetString(expandedText), expandAbbrInput.rangeToReplace, { undoStopBefore: false, undoStopAfter: false }));
await editor.insertSnippet(new vscode.SnippetString(expandedText), expandAbbrInput.rangeToReplace, { undoStopBefore: false, undoStopAfter: false });
insertedSnippetsCount++;
}
});
if (insertPromises.length === 0) {
return Promise.resolve(false);
}
return Promise.all(insertPromises).then(() => Promise.resolve(true));
return insertedSnippetsCount > 0;
}
// Snippet to replace at all cursors are the same
@ -653,7 +652,7 @@ function expandAbbreviationInRange(editor: vscode.TextEditor, expandAbbrList: Ex
if (expandedText) {
return editor.insertSnippet(new vscode.SnippetString(expandedText), allRanges);
}
return Promise.resolve(false);
return false;
}
/**
@ -694,7 +693,7 @@ function expandAbbr(input: ExpandAbbreviationInput): string | undefined {
try {
expandedText = helper.expandAbbreviation(input.abbreviation, expandOptions);
} catch (e) {
vscode.window.showErrorMessage('Failed to expand abbreviation');
void vscode.window.showErrorMessage('Failed to expand abbreviation');
}
return expandedText;

3
src/vs/workbench/api/browser/mainThreadEditor.ts
View file

@ -523,8 +523,7 @@ export class MainThreadTextEditor {
}
if (this._codeEditor.getModel().getVersionId() !== modelVersionId) {
// ignored because emmet tests fail...
// return false;
return false;
}
const snippetController = SnippetController2.get(this._codeEditor);