@codingame/monaco-vscode-api 6.0.3 → 7.0.1

package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidget.js

@@ -41,31 +41,31 @@ import { getListStyles } from '../../../../platform/theme/browser/defaultStyles.
 import { status } from '../../../../base/browser/ui/aria/aria.js';
 var SuggestWidget_1;
 const _moduleId = "vs/editor/contrib/suggest/browser/suggestWidget";
-registerColor('editorSuggestWidget.background', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground }, ( localizeWithPath(_moduleId, 0, 'Background color of the suggest widget.')));
-registerColor('editorSuggestWidget.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, ( localizeWithPath(_moduleId, 1, 'Border color of the suggest widget.')));
-const editorSuggestWidgetForeground = registerColor('editorSuggestWidget.foreground', { dark: editorForeground, light: editorForeground, hcDark: editorForeground, hcLight: editorForeground }, ( localizeWithPath(_moduleId, 2, 'Foreground color of the suggest widget.')));
-registerColor('editorSuggestWidget.selectedForeground', { dark: quickInputListFocusForeground, light: quickInputListFocusForeground, hcDark: quickInputListFocusForeground, hcLight: quickInputListFocusForeground }, ( localizeWithPath(
+registerColor('editorSuggestWidget.background', editorWidgetBackground, ( localizeWithPath(_moduleId, 0, 'Background color of the suggest widget.')));
+registerColor('editorSuggestWidget.border', editorWidgetBorder, ( localizeWithPath(_moduleId, 1, 'Border color of the suggest widget.')));
+const editorSuggestWidgetForeground = registerColor('editorSuggestWidget.foreground', editorForeground, ( localizeWithPath(_moduleId, 2, 'Foreground color of the suggest widget.')));
+registerColor('editorSuggestWidget.selectedForeground', quickInputListFocusForeground, ( localizeWithPath(
     _moduleId,
     3,
     'Foreground color of the selected entry in the suggest widget.'
 )));
-registerColor('editorSuggestWidget.selectedIconForeground', { dark: quickInputListFocusIconForeground, light: quickInputListFocusIconForeground, hcDark: quickInputListFocusIconForeground, hcLight: quickInputListFocusIconForeground }, ( localizeWithPath(
+registerColor('editorSuggestWidget.selectedIconForeground', quickInputListFocusIconForeground, ( localizeWithPath(
     _moduleId,
     4,
     'Icon foreground color of the selected entry in the suggest widget.'
 )));
-const editorSuggestWidgetSelectedBackground = registerColor('editorSuggestWidget.selectedBackground', { dark: quickInputListFocusBackground, light: quickInputListFocusBackground, hcDark: quickInputListFocusBackground, hcLight: quickInputListFocusBackground }, ( localizeWithPath(
+const editorSuggestWidgetSelectedBackground = registerColor('editorSuggestWidget.selectedBackground', quickInputListFocusBackground, ( localizeWithPath(
     _moduleId,
     5,
     'Background color of the selected entry in the suggest widget.'
 )));
-registerColor('editorSuggestWidget.highlightForeground', { dark: listHighlightForeground, light: listHighlightForeground, hcDark: listHighlightForeground, hcLight: listHighlightForeground }, ( localizeWithPath(_moduleId, 6, 'Color of the match highlights in the suggest widget.')));
-registerColor('editorSuggestWidget.focusHighlightForeground', { dark: listFocusHighlightForeground, light: listFocusHighlightForeground, hcDark: listFocusHighlightForeground, hcLight: listFocusHighlightForeground }, ( localizeWithPath(
+registerColor('editorSuggestWidget.highlightForeground', listHighlightForeground, ( localizeWithPath(_moduleId, 6, 'Color of the match highlights in the suggest widget.')));
+registerColor('editorSuggestWidget.focusHighlightForeground', listFocusHighlightForeground, ( localizeWithPath(
     _moduleId,
     7,
     'Color of the match highlights in the suggest widget when an item is focused.'
 )));
-registerColor('editorSuggestWidgetStatus.foreground', { dark: ( (transparent(editorSuggestWidgetForeground, .5))), light: ( (transparent(editorSuggestWidgetForeground, .5))), hcDark: ( (transparent(editorSuggestWidgetForeground, .5))), hcLight: ( (transparent(editorSuggestWidgetForeground, .5))) }, ( localizeWithPath(_moduleId, 8, 'Foreground color of the suggest widget status.')));
+registerColor('editorSuggestWidgetStatus.foreground', ( (transparent(editorSuggestWidgetForeground, .5))), ( localizeWithPath(_moduleId, 8, 'Foreground color of the suggest widget status.')));
 var State;
 ( ((function(State) {
     State[State["Hidden"] = 0] = "Hidden";

package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.js

@@ -2,45 +2,23 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { append, $ } from '../../../../base/browser/dom.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
-import { localizeWithPath } from '../../../../nls.js';
-import { MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { TextOnlyMenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-const _moduleId = "vs/editor/contrib/suggest/browser/suggestWidgetStatus";
-class StatusBarViewItem extends MenuEntryActionViewItem {
-    updateLabel() {
-        const kb = this._keybindingService.lookupKeybinding(this._action.id, this._contextKeyService);
-        if (!kb) {
-            return super.updateLabel();
-        }
-        if (this.label) {
-            this.label.textContent = ( localizeWithPath(
-                _moduleId,
-                0,
-                '{0} ({1})',
-                this._action.label,
-                StatusBarViewItem.symbolPrintEnter(kb)
-            ));
-        }
-    }
-    static symbolPrintEnter(kb) {
-        return kb.getLabel()?.replace(/\benter\b/gi, '\u23CE');
-    }
-}
 let SuggestWidgetStatus = class SuggestWidgetStatus {
     constructor(container, _menuId, instantiationService, _menuService, _contextKeyService) {
         this._menuId = _menuId;
         this._menuService = _menuService;
         this._contextKeyService = _contextKeyService;
-        this._menuDisposables = ( (new DisposableStore()));
+        this._menuDisposables = ( new DisposableStore());
         this.element = append(container, $('.suggest-status-bar'));
         const actionViewItemProvider = (action => {
-            return action instanceof MenuItemAction ? instantiationService.createInstance(StatusBarViewItem, action, undefined) : undefined;
+            return action instanceof MenuItemAction ? instantiationService.createInstance(TextOnlyMenuEntryActionViewItem, action, { useComma: true }) : undefined;
         });
-        this._leftActions = ( (new ActionBar(this.element, { actionViewItemProvider })));
-        this._rightActions = ( (new ActionBar(this.element, { actionViewItemProvider })));
+        this._leftActions = ( new ActionBar(this.element, { actionViewItemProvider }));
+        this._rightActions = ( new ActionBar(this.element, { actionViewItemProvider }));
         this._leftActions.domNode.classList.add('left');
         this._rightActions.domNode.classList.add('right');
     }
@@ -75,9 +53,9 @@ let SuggestWidgetStatus = class SuggestWidgetStatus {
         this._menuDisposables.clear();
     }
 };
-SuggestWidgetStatus = ( (__decorate([
-    ( (__param(2, IInstantiationService))),
-    ( (__param(3, IMenuService))),
-    ( (__param(4, IContextKeyService)))
-], SuggestWidgetStatus)));
+SuggestWidgetStatus = ( __decorate([
+    ( __param(2, IInstantiationService)),
+    ( __param(3, IMenuService)),
+    ( __param(4, IContextKeyService))
+], SuggestWidgetStatus));
 export { SuggestWidgetStatus };

package/vscode/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.js

@@ -12,22 +12,12 @@ import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 const _moduleId = "vs/editor/contrib/symbolIcons/browser/symbolIcons";
-registerColor('symbolIcon.arrayForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground,
-}, ( localizeWithPath(
+registerColor('symbolIcon.arrayForeground', foreground, ( localizeWithPath(
     _moduleId,
     0,
     'The foreground color for array symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.booleanForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground,
-}, ( localizeWithPath(
+registerColor('symbolIcon.booleanForeground', foreground, ( localizeWithPath(
     _moduleId,
     1,
     'The foreground color for boolean symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
@@ -42,22 +32,12 @@ registerColor('symbolIcon.classForeground', {
     2,
     'The foreground color for class symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.colorForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.colorForeground', foreground, ( localizeWithPath(
     _moduleId,
     3,
     'The foreground color for color symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.constantForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.constantForeground', foreground, ( localizeWithPath(
     _moduleId,
     4,
     'The foreground color for constant symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
@@ -112,22 +92,12 @@ registerColor('symbolIcon.fieldForeground', {
     9,
     'The foreground color for field symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.fileForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.fileForeground', foreground, ( localizeWithPath(
     _moduleId,
     10,
     'The foreground color for file symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.folderForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.folderForeground', foreground, ( localizeWithPath(
     _moduleId,
     11,
     'The foreground color for folder symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
@@ -152,22 +122,12 @@ registerColor('symbolIcon.interfaceForeground', {
     13,
     'The foreground color for interface symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.keyForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.keyForeground', foreground, ( localizeWithPath(
     _moduleId,
     14,
     'The foreground color for key symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.keywordForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.keywordForeground', foreground, ( localizeWithPath(
     _moduleId,
     15,
     'The foreground color for keyword symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
@@ -182,152 +142,77 @@ registerColor('symbolIcon.methodForeground', {
     16,
     'The foreground color for method symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.moduleForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.moduleForeground', foreground, ( localizeWithPath(
     _moduleId,
     17,
     'The foreground color for module symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.namespaceForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.namespaceForeground', foreground, ( localizeWithPath(
     _moduleId,
     18,
     'The foreground color for namespace symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.nullForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.nullForeground', foreground, ( localizeWithPath(
     _moduleId,
     19,
     'The foreground color for null symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.numberForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.numberForeground', foreground, ( localizeWithPath(
     _moduleId,
     20,
     'The foreground color for number symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.objectForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.objectForeground', foreground, ( localizeWithPath(
     _moduleId,
     21,
     'The foreground color for object symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.operatorForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.operatorForeground', foreground, ( localizeWithPath(
     _moduleId,
     22,
     'The foreground color for operator symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.packageForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.packageForeground', foreground, ( localizeWithPath(
     _moduleId,
     23,
     'The foreground color for package symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.propertyForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.propertyForeground', foreground, ( localizeWithPath(
     _moduleId,
     24,
     'The foreground color for property symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.referenceForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.referenceForeground', foreground, ( localizeWithPath(
     _moduleId,
     25,
     'The foreground color for reference symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.snippetForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.snippetForeground', foreground, ( localizeWithPath(
     _moduleId,
     26,
     'The foreground color for snippet symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.stringForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.stringForeground', foreground, ( localizeWithPath(
     _moduleId,
     27,
     'The foreground color for string symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.structForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground,
-}, ( localizeWithPath(
+registerColor('symbolIcon.structForeground', foreground, ( localizeWithPath(
     _moduleId,
     28,
     'The foreground color for struct symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.textForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.textForeground', foreground, ( localizeWithPath(
     _moduleId,
     29,
     'The foreground color for text symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.typeParameterForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.typeParameterForeground', foreground, ( localizeWithPath(
     _moduleId,
     30,
     'The foreground color for type parameter symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.unitForeground', {
-    dark: foreground,
-    light: foreground,
-    hcDark: foreground,
-    hcLight: foreground
-}, ( localizeWithPath(
+registerColor('symbolIcon.unitForeground', foreground, ( localizeWithPath(
     _moduleId,
     31,
     'The foreground color for unit symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'

package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.js

@@ -419,6 +419,9 @@ let UnicodeHighlighterHoverParticipant = class UnicodeHighlighterHoverParticipan
     renderHoverParts(context, hoverParts) {
         return renderMarkdownHovers(context, hoverParts, this._editor, this._languageService, this._openerService);
     }
+    getAccessibleContent(hoverPart) {
+        return ( (hoverPart.contents.map(c => c.value))).join('\n');
+    }
 };
 UnicodeHighlighterHoverParticipant = ( (__decorate([
     ( (__param(1, ILanguageService))),

package/vscode/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.js

@@ -26,7 +26,7 @@ registerColor('editor.wordHighlightStrongBackground', { dark: '#004972B8', light
     1,
     'Background color of a symbol during write-access, like writing to a variable. The color must not be opaque so as not to hide underlying decorations.'
 )), true);
-registerColor('editor.wordHighlightTextBackground', { light: wordHighlightBackground, dark: wordHighlightBackground, hcDark: wordHighlightBackground, hcLight: wordHighlightBackground }, ( localizeWithPath(
+registerColor('editor.wordHighlightTextBackground', wordHighlightBackground, ( localizeWithPath(
     _moduleId,
     2,
     'Background color of a textual occurrence for a symbol. The color must not be opaque so as not to hide underlying decorations.'
@@ -41,18 +41,18 @@ registerColor('editor.wordHighlightStrongBorder', { light: null, dark: null, hcD
     4,
     'Border color of a symbol during write-access, like writing to a variable.'
 )));
-registerColor('editor.wordHighlightTextBorder', { light: wordHighlightBorder, dark: wordHighlightBorder, hcDark: wordHighlightBorder, hcLight: wordHighlightBorder }, ( localizeWithPath(_moduleId, 5, "Border color of a textual occurrence for a symbol.")));
-const overviewRulerWordHighlightForeground = registerColor('editorOverviewRuler.wordHighlightForeground', { dark: '#A0A0A0CC', light: '#A0A0A0CC', hcDark: '#A0A0A0CC', hcLight: '#A0A0A0CC' }, ( localizeWithPath(
+registerColor('editor.wordHighlightTextBorder', wordHighlightBorder, ( localizeWithPath(_moduleId, 5, "Border color of a textual occurrence for a symbol.")));
+const overviewRulerWordHighlightForeground = registerColor('editorOverviewRuler.wordHighlightForeground', '#A0A0A0CC', ( localizeWithPath(
     _moduleId,
     6,
     'Overview ruler marker color for symbol highlights. The color must not be opaque so as not to hide underlying decorations.'
 )), true);
-const overviewRulerWordHighlightStrongForeground = registerColor('editorOverviewRuler.wordHighlightStrongForeground', { dark: '#C0A0C0CC', light: '#C0A0C0CC', hcDark: '#C0A0C0CC', hcLight: '#C0A0C0CC' }, ( localizeWithPath(
+const overviewRulerWordHighlightStrongForeground = registerColor('editorOverviewRuler.wordHighlightStrongForeground', '#C0A0C0CC', ( localizeWithPath(
     _moduleId,
     7,
     'Overview ruler marker color for write-access symbol highlights. The color must not be opaque so as not to hide underlying decorations.'
 )), true);
-const overviewRulerWordHighlightTextForeground = registerColor('editorOverviewRuler.wordHighlightTextForeground', { dark: overviewRulerSelectionHighlightForeground, light: overviewRulerSelectionHighlightForeground, hcDark: overviewRulerSelectionHighlightForeground, hcLight: overviewRulerSelectionHighlightForeground }, ( localizeWithPath(
+const overviewRulerWordHighlightTextForeground = registerColor('editorOverviewRuler.wordHighlightTextForeground', overviewRulerSelectionHighlightForeground, ( localizeWithPath(
     _moduleId,
     8,
     'Overview ruler marker color of a textual occurrence for a symbol. The color must not be opaque so as not to hide underlying decorations.'

package/vscode/src/vs/editor/contrib/wordOperations/browser/wordOperations.js

@@ -31,9 +31,10 @@ class MoveWordCommand extends EditorCommand {
         const wordSeparators = getMapForWordSeparators(editor.getOption(EditorOption.wordSeparators), editor.getOption(EditorOption.wordSegmenterLocales));
         const model = editor.getModel();
         const selections = editor.getSelections();
+        const hasMulticursor = selections.length > 1;
         const result = ( (selections.map((sel) => {
             const inPosition = ( (new Position(sel.positionLineNumber, sel.positionColumn)));
-            const outPosition = this._move(wordSeparators, model, inPosition, this._wordNavigationType);
+            const outPosition = this._move(wordSeparators, model, inPosition, this._wordNavigationType, hasMulticursor);
             return this._moveTo(sel, outPosition, this._inSelectionMode);
         })));
         model.pushStackElement();
@@ -62,12 +63,12 @@ class MoveWordCommand extends EditorCommand {
     }
 }
 class WordLeftCommand extends MoveWordCommand {
-    _move(wordSeparators, model, position, wordNavigationType) {
-        return WordOperations.moveWordLeft(wordSeparators, model, position, wordNavigationType);
+    _move(wordSeparators, model, position, wordNavigationType, hasMulticursor) {
+        return WordOperations.moveWordLeft(wordSeparators, model, position, wordNavigationType, hasMulticursor);
     }
 }
 class WordRightCommand extends MoveWordCommand {
-    _move(wordSeparators, model, position, wordNavigationType) {
+    _move(wordSeparators, model, position, wordNavigationType, hasMulticursor) {
         return WordOperations.moveWordRight(wordSeparators, model, position, wordNavigationType);
     }
 }
@@ -158,8 +159,8 @@ class CursorWordAccessibilityLeft extends WordLeftCommand {
             precondition: undefined
         });
     }
-    _move(wordCharacterClassifier, model, position, wordNavigationType) {
-        return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType);
+    _move(wordCharacterClassifier, model, position, wordNavigationType, hasMulticursor) {
+        return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType, hasMulticursor);
     }
 }
 class CursorWordAccessibilityLeftSelect extends WordLeftCommand {
@@ -171,8 +172,8 @@ class CursorWordAccessibilityLeftSelect extends WordLeftCommand {
             precondition: undefined
         });
     }
-    _move(wordCharacterClassifier, model, position, wordNavigationType) {
-        return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType);
+    _move(wordCharacterClassifier, model, position, wordNavigationType, hasMulticursor) {
+        return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType, hasMulticursor);
     }
 }
 class CursorWordStartRight extends WordRightCommand {
@@ -262,8 +263,8 @@ class CursorWordAccessibilityRight extends WordRightCommand {
             precondition: undefined
         });
     }
-    _move(wordCharacterClassifier, model, position, wordNavigationType) {
-        return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType);
+    _move(wordCharacterClassifier, model, position, wordNavigationType, hasMulticursor) {
+        return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType, hasMulticursor);
     }
 }
 class CursorWordAccessibilityRightSelect extends WordRightCommand {
@@ -275,8 +276,8 @@ class CursorWordAccessibilityRightSelect extends WordRightCommand {
             precondition: undefined
         });
     }
-    _move(wordCharacterClassifier, model, position, wordNavigationType) {
-        return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType);
+    _move(wordCharacterClassifier, model, position, wordNavigationType, hasMulticursor) {
+        return super._move(getMapForWordSeparators(EditorOptions.wordSeparators.defaultValue, wordCharacterClassifier.intlSegmenterLocales), model, position, wordNavigationType, hasMulticursor);
     }
 }
 class DeleteWordCommand extends EditorCommand {

package/vscode/src/vs/editor/contrib/wordPartOperations/browser/wordPartOperations.js

@@ -55,8 +55,8 @@ class DeleteWordPartRight extends DeleteWordCommand {
     }
 }
 class WordPartLeftCommand extends MoveWordCommand {
-    _move(wordSeparators, model, position, wordNavigationType) {
-        return WordPartOperations.moveWordPartLeft(wordSeparators, model, position);
+    _move(wordSeparators, model, position, wordNavigationType, hasMulticursor) {
+        return WordPartOperations.moveWordPartLeft(wordSeparators, model, position, hasMulticursor);
     }
 }
 class CursorWordPartLeft extends WordPartLeftCommand {
@@ -94,7 +94,7 @@ class CursorWordPartLeftSelect extends WordPartLeftCommand {
 }
 CommandsRegistry.registerCommandAlias('cursorWordPartStartLeftSelect', 'cursorWordPartLeftSelect');
 class WordPartRightCommand extends MoveWordCommand {
-    _move(wordSeparators, model, position, wordNavigationType) {
+    _move(wordSeparators, model, position, wordNavigationType, hasMulticursor) {
         return WordPartOperations.moveWordPartRight(wordSeparators, model, position);
     }
 }

package/vscode/src/vs/platform/accessibility/browser/accessibilityService.js

@@ -17,6 +17,7 @@ let AccessibilityService = class AccessibilityService extends Disposable {
         this._accessibilitySupport = AccessibilitySupport.Unknown;
         this._onDidChangeScreenReaderOptimized = ( new Emitter());
         this._onDidChangeReducedMotion = ( new Emitter());
+        this._onDidChangeLinkUnderline = ( new Emitter());
         this._accessibilityModeEnabledContext = CONTEXT_ACCESSIBILITY_MODE_ENABLED.bindTo(this._contextKeyService);
         const updateContextKey = () => this._accessibilityModeEnabledContext.set(this.isScreenReaderOptimized());
         this._register(this._configurationService.onDidChangeConfiguration(e => {
@@ -34,7 +35,9 @@ let AccessibilityService = class AccessibilityService extends Disposable {
         const reduceMotionMatcher = mainWindow.matchMedia(`(prefers-reduced-motion: reduce)`);
         this._systemMotionReduced = reduceMotionMatcher.matches;
         this._configMotionReduced = this._configurationService.getValue('workbench.reduceMotion');
+        this._linkUnderlinesEnabled = this._configurationService.getValue('accessibility.underlineLinks');
         this.initReducedMotionListeners(reduceMotionMatcher);
+        this.initLinkUnderlineListeners();
     }
     initReducedMotionListeners(reduceMotionMatcher) {
         this._register(addDisposableListener(reduceMotionMatcher, 'change', () => {
@@ -51,6 +54,24 @@ let AccessibilityService = class AccessibilityService extends Disposable {
         updateRootClasses();
         this._register(this.onDidChangeReducedMotion(() => updateRootClasses()));
     }
+    initLinkUnderlineListeners() {
+        this._register(this._configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration('accessibility.underlineLinks')) {
+                const linkUnderlinesEnabled = this._configurationService.getValue('accessibility.underlineLinks');
+                this._linkUnderlinesEnabled = linkUnderlinesEnabled;
+                this._onDidChangeLinkUnderline.fire();
+            }
+        }));
+        const updateLinkUnderlineClasses = () => {
+            const underlineLinks = this._linkUnderlinesEnabled;
+            this._layoutService.mainContainer.classList.toggle('underline-links', underlineLinks);
+        };
+        updateLinkUnderlineClasses();
+        this._register(this.onDidChangeLinkUnderlines(() => updateLinkUnderlineClasses()));
+    }
+    onDidChangeLinkUnderlines(listener) {
+        return this._onDidChangeLinkUnderline.event(listener);
+    }
     get onDidChangeScreenReaderOptimized() {
         return this._onDidChangeScreenReaderOptimized.event;
     }

package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js

@@ -21,7 +21,7 @@ let AccessibilitySignalService = class AccessibilitySignalService extends Dispos
         this.accessibilityService = accessibilityService;
         this.telemetryService = telemetryService;
         this.sounds = ( (new Map()));
-        this.screenReaderAttached = observableFromEvent(this.accessibilityService.onDidChangeScreenReaderOptimized, () =>  this.accessibilityService.isScreenReaderOptimized());
+        this.screenReaderAttached = observableFromEvent(this, this.accessibilityService.onDidChangeScreenReaderOptimized, () =>  this.accessibilityService.isScreenReaderOptimized());
         this.sentTelemetry = ( (new Set()));
         this.playingSounds = ( (new Set()));
         this._signalConfigValue = ( (new CachedFunction(
@@ -151,19 +151,18 @@ let AccessibilitySignalService = class AccessibilitySignalService extends Dispos
         return this.getEnabledState(signal, false).onDidChange;
     }
     getDelayMs(signal, modality, mode) {
-        const options = this.configurationService.getValue('accessibility.signalOptions');
-        if (!options || !options.debouncePositionChanges) {
+        if (!this.configurationService.getValue('accessibility.signalOptions.debouncePositionChanges')) {
             return 0;
         }
         let value;
         if (signal.name === AccessibilitySignal.errorAtPosition.name && mode === 'positional') {
-            value = options['experimental.delays'].errorAtPosition;
+            value = this.configurationService.getValue('accessibility.signalOptions.experimental.delays.errorAtPosition');
         }
         else if (signal.name === AccessibilitySignal.warningAtPosition.name && mode === 'positional') {
-            value = options['experimental.delays'].warningAtPosition;
+            value = this.configurationService.getValue('accessibility.signalOptions.experimental.delays.warningAtPosition');
         }
         else {
-            value = options['experimental.delays'].general;
+            value = this.configurationService.getValue('accessibility.signalOptions.experimental.delays.general');
         }
         return modality === 'sound' ? value.sound : value.announcement;
     }

package/vscode/src/vs/platform/actionWidget/browser/actionWidget.js

@@ -25,7 +25,7 @@ import '../../theme/common/colors/miscColors.js';
 import '../../theme/common/colors/quickpickColors.js';
 import '../../theme/common/colors/searchColors.js';
 const _moduleId = "vs/platform/actionWidget/browser/actionWidget";
-registerColor('actionBar.toggledBackground', { dark: inputActiveOptionBackground, light: inputActiveOptionBackground, hcDark: inputActiveOptionBackground, hcLight: inputActiveOptionBackground, }, ( localizeWithPath(_moduleId, 0, 'Background color for toggled action items in action bar.')));
+registerColor('actionBar.toggledBackground', inputActiveOptionBackground, ( localizeWithPath(_moduleId, 0, 'Background color for toggled action items in action bar.')));
 const ActionWidgetContextKeys = {
     Visible: ( (new RawContextKey('codeActionMenuVisible', false, ( localizeWithPath(_moduleId, 1, "Whether the action widget list is visible")))))
 };