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

Tweaks for #62079

Browse Source
This commit is contained in:
Alex Dima
2019-02-18 16:41:01 +01:00
parent 5f70fddbfa
commit b164459bf8
23 changed files with 259 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -176,7 +176,7 @@ export interface MainThreadDocumentsShape extends IDisposable {
export interface ITextEditorConfigurationUpdate {
tabSize?: number | 'auto';
indentSize?: number | 'tab';
indentSize?: number | 'tabSize';
insertSpaces?: boolean | 'auto';
cursorStyle?: TextEditorCursorStyle;
lineNumbers?: TextEditorLineNumbersStyle;

8
src/vs/workbench/api/node/extHostTextEditor.ts
View File

@@ -206,9 +206,9 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions {
return this._indentSize;
}
private _validateIndentSize(value: number | string): number | 'tab' | null {
if (value === 'tab') {
return 'tab';
private _validateIndentSize(value: number | string): number | 'tabSize' | null {
if (value === 'tabSize') {
return 'tabSize';
}
if (typeof value === 'number') {
let r = Math.floor(value);
@@ -318,7 +318,7 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions {
if (typeof newOptions.indentSize !== 'undefined') {
let indentSize = this._validateIndentSize(newOptions.indentSize);
if (indentSize === 'tab') {
if (indentSize === 'tabSize') {
hasUpdate = true;
bulkConfigurationUpdate.indentSize = indentSize;
} else if (typeof indentSize === 'number' && this._indentSize !== indentSize) {