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

fix #23404

Browse Source
This commit is contained in:
Johannes Rieken
2017-03-29 11:57:24 +02:00
parent b7e71acc87
commit f8a31fde7e
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/api/node/mainThreadSaveParticipant.ts
View File

@@ -147,7 +147,7 @@ class FormatOnSaveParticipant implements INamedSaveParticpant {
}
const versionNow = model.getVersionId();
const {tabSize, insertSpaces} = model.getOptions();
const { tabSize, insertSpaces } = model.getOptions();
return new TPromise<ISingleEditOperation[]>((resolve, reject) => {
setTimeout(reject, 750);
@@ -166,16 +166,16 @@ class FormatOnSaveParticipant implements INamedSaveParticpant {
}
private _editsWithEditor(editor: ICommonCodeEditor, edits: ISingleEditOperation[]): void {
editor.executeCommand('files.formatOnSave', new EditOperationsCommand(edits, editor.getSelection()));
EditOperationsCommand.execute(editor, edits);
}
private _editWithModel(model: IModel, edits: ISingleEditOperation[]): void {
const [{range}] = edits;
const [{ range }] = edits;
const initialSelection = new Selection(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn);
model.pushEditOperations([initialSelection], edits.map(FormatOnSaveParticipant._asIdentEdit), undoEdits => {
for (const {range} of undoEdits) {
for (const { range } of undoEdits) {
if (Range.areIntersectingOrTouching(range, initialSelection)) {
return [new Selection(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn)];
}
@@ -184,7 +184,7 @@ class FormatOnSaveParticipant implements INamedSaveParticpant {
});
}
private static _asIdentEdit({text, range}: ISingleEditOperation): IIdentifiedSingleEditOperation {
private static _asIdentEdit({ text, range }: ISingleEditOperation): IIdentifiedSingleEditOperation {
return {
text,
range: Range.lift(range),
@@ -246,7 +246,7 @@ export class SaveParticipant implements ISaveParticipant {
const promiseFactory = this._saveParticipants.map(p => () => {
const {name} = p;
const { name } = p;
const t1 = Date.now();
return TPromise.as(p.participate(model, env)).then(() => {