Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-27 19:08:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #102718, add formatting indicator

Browse Source
This commit is contained in:
Chuang Yu
2020-08-09 15:25:11 +08:00
parent 4807607637
commit d36c19e19f
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/contrib/format/formatActions.ts
+16 -3
View File
@@ -25,7 +25,7 @@ import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegis
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { onUnexpectedError } from 'vs/base/common/errors';
import { EditorOption } from 'vs/editor/common/config/editorOptions';
import { Progress } from 'vs/platform/progress/common/progress';
import { Progress, IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress';
class FormatOnType implements IEditorContribution {
@@ -231,7 +231,13 @@ class FormatDocumentAction extends EditorAction {
async run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
if (editor.hasModel()) {
const instaService = accessor.get(IInstantiationService);
await instaService.invokeFunction(formatDocumentWithSelectedProvider, editor, FormattingMode.Explicit, Progress.None, CancellationToken.None);
const progressService = accessor.get(IProgressService);
return progressService.withProgress({
location: ProgressLocation.Window,
title: nls.localize("formatDocument.label.formatting", "Formatting document...")
}, async () => {
return await instaService.invokeFunction(formatDocumentWithSelectedProvider, editor, FormattingMode.Explicit, Progress.None, CancellationToken.None);
});
}
}
}
@@ -267,7 +273,14 @@ class FormatSelectionAction extends EditorAction {
if (range.isEmpty()) {
range = new Range(range.startLineNumber, 1, range.startLineNumber, model.getLineMaxColumn(range.startLineNumber));
}
await instaService.invokeFunction(formatDocumentRangeWithSelectedProvider, editor, range, FormattingMode.Explicit, CancellationToken.None);
const progressService = accessor.get(IProgressService);
return progressService.withProgress({
location: ProgressLocation.Window,
title: nls.localize("formatSelection.label.formatting", "Formatting selection...")
}, async () => {
return await instaService.invokeFunction(formatDocumentRangeWithSelectedProvider, editor, range, FormattingMode.Explicit, CancellationToken.None);
});
}
}