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

Jumpy cursor with trim trailing whitespace and autosave (fixes #18410)

Browse Source
This commit is contained in:
Benjamin Pasero
2017-01-11 18:45:24 +01:00
parent 05ac1a76e7
commit c936b0f6f5
1 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,23 +70,21 @@ class TrimWhitespaceParticipant implements INamedSaveParticpant {
}
function findEditor(model: IModel, codeEditorService: ICodeEditorService): ICommonCodeEditor {
let candidate: ICommonCodeEditor = null;
if (model.isAttachedToEditor()) {
const allEditors = codeEditorService.listCodeEditors();
for (let i = 0, len = allEditors.length; i < len; i++) {
const editor = allEditors[i];
const editorModel = editor.getModel();
for (const editor of codeEditorService.listCodeEditors()) {
if (editor.getModel() === model) {
if (editor.isFocused()) {
return editor; // favour focussed editor if there are multiple
}
if (!editorModel) {
continue; // empty editor
}
if (model === editorModel) {
return editor;
candidate = editor;
}
}
}
return null;
return candidate;
}
export class FinalNewLineParticipant implements INamedSaveParticpant {
@@ -158,7 +156,7 @@ class FormatOnSaveParticipant implements INamedSaveParticpant {
}).then(edits => {
if (edits && versionNow === model.getVersionId()) {
const editor = this._findEditor(model);
const editor = findEditor(model, this._editorService);
if (editor) {
this._editsWithEditor(editor, edits);
} else {
@@ -194,24 +192,6 @@ class FormatOnSaveParticipant implements INamedSaveParticpant {
forceMoveMarkers: true
};
}
private _findEditor(model: IModel) {
if (!model.isAttachedToEditor()) {
return;
}
let candidate: ICommonCodeEditor;
for (const editor of this._editorService.listCodeEditors()) {
if (editor.getModel() === model) {
if (editor.isFocused()) {
return editor;
} else {
candidate = editor;
}
}
}
return candidate;
}
}
class ExtHostSaveParticipant implements INamedSaveParticpant {