mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-11 18:48:33 -05:00
Merge VS Code 1.26.1 (#2394)
* Squash merge commits for 1.26 (#1) (#2323) * Polish tag search as per feedback (#55269) * Polish tag search as per feedback * Updated regex * Allow users to opt-out of features that send online requests in the background (#55097) * settings sweep #54690 * Minor css tweaks to enable eoverflow elipsis in more places (#55277) * fix an issue with titlebarheight when not scaling with zoom * Settings descriptions update #54690 * fixes #55209 * Settings editor - many padding fixes * More space above level 2 label * Fixing Cannot debug npm script using Yarn #55103 * Settings editor - show ellipsis when description overflows * Settings editor - ... fix measuring around links, relayout * Setting descriptions * Settings editor - fix ... for some short lines, fix select container width * Settings editor - overlay trees so scrollable shadow is full width * Fix #54133 - missing extension settings after reload * Settings color token description tweak * Settings editor - disable overflow indicator temporarily, needs to be faster * Added command to Run the selected npm script * fixes #54452 * fixes #54929 * fixes #55248 * prefix command with extension name * Contribute run selected to the context menu * node-debug@1.26.6 * Allow terminal rendererType to be swapped out at runtime Part of #53274 Fixes #55344 * Settings editor - fix not focusing search when restoring editor setInput must be actually async. Will be fixed naturally when we aren't using winJS promises... * Settings editor - TOC should only expand the section with a selected item * Bump node-debug2 * Settings editor - Tree focus outlines * Settings editor - don't blink the scrollbar when toc selection changes And hide TOC correctly when the editor is narrow * Settings editor - header rows should not be selectable * fixes #54877 * change debug assignee to isi * Settings sweep (#54690) * workaround for #55051 * Settings sweep (#54690) * settings sweep #54690 * Don't try closing tags when you type > after another > * Describe what implementation code lens does Fixes #55370 * fix javadoc formatter setting description * fixes #55325 * update to officical TS version * Settings editor - Even more padding, use semibold instead of bold * Fix #55357 - fix TOC twistie * fixes #55288 * explorer: refresh on di change file system provider registration fixes #53256 * Disable push to Linux repo to test standalone publisher * New env var to notify log level to extensions #54001 * Disable snippets in extension search (when not in suggest dropdown) (#55281) * Disable snippits in extension search (when not in suggest dropdown) * Add monaco input contributions * Fix bug preventing snippetSuggestions from taking effect in sub-editors * Latest emmet helper to fix #52366 * Fix comment updates for threads within same file * Allow extensions to log telemetry to log files #54001 * Pull latest css grammar * files.exclude control - use same style for "add" vs "edit" * files.exclude control - focus/keyboard behavior * don't show menubar too early * files.exclude - better styling * Place cursor at end of extensions search box on autofill (#55254) * Place cursor at end of extensions search box on autofill * Use position instead of selection * fix linux build issue (empty if block) * Settings editor - fix extension category prefixes * Settings editor - add simple ellipsis for first line that overflows, doesn't cover case when first line does not overflow but there is more text, TODO * File/Text search provider docs * Fixes #52655 * Include epoch (#55008) * Fixes #53385 * Fixes #49480 * VS Code Insiders (Users) not opening Fixes #55353 * Better handling of the case when the extension host fails to start * Fixes #53966 * Remove confusing Start from wordPartLeft commands ID * vscode-xterm@3.6.0-beta12 Fixes #55488 * Initial size is set to infinity!! Fixes #55461 * Polish embeddedEditorBackground * configuration service misses event * Fix #55224 - fix duplicate results in multiroot workspace from splitting the diskseach query * Select all not working in issue reporter on mac, fixes #55424 * Disable fuzzy matching for extensions autosuggest (#55498) * Fix clipping of extensions search border in some third party themes (#55504) * fixes #55538 * Fix bug causing an aria alert to not be shown the third time (and odd numbers thereafter) * Settings editor - work around rendering glitch with webkit-line-clamp * Settings editor - revert earlier '...' changes * Settings editor - move enumDescription to its own div, because it disturbs -webkit-line-clamp for some reason * Settings editor - better overflow indicator * Don't show existing filters in autocomplete (#55495) * Dont show existing filters in autocomplete * Simplify * Settings Editor: Add aria labels for input elements Fixes: #54836 (#55543) * fixes #55223 * Update vscode-css-languageservice to 3.0.10-next.1 * Fix #55509 - settings navigation * Fix #55519 * Fix #55520 * FIx #55524 * Fix #55556 - include wordSeparators in all search queries, so findTextInFiles can respect isWordMatch correctly * oss updates for endgame * Fix unit tests * fixes #55522 * Avoid missing manifest error from bubbling up #54757 * Settings format crawl * Search provider - Fix FileSearchProvider to return array, not progress * Fix #55598 * Settings editor - fix NPE rendering settings with no description * dont render inden guides in search box (#55600) * fixes #55454 * More settings crawl * Another change for #55598 - maxResults applies to FileSearch and TextSearch but not FileIndex * Fix FileSearchProvider unit tests for progress change * fixes #55561 * Settings description update for #54690 * Update setting descriptions for online services * Minor edits * fixes #55513 * fixes #55451 * Fix #55612 - fix findTextInFiles cancellation * fixes #55539 * More setting description tweaks * Setting to disable online experiments #54354 * fixes #55507 * fixes #55515 * Show online services action only in Insiders for now * Settings editor - change toc behavior default to 'filter' * Settings editor - nicer filter count style during search * Fix #55617 - search viewlet icons * Settings editor - better styling for element count indicator * SearchProvider - fix NPE when searching extraFileResources * Allow extends to work without json suffix Fixes #16905 * Remove accessability options logic entirely Follow up on #55451 * use latest version of DAP * fixes #55490 * fixes #55122 * fixes #52332 * Avoid assumptions about git: URIs (fixes #36236) * relative path for descriptions * resourece: get rid of isFile context key fixes #48275 * Register previous ids for compatibility (#53497) * more tuning for #48275 * no need to always re-read "files explorer" fixes #52003 * read out active composites properly fixes #51967 * Update link colors for hc theme to meet color contrast ratio, fixes #55651 Also updated link color for `textLinkActiveForeground` to be the same as `textLinkForeground` as it wasn't properly updated * detect 'winpty-agent.exe'; fixes #55672 * node-debug@1.26.7 * reset counter on new label * Settings editor - fix multiple setting links in one description * Settings editor - color code blocks in setting descriptions, fix #55532 * Settings editor - hover color in TOC * Settings editor - fix navigation NPE * Settings editor - fix text control width * Settings editor - maybe fix #55684 * Fix bug causing cursor to not move on paste * fixes #53582 * Use ctrlCmd instead of ctrl for go down from search box * fixes #55264 * fixes #55456 * filter for spcaes before triggering search (#55611) * Fix #55698 - don't lose filtered TOC counts when refreshing TOC * fixes #55421 * fixes #28979 * fixes #55576 * only add check for updates to windows/linux help * readonly files: append decoration to label fixes #53022 * debug: do not show toolbar while initialising fixes #55026 * Opening launch.json should not activate debug extensions fixes #55029 * fixes #55435 * fixes #55434 * fixes #55439 * trigger menu only on altkey up * Fix #50555 - fix settings editor memory leak * Fix #55712 - no need to focus 'a' anymore when restoring control focus after tree render * fixes #55335 * proper fix for readonly model fixes #53022 * improve FoldingRangeKind spec (for #55686) * Use class with static fields (fixes #55494) * Fixes #53671 * fixes #54630 * [html] should disable ionic suggestions by default. Currently forces deprecated Ionic v1 suggestions in .html files while typing. Fixes #53324 * cleanup deps * debug issues back to andre * update electron for smoketest * Fix #55757 - prevent settings tabs from overflowing * Fix #53897 - revert setting menu defaults to old editor * Add enum descriptions to `typescript.preferences.importModuleSpecifier` * Fix #55767 - leaking style elements from settings editor * Fix #55521 - prevent flashing when clicking in exclude control * Update Git modified color for contrast ratio, fixes #53140 * Revert "Merge branch 'master' of github.com:Microsoft/vscode" This reverts commit bf46b6bfbae0cab99c2863e1244a916181fa9fbc, reversing changes made to e275a424483dfb4ed33b428c97d5e2c441d6b917. * Revert "Revert "Merge branch 'master' of github.com:Microsoft/vscode"" This reverts commit 53949d963f39e40757557c6526332354a31d9154. * don't ask to install an incomplete menu * Fix NPE in terminal AccessibilityManager Fixes #55744 * don't display fallback menu unless we've closed the last window * fixes #55547 * Fix smoke tests for extension search box * Update OSSREADME.json for Electron 2.0.5 * Update distro Includes Chromium license changes * fix #55455 * fix #55865 * fixes #55893 * Fix bug causing workspace recommendations to go away upon ignoring a recommendation (#55805) * Fix bug causing workspace recommendations to go away upon ignoring a recommendation * ONly show on @recommended or @recommended:workspace * Make more consistant * Fix #55911 * Understand json activity (#55926) * Understand json file activity * Refactoring * adding composer.json * Distro update for experiments * use terminal.processId for auto-attach; fixes #55918 * Reject invalid URI with vscode.openFolder (for #55891) * improve win32 setup system vs user detection fixes #55840 fixes #55840 delay winreg import related to #55840 show notification earlier related to #55840 fix #55840 update inno setup message related to #55840 * Fix #55593 - this code only operates on local paths, so use fsPath and Uri.file instead * Bring back the old menu due to electron 2.0 issues (#55913) * add the old menu back for native menus * make menu labels match * `vscode.openFolder`: treat missing URI schema gracefully (for #55891) * delay EH reattach; fixes #55955 * Mark all json files under appSettingsHome as settings * Use localized strings for telemetry opt-out * Exception when saving file editor opened from remote file provider (fixes #55051) * Remove terminal menu from stable Fixes 56003 * VSCode Insiders crashes on open with TypeError: Cannot read property 'lastIndexOf' of undefined. Fixes #54933 * improve fix for #55891 * fix #55916 * Improve #55891 * increase EH debugging restart delay; fixes #55955 * Revert "Don't include non-resource entries in history quick pick" This reverts commit 37209a838e9f7e9abe6dc53ed73cdf1e03b72060. * Diff editor: horizontal scrollbar height is smaller (fixes #56062) * improve openFolder uri fix (correctly treat backslashes) * fixes #56116 repair ipc for native menubar keybindings * Fix #56240 - Open the JSON settings editor instead of the UI editor * Fix #55536 * uriDisplay: if no formatter is registered fall back to getPathlabel fixes #56104 * VSCode hangs when opening python file. Fixes #56377 * VS Code Hangs When Opening Specific PowerShell File. Fixes #56430 * Fix #56433 - search extraFileResources even when no folders open * Workaround #55649 * Fix in master #56371 * Fix tests #56371 * Fix in master #56317 * increase version to 1.26.1 * Fixes #56387: Handle SIGPIPE in extension host * fixes #56185 * Fix merge issues (part 1) * Fix build breaks (part 1) * Build breaks (part 2) * Build breaks (part 3) * More build breaks (part 4) * Fix build breaks (part 5) * WIP * Fix menus * Render query result and message panels (#2363) * Put back query editor hot exit changes * Fix grid changes that broke profiler (#2365) * Update APIs for saving query editor state * Fix restore view state for profiler and edit data * Updating custom default themes to support 4.5:1 contrast ratio * Test updates * Fix Extension Manager and Windows Setup * Update license headers * Add appveyor and travis files back * Fix hidden modal dropdown issue
This commit is contained in:
Karl Burtram
@@ -61,6 +61,8 @@ export interface IEnvConfiguration {
|
||||
accessibilitySupport: platform.AccessibilitySupport;
|
||||
}
|
||||
|
||||
const hasOwnProperty = Object.hasOwnProperty;
|
||||
|
||||
export abstract class CommonEditorConfiguration extends Disposable implements editorCommon.IConfiguration {
|
||||
|
||||
protected _rawOptions: editorOptions.IEditorOptions;
|
||||
@@ -80,6 +82,7 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
|
||||
this._rawOptions.scrollbar = objects.mixin({}, this._rawOptions.scrollbar || {});
|
||||
this._rawOptions.minimap = objects.mixin({}, this._rawOptions.minimap || {});
|
||||
this._rawOptions.find = objects.mixin({}, this._rawOptions.find || {});
|
||||
this._rawOptions.hover = objects.mixin({}, this._rawOptions.hover || {});
|
||||
|
||||
this._validatedOptions = editorOptions.EditorOptionsValidator.validate(this._rawOptions, EDITOR_DEFAULTS);
|
||||
this.editor = null;
|
||||
@@ -90,6 +93,9 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
|
||||
this._register(TabFocus.onDidChangeTabFocus(_ => this._recomputeOptions()));
|
||||
}
|
||||
|
||||
public observeReferenceElement(dimension?: editorCommon.IDimension): void {
|
||||
}
|
||||
|
||||
public dispose(): void {
|
||||
super.dispose();
|
||||
}
|
||||
@@ -132,7 +138,53 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
|
||||
return editorOptions.InternalEditorOptionsFactory.createInternalEditorOptions(env, opts);
|
||||
}
|
||||
|
||||
private static _primitiveArrayEquals(a: any[], b: any[]): boolean {
|
||||
if (a.length !== b.length) {
|
||||
return false;
|
||||
}
|
||||
for (let i = 0; i < a.length; i++) {
|
||||
if (a[i] !== b[i]) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private static _subsetEquals(base: object, subset: object): boolean {
|
||||
for (let key in subset) {
|
||||
if (hasOwnProperty.call(subset, key)) {
|
||||
const subsetValue = subset[key];
|
||||
const baseValue = base[key];
|
||||
|
||||
if (baseValue === subsetValue) {
|
||||
continue;
|
||||
}
|
||||
if (Array.isArray(baseValue) && Array.isArray(subsetValue)) {
|
||||
if (!this._primitiveArrayEquals(baseValue, subsetValue)) {
|
||||
return false;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (typeof baseValue === 'object' && typeof subsetValue === 'object') {
|
||||
if (!this._subsetEquals(baseValue, subsetValue)) {
|
||||
return false;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public updateOptions(newOptions: editorOptions.IEditorOptions): void {
|
||||
if (typeof newOptions === 'undefined') {
|
||||
return;
|
||||
}
|
||||
if (CommonEditorConfiguration._subsetEquals(this._rawOptions, newOptions)) {
|
||||
return;
|
||||
}
|
||||
this._rawOptions = objects.mixin(this._rawOptions, newOptions || {});
|
||||
this._validatedOptions = editorOptions.EditorOptionsValidator.validate(this._rawOptions, EDITOR_DEFAULTS);
|
||||
this._recomputeOptions();
|
||||
@@ -194,7 +246,7 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.lineHeight': {
|
||||
'type': 'number',
|
||||
'default': EDITOR_FONT_DEFAULTS.lineHeight,
|
||||
'description': nls.localize('lineHeight', "Controls the line height. Use 0 to compute the lineHeight from the fontSize.")
|
||||
'description': nls.localize('lineHeight', "Controls the line height. Use 0 to compute the line height from the font size.")
|
||||
},
|
||||
'editor.letterSpacing': {
|
||||
'type': 'number',
|
||||
@@ -219,50 +271,55 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'type': 'number'
|
||||
},
|
||||
'default': EDITOR_DEFAULTS.viewInfo.rulers,
|
||||
'description': nls.localize('rulers', "Render vertical rulers after a certain number of monospace characters. Use multiple values for multiple rulers. No rulers are drawn if array is empty")
|
||||
'description': nls.localize('rulers', "Render vertical rulers after a certain number of monospace characters. Use multiple values for multiple rulers. No rulers are drawn if array is empty.")
|
||||
},
|
||||
'editor.wordSeparators': {
|
||||
'type': 'string',
|
||||
'default': EDITOR_DEFAULTS.wordSeparators,
|
||||
'description': nls.localize('wordSeparators', "Characters that will be used as word separators when doing word related navigations or operations")
|
||||
'description': nls.localize('wordSeparators', "Characters that will be used as word separators when doing word related navigations or operations.")
|
||||
},
|
||||
'editor.tabSize': {
|
||||
'type': 'number',
|
||||
'default': EDITOR_MODEL_DEFAULTS.tabSize,
|
||||
'minimum': 1,
|
||||
'description': nls.localize('tabSize', "The number of spaces a tab is equal to. This setting is overridden based on the file contents when `editor.detectIndentation` is on."),
|
||||
'description': nls.localize('tabSize', "The number of spaces a tab is equal to. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on."),
|
||||
'errorMessage': nls.localize('tabSize.errorMessage', "Expected 'number'. Note that the value \"auto\" has been replaced by the `editor.detectIndentation` setting.")
|
||||
},
|
||||
'editor.insertSpaces': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_MODEL_DEFAULTS.insertSpaces,
|
||||
'description': nls.localize('insertSpaces', "Insert spaces when pressing Tab. This setting is overridden based on the file contents when `editor.detectIndentation` is on."),
|
||||
'description': nls.localize('insertSpaces', "Insert spaces when pressing `Tab`. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on."),
|
||||
'errorMessage': nls.localize('insertSpaces.errorMessage', "Expected 'boolean'. Note that the value \"auto\" has been replaced by the `editor.detectIndentation` setting.")
|
||||
},
|
||||
'editor.detectIndentation': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_MODEL_DEFAULTS.detectIndentation,
|
||||
'description': nls.localize('detectIndentation', "When opening a file, `editor.tabSize` and `editor.insertSpaces` will be detected based on the file contents.")
|
||||
'description': nls.localize('detectIndentation', "Controls whether `#editor.tabSize#` and `#editor.insertSpaces#` will be automatically detected when a file is opened based on the file contents.")
|
||||
},
|
||||
'editor.roundedSelection': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.roundedSelection,
|
||||
'description': nls.localize('roundedSelection', "Controls if selections have rounded corners")
|
||||
'description': nls.localize('roundedSelection', "Controls whether selections should have rounded corners.")
|
||||
},
|
||||
'editor.scrollBeyondLastLine': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.scrollBeyondLastLine,
|
||||
'description': nls.localize('scrollBeyondLastLine', "Controls if the editor will scroll beyond the last line")
|
||||
'description': nls.localize('scrollBeyondLastLine', "Controls whether the editor will scroll beyond the last line.")
|
||||
},
|
||||
'editor.scrollBeyondLastColumn': {
|
||||
'type': 'number',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.scrollBeyondLastColumn,
|
||||
'description': nls.localize('scrollBeyondLastColumn', "Controls the number of extra characters beyond which the editor will scroll horizontally.")
|
||||
},
|
||||
'editor.smoothScrolling': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.smoothScrolling,
|
||||
'description': nls.localize('smoothScrolling', "Controls if the editor will scroll using an animation")
|
||||
'description': nls.localize('smoothScrolling', "Controls whether the editor will scroll using an animation.")
|
||||
},
|
||||
'editor.minimap.enabled': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.minimap.enabled,
|
||||
'description': nls.localize('minimap.enabled', "Controls if the minimap is shown")
|
||||
'description': nls.localize('minimap.enabled', "Controls whether the minimap is shown.")
|
||||
},
|
||||
'editor.minimap.side': {
|
||||
'type': 'string',
|
||||
@@ -279,27 +336,42 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.minimap.renderCharacters': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.minimap.renderCharacters,
|
||||
'description': nls.localize('minimap.renderCharacters', "Render the actual characters on a line (as opposed to color blocks)")
|
||||
'description': nls.localize('minimap.renderCharacters', "Render the actual characters on a line as opposed to color blocks.")
|
||||
},
|
||||
'editor.minimap.maxColumn': {
|
||||
'type': 'number',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.minimap.maxColumn,
|
||||
'description': nls.localize('minimap.maxColumn', "Limit the width of the minimap to render at most a certain number of columns")
|
||||
'description': nls.localize('minimap.maxColumn', "Limit the width of the minimap to render at most a certain number of columns.")
|
||||
},
|
||||
'editor.hover.enabled': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.hover.enabled,
|
||||
'description': nls.localize('hover.enabled', "Controls whether the hover is shown.")
|
||||
},
|
||||
'editor.hover.delay': {
|
||||
'type': 'number',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.hover.delay,
|
||||
'description': nls.localize('hover.delay', "Time delay in milliseconds after which to the hover is shown.")
|
||||
},
|
||||
'editor.hover.sticky': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.hover.sticky,
|
||||
'description': nls.localize('hover.sticky', "Controls whether the hover should remain visible when mouse is moved over it.")
|
||||
},
|
||||
'editor.find.seedSearchStringFromSelection': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.find.seedSearchStringFromSelection,
|
||||
'description': nls.localize('find.seedSearchStringFromSelection', "Controls if we seed the search string in Find Widget from editor selection")
|
||||
'description': nls.localize('find.seedSearchStringFromSelection', "Controls whether the search string in the Find Widget is seeded from the editor selection.")
|
||||
},
|
||||
'editor.find.autoFindInSelection': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.find.autoFindInSelection,
|
||||
'description': nls.localize('find.autoFindInSelection', "Controls if Find in Selection flag is turned on when multiple characters or lines of text are selected in the editor")
|
||||
'description': nls.localize('find.autoFindInSelection', "Controls whether the find operation is carried on selected text or the entire file in the editor.")
|
||||
},
|
||||
'editor.find.globalFindClipboard': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.find.globalFindClipboard,
|
||||
'description': nls.localize('find.globalFindClipboard', "Controls if the Find Widget should read or modify the shared find clipboard on macOS"),
|
||||
'description': nls.localize('find.globalFindClipboard', "Controls whether the Find Widget should read or modify the shared find clipboard on macOS."),
|
||||
'included': platform.isMacintosh
|
||||
},
|
||||
'editor.wordWrap': {
|
||||
@@ -313,14 +385,14 @@ const editorConfiguration: IConfigurationNode = {
|
||||
comment: [
|
||||
'- `editor.wordWrapColumn` refers to a different setting and should not be localized.'
|
||||
]
|
||||
}, "Lines will wrap at `editor.wordWrapColumn`."),
|
||||
}, "Lines will wrap at `#editor.wordWrapColumn#`."),
|
||||
nls.localize({
|
||||
key: 'wordWrap.bounded',
|
||||
comment: [
|
||||
'- viewport means the edge of the visible window size.',
|
||||
'- `editor.wordWrapColumn` refers to a different setting and should not be localized.'
|
||||
]
|
||||
}, "Lines will wrap at the minimum of viewport and `editor.wordWrapColumn`."),
|
||||
}, "Lines will wrap at the minimum of viewport and `#editor.wordWrapColumn#`."),
|
||||
],
|
||||
'default': EDITOR_DEFAULTS.wordWrap,
|
||||
'description': nls.localize({
|
||||
@@ -329,7 +401,7 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'- \'off\', \'on\', \'wordWrapColumn\' and \'bounded\' refer to values the setting can take and should not be localized.',
|
||||
'- `editor.wordWrapColumn` refers to a different setting and should not be localized.'
|
||||
]
|
||||
}, "Controls how lines should wrap. Can be:\n - 'off' (disable wrapping),\n - 'on' (viewport wrapping),\n - 'wordWrapColumn' (wrap at `editor.wordWrapColumn`) or\n - 'bounded' (wrap at minimum of viewport and `editor.wordWrapColumn`).")
|
||||
}, "Controls how lines should wrap.")
|
||||
},
|
||||
'editor.wordWrapColumn': {
|
||||
'type': 'integer',
|
||||
@@ -341,18 +413,24 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'- `editor.wordWrap` refers to a different setting and should not be localized.',
|
||||
'- \'wordWrapColumn\' and \'bounded\' refer to values the different setting can take and should not be localized.'
|
||||
]
|
||||
}, "Controls the wrapping column of the editor when `editor.wordWrap` is 'wordWrapColumn' or 'bounded'.")
|
||||
}, "Controls the wrapping column of the editor when `#editor.wordWrap#` is `wordWrapColumn` or `bounded`.")
|
||||
},
|
||||
'editor.wrappingIndent': {
|
||||
'type': 'string',
|
||||
'enum': ['none', 'same', 'indent'],
|
||||
'enum': ['none', 'same', 'indent', 'deepIndent'],
|
||||
enumDescriptions: [
|
||||
nls.localize('wrappingIndent.none', "No indentation. Wrapped lines begin at column 1."),
|
||||
nls.localize('wrappingIndent.same', "Wrapped lines get the same indentation as the parent."),
|
||||
nls.localize('wrappingIndent.indent', "Wrapped lines get +1 indentation toward the parent."),
|
||||
nls.localize('wrappingIndent.deepIndent', "Wrapped lines get +2 indentation toward the parent."),
|
||||
],
|
||||
'default': 'same',
|
||||
'description': nls.localize('wrappingIndent', "Controls the indentation of wrapped lines. Can be one of 'none', 'same' or 'indent'.")
|
||||
'description': nls.localize('wrappingIndent', "Controls the indentation of wrapped lines."),
|
||||
},
|
||||
'editor.mouseWheelScrollSensitivity': {
|
||||
'type': 'number',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.scrollbar.mouseWheelScrollSensitivity,
|
||||
'description': nls.localize('mouseWheelScrollSensitivity', "A multiplier to be used on the `deltaX` and `deltaY` of mouse wheel scroll events")
|
||||
'description': nls.localize('mouseWheelScrollSensitivity', "A multiplier to be used on the `deltaX` and `deltaY` of mouse wheel scroll events.")
|
||||
},
|
||||
'editor.multiCursorModifier': {
|
||||
'type': 'string',
|
||||
@@ -368,7 +446,7 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'- `ctrlCmd` refers to a value the setting can take and should not be localized.',
|
||||
'- `Control` and `Command` refer to the modifier keys Ctrl or Cmd on the keyboard and can be localized.'
|
||||
]
|
||||
}, "The modifier to be used to add multiple cursors with the mouse. `ctrlCmd` maps to `Control` on Windows and Linux and to `Command` on macOS. The Go To Definition and Open Link mouse gestures will adapt such that they do not conflict with the multicursor modifier.")
|
||||
}, "The modifier to be used to add multiple cursors with the mouse. The Go To Definition and Open Link mouse gestures will adapt such that they do not conflict with the multicursor modifier. [Read more](https://code.visualstudio.com/docs/editor/codebasics#_multicursor-modifier).")
|
||||
},
|
||||
'editor.multiCursorMergeOverlapping': {
|
||||
'type': 'boolean',
|
||||
@@ -402,54 +480,59 @@ const editorConfiguration: IConfigurationNode = {
|
||||
}
|
||||
],
|
||||
'default': EDITOR_DEFAULTS.contribInfo.quickSuggestions,
|
||||
'description': nls.localize('quickSuggestions', "Controls if suggestions should automatically show up while typing")
|
||||
'description': nls.localize('quickSuggestions', "Controls whether suggestions should automatically show up while typing.")
|
||||
},
|
||||
'editor.quickSuggestionsDelay': {
|
||||
'type': 'integer',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.quickSuggestionsDelay,
|
||||
'minimum': 0,
|
||||
'description': nls.localize('quickSuggestionsDelay', "Controls the delay in ms after which quick suggestions will show up")
|
||||
'description': nls.localize('quickSuggestionsDelay', "Controls the delay in milliseconds after which quick suggestions will show up.")
|
||||
},
|
||||
'editor.parameterHints': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.parameterHints,
|
||||
'description': nls.localize('parameterHints', "Enables pop-up that shows parameter documentation and type information as you type")
|
||||
'description': nls.localize('parameterHints', "Enables a pop-up that shows parameter documentation and type information as you type.")
|
||||
},
|
||||
'editor.autoClosingBrackets': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.autoClosingBrackets,
|
||||
'description': nls.localize('autoClosingBrackets', "Controls if the editor should automatically close brackets after opening them")
|
||||
'description': nls.localize('autoClosingBrackets', "Controls whether the editor should automatically close brackets after the user adds an opening bracket.")
|
||||
},
|
||||
'editor.formatOnType': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.formatOnType,
|
||||
'description': nls.localize('formatOnType', "Controls if the editor should automatically format the line after typing")
|
||||
'description': nls.localize('formatOnType', "Controls whether the editor should automatically format the line after typing.")
|
||||
},
|
||||
'editor.formatOnPaste': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.formatOnPaste,
|
||||
'description': nls.localize('formatOnPaste', "Controls if the editor should automatically format the pasted content. A formatter must be available and the formatter should be able to format a range in a document.")
|
||||
'description': nls.localize('formatOnPaste', "Controls whether the editor should automatically format the pasted content. A formatter must be available and the formatter should be able to format a range in a document.")
|
||||
},
|
||||
'editor.autoIndent': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.autoIndent,
|
||||
'description': nls.localize('autoIndent', "Controls if the editor should automatically adjust the indentation when users type, paste or move lines. Indentation rules of the language must be available.")
|
||||
'description': nls.localize('autoIndent', "Controls whether the editor should automatically adjust the indentation when users type, paste or move lines. Extensions with indentation rules of the language must be available.")
|
||||
},
|
||||
'editor.suggestOnTriggerCharacters': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.suggestOnTriggerCharacters,
|
||||
'description': nls.localize('suggestOnTriggerCharacters', "Controls if suggestions should automatically show up when typing trigger characters")
|
||||
'description': nls.localize('suggestOnTriggerCharacters', "Controls whether suggestions should automatically show up when typing trigger characters.")
|
||||
},
|
||||
'editor.acceptSuggestionOnEnter': {
|
||||
'type': 'string',
|
||||
'enum': ['on', 'smart', 'off'],
|
||||
'default': EDITOR_DEFAULTS.contribInfo.acceptSuggestionOnEnter,
|
||||
'description': nls.localize('acceptSuggestionOnEnter', "Controls if suggestions should be accepted on 'Enter' - in addition to 'Tab'. Helps to avoid ambiguity between inserting new lines or accepting suggestions. The value 'smart' means only accept a suggestion with Enter when it makes a textual change")
|
||||
'enumDescriptions': [
|
||||
'',
|
||||
nls.localize('acceptSuggestionOnEnterSmart', "Only accept a suggestion with `Enter` when it makes a textual change."),
|
||||
''
|
||||
],
|
||||
'description': nls.localize('acceptSuggestionOnEnter', "Controls whether suggestions should be accepted on `Enter`, in addition to `Tab`. Helps to avoid ambiguity between inserting new lines or accepting suggestions.")
|
||||
},
|
||||
'editor.acceptSuggestionOnCommitCharacter': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.acceptSuggestionOnCommitCharacter,
|
||||
'description': nls.localize('acceptSuggestionOnCommitCharacter', "Controls if suggestions should be accepted on commit characters. For instance in JavaScript the semi-colon (';') can be a commit character that accepts a suggestion and types that character.")
|
||||
'description': nls.localize('acceptSuggestionOnCommitCharacter', "Controls whether suggestions should be accepted on commit characters. For example, in JavaScript, the semi-colon (`;`) can be a commit character that accepts a suggestion and types that character.")
|
||||
},
|
||||
'editor.snippetSuggestions': {
|
||||
'type': 'string',
|
||||
@@ -460,7 +543,7 @@ const editorConfiguration: IConfigurationNode = {
|
||||
nls.localize('snippetSuggestions.inline', "Show snippets suggestions with other suggestions."),
|
||||
nls.localize('snippetSuggestions.none', "Do not show snippet suggestions."),
|
||||
],
|
||||
'default': EDITOR_DEFAULTS.contribInfo.snippetSuggestions,
|
||||
'default': EDITOR_DEFAULTS.contribInfo.suggest.snippets,
|
||||
'description': nls.localize('snippetSuggestions', "Controls whether snippets are shown with other suggestions and how they are sorted.")
|
||||
},
|
||||
'editor.emptySelectionClipboard': {
|
||||
@@ -488,33 +571,43 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'type': 'integer',
|
||||
'default': 0,
|
||||
'minimum': 0,
|
||||
'description': nls.localize('suggestFontSize', "Font size for the suggest widget")
|
||||
'description': nls.localize('suggestFontSize', "Font size for the suggest widget.")
|
||||
},
|
||||
'editor.suggestLineHeight': {
|
||||
'type': 'integer',
|
||||
'default': 0,
|
||||
'minimum': 0,
|
||||
'description': nls.localize('suggestLineHeight', "Line height for the suggest widget")
|
||||
'description': nls.localize('suggestLineHeight', "Line height for the suggest widget.")
|
||||
},
|
||||
'editor.suggest.filterGraceful': {
|
||||
type: 'boolean',
|
||||
default: true,
|
||||
description: nls.localize('suggest.filterGraceful', "Controls whether filtering and sorting suggestions accounts for small typos.")
|
||||
},
|
||||
'editor.suggest.snippetsPreventQuickSuggestions': {
|
||||
type: 'boolean',
|
||||
default: true,
|
||||
description: nls.localize('suggest.snippetsPreventQuickSuggestions', "Control whether an active snippet prevents quick suggestions.")
|
||||
},
|
||||
'editor.selectionHighlight': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.selectionHighlight,
|
||||
'description': nls.localize('selectionHighlight', "Controls whether the editor should highlight similar matches to the selection")
|
||||
'description': nls.localize('selectionHighlight', "Controls whether the editor should highlight matches similar to the selection")
|
||||
},
|
||||
'editor.occurrencesHighlight': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.occurrencesHighlight,
|
||||
'description': nls.localize('occurrencesHighlight', "Controls whether the editor should highlight semantic symbol occurrences")
|
||||
'description': nls.localize('occurrencesHighlight', "Controls whether the editor should highlight semantic symbol occurrences.")
|
||||
},
|
||||
'editor.overviewRulerLanes': {
|
||||
'type': 'integer',
|
||||
'default': 3,
|
||||
'description': nls.localize('overviewRulerLanes', "Controls the number of decorations that can show up at the same position in the overview ruler")
|
||||
'description': nls.localize('overviewRulerLanes', "Controls the number of decorations that can show up at the same position in the overview ruler.")
|
||||
},
|
||||
'editor.overviewRulerBorder': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.overviewRulerBorder,
|
||||
'description': nls.localize('overviewRulerBorder', "Controls if a border should be drawn around the overview ruler.")
|
||||
'description': nls.localize('overviewRulerBorder', "Controls whether a border should be drawn around the overview ruler.")
|
||||
},
|
||||
'editor.cursorBlinking': {
|
||||
'type': 'string',
|
||||
@@ -525,55 +618,71 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.mouseWheelZoom': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.mouseWheelZoom,
|
||||
'description': nls.localize('mouseWheelZoom', "Zoom the font of the editor when using mouse wheel and holding Ctrl")
|
||||
'description': nls.localize('mouseWheelZoom', "Zoom the font of the editor when using mouse wheel and holding `Ctrl`.")
|
||||
},
|
||||
'editor.cursorStyle': {
|
||||
'type': 'string',
|
||||
'enum': ['block', 'block-outline', 'line', 'line-thin', 'underline', 'underline-thin'],
|
||||
'default': editorOptions.cursorStyleToString(EDITOR_DEFAULTS.viewInfo.cursorStyle),
|
||||
'description': nls.localize('cursorStyle', "Controls the cursor style, accepted values are 'block', 'block-outline', 'line', 'line-thin', 'underline' and 'underline-thin'")
|
||||
'description': nls.localize('cursorStyle', "Controls the cursor style.")
|
||||
},
|
||||
'editor.cursorWidth': {
|
||||
'type': 'integer',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.cursorWidth,
|
||||
'description': nls.localize('cursorWidth', "Controls the width of the cursor when editor.cursorStyle is set to 'line'")
|
||||
'description': nls.localize('cursorWidth', "Controls the width of the cursor when `#editor.cursorStyle#` is set to `line`.")
|
||||
},
|
||||
'editor.fontLigatures': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.fontLigatures,
|
||||
'description': nls.localize('fontLigatures', "Enables font ligatures")
|
||||
'description': nls.localize('fontLigatures', "Enables/Disables font ligatures.")
|
||||
},
|
||||
'editor.hideCursorInOverviewRuler': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.viewInfo.hideCursorInOverviewRuler,
|
||||
'description': nls.localize('hideCursorInOverviewRuler', "Controls if the cursor should be hidden in the overview ruler.")
|
||||
'description': nls.localize('hideCursorInOverviewRuler', "Controls whether the cursor should be hidden in the overview ruler.")
|
||||
},
|
||||
'editor.renderWhitespace': {
|
||||
'type': 'string',
|
||||
'enum': ['none', 'boundary', 'all'],
|
||||
'enumDescriptions': [
|
||||
'',
|
||||
nls.localize('renderWhiteSpace.boundary', "Render whitespace characters except for single spaces between words."),
|
||||
''
|
||||
],
|
||||
default: EDITOR_DEFAULTS.viewInfo.renderWhitespace,
|
||||
description: nls.localize('renderWhitespace', "Controls how the editor should render whitespace characters, possibilities are 'none', 'boundary', and 'all'. The 'boundary' option does not render single spaces between words.")
|
||||
description: nls.localize('renderWhitespace', "Controls how the editor should render whitespace characters.")
|
||||
},
|
||||
'editor.renderControlCharacters': {
|
||||
'type': 'boolean',
|
||||
default: EDITOR_DEFAULTS.viewInfo.renderControlCharacters,
|
||||
description: nls.localize('renderControlCharacters', "Controls whether the editor should render control characters")
|
||||
description: nls.localize('renderControlCharacters', "Controls whether the editor should render control characters.")
|
||||
},
|
||||
'editor.renderIndentGuides': {
|
||||
'type': 'boolean',
|
||||
default: EDITOR_DEFAULTS.viewInfo.renderIndentGuides,
|
||||
description: nls.localize('renderIndentGuides', "Controls whether the editor should render indent guides")
|
||||
description: nls.localize('renderIndentGuides', "Controls whether the editor should render indent guides.")
|
||||
},
|
||||
'editor.highlightActiveIndentGuide': {
|
||||
'type': 'boolean',
|
||||
default: EDITOR_DEFAULTS.viewInfo.highlightActiveIndentGuide,
|
||||
description: nls.localize('highlightActiveIndentGuide', "Controls whether the editor should highlight the active indent guide.")
|
||||
},
|
||||
'editor.renderLineHighlight': {
|
||||
'type': 'string',
|
||||
'enum': ['none', 'gutter', 'line', 'all'],
|
||||
'enumDescriptions': [
|
||||
'',
|
||||
'',
|
||||
'',
|
||||
nls.localize('renderLineHighlight.all', "Highlights both the gutter and the current line."),
|
||||
],
|
||||
default: EDITOR_DEFAULTS.viewInfo.renderLineHighlight,
|
||||
description: nls.localize('renderLineHighlight', "Controls how the editor should render the current line highlight, possibilities are 'none', 'gutter', 'line', and 'all'.")
|
||||
description: nls.localize('renderLineHighlight', "Controls how the editor should render the current line highlight.")
|
||||
},
|
||||
'editor.codeLens': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.codeLens,
|
||||
'description': nls.localize('codeLens', "Controls if the editor shows CodeLens")
|
||||
'description': nls.localize('codeLens', "Controls whether the editor shows CodeLens")
|
||||
},
|
||||
'editor.folding': {
|
||||
'type': 'boolean',
|
||||
@@ -583,12 +692,8 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.foldingStrategy': {
|
||||
'type': 'string',
|
||||
'enum': ['auto', 'indentation'],
|
||||
'enumDescriptions': [
|
||||
nls.localize('foldingStrategyAuto', 'If available, use a language specific folding strategy, otherwise falls back to the indentation based strategy.'),
|
||||
nls.localize('foldingStrategyIndentation', 'Always use the indentation based folding strategy')
|
||||
],
|
||||
'default': EDITOR_DEFAULTS.contribInfo.foldingStrategy,
|
||||
'description': nls.localize('foldingStrategy', "Controls the way folding ranges are computed. 'auto' picks uses a language specific folding strategy, if available. 'indentation' forces that the indentation based folding strategy is used.")
|
||||
'description': nls.localize('foldingStrategy', "Controls the strategy for computing folding ranges. `auto` uses a language specific folding strategy, if available. `indentation` uses the indentation based folding strategy.")
|
||||
},
|
||||
'editor.showFoldingControls': {
|
||||
'type': 'string',
|
||||
@@ -609,22 +714,22 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.useTabStops': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.useTabStops,
|
||||
'description': nls.localize('useTabStops', "Inserting and deleting whitespace follows tab stops")
|
||||
'description': nls.localize('useTabStops', "Inserting and deleting whitespace follows tab stops.")
|
||||
},
|
||||
'editor.trimAutoWhitespace': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_MODEL_DEFAULTS.trimAutoWhitespace,
|
||||
'description': nls.localize('trimAutoWhitespace', "Remove trailing auto inserted whitespace")
|
||||
'description': nls.localize('trimAutoWhitespace', "Remove trailing auto inserted whitespace.")
|
||||
},
|
||||
'editor.stablePeek': {
|
||||
'type': 'boolean',
|
||||
'default': false,
|
||||
'description': nls.localize('stablePeek', "Keep peek editors open even when double clicking their content or when hitting Escape.")
|
||||
'description': nls.localize('stablePeek', "Keep peek editors open even when double clicking their content or when hitting `Escape`.")
|
||||
},
|
||||
'editor.dragAndDrop': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.dragAndDrop,
|
||||
'description': nls.localize('dragAndDrop', "Controls if the editor should allow to move selections via drag and drop.")
|
||||
'description': nls.localize('dragAndDrop', "Controls whether the editor should allow moving selections via drag and drop.")
|
||||
},
|
||||
'editor.accessibilitySupport': {
|
||||
'type': 'string',
|
||||
@@ -637,10 +742,15 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'default': EDITOR_DEFAULTS.accessibilitySupport,
|
||||
'description': nls.localize('accessibilitySupport', "Controls whether the editor should run in a mode where it is optimized for screen readers.")
|
||||
},
|
||||
'editor.showUnused': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.showUnused,
|
||||
'description': nls.localize('showUnused', "Controls fading out of unused code.")
|
||||
},
|
||||
'editor.links': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.links,
|
||||
'description': nls.localize('links', "Controls whether the editor should detect links and make them clickable")
|
||||
'description': nls.localize('links', "Controls whether the editor should detect links and make them clickable.")
|
||||
},
|
||||
'editor.colorDecorators': {
|
||||
'type': 'boolean',
|
||||
@@ -650,14 +760,14 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.lightbulb.enabled': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.lightbulbEnabled,
|
||||
'description': nls.localize('codeActions', "Enables the code action lightbulb")
|
||||
'description': nls.localize('codeActions', "Enables the code action lightbulb in the editor.")
|
||||
},
|
||||
'editor.codeActionsOnSave': {
|
||||
'type': 'object',
|
||||
'properties': {
|
||||
'source.organizeImports': {
|
||||
'type': 'boolean',
|
||||
'description': nls.localize('codeActionsOnSave.organizeImports', "Run organize imports on save?")
|
||||
'description': nls.localize('codeActionsOnSave.organizeImports', "Controls whether organize imports action should be run on file save.")
|
||||
}
|
||||
},
|
||||
'additionalProperties': {
|
||||
@@ -669,23 +779,23 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'editor.codeActionsOnSaveTimeout': {
|
||||
'type': 'number',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.codeActionsOnSaveTimeout,
|
||||
'description': nls.localize('codeActionsOnSaveTimeout', "Timeout for code actions run on save.")
|
||||
'description': nls.localize('codeActionsOnSaveTimeout', "Timeout in milliseconds after which the code actions that are run on save are cancelled.")
|
||||
},
|
||||
'editor.selectionClipboard': {
|
||||
'type': 'boolean',
|
||||
'default': EDITOR_DEFAULTS.contribInfo.selectionClipboard,
|
||||
'description': nls.localize('selectionClipboard', "Controls if the Linux primary clipboard should be supported."),
|
||||
'description': nls.localize('selectionClipboard', "Controls whether the Linux primary clipboard should be supported."),
|
||||
'included': platform.isLinux
|
||||
},
|
||||
'diffEditor.renderSideBySide': {
|
||||
'type': 'boolean',
|
||||
'default': true,
|
||||
'description': nls.localize('sideBySide', "Controls if the diff editor shows the diff side by side or inline")
|
||||
'description': nls.localize('sideBySide', "Controls whether the diff editor shows the diff side by side or inline.")
|
||||
},
|
||||
'diffEditor.ignoreTrimWhitespace': {
|
||||
'type': 'boolean',
|
||||
'default': true,
|
||||
'description': nls.localize('ignoreTrimWhitespace', "Controls if the diff editor shows changes in leading or trailing whitespace as diffs")
|
||||
'description': nls.localize('ignoreTrimWhitespace', "Controls whether the diff editor shows changes in leading or trailing whitespace as diffs.")
|
||||
},
|
||||
'editor.largeFileOptimizations': {
|
||||
'type': 'boolean',
|
||||
@@ -695,9 +805,29 @@ const editorConfiguration: IConfigurationNode = {
|
||||
'diffEditor.renderIndicators': {
|
||||
'type': 'boolean',
|
||||
'default': true,
|
||||
'description': nls.localize('renderIndicators', "Controls if the diff editor shows +/- indicators for added/removed changes")
|
||||
'description': nls.localize('renderIndicators', "Controls whether the diff editor shows +/- indicators for added/removed changes.")
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let cachedEditorConfigurationKeys: { [key: string]: boolean; } = null;
|
||||
function getEditorConfigurationKeys(): { [key: string]: boolean; } {
|
||||
if (cachedEditorConfigurationKeys === null) {
|
||||
cachedEditorConfigurationKeys = Object.create(null);
|
||||
Object.keys(editorConfiguration.properties).forEach((prop) => {
|
||||
cachedEditorConfigurationKeys[prop] = true;
|
||||
});
|
||||
}
|
||||
return cachedEditorConfigurationKeys;
|
||||
}
|
||||
|
||||
export function isEditorConfigurationKey(key: string): boolean {
|
||||
const editorConfigurationKeys = getEditorConfigurationKeys();
|
||||
return (editorConfigurationKeys[`editor.${key}`] || false);
|
||||
}
|
||||
export function isDiffEditorConfigurationKey(key: string): boolean {
|
||||
const editorConfigurationKeys = getEditorConfigurationKeys();
|
||||
return (editorConfigurationKeys[`diffEditor.${key}`] || false);
|
||||
}
|
||||
|
||||
configurationRegistry.registerConfiguration(editorConfiguration);
|
||||
|
||||
Reference in New Issue
Block a user