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

Introduce TextEditorLineNumbersStyle for TextEditorOptions.lineNumbers

Browse Source
This commit is contained in:
Alex Dima
2016-09-27 23:10:24 +03:00
parent 477d368fbe
commit 7f0e2adacf
4 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,7 @@ export class ExtHostAPIImplementation {
EndOfLine: typeof vscode.EndOfLine;
TextDocumentSaveReason: typeof vscode.TextDocumentSaveReason;
TextEditorCursorStyle: typeof vscode.TextEditorCursorStyle;
TextEditorLineNumbersStyle: typeof vscode.TextEditorLineNumbersStyle;
TextEditorSelectionChangeKind: typeof vscode.TextEditorSelectionChangeKind;
commands: typeof vscode.commands;
window: typeof vscode.window;
@@ -169,6 +170,7 @@ export class ExtHostAPIImplementation {
this.TextEditorRevealType = extHostTypes.TextEditorRevealType;
this.EndOfLine = extHostTypes.EndOfLine;
this.TextEditorCursorStyle = EditorCommon.TextEditorCursorStyle;
this.TextEditorLineNumbersStyle = extHostTypes.TextEditorLineNumbersStyle;
this.TextEditorSelectionChangeKind = extHostTypes.TextEditorSelectionChangeKind;
this.TextDocumentSaveReason = extHostTypes.TextDocumentSaveReason;

6
src/vs/workbench/api/node/extHostTypes.ts
View File

@@ -825,6 +825,12 @@ export enum EndOfLine {
CRLF = 2
}
export enum TextEditorLineNumbersStyle {
Off = 0,
On = 1,
Relative = 2
}
export enum TextDocumentSaveReason {
Explicit = 1,
Auto = 2,

27
src/vs/workbench/api/node/mainThreadEditorsTracker.ts
View File

@@ -14,19 +14,19 @@ import {RunOnceScheduler} from 'vs/base/common/async';
import {IdGenerator} from 'vs/base/common/idGenerator';
import {Range} from 'vs/editor/common/core/range';
import {Selection} from 'vs/editor/common/core/selection';
import {EndOfLine} from 'vs/workbench/api/node/extHostTypes';
import {EndOfLine, TextEditorLineNumbersStyle} from 'vs/workbench/api/node/extHostTypes';
export interface ITextEditorConfigurationUpdate {
tabSize?: number | string;
insertSpaces?: boolean | string;
cursorStyle?: EditorCommon.TextEditorCursorStyle;
lineNumbers?: boolean | 'relative';
lineNumbers?: TextEditorLineNumbersStyle;
}
export interface IResolvedTextEditorConfiguration {
tabSize: number;
insertSpaces: boolean;
cursorStyle: EditorCommon.TextEditorCursorStyle;
lineNumbers: boolean | 'relative';
lineNumbers: TextEditorLineNumbersStyle;
}
function configurationsEqual(a:IResolvedTextEditorConfiguration, b:IResolvedTextEditorConfiguration) {
@@ -263,8 +263,19 @@ export class MainThreadTextEditor {
return;
}
let lineNumbers: true | false | 'relative';
switch (newConfiguration.lineNumbers) {
case TextEditorLineNumbersStyle.On:
lineNumbers = true;
break;
case TextEditorLineNumbersStyle.Relative:
lineNumbers = 'relative';
break;
default:
lineNumbers = false;
}
this._codeEditor.updateOptions({
lineNumbers: newConfiguration.lineNumbers
lineNumbers: lineNumbers
});
}
}
@@ -299,17 +310,17 @@ export class MainThreadTextEditor {
return this._configuration;
}
let cursorStyle = this._configuration ? this._configuration.cursorStyle : EditorCommon.TextEditorCursorStyle.Line;
let lineNumbers: boolean | 'relative' = this._configuration ? this._configuration.lineNumbers : true;
let lineNumbers: TextEditorLineNumbersStyle = this._configuration ? this._configuration.lineNumbers : TextEditorLineNumbersStyle.On;
if (codeEditor) {
let codeEditorOpts = codeEditor.getConfiguration();
cursorStyle = codeEditorOpts.viewInfo.cursorStyle;
if (codeEditorOpts.viewInfo.renderRelativeLineNumbers) {
lineNumbers = 'relative';
lineNumbers = TextEditorLineNumbersStyle.Relative;
} else if (codeEditorOpts.viewInfo.renderLineNumbers) {
lineNumbers = true;
lineNumbers = TextEditorLineNumbersStyle.On;
} else {
lineNumbers = false;
lineNumbers = TextEditorLineNumbersStyle.Off;
}
}