mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-12 19:18:32 -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
@@ -137,6 +137,38 @@ export interface IEditorLightbulbOptions {
|
||||
enabled?: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* Configuration options for editor hover
|
||||
*/
|
||||
export interface IEditorHoverOptions {
|
||||
/**
|
||||
* Enable the hover.
|
||||
* Defaults to true.
|
||||
*/
|
||||
enabled?: boolean;
|
||||
/**
|
||||
* Delay for showing the hover.
|
||||
* Defaults to 300.
|
||||
*/
|
||||
delay?: number;
|
||||
/**
|
||||
* Is the hover sticky such that it can be clicked and its contents selected?
|
||||
* Defaults to true.
|
||||
*/
|
||||
sticky?: boolean;
|
||||
}
|
||||
|
||||
export interface ISuggestOptions {
|
||||
/**
|
||||
* Enable graceful matching. Defaults to true.
|
||||
*/
|
||||
filterGraceful?: boolean;
|
||||
/**
|
||||
* Prevent quick suggestions when a snippet is active. Defaults to true.
|
||||
*/
|
||||
snippetsPreventQuickSuggestions?: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* Configuration map for codeActionsOnSave
|
||||
*/
|
||||
@@ -300,6 +332,11 @@ export interface IEditorOptions {
|
||||
* Defaults to true.
|
||||
*/
|
||||
scrollBeyondLastLine?: boolean;
|
||||
/**
|
||||
* Enable that scrolling can go beyond the last column by a number of columns.
|
||||
* Defaults to 5.
|
||||
*/
|
||||
scrollBeyondLastColumn?: number;
|
||||
/**
|
||||
* Enable that the editor animates scrolling to a position.
|
||||
* Defaults to false.
|
||||
@@ -335,7 +372,7 @@ export interface IEditorOptions {
|
||||
*/
|
||||
wordWrapMinified?: boolean;
|
||||
/**
|
||||
* Control indentation of wrapped lines. Can be: 'none', 'same' or 'indent'.
|
||||
* Control indentation of wrapped lines. Can be: 'none', 'same', 'indent' or 'deepIndent'.
|
||||
* Defaults to 'same' in vscode and to 'none' in monaco-editor.
|
||||
*/
|
||||
wrappingIndent?: string;
|
||||
@@ -362,10 +399,9 @@ export interface IEditorOptions {
|
||||
*/
|
||||
stopRenderingLineAfter?: number;
|
||||
/**
|
||||
* Enable hover.
|
||||
* Defaults to true.
|
||||
* Configure the editor's hover.
|
||||
*/
|
||||
hover?: boolean;
|
||||
hover?: IEditorHoverOptions;
|
||||
/**
|
||||
* Enable detecting links and making them clickable.
|
||||
* Defaults to true.
|
||||
@@ -400,6 +436,10 @@ export interface IEditorOptions {
|
||||
* Defaults to 'auto'. It is best to leave this to 'auto'.
|
||||
*/
|
||||
accessibilitySupport?: 'auto' | 'off' | 'on';
|
||||
/**
|
||||
* Suggest options.
|
||||
*/
|
||||
suggest?: ISuggestOptions;
|
||||
/**
|
||||
* Enable quick suggestions (shadow suggestions)
|
||||
* Defaults to true.
|
||||
@@ -544,9 +584,14 @@ export interface IEditorOptions {
|
||||
renderControlCharacters?: boolean;
|
||||
/**
|
||||
* Enable rendering of indent guides.
|
||||
* Defaults to false.
|
||||
* Defaults to true.
|
||||
*/
|
||||
renderIndentGuides?: boolean;
|
||||
/**
|
||||
* Enable highlighting of the active indent guide.
|
||||
* Defaults to true.
|
||||
*/
|
||||
highlightActiveIndentGuide?: boolean;
|
||||
/**
|
||||
* Enable rendering of current line highlight.
|
||||
* Defaults to all.
|
||||
@@ -576,6 +621,10 @@ export interface IEditorOptions {
|
||||
* The letter spacing
|
||||
*/
|
||||
letterSpacing?: number;
|
||||
/**
|
||||
* Controls fading out of unused variables.
|
||||
*/
|
||||
showUnused?: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -630,9 +679,13 @@ export enum WrappingIndent {
|
||||
*/
|
||||
Same = 1,
|
||||
/**
|
||||
* Indent => wrapped lines get +1 indentation as the parent.
|
||||
* Indent => wrapped lines get +1 indentation toward the parent.
|
||||
*/
|
||||
Indent = 2
|
||||
Indent = 2,
|
||||
/**
|
||||
* DeepIndent => wrapped lines get +2 indentation toward the parent.
|
||||
*/
|
||||
DeepIndent = 3
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -786,6 +839,18 @@ export interface InternalEditorFindOptions {
|
||||
readonly globalFindClipboard: boolean;
|
||||
}
|
||||
|
||||
export interface InternalEditorHoverOptions {
|
||||
readonly enabled: boolean;
|
||||
readonly delay: number;
|
||||
readonly sticky: boolean;
|
||||
}
|
||||
|
||||
export interface InternalSuggestOptions {
|
||||
readonly filterGraceful: boolean;
|
||||
readonly snippets: 'top' | 'bottom' | 'inline' | 'none';
|
||||
readonly snippetsPreventQuickSuggestions: boolean;
|
||||
}
|
||||
|
||||
export interface EditorWrappingInfo {
|
||||
readonly inDiffEditor: boolean;
|
||||
readonly isDominatedByLongLines: boolean;
|
||||
@@ -825,12 +890,14 @@ export interface InternalEditorViewOptions {
|
||||
readonly cursorWidth: number;
|
||||
readonly hideCursorInOverviewRuler: boolean;
|
||||
readonly scrollBeyondLastLine: boolean;
|
||||
readonly scrollBeyondLastColumn: number;
|
||||
readonly smoothScrolling: boolean;
|
||||
readonly stopRenderingLineAfter: number;
|
||||
readonly renderWhitespace: 'none' | 'boundary' | 'all';
|
||||
readonly renderControlCharacters: boolean;
|
||||
readonly fontLigatures: boolean;
|
||||
readonly renderIndentGuides: boolean;
|
||||
readonly highlightActiveIndentGuide: boolean;
|
||||
readonly renderLineHighlight: 'none' | 'gutter' | 'line' | 'all';
|
||||
readonly scrollbar: InternalEditorScrollbarOptions;
|
||||
readonly minimap: InternalEditorMinimapOptions;
|
||||
@@ -839,7 +906,7 @@ export interface InternalEditorViewOptions {
|
||||
|
||||
export interface EditorContribOptions {
|
||||
readonly selectionClipboard: boolean;
|
||||
readonly hover: boolean;
|
||||
readonly hover: InternalEditorHoverOptions;
|
||||
readonly links: boolean;
|
||||
readonly contextmenu: boolean;
|
||||
readonly quickSuggestions: boolean | { other: boolean, comments: boolean, strings: boolean };
|
||||
@@ -851,11 +918,12 @@ export interface EditorContribOptions {
|
||||
readonly suggestOnTriggerCharacters: boolean;
|
||||
readonly acceptSuggestionOnEnter: 'on' | 'smart' | 'off';
|
||||
readonly acceptSuggestionOnCommitCharacter: boolean;
|
||||
readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
|
||||
// readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
|
||||
readonly wordBasedSuggestions: boolean;
|
||||
readonly suggestSelection: 'first' | 'recentlyUsed' | 'recentlyUsedByPrefix';
|
||||
readonly suggestFontSize: number;
|
||||
readonly suggestLineHeight: number;
|
||||
readonly suggest: InternalSuggestOptions;
|
||||
readonly selectionHighlight: boolean;
|
||||
readonly occurrencesHighlight: boolean;
|
||||
readonly codeLens: boolean;
|
||||
@@ -899,6 +967,7 @@ export interface IValidatedEditorOptions {
|
||||
readonly multiCursorModifier: 'altKey' | 'ctrlKey' | 'metaKey';
|
||||
readonly multiCursorMergeOverlapping: boolean;
|
||||
readonly accessibilitySupport: 'auto' | 'off' | 'on';
|
||||
readonly showUnused: boolean;
|
||||
|
||||
readonly viewInfo: InternalEditorViewOptions;
|
||||
readonly contribInfo: EditorContribOptions;
|
||||
@@ -921,6 +990,7 @@ export class InternalEditorOptions {
|
||||
readonly accessibilitySupport: platform.AccessibilitySupport;
|
||||
readonly multiCursorModifier: 'altKey' | 'ctrlKey' | 'metaKey';
|
||||
readonly multiCursorMergeOverlapping: boolean;
|
||||
readonly showUnused: boolean;
|
||||
|
||||
// ---- cursor options
|
||||
readonly wordSeparators: string;
|
||||
@@ -962,6 +1032,7 @@ export class InternalEditorOptions {
|
||||
viewInfo: InternalEditorViewOptions;
|
||||
wrappingInfo: EditorWrappingInfo;
|
||||
contribInfo: EditorContribOptions;
|
||||
showUnused: boolean;
|
||||
}) {
|
||||
this.canUseLayerHinting = source.canUseLayerHinting;
|
||||
this.pixelRatio = source.pixelRatio;
|
||||
@@ -983,6 +1054,7 @@ export class InternalEditorOptions {
|
||||
this.viewInfo = source.viewInfo;
|
||||
this.wrappingInfo = source.wrappingInfo;
|
||||
this.contribInfo = source.contribInfo;
|
||||
this.showUnused = source.showUnused;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1004,6 +1076,7 @@ export class InternalEditorOptions {
|
||||
&& this.useTabStops === other.useTabStops
|
||||
&& this.tabFocusMode === other.tabFocusMode
|
||||
&& this.dragAndDrop === other.dragAndDrop
|
||||
&& this.showUnused === other.showUnused
|
||||
&& this.emptySelectionClipboard === other.emptySelectionClipboard
|
||||
&& InternalEditorOptions._equalsLayoutInfo(this.layoutInfo, other.layoutInfo)
|
||||
&& this.fontInfo.equals(other.fontInfo)
|
||||
@@ -1105,12 +1178,14 @@ export class InternalEditorOptions {
|
||||
&& a.cursorWidth === b.cursorWidth
|
||||
&& a.hideCursorInOverviewRuler === b.hideCursorInOverviewRuler
|
||||
&& a.scrollBeyondLastLine === b.scrollBeyondLastLine
|
||||
&& a.scrollBeyondLastColumn === b.scrollBeyondLastColumn
|
||||
&& a.smoothScrolling === b.smoothScrolling
|
||||
&& a.stopRenderingLineAfter === b.stopRenderingLineAfter
|
||||
&& a.renderWhitespace === b.renderWhitespace
|
||||
&& a.renderControlCharacters === b.renderControlCharacters
|
||||
&& a.fontLigatures === b.fontLigatures
|
||||
&& a.renderIndentGuides === b.renderIndentGuides
|
||||
&& a.highlightActiveIndentGuide === b.highlightActiveIndentGuide
|
||||
&& a.renderLineHighlight === b.renderLineHighlight
|
||||
&& this._equalsScrollbarOptions(a.scrollbar, b.scrollbar)
|
||||
&& this._equalsMinimapOptions(a.minimap, b.minimap)
|
||||
@@ -1154,7 +1229,6 @@ export class InternalEditorOptions {
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
|
||||
private static _equalFindOptions(a: InternalEditorFindOptions, b: InternalEditorFindOptions): boolean {
|
||||
return (
|
||||
a.seedSearchStringFromSelection === b.seedSearchStringFromSelection
|
||||
@@ -1163,6 +1237,32 @@ export class InternalEditorOptions {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
private static _equalsHoverOptions(a: InternalEditorHoverOptions, b: InternalEditorHoverOptions): boolean {
|
||||
return (
|
||||
a.enabled === b.enabled
|
||||
&& a.delay === b.delay
|
||||
&& a.sticky === b.sticky
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
private static _equalsSuggestOptions(a: InternalSuggestOptions, b: InternalSuggestOptions): any {
|
||||
if (a === b) {
|
||||
return true;
|
||||
} else if (!a || !b) {
|
||||
return false;
|
||||
} else {
|
||||
return a.filterGraceful === b.filterGraceful
|
||||
&& a.snippets === b.snippets
|
||||
&& a.snippetsPreventQuickSuggestions === b.snippetsPreventQuickSuggestions;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
@@ -1186,7 +1286,7 @@ export class InternalEditorOptions {
|
||||
private static _equalsContribOptions(a: EditorContribOptions, b: EditorContribOptions): boolean {
|
||||
return (
|
||||
a.selectionClipboard === b.selectionClipboard
|
||||
&& a.hover === b.hover
|
||||
&& this._equalsHoverOptions(a.hover, b.hover)
|
||||
&& a.links === b.links
|
||||
&& a.contextmenu === b.contextmenu
|
||||
&& InternalEditorOptions._equalsQuickSuggestions(a.quickSuggestions, b.quickSuggestions)
|
||||
@@ -1198,11 +1298,11 @@ export class InternalEditorOptions {
|
||||
&& a.suggestOnTriggerCharacters === b.suggestOnTriggerCharacters
|
||||
&& a.acceptSuggestionOnEnter === b.acceptSuggestionOnEnter
|
||||
&& a.acceptSuggestionOnCommitCharacter === b.acceptSuggestionOnCommitCharacter
|
||||
&& a.snippetSuggestions === b.snippetSuggestions
|
||||
&& a.wordBasedSuggestions === b.wordBasedSuggestions
|
||||
&& a.suggestSelection === b.suggestSelection
|
||||
&& a.suggestFontSize === b.suggestFontSize
|
||||
&& a.suggestLineHeight === b.suggestLineHeight
|
||||
&& this._equalsSuggestOptions(a.suggest, b.suggest)
|
||||
&& a.selectionHighlight === b.selectionHighlight
|
||||
&& a.occurrencesHighlight === b.occurrencesHighlight
|
||||
&& a.codeLens === b.codeLens
|
||||
@@ -1470,10 +1570,12 @@ function _wrappingIndentFromString(wrappingIndent: string, defaultValue: Wrappin
|
||||
if (typeof wrappingIndent !== 'string') {
|
||||
return defaultValue;
|
||||
}
|
||||
if (wrappingIndent === 'indent') {
|
||||
return WrappingIndent.Indent;
|
||||
} else if (wrappingIndent === 'same') {
|
||||
if (wrappingIndent === 'same') {
|
||||
return WrappingIndent.Same;
|
||||
} else if (wrappingIndent === 'indent') {
|
||||
return WrappingIndent.Indent;
|
||||
} else if (wrappingIndent === 'deepIndent') {
|
||||
return WrappingIndent.DeepIndent;
|
||||
} else {
|
||||
return WrappingIndent.None;
|
||||
}
|
||||
@@ -1572,6 +1674,7 @@ export class EditorOptionsValidator {
|
||||
multiCursorModifier: multiCursorModifier,
|
||||
multiCursorMergeOverlapping: _boolean(opts.multiCursorMergeOverlapping, defaults.multiCursorMergeOverlapping),
|
||||
accessibilitySupport: _stringSet<'auto' | 'on' | 'off'>(opts.accessibilitySupport, defaults.accessibilitySupport, ['auto', 'on', 'off']),
|
||||
showUnused: _boolean(opts.showUnused, defaults.showUnused),
|
||||
viewInfo: viewInfo,
|
||||
contribInfo: contribInfo,
|
||||
};
|
||||
@@ -1629,6 +1732,35 @@ export class EditorOptionsValidator {
|
||||
};
|
||||
}
|
||||
|
||||
private static _santizeHoverOpts(_opts: boolean | IEditorHoverOptions, defaults: InternalEditorHoverOptions): InternalEditorHoverOptions {
|
||||
let opts: IEditorHoverOptions;
|
||||
if (typeof _opts === 'boolean') {
|
||||
opts = {
|
||||
enabled: _opts
|
||||
};
|
||||
} else if (typeof _opts === 'object') {
|
||||
opts = _opts;
|
||||
} else {
|
||||
return defaults;
|
||||
}
|
||||
|
||||
return {
|
||||
enabled: _boolean(opts.enabled, defaults.enabled),
|
||||
delay: _clampedInt(opts.delay, defaults.delay, 0, 10000),
|
||||
sticky: _boolean(opts.sticky, defaults.sticky)
|
||||
};
|
||||
}
|
||||
|
||||
private static _sanitizeSuggestOpts(opts: IEditorOptions, defaults: InternalSuggestOptions): InternalSuggestOptions {
|
||||
const suggestOpts = opts.suggest || {};
|
||||
return {
|
||||
filterGraceful: _boolean(suggestOpts.filterGraceful, defaults.filterGraceful),
|
||||
snippets: _stringSet<'top' | 'bottom' | 'inline' | 'none'>(opts.snippetSuggestions, defaults.snippets, ['top', 'bottom', 'inline', 'none']),
|
||||
snippetsPreventQuickSuggestions: _boolean(suggestOpts.snippetsPreventQuickSuggestions, defaults.filterGraceful),
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
private static _sanitizeViewInfo(opts: IEditorOptions, defaults: InternalEditorViewOptions): InternalEditorViewOptions {
|
||||
|
||||
let rulers: number[] = [];
|
||||
@@ -1718,12 +1850,14 @@ export class EditorOptionsValidator {
|
||||
cursorWidth: _clampedInt(opts.cursorWidth, defaults.cursorWidth, 0, Number.MAX_VALUE),
|
||||
hideCursorInOverviewRuler: _boolean(opts.hideCursorInOverviewRuler, defaults.hideCursorInOverviewRuler),
|
||||
scrollBeyondLastLine: _boolean(opts.scrollBeyondLastLine, defaults.scrollBeyondLastLine),
|
||||
scrollBeyondLastColumn: _clampedInt(opts.scrollBeyondLastColumn, defaults.scrollBeyondLastColumn, 0, Constants.MAX_SAFE_SMALL_INTEGER),
|
||||
smoothScrolling: _boolean(opts.smoothScrolling, defaults.smoothScrolling),
|
||||
stopRenderingLineAfter: _clampedInt(opts.stopRenderingLineAfter, defaults.stopRenderingLineAfter, -1, Constants.MAX_SAFE_SMALL_INTEGER),
|
||||
renderWhitespace: renderWhitespace,
|
||||
renderControlCharacters: _boolean(opts.renderControlCharacters, defaults.renderControlCharacters),
|
||||
fontLigatures: fontLigatures,
|
||||
renderIndentGuides: _boolean(opts.renderIndentGuides, defaults.renderIndentGuides),
|
||||
highlightActiveIndentGuide: _boolean(opts.highlightActiveIndentGuide, defaults.highlightActiveIndentGuide),
|
||||
renderLineHighlight: renderLineHighlight,
|
||||
scrollbar: scrollbar,
|
||||
minimap: minimap,
|
||||
@@ -1745,7 +1879,7 @@ export class EditorOptionsValidator {
|
||||
const find = this._santizeFindOpts(opts.find, defaults.find);
|
||||
return {
|
||||
selectionClipboard: _boolean(opts.selectionClipboard, defaults.selectionClipboard),
|
||||
hover: _boolean(opts.hover, defaults.hover),
|
||||
hover: this._santizeHoverOpts(opts.hover, defaults.hover),
|
||||
links: _boolean(opts.links, defaults.links),
|
||||
contextmenu: _boolean(opts.contextmenu, defaults.contextmenu),
|
||||
quickSuggestions: quickSuggestions,
|
||||
@@ -1757,11 +1891,11 @@ export class EditorOptionsValidator {
|
||||
suggestOnTriggerCharacters: _boolean(opts.suggestOnTriggerCharacters, defaults.suggestOnTriggerCharacters),
|
||||
acceptSuggestionOnEnter: _stringSet<'on' | 'smart' | 'off'>(opts.acceptSuggestionOnEnter, defaults.acceptSuggestionOnEnter, ['on', 'smart', 'off']),
|
||||
acceptSuggestionOnCommitCharacter: _boolean(opts.acceptSuggestionOnCommitCharacter, defaults.acceptSuggestionOnCommitCharacter),
|
||||
snippetSuggestions: _stringSet<'top' | 'bottom' | 'inline' | 'none'>(opts.snippetSuggestions, defaults.snippetSuggestions, ['top', 'bottom', 'inline', 'none']),
|
||||
wordBasedSuggestions: _boolean(opts.wordBasedSuggestions, defaults.wordBasedSuggestions),
|
||||
suggestSelection: _stringSet<'first' | 'recentlyUsed' | 'recentlyUsedByPrefix'>(opts.suggestSelection, defaults.suggestSelection, ['first', 'recentlyUsed', 'recentlyUsedByPrefix']),
|
||||
suggestFontSize: _clampedInt(opts.suggestFontSize, defaults.suggestFontSize, 0, 1000),
|
||||
suggestLineHeight: _clampedInt(opts.suggestLineHeight, defaults.suggestLineHeight, 0, 1000),
|
||||
suggest: this._sanitizeSuggestOpts(opts, defaults.suggest),
|
||||
selectionHighlight: _boolean(opts.selectionHighlight, defaults.selectionHighlight),
|
||||
occurrencesHighlight: _boolean(opts.occurrencesHighlight, defaults.occurrencesHighlight),
|
||||
codeLens: _boolean(opts.codeLens, defaults.codeLens),
|
||||
@@ -1810,6 +1944,7 @@ export class InternalEditorOptionsFactory {
|
||||
multiCursorModifier: opts.multiCursorModifier,
|
||||
multiCursorMergeOverlapping: opts.multiCursorMergeOverlapping,
|
||||
accessibilitySupport: opts.accessibilitySupport,
|
||||
showUnused: opts.showUnused,
|
||||
|
||||
viewInfo: {
|
||||
extraEditorClassName: opts.viewInfo.extraEditorClassName,
|
||||
@@ -1830,12 +1965,14 @@ export class InternalEditorOptionsFactory {
|
||||
cursorWidth: opts.viewInfo.cursorWidth,
|
||||
hideCursorInOverviewRuler: opts.viewInfo.hideCursorInOverviewRuler,
|
||||
scrollBeyondLastLine: opts.viewInfo.scrollBeyondLastLine,
|
||||
scrollBeyondLastColumn: opts.viewInfo.scrollBeyondLastColumn,
|
||||
smoothScrolling: opts.viewInfo.smoothScrolling,
|
||||
stopRenderingLineAfter: opts.viewInfo.stopRenderingLineAfter,
|
||||
renderWhitespace: (accessibilityIsOn ? 'none' : opts.viewInfo.renderWhitespace), // DISABLED WHEN SCREEN READER IS ATTACHED
|
||||
renderControlCharacters: (accessibilityIsOn ? false : opts.viewInfo.renderControlCharacters), // DISABLED WHEN SCREEN READER IS ATTACHED
|
||||
fontLigatures: (accessibilityIsOn ? false : opts.viewInfo.fontLigatures), // DISABLED WHEN SCREEN READER IS ATTACHED
|
||||
renderIndentGuides: (accessibilityIsOn ? false : opts.viewInfo.renderIndentGuides), // DISABLED WHEN SCREEN READER IS ATTACHED
|
||||
highlightActiveIndentGuide: opts.viewInfo.highlightActiveIndentGuide,
|
||||
renderLineHighlight: opts.viewInfo.renderLineHighlight,
|
||||
scrollbar: opts.viewInfo.scrollbar,
|
||||
minimap: {
|
||||
@@ -1862,11 +1999,11 @@ export class InternalEditorOptionsFactory {
|
||||
suggestOnTriggerCharacters: opts.contribInfo.suggestOnTriggerCharacters,
|
||||
acceptSuggestionOnEnter: opts.contribInfo.acceptSuggestionOnEnter,
|
||||
acceptSuggestionOnCommitCharacter: opts.contribInfo.acceptSuggestionOnCommitCharacter,
|
||||
snippetSuggestions: opts.contribInfo.snippetSuggestions,
|
||||
wordBasedSuggestions: opts.contribInfo.wordBasedSuggestions,
|
||||
suggestSelection: opts.contribInfo.suggestSelection,
|
||||
suggestFontSize: opts.contribInfo.suggestFontSize,
|
||||
suggestLineHeight: opts.contribInfo.suggestLineHeight,
|
||||
suggest: opts.contribInfo.suggest,
|
||||
selectionHighlight: (accessibilityIsOn ? false : opts.contribInfo.selectionHighlight), // DISABLED WHEN SCREEN READER IS ATTACHED
|
||||
occurrencesHighlight: (accessibilityIsOn ? false : opts.contribInfo.occurrencesHighlight), // DISABLED WHEN SCREEN READER IS ATTACHED
|
||||
codeLens: (accessibilityIsOn ? false : opts.contribInfo.codeLens), // DISABLED WHEN SCREEN READER IS ATTACHED
|
||||
@@ -2030,7 +2167,8 @@ export class InternalEditorOptionsFactory {
|
||||
fontInfo: env.fontInfo,
|
||||
viewInfo: opts.viewInfo,
|
||||
wrappingInfo: wrappingInfo,
|
||||
contribInfo: opts.contribInfo
|
||||
contribInfo: opts.contribInfo,
|
||||
showUnused: opts.showUnused,
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -2260,6 +2398,7 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
|
||||
multiCursorModifier: 'altKey',
|
||||
multiCursorMergeOverlapping: true,
|
||||
accessibilitySupport: 'auto',
|
||||
showUnused: true,
|
||||
|
||||
viewInfo: {
|
||||
extraEditorClassName: '',
|
||||
@@ -2280,12 +2419,14 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
|
||||
cursorWidth: 0,
|
||||
hideCursorInOverviewRuler: false,
|
||||
scrollBeyondLastLine: true,
|
||||
scrollBeyondLastColumn: 5,
|
||||
smoothScrolling: false,
|
||||
stopRenderingLineAfter: 10000,
|
||||
renderWhitespace: 'none',
|
||||
renderControlCharacters: false,
|
||||
fontLigatures: false,
|
||||
renderIndentGuides: true,
|
||||
highlightActiveIndentGuide: true,
|
||||
renderLineHighlight: 'line',
|
||||
scrollbar: {
|
||||
vertical: ScrollbarVisibility.Auto,
|
||||
@@ -2314,7 +2455,11 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
|
||||
|
||||
contribInfo: {
|
||||
selectionClipboard: true,
|
||||
hover: true,
|
||||
hover: {
|
||||
enabled: true,
|
||||
delay: 300,
|
||||
sticky: true
|
||||
},
|
||||
links: true,
|
||||
contextmenu: true,
|
||||
quickSuggestions: { other: true, comments: false, strings: false },
|
||||
@@ -2326,11 +2471,15 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = {
|
||||
suggestOnTriggerCharacters: true,
|
||||
acceptSuggestionOnEnter: 'on',
|
||||
acceptSuggestionOnCommitCharacter: true,
|
||||
snippetSuggestions: 'inline',
|
||||
wordBasedSuggestions: true,
|
||||
suggestSelection: 'recentlyUsed',
|
||||
suggestFontSize: 0,
|
||||
suggestLineHeight: 0,
|
||||
suggest: {
|
||||
filterGraceful: true,
|
||||
snippets: 'inline',
|
||||
snippetsPreventQuickSuggestions: true
|
||||
},
|
||||
selectionHighlight: true,
|
||||
occurrencesHighlight: true,
|
||||
codeLens: true,
|
||||
|
||||
Reference in New Issue
Block a user