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

don't run formatOnSave when auto saved, #12449

Browse Source
This commit is contained in:
Johannes Rieken
2016-09-23 14:29:36 +02:00
parent 50d4edb682
commit 21d4e10fa0
2 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@ class FormatOnSaveParticipant implements ISaveParticipant {
participate(editorModel: ITextFileEditorModel, env: { isAutoSaved: boolean }): TPromise<any> {
if (!this._configurationService.lookup('files.formatOnSave').value) {
if (env.isAutoSaved || !this._configurationService.lookup('files.formatOnSave').value) {
return;
}
@@ -97,7 +97,7 @@ class FormatOnSaveParticipant implements ISaveParticipant {
return getDocumentRangeFormattingEdits(model, model.getFullModelRange(), { tabSize, insertSpaces }).then(edits => {
if (edits) {
if (editor) {
this._editsWithEditor(editor, edits, env.isAutoSaved);
this._editsWithEditor(editor, edits);
} else {
this._editWithModel(model, edits);
}
@@ -105,27 +105,7 @@ class FormatOnSaveParticipant implements ISaveParticipant {
});
}
private _editsWithEditor(editor: ICommonCodeEditor, edits: ISingleEditOperation[], isAutoSaved: boolean): void {
if (isAutoSaved && editor.isFocused()) {
// when we save an focus (active) editor we check if
// formatting edits intersect with any cursor. iff so
// we ignore this
let intersectsCursor = false;
outer: for (const selection of editor.getSelections()) {
for (const {range} of edits) {
if (Range.areIntersectingOrTouching(range, selection)) {
intersectsCursor = true;
break outer;
}
}
}
if (intersectsCursor) {
return;
}
}
private _editsWithEditor(editor: ICommonCodeEditor, edits: ISingleEditOperation[]): void {
editor.executeCommand('files.formatOnSave', new EditOperationsCommand(edits, editor.getSelection()));
}

2
src/vs/workbench/parts/files/browser/files.contribution.ts
View File

@@ -215,7 +215,7 @@ configurationRegistry.registerConfiguration({
'files.formatOnSave': {
'type': 'boolean',
'default': false,
'description': nls.localize('formatOnSave', "Format a file on save - a matching formatting provider must be available.")
'description': nls.localize('formatOnSave', "Format a file on save. A formatter must be available and the file must not be auto-saved")
},
'files.autoSave': {
'type': 'string',