maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

indentation: store indentation in history only if editor configuration changed by user

Browse source 
fixes #3469
This commit is contained in:
isidor 2016-02-26 10:00:17 +01:00
parent d95f2abecb
commit 76b210e08e
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vs/workbench/browser/parts/editor/editorStatus.ts
View file

@ -97,6 +97,7 @@ interface StateDelta {
modelId: string;
insertSpaces: boolean;
tabSize: number;
storeInHistory: boolean;
};
tabFocusMode?: boolean;
}
@ -154,7 +155,9 @@ class State {
if (update.indentation) {
indentationLabel = update.indentation.insertSpaces ? nls.localize('spacesSize', "Spaces: {0}", update.indentation.tabSize) :
nls.localize('tabSize', "Tab Size: {0}", update.indentation.tabSize);
this._indentationHistory[update.indentation.modelId] = update.indentation;
if (update.indentation.storeInHistory) {
this._indentationHistory[update.indentation.modelId] = update.indentation;
}
}
if (this._indentation !== indentationLabel) {
this._indentation = indentationLabel;
@ -469,7 +472,8 @@ export class EditorStatus implements IStatusbarItem {
update.indentation = {
insertSpaces: (<ICommonCodeEditor>editorWidget).getIndentationOptions().insertSpaces,
tabSize: (<ICommonCodeEditor>editorWidget).getIndentationOptions().tabSize,
modelId
modelId,
storeInHistory: !inputChanged
};
}
}