@codingame/monaco-vscode-api 3.2.3 → 4.1.0

package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.js

@@ -1,5 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { disposableObservableValue, observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
+import '../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent, constObservable, observableSignalFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { EditOperation } from '../../../common/core/editOperation.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
@@ -8,15 +13,12 @@ import { RawContextKey, IContextKeyService } from '../../../../platform/contextk
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { InlineEditTriggerKind } from '../../../common/languages.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
-import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { GhostText, GhostTextPart } from '../../inlineCompletions/browser/ghostText.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { InlineEditHintsWidget } from './inlineEditHintsWidget.js';
 import { createStyleSheet2 } from '../../../../base/browser/dom.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { disposableObservableValue } from '../../../../base/common/observableInternal/base.js';
-import { observableFromEvent, constObservable, observableSignalFromEvent } from '../../../../base/common/observableInternal/utils.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
 var InlineEditController_1;
 class InlineEditWidget {
     constructor(widget, edit) {
@@ -48,7 +50,7 @@ let InlineEditController = class InlineEditController extends Disposable {
         this._isVisibleContext = InlineEditController_1.inlineEditVisibleContext.bindTo(this.contextKeyService);
         this._isCursorAtInlineEditContext = InlineEditController_1.cursorAtInlineEditContext.bindTo(this.contextKeyService);
         this._currentEdit = this._register(disposableObservableValue(this, undefined));
-        this._isAccepting = false;
+        this._isAccepting = observableValue(this, false);
         this._enabled = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(63 ).enabled);
         this._fontFamily = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(63 ).fontFamily);
         this._backgroundColoring = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(63 ).backgroundColoring);
@@ -58,6 +60,9 @@ let InlineEditController = class InlineEditController extends Disposable {
                 return;
             }
             modelChangedSignal.read(reader);
+            if (this._isAccepting.read(reader)) {
+                return;
+            }
             this.getInlineEdit(editor, true);
         }));
         const cursorPosition = observableFromEvent(editor.onDidChangeCursorPosition, () => editor.getPosition());
@@ -84,7 +89,7 @@ let InlineEditController = class InlineEditController extends Disposable {
             }
         }));
         const editorBlurSingal = observableSignalFromEvent('InlineEditController.editorBlurSignal', editor.onDidBlurEditorWidget);
-        this._register(autorun(reader => {
+        this._register(autorun(async (reader) => {
             if (!this._enabled.read(reader)) {
                 return;
             }
@@ -92,9 +97,9 @@ let InlineEditController = class InlineEditController extends Disposable {
             if (this._configurationService.getValue('editor.experimentalInlineEdit.keepOnBlur') || editor.getOption(63 ).keepOnBlur) {
                 return;
             }
-            this._currentRequestCts?.dispose();
+            this._currentRequestCts?.dispose(true);
             this._currentRequestCts = undefined;
-            this.clear(false);
+            await this.clear(false);
         }));
         const editorFocusSignal = observableSignalFromEvent('InlineEditController.editorFocusSignal', editor.onDidFocusEditorText);
         this._register(autorun(reader => {
@@ -181,8 +186,7 @@ let InlineEditController = class InlineEditController extends Disposable {
     }
     async getInlineEdit(editor, auto) {
         this._isCursorAtInlineEditContext.set(false);
-        this.clear();
-        this._isAccepting = false;
+        await this.clear();
         const edit = await this.fetchInlineEdit(editor, auto);
         if (!edit) {
             return;
@@ -209,8 +213,8 @@ let InlineEditController = class InlineEditController extends Disposable {
         this.editor.setPosition(this._jumpBackPosition);
         this.editor.revealPositionInCenterIfOutsideViewport(this._jumpBackPosition);
     }
-    accept() {
-        this._isAccepting = true;
+    async accept() {
+        this._isAccepting.set(true, undefined);
         const data = this._currentEdit.get()?.edit;
         if (!data) {
             return;
@@ -222,10 +226,15 @@ let InlineEditController = class InlineEditController extends Disposable {
         this.editor.pushUndoStop();
         this.editor.executeEdits('acceptCurrent', [EditOperation.replace(Range.lift(data.range), text)]);
         if (data.accepted) {
-            this._commandService.executeCommand(data.accepted.id, ...(data.accepted.arguments || []));
+            await this._commandService
+                .executeCommand(data.accepted.id, ...(data.accepted.arguments || []))
+                .then(undefined, onUnexpectedExternalError);
         }
         this.freeEdit(data);
-        this._currentEdit.set(undefined, undefined);
+        transaction((tx) => {
+            this._currentEdit.set(undefined, tx);
+            this._isAccepting.set(false, tx);
+        });
     }
     jumpToCurrent() {
         this._jumpBackPosition = this.editor.getSelection()?.getStartPosition();
@@ -237,10 +246,12 @@ let InlineEditController = class InlineEditController extends Disposable {
         this.editor.setPosition(position);
         this.editor.revealPositionInCenterIfOutsideViewport(position);
     }
-    clear(sendRejection = true) {
+    async clear(sendRejection = true) {
         const edit = this._currentEdit.get()?.edit;
-        if (edit && edit?.rejected && !this._isAccepting && sendRejection) {
-            this._commandService.executeCommand(edit.rejected.id, ...(edit.rejected.arguments || []));
+        if (edit && edit?.rejected && sendRejection) {
+            await this._commandService
+                .executeCommand(edit.rejected.id, ...(edit.rejected.arguments || []))
+                .then(undefined, onUnexpectedExternalError);
         }
         if (edit) {
             this.freeEdit(edit);

package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditHintsWidget.js

@@ -4,6 +4,10 @@ import { KeybindingLabel, unthemedKeybindingLabelOptions } from '../../../../bas
 import { Separator } from '../../../../base/common/actions.js';
 import { equals } from '../../../../base/common/arrays.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { derived } from '../../../../base/common/observableInternal/derived.js';
+import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { OS } from '../../../../base/common/platform.js';
 import './inlineEditHintsWidget.css.js';
 import { Position } from '../../../common/core/position.js';
@@ -15,9 +19,6 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
 var InlineEditHintsContentWidget_1;
 let InlineEditHintsWidget = class InlineEditHintsWidget extends Disposable {
     constructor(editor, model, instantiationService) {
@@ -135,7 +136,7 @@ class StatusBarViewItem extends MenuEntryActionViewItem {
         }
         if (this.label) {
             const div = h('div.keybinding').root;
-            const k = ( new KeybindingLabel(div, OS, { disableTitle: true, ...unthemedKeybindingLabelOptions }));
+            const k = this._register(( new KeybindingLabel(div, OS, { disableTitle: true, ...unthemedKeybindingLabelOptions })));
             k.set(kb);
             this.label.textContent = this._action.label;
             this.label.appendChild(div);

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

@@ -28,7 +28,7 @@ class ExpandLineSelectionAction extends EditorAction {
         const viewModel = editor._getViewModel();
         viewModel.model.pushStackElement();
         viewModel.setCursorStates(args.source, 3 , CursorMoveCommands.expandLineSelection(viewModel, viewModel.getCursorStates()));
-        viewModel.revealPrimaryCursor(args.source, true);
+        viewModel.revealAllCursors(args.source, true);
     }
 }
 registerEditorAction(ExpandLineSelectionAction);

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

@@ -15,6 +15,7 @@ import { SortLinesCommand } from './sortLinesCommand.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 class AbstractCopyLinesAction extends EditorAction {
     constructor(down, opts) {
         super(opts);
@@ -241,7 +242,14 @@ class AbstractSortLinesAction extends EditorAction {
         this.descending = descending;
     }
     run(_accessor, editor) {
-        const selections = editor.getSelections() || [];
+        if (!editor.hasModel()) {
+            return;
+        }
+        const model = editor.getModel();
+        let selections = editor.getSelections();
+        if (selections.length === 1 && selections[0].isEmpty()) {
+            selections = [( new Selection(1, 1, model.getLineCount(), model.getLineMaxColumn(model.getLineCount())))];
+        }
         for (const selection of selections) {
             if (!SortLinesCommand.canRun(editor.getModel(), selection, this.descending)) {
                 return;
@@ -308,7 +316,13 @@ class DeleteDuplicateLinesAction extends EditorAction {
         const edits = [];
         const endCursorState = [];
         let linesDeleted = 0;
-        for (const selection of editor.getSelections()) {
+        let updateSelection = true;
+        let selections = editor.getSelections();
+        if (selections.length === 1 && selections[0].isEmpty()) {
+            selections = [( new Selection(1, 1, model.getLineCount(), model.getLineMaxColumn(model.getLineCount())))];
+            updateSelection = false;
+        }
+        for (const selection of selections) {
             const uniqueLines = ( new Set());
             const lines = [];
             for (let i = selection.startLineNumber; i <= selection.endLineNumber; i++) {
@@ -337,7 +351,7 @@ class DeleteDuplicateLinesAction extends EditorAction {
             linesDeleted += (selection.endLineNumber - selection.startLineNumber + 1) - lines.length;
         }
         editor.pushUndoStop();
-        editor.executeEdits(this.id, edits, endCursorState);
+        editor.executeEdits(this.id, edits, updateSelection ? endCursorState : undefined);
         editor.pushUndoStop();
     }
 }
@@ -369,7 +383,10 @@ class TrimTrailingWhitespaceAction extends EditorAction {
         if (selection === null) {
             return;
         }
-        const command = ( new TrimTrailingWhitespaceCommand(selection, cursors));
+        const config = _accessor.get(IConfigurationService);
+        const model = editor.getModel();
+        const trimInRegexAndStrings = config.getValue('files.trimTrailingWhitespaceInRegexAndStrings', { overrideIdentifier: model?.getLanguageId(), resource: model?.uri });
+        const command = ( new TrimTrailingWhitespaceCommand(selection, cursors, trimInRegexAndStrings));
         editor.pushUndoStop();
         editor.executeCommands(this.id, [command]);
         editor.pushUndoStop();
@@ -994,7 +1011,7 @@ class AbstractCaseAction extends EditorAction {
         if (model === null) {
             return;
         }
-        const wordSeparators = editor.getOption(130 );
+        const wordSeparators = editor.getOption(131 );
         const textEdits = [];
         for (const selection of selections) {
             if (selection.isEmpty()) {
@@ -1149,6 +1166,33 @@ class CamelCaseAction extends AbstractCaseAction {
             .join('');
     }
 }
+class PascalCaseAction extends AbstractCaseAction {
+    static { this.wordBoundary = ( new BackwardsCompatibleRegExp('[_\\s-]', 'gm')); }
+    static { this.wordBoundaryToMaintain = ( new BackwardsCompatibleRegExp('(?<=\\.)', 'gm')); }
+    constructor() {
+        super({
+            id: 'editor.action.transformToPascalcase',
+            label: ( localizeWithPath(
+                'vs/editor/contrib/linesOperations/browser/linesOperations',
+                'editor.transformToPascalcase',
+                "Transform to Pascal Case"
+            )),
+            alias: 'Transform to Pascal Case',
+            precondition: EditorContextKeys.writable
+        });
+    }
+    _modifyText(text, wordSeparators) {
+        const wordBoundary = PascalCaseAction.wordBoundary.get();
+        const wordBoundaryToMaintain = PascalCaseAction.wordBoundaryToMaintain.get();
+        if (!wordBoundary || !wordBoundaryToMaintain) {
+            return text;
+        }
+        const wordsWithMaintainBoundaries = text.split(wordBoundaryToMaintain);
+        const words = ( wordsWithMaintainBoundaries.map((word) => word.split(wordBoundary))).flat();
+        return ( words.map((word) => word.substring(0, 1).toLocaleUpperCase() + word.substring(1)))
+            .join('');
+    }
+}
 class KebabCaseAction extends AbstractCaseAction {
     static isSupported() {
         const areAllRegexpsSupported = [
@@ -1213,10 +1257,13 @@ if (SnakeCaseAction.caseBoundary.isSupported() && SnakeCaseAction.singleLetters.
 if (CamelCaseAction.wordBoundary.isSupported()) {
     registerEditorAction(CamelCaseAction);
 }
+if (PascalCaseAction.wordBoundary.isSupported()) {
+    registerEditorAction(PascalCaseAction);
+}
 if (TitleCaseAction.titleBoundary.isSupported()) {
     registerEditorAction(TitleCaseAction);
 }
 if (KebabCaseAction.isSupported()) {
     registerEditorAction(KebabCaseAction);
 }
-export { AbstractCaseAction, AbstractDeleteAllToBoundaryAction, AbstractSortLinesAction, CamelCaseAction, DeleteAllLeftAction, DeleteAllRightAction, DeleteDuplicateLinesAction, DeleteLinesAction, DuplicateSelectionAction, IndentLinesAction, InsertLineAfterAction, InsertLineBeforeAction, JoinLinesAction, KebabCaseAction, LowerCaseAction, SnakeCaseAction, SortLinesAscendingAction, SortLinesDescendingAction, TitleCaseAction, TransposeAction, TrimTrailingWhitespaceAction, UpperCaseAction };
+export { AbstractCaseAction, AbstractDeleteAllToBoundaryAction, AbstractSortLinesAction, CamelCaseAction, DeleteAllLeftAction, DeleteAllRightAction, DeleteDuplicateLinesAction, DeleteLinesAction, DuplicateSelectionAction, IndentLinesAction, InsertLineAfterAction, InsertLineBeforeAction, JoinLinesAction, KebabCaseAction, LowerCaseAction, PascalCaseAction, SnakeCaseAction, SortLinesAscendingAction, SortLinesDescendingAction, TitleCaseAction, TransposeAction, TrimTrailingWhitespaceAction, UpperCaseAction };

package/vscode/src/vs/editor/contrib/linesOperations/browser/moveLinesCommand.js

@@ -5,7 +5,7 @@ import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
 import { IndentAction } from '../../../common/languages/languageConfiguration.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
-import { getSpaceCnt, generateIndent } from '../../indentation/browser/indentUtils.js';
+import { getSpaceCnt, generateIndent } from '../../indentation/common/indentUtils.js';
 import { getGoodIndentForLine, getIndentMetadata } from '../../../common/languages/autoIndent.js';
 import { getEnterAction } from '../../../common/languages/enterAction.js';
 let MoveLinesCommand = class MoveLinesCommand {

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

@@ -18,7 +18,17 @@ import { ILanguageConfigurationService } from '../../../common/languages/languag
 import { localizeWithPath } from '../../../../nls.js';
 import { RawContextKey, IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
-import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
 import './linkedEditing.css.js';

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

@@ -186,10 +186,10 @@ let LinkDetector = class LinkDetector extends Disposable {
                     if (parsedUri.scheme === Schemas.file) {
                         const fsPath = originalFSPath(parsedUri);
                         let relativePath = null;
-                        if (fsPath.startsWith('/./')) {
+                        if (fsPath.startsWith('/./') || fsPath.startsWith('\\.\\')) {
                             relativePath = `.${fsPath.substr(1)}`;
                         }
-                        else if (fsPath.startsWith('//./')) {
+                        else if (fsPath.startsWith('//./') || fsPath.startsWith('\\\\.\\')) {
                             relativePath = `.${fsPath.substr(2)}`;
                         }
                         if (relativePath) {

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

@@ -368,7 +368,7 @@ class MultiCursorSession {
         this.findController.highlightFindOptions();
         const allSelections = this._editor.getSelections();
         const lastAddedSelection = allSelections[allSelections.length - 1];
-        const nextMatch = this._editor.getModel().findNextMatch(this.searchText, lastAddedSelection.getEndPosition(), false, this.matchCase, this.wholeWord ? this._editor.getOption(130 ) : null, false);
+        const nextMatch = this._editor.getModel().findNextMatch(this.searchText, lastAddedSelection.getEndPosition(), false, this.matchCase, this.wholeWord ? this._editor.getOption(131 ) : null, false);
         if (!nextMatch) {
             return null;
         }
@@ -421,7 +421,7 @@ class MultiCursorSession {
         this.findController.highlightFindOptions();
         const allSelections = this._editor.getSelections();
         const lastAddedSelection = allSelections[allSelections.length - 1];
-        const previousMatch = this._editor.getModel().findPreviousMatch(this.searchText, lastAddedSelection.getStartPosition(), false, this.matchCase, this.wholeWord ? this._editor.getOption(130 ) : null, false);
+        const previousMatch = this._editor.getModel().findPreviousMatch(this.searchText, lastAddedSelection.getStartPosition(), false, this.matchCase, this.wholeWord ? this._editor.getOption(131 ) : null, false);
         if (!previousMatch) {
             return null;
         }
@@ -439,9 +439,9 @@ class MultiCursorSession {
         this.findController.highlightFindOptions();
         const editorModel = this._editor.getModel();
         if (searchScope) {
-            return editorModel.findMatches(this.searchText, searchScope, false, this.matchCase, this.wholeWord ? this._editor.getOption(130 ) : null, false, 1073741824 );
+            return editorModel.findMatches(this.searchText, searchScope, false, this.matchCase, this.wholeWord ? this._editor.getOption(131 ) : null, false, 1073741824 );
         }
-        return editorModel.findMatches(this.searchText, true, false, this.matchCase, this.wholeWord ? this._editor.getOption(130 ) : null, false, 1073741824 );
+        return editorModel.findMatches(this.searchText, true, false, this.matchCase, this.wholeWord ? this._editor.getOption(131 ) : null, false, 1073741824 );
     }
 }
 class MultiCursorSelectionController extends Disposable {
@@ -587,10 +587,10 @@ class MultiCursorSelectionController extends Disposable {
         if (findState.isRevealed && findState.searchString.length > 0 && findState.isRegex) {
             const editorModel = this._editor.getModel();
             if (findState.searchScope) {
-                matches = editorModel.findMatches(findState.searchString, findState.searchScope, findState.isRegex, findState.matchCase, findState.wholeWord ? this._editor.getOption(130 ) : null, false, 1073741824 );
+                matches = editorModel.findMatches(findState.searchString, findState.searchScope, findState.isRegex, findState.matchCase, findState.wholeWord ? this._editor.getOption(131 ) : null, false, 1073741824 );
             }
             else {
-                matches = editorModel.findMatches(findState.searchString, true, findState.isRegex, findState.matchCase, findState.wholeWord ? this._editor.getOption(130 ) : null, false, 1073741824 );
+                matches = editorModel.findMatches(findState.searchString, true, findState.isRegex, findState.matchCase, findState.wholeWord ? this._editor.getOption(131 ) : null, false, 1073741824 );
             }
         }
         else {
@@ -943,7 +943,7 @@ let SelectionHighlighter = class SelectionHighlighter extends Disposable {
             editor.getModel(),
             r.searchText,
             r.matchCase,
-            r.wholeWord ? editor.getOption(130 ) : null,
+            r.wholeWord ? editor.getOption(131 ) : null,
             oldState
         ));
     }

package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.js

@@ -14,7 +14,17 @@ import { Context } from './provideSignatureHelp.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { registerColor, listHighlightForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import { listHighlightForeground } from '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 var ParameterHintsWidget_1;

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

@@ -10,14 +10,24 @@ import { mixin } from '../../../../base/common/objects.js';
 import './media/peekViewWidget.css.js';
 import { registerEditorContribution } from '../../../browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
-import { EmbeddedCodeEditorWidget } from '../../../browser/widget/embeddedCodeEditorWidget.js';
+import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { ZoneWidget } from '../../zoneWidget/browser/zoneWidget.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { RawContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService, createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { registerColor, editorForeground, editorInfoForeground, contrastBorder, activeContrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
+import { contrastBorder, activeContrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorForeground, editorInfoForeground } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 const IPeekViewService = ( createDecorator('IPeekViewService'));
 registerSingleton(IPeekViewService, class {
     constructor() {

package/vscode/src/vs/editor/contrib/quickAccess/browser/commandsQuickAccess.js

@@ -0,0 +1,23 @@
+import { stripIcons } from '../../../../base/common/iconLabels.js';
+import { AbstractCommandsQuickAccessProvider } from '../../../../platform/quickinput/browser/commandsQuickAccess.js';
+class AbstractEditorCommandsQuickAccessProvider extends AbstractCommandsQuickAccessProvider {
+    constructor(options, instantiationService, keybindingService, commandService, telemetryService, dialogService) {
+        super(options, instantiationService, keybindingService, commandService, telemetryService, dialogService);
+    }
+    getCodeEditorCommandPicks() {
+        const activeTextEditorControl = this.activeTextEditorControl;
+        if (!activeTextEditorControl) {
+            return [];
+        }
+        const editorCommandPicks = [];
+        for (const editorAction of activeTextEditorControl.getSupportedActions()) {
+            editorCommandPicks.push({
+                commandId: editorAction.id,
+                commandAlias: editorAction.alias,
+                label: stripIcons(editorAction.label) || editorAction.id,
+            });
+        }
+        return editorCommandPicks;
+    }
+}
+export { AbstractEditorCommandsQuickAccessProvider };

package/vscode/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.js

@@ -52,7 +52,7 @@ class AbstractEditorNavigationQuickAccessProvider {
         return true;
     }
     gotoLocation({ editor }, options) {
-        editor.setSelection(options.range);
+        editor.setSelection(options.range, "code.jump" );
         editor.revealRangeInCenter(options.range, 0 );
         if (!options.preserveFocus) {
             editor.focus();

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

@@ -2,7 +2,8 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { raceCancellation } from '../../../../base/common/async.js';
 import { CancellationTokenSource, CancellationToken } from '../../../../base/common/cancellation.js';
-import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { CancellationError, onUnexpectedError } from '../../../../base/common/errors.js';
+import { isMarkdownString } from '../../../../base/common/htmlContent.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { assertType } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -26,7 +27,7 @@ import { INotificationService } from '../../../../platform/notification/common/n
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { RenameInputField, CONTEXT_RENAME_INPUT_VISIBLE, CONTEXT_RENAME_INPUT_FOCUSED } from './renameInputField.js';
+import { RenameWidget, CONTEXT_RENAME_INPUT_VISIBLE } from './renameWidget.js';
 var RenameController_1;
 class RenameSkeleton {
     constructor(model, position, registry) {
@@ -122,7 +123,7 @@ let RenameController = class RenameController {
         this._telemetryService = _telemetryService;
         this._disposableStore = ( new DisposableStore());
         this._cts = ( new CancellationTokenSource());
-        this._renameInputField = this._disposableStore.add(this._instaService.createInstance(RenameInputField, this.editor, ['acceptRenameInput', 'acceptRenameInputWithPreview']));
+        this._renameWidget = this._disposableStore.add(this._instaService.createInstance(RenameWidget, this.editor, ['acceptRenameInput', 'acceptRenameInputWithPreview']));
     }
     dispose() {
         this._disposableStore.dispose();
@@ -161,12 +162,19 @@ let RenameController = class RenameController {
             trace('resolved rename location');
         }
         catch (e) {
-            trace('resolve rename location failed', JSON.stringify(e, null, '\t'));
-            MessageController.get(this.editor)?.showMessage(e || ( localizeWithPath(
-                'vs/editor/contrib/rename/browser/rename',
-                'resolveRenameLocationFailed',
-                "An unknown error occurred while resolving rename location"
-            )), position);
+            if (e instanceof CancellationError) {
+                trace('resolve rename location cancelled', JSON.stringify(e, null, '\t'));
+            }
+            else {
+                trace('resolve rename location failed', e instanceof Error ? e : JSON.stringify(e, null, '\t'));
+                if (typeof e === 'string' || isMarkdownString(e)) {
+                    MessageController.get(this.editor)?.showMessage(e || ( localizeWithPath(
+                        'vs/editor/contrib/rename/browser/rename',
+                        'resolveRenameLocationFailed',
+                        "An unknown error occurred while resolving rename location"
+                    )), position);
+                }
+            }
             return undefined;
         }
         finally {
@@ -192,20 +200,11 @@ let RenameController = class RenameController {
             this._cts.token
         ));
         const model = this.editor.getModel();
-        const renameCandidatesCts = ( new CancellationTokenSource(cts2.token));
         const newSymbolNamesProviders = this._languageFeaturesService.newSymbolNamesProvider.all(model);
-        const newSymbolNameProvidersResults = ( newSymbolNamesProviders.map(p => p.provideNewSymbolNames(model, loc.range, renameCandidatesCts.token)));
-        trace(`requested new symbol names from ${newSymbolNamesProviders.length} providers`);
-        const selection = this.editor.getSelection();
-        let selectionStart = 0;
-        let selectionEnd = loc.text.length;
-        if (!Range.isEmpty(selection) && !Range.spansMultipleLines(selection) && Range.containsRange(loc.range, selection)) {
-            selectionStart = Math.max(0, selection.startColumn - loc.range.startColumn);
-            selectionEnd = Math.min(loc.range.endColumn, selection.endColumn) - loc.range.startColumn;
-        }
+        const requestRenameSuggestions = (cts) => ( newSymbolNamesProviders.map(p => p.provideNewSymbolNames(model, loc.range, cts)));
         trace('creating rename input field and awaiting its result');
         const supportPreview = this._bulkEditService.hasPreviewHandler() && this._configService.getValue(this.editor.getModel().uri, 'editor.rename.enablePreview');
-        const inputFieldResult = await this._renameInputField.getInput(loc.range, loc.text, selectionStart, selectionEnd, supportPreview, newSymbolNameProvidersResults, renameCandidatesCts);
+        const inputFieldResult = await this._renameWidget.getInput(loc.range, loc.text, supportPreview, requestRenameSuggestions, cts2);
         trace('received response from rename input field');
         if (newSymbolNamesProviders.length > 0) {
             this._reportTelemetry(newSymbolNamesProviders.length, model.getLanguageId(), inputFieldResult);
@@ -292,16 +291,16 @@ let RenameController = class RenameController {
         return renameOperation;
     }
     acceptRenameInput(wantsPreview) {
-        this._renameInputField.acceptInput(wantsPreview);
+        this._renameWidget.acceptInput(wantsPreview);
     }
     cancelRenameInput() {
-        this._renameInputField.cancelInput(true, 'cancelRenameInput command');
+        this._renameWidget.cancelInput(true, 'cancelRenameInput command');
     }
     focusNextRenameSuggestion() {
-        this._renameInputField.focusNextRenameSuggestion();
+        this._renameWidget.focusNextRenameSuggestion();
     }
     focusPreviousRenameSuggestion() {
-        this._renameInputField.focusPreviousRenameSuggestion();
+        this._renameWidget.focusPreviousRenameSuggestion();
     }
     _reportTelemetry(nRenameSuggestionProviders, languageId, inputFieldResult) {
         const value = typeof inputFieldResult === 'boolean'
@@ -314,8 +313,9 @@ let RenameController = class RenameController {
                 kind: 'accepted',
                 languageId,
                 nRenameSuggestionProviders,
-                source: inputFieldResult.source,
-                nRenameSuggestions: inputFieldResult.nRenameSuggestions,
+                source: inputFieldResult.stats.source.k,
+                nRenameSuggestions: inputFieldResult.stats.nRenameSuggestions,
+                timeBeforeFirstInputFieldEdit: inputFieldResult.stats.timeBeforeFirstInputFieldEdit,
                 wantsPreview: inputFieldResult.wantsPreview,
             };
         this._telemetryService.publicLog2('renameInvokedEvent', value);
@@ -397,7 +397,7 @@ registerEditorCommand(( new RenameCommand({
     kbOpts: {
         weight: 100  + 99,
         kbExpr: ( ContextKeyExpr.and(EditorContextKeys.focus, ContextKeyExpr.not('isComposing'))),
-        primary: 1024  + 3
+        primary: 2048  + 3
     }
 })));
 registerEditorCommand(( new RenameCommand({
@@ -458,12 +458,6 @@ registerAction2(class FocusPreviousRenameSuggestion extends Action2 {
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
                 {
-                    when: CONTEXT_RENAME_INPUT_FOCUSED,
-                    primary: 2  | 4 ,
-                    weight: 100  + 99,
-                },
-                {
-                    when: ( CONTEXT_RENAME_INPUT_FOCUSED.toNegated()),
                     primary: 1024  | 2 ,
                     secondary: [16 ],
                     weight: 100  + 99,