Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #8412: Rename editor.indentGuides to editor.renderIndentGuides

Browse Source
This commit is contained in:
Alex Dima
2016-06-29 13:28:49 +02:00
parent 973c3bdae5
commit ea47e6a1ad
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/browser/viewParts/indentGuides/indentGuides.ts
+3 -3
View File
@@ -24,7 +24,7 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
this._context = context;
this._lineHeight = this._context.configuration.editor.lineHeight;
this._spaceWidth = this._context.configuration.editor.fontInfo.spaceWidth;
this._enabled = this._context.configuration.editor.viewInfo.indentGuides;
this._enabled = this._context.configuration.editor.viewInfo.renderIndentGuides;
this._renderResult = null;
this._context.addEventHandler(this);
@@ -56,8 +56,8 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
if (e.fontInfo) {
this._spaceWidth = this._context.configuration.editor.fontInfo.spaceWidth;
}
if (e.viewInfo.indentGuides) {
this._enabled = this._context.configuration.editor.viewInfo.indentGuides;
if (e.viewInfo.renderIndentGuides) {
this._enabled = this._context.configuration.editor.viewInfo.renderIndentGuides;
}
return true;
}
src/vs/editor/common/config/commonEditorConfig.ts
+6 -6
View File
@@ -202,7 +202,7 @@ class InternalEditorOptionsHelper {
stopRenderingLineAfter: stopRenderingLineAfter,
renderWhitespace: toBoolean(opts.renderWhitespace),
renderControlCharacters: toBoolean(opts.renderControlCharacters),
indentGuides: toBoolean(opts.indentGuides),
renderIndentGuides: toBoolean(opts.renderIndentGuides),
scrollbar: scrollbar,
});
@@ -697,11 +697,11 @@ let editorConfiguration:IConfigurationNode = {
default: DefaultConfig.editor.renderControlCharacters,
description: nls.localize('renderControlCharacters', "Controls whether the editor should render control characters")
},
// 'editor.indentGuides': {
// 'type': 'boolean',
// default: DefaultConfig.editor.indentGuides,
// description: nls.localize('indentGuides', "Controls whether the editor should render indent guides")
// },
'editor.renderIndentGuides': {
'type': 'boolean',
default: DefaultConfig.editor.renderIndentGuides,
description: nls.localize('renderIndentGuides', "Controls whether the editor should render indent guides")
},
'editor.referenceInfos' : {
'type': 'boolean',
'default': DefaultConfig.editor.referenceInfos,
src/vs/editor/common/config/defaultConfig.ts
+1 -1
View File
@@ -89,7 +89,7 @@ class ConfigClass implements IConfiguration {
folding: true,
renderWhitespace: false,
renderControlCharacters: false,
indentGuides: false,
renderIndentGuides: false,
useTabStops: true,
fontFamily: (
src/vs/editor/common/editorCommon.ts
+7 -7
View File
@@ -425,7 +425,7 @@ export interface IEditorOptions {
* Enable rendering of indent guides.
* Defaults to true.
*/
indentGuides?: boolean;
renderIndentGuides?: boolean;
/**
* Inserting and deleting whitespace follows tab stops.
*/
@@ -618,7 +618,7 @@ export class InternalEditorViewOptions {
stopRenderingLineAfter: number;
renderWhitespace: boolean;
renderControlCharacters: boolean;
indentGuides: boolean;
renderIndentGuides: boolean;
scrollbar:InternalEditorScrollbarOptions;
/**
@@ -644,7 +644,7 @@ export class InternalEditorViewOptions {
stopRenderingLineAfter: number;
renderWhitespace: boolean;
renderControlCharacters: boolean;
indentGuides: boolean;
renderIndentGuides: boolean;
scrollbar:InternalEditorScrollbarOptions;
}) {
this.theme = String(source.theme);
@@ -666,7 +666,7 @@ export class InternalEditorViewOptions {
this.stopRenderingLineAfter = source.stopRenderingLineAfter|0;
this.renderWhitespace = Boolean(source.renderWhitespace);
this.renderControlCharacters = Boolean(source.renderControlCharacters);
this.indentGuides = Boolean(source.indentGuides);
this.renderIndentGuides = Boolean(source.renderIndentGuides);
this.scrollbar = source.scrollbar.clone();
}
@@ -722,7 +722,7 @@ export class InternalEditorViewOptions {
&& this.stopRenderingLineAfter === other.stopRenderingLineAfter
&& this.renderWhitespace === other.renderWhitespace
&& this.renderControlCharacters === other.renderControlCharacters
&& this.indentGuides === other.indentGuides
&& this.renderIndentGuides === other.renderIndentGuides
&& this.scrollbar.equals(other.scrollbar)
);
}
@@ -751,7 +751,7 @@ export class InternalEditorViewOptions {
stopRenderingLineAfter: this.stopRenderingLineAfter !== newOpts.stopRenderingLineAfter,
renderWhitespace: this.renderWhitespace !== newOpts.renderWhitespace,
renderControlCharacters: this.renderControlCharacters !== newOpts.renderControlCharacters,
indentGuides: this.indentGuides !== newOpts.indentGuides,
renderIndentGuides: this.renderIndentGuides !== newOpts.renderIndentGuides,
scrollbar: (!this.scrollbar.equals(newOpts.scrollbar)),
};
}
@@ -784,7 +784,7 @@ export interface IViewConfigurationChangedEvent {
stopRenderingLineAfter: boolean;
renderWhitespace: boolean;
renderControlCharacters: boolean;
indentGuides: boolean;
renderIndentGuides: boolean;
scrollbar: boolean;
}
src/vs/monaco.d.ts
Vendored
+3 -3
View File
@@ -1277,7 +1277,7 @@ declare module monaco.editor {
* Enable rendering of indent guides.
* Defaults to true.
*/
indentGuides?: boolean;
renderIndentGuides?: boolean;
/**
* Inserting and deleting whitespace follows tab stops.
*/
@@ -1369,7 +1369,7 @@ declare module monaco.editor {
stopRenderingLineAfter: number;
renderWhitespace: boolean;
renderControlCharacters: boolean;
indentGuides: boolean;
renderIndentGuides: boolean;
scrollbar: InternalEditorScrollbarOptions;
}
@@ -1393,7 +1393,7 @@ declare module monaco.editor {
stopRenderingLineAfter: boolean;
renderWhitespace: boolean;
renderControlCharacters: boolean;
indentGuides: boolean;
renderIndentGuides: boolean;
scrollbar: boolean;
}