@codingame/monaco-vscode-api 2.2.1 → 3.0.0

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(129 ) : null, false);
+        const nextMatch = this._editor.getModel().findNextMatch(this.searchText, lastAddedSelection.getEndPosition(), false, this.matchCase, this.wholeWord ? this._editor.getOption(130 ) : 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(129 ) : null, false);
+        const previousMatch = this._editor.getModel().findPreviousMatch(this.searchText, lastAddedSelection.getStartPosition(), false, this.matchCase, this.wholeWord ? this._editor.getOption(130 ) : 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(129 ) : null, false, 1073741824 );
+            return editorModel.findMatches(this.searchText, searchScope, 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(129 ) : null, false, 1073741824 );
+        return editorModel.findMatches(this.searchText, true, false, this.matchCase, this.wholeWord ? this._editor.getOption(130 ) : 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(129 ) : null, false, 1073741824 );
+                matches = editorModel.findMatches(findState.searchString, findState.searchScope, findState.isRegex, findState.matchCase, findState.wholeWord ? this._editor.getOption(130 ) : null, false, 1073741824 );
             }
             else {
-                matches = editorModel.findMatches(findState.searchString, true, findState.isRegex, findState.matchCase, findState.wholeWord ? this._editor.getOption(129 ) : null, false, 1073741824 );
+                matches = editorModel.findMatches(findState.searchString, true, findState.isRegex, findState.matchCase, findState.wholeWord ? this._editor.getOption(130 ) : null, false, 1073741824 );
             }
         }
         else {
@@ -835,12 +835,12 @@ let SelectionHighlighter = class SelectionHighlighter extends Disposable {
         super();
         this._languageFeaturesService = _languageFeaturesService;
         this.editor = editor;
-        this._isEnabled = editor.getOption(107 );
+        this._isEnabled = editor.getOption(108 );
         this._decorations = editor.createDecorationsCollection();
         this.updateSoon = this._register(( new RunOnceScheduler(() => this._update(), 300)));
         this.state = null;
         this._register(editor.onDidChangeConfiguration((e) => {
-            this._isEnabled = editor.getOption(107 );
+            this._isEnabled = editor.getOption(108 );
         }));
         this._register(editor.onDidChangeCursorSelection((e) => {
             if (!this._isEnabled) {
@@ -943,7 +943,7 @@ let SelectionHighlighter = class SelectionHighlighter extends Disposable {
             editor.getModel(),
             r.searchText,
             r.matchCase,
-            r.wholeWord ? editor.getOption(129 ) : null,
+            r.wholeWord ? editor.getOption(130 ) : null,
             oldState
         ));
     }
@@ -987,7 +987,7 @@ let SelectionHighlighter = class SelectionHighlighter extends Disposable {
                 }
             }
         }
-        const occurrenceHighlighting = this.editor.getOption(80 ) !== 'off';
+        const occurrenceHighlighting = this.editor.getOption(81 ) !== 'off';
         const hasSemanticHighlights = ( this._languageFeaturesService.documentHighlightProvider.has(model)) && occurrenceHighlighting;
         const decorations = ( matches.map(r => {
             return {

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

@@ -89,7 +89,7 @@ class ParameterHintsModel extends Disposable {
         const length = this.state.hints.signatures.length;
         const activeSignature = this.state.hints.activeSignature;
         const last = (activeSignature % length) === (length - 1);
-        const cycle = this.editor.getOption(85 ).cycle;
+        const cycle = this.editor.getOption(86 ).cycle;
         if ((length < 2 || last) && !cycle) {
             this.cancel();
             return;
@@ -103,7 +103,7 @@ class ParameterHintsModel extends Disposable {
         const length = this.state.hints.signatures.length;
         const activeSignature = this.state.hints.activeSignature;
         const first = activeSignature === 0;
-        const cycle = this.editor.getOption(85 ).cycle;
+        const cycle = this.editor.getOption(86 ).cycle;
         if ((length < 2 || first) && !cycle) {
             this.cancel();
             return;
@@ -227,7 +227,7 @@ class ParameterHintsModel extends Disposable {
         }
     }
     onEditorConfigurationChange() {
-        this.triggerOnType = this.editor.getOption(85 ).enabled;
+        this.triggerOnType = this.editor.getOption(86 ).enabled;
         if (!this.triggerOnType) {
             this.cancel();
         }

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

@@ -188,7 +188,7 @@ let PeekViewWidget = class PeekViewWidget extends ZoneWidget {
             this.dispose();
             return;
         }
-        const headHeight = Math.ceil(this.editor.getOption(66 ) * 1.2);
+        const headHeight = Math.ceil(this.editor.getOption(67 ) * 1.2);
         const bodyHeight = Math.round(heightInPixel - ((headHeight + 2) ));
         this._doLayoutHead(headHeight, widthInPixel);
         this._doLayoutBody(bodyHeight, widthInPixel);

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

@@ -54,7 +54,7 @@ class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickA
         const codeEditor = getCodeEditor(editor);
         if (codeEditor) {
             const options = codeEditor.getOptions();
-            const lineNumbers = options.get(67 );
+            const lineNumbers = options.get(68 );
             if (lineNumbers.renderType === 2 ) {
                 codeEditor.updateOptions({ lineNumbers: 'on' });
                 disposables.add(toDisposable(() => codeEditor.updateOptions({ lineNumbers: 'relative' })));

package/vscode/src/vs/editor/contrib/readOnlyMessage/browser/contribution.js

@@ -13,7 +13,7 @@ class ReadOnlyMessageController extends Disposable {
     _onDidAttemptReadOnlyEdit() {
         const messageController = MessageController.get(this.editor);
         if (messageController && this.editor.hasModel()) {
-            let message = this.editor.getOptions().get(91 );
+            let message = this.editor.getOptions().get(92 );
             if (!message) {
                 if (this.editor.isSimpleWidget) {
                     message = ( new MarkdownString(( localizeWithPath(

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

@@ -6,16 +6,18 @@ import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { assertType } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
-import { EditorStateCancellationTokenSource } from '../../editorState/browser/editorState.js';
 import { registerEditorContribution, registerEditorAction, registerEditorCommand, registerModelAndPositionCommand, EditorCommand, EditorAction } from '../../../browser/editorExtensions.js';
 import { IBulkEditService } from '../../../browser/services/bulkEditService.js';
 import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { ITextResourceConfigurationService } from '../../../common/services/textResourceConfiguration.js';
+import { EditorStateCancellationTokenSource } from '../../editorState/browser/editorState.js';
 import { MessageController } from '../../message/browser/messageController.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
+import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
 import { Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -23,8 +25,8 @@ import { ILogService } from '../../../../platform/log/common/log.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { RenameInputField, CONTEXT_RENAME_INPUT_VISIBLE } from './renameInputField.js';
-import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { RenameInputField, CONTEXT_RENAME_INPUT_VISIBLE, CONTEXT_RENAME_INPUT_FOCUSED } from './renameInputField.js';
 var RenameController_1;
 class RenameSkeleton {
     constructor(model, position, registry) {
@@ -108,7 +110,7 @@ let RenameController = class RenameController {
     static get(editor) {
         return editor.getContribution(RenameController_1.ID);
     }
-    constructor(editor, _instaService, _notificationService, _bulkEditService, _progressService, _logService, _configService, _languageFeaturesService) {
+    constructor(editor, _instaService, _notificationService, _bulkEditService, _progressService, _logService, _configService, _languageFeaturesService, _telemetryService) {
         this.editor = editor;
         this._instaService = _instaService;
         this._notificationService = _notificationService;
@@ -117,6 +119,7 @@ let RenameController = class RenameController {
         this._logService = _logService;
         this._configService = _configService;
         this._languageFeaturesService = _languageFeaturesService;
+        this._telemetryService = _telemetryService;
         this._disposableStore = ( new DisposableStore());
         this._cts = ( new CancellationTokenSource());
         this._renameInputField = this._disposableStore.add(this._instaService.createInstance(RenameInputField, this.editor, ['acceptRenameInput', 'acceptRenameInputWithPreview']));
@@ -126,9 +129,11 @@ let RenameController = class RenameController {
         this._cts.dispose(true);
     }
     async run() {
+        const trace = this._logService.trace.bind(this._logService, '[rename]');
         this._cts.dispose(true);
         this._cts = ( new CancellationTokenSource());
         if (!this.editor.hasModel()) {
+            trace('editor has no model');
             return undefined;
         }
         const position = this.editor.getPosition();
@@ -138,6 +143,7 @@ let RenameController = class RenameController {
             this._languageFeaturesService.renameProvider
         ));
         if (!skeleton.hasProvider()) {
+            trace('skeleton has no provider');
             return undefined;
         }
         const cts1 = ( new EditorStateCancellationTokenSource(
@@ -148,11 +154,14 @@ let RenameController = class RenameController {
         ));
         let loc;
         try {
+            trace('resolving rename location');
             const resolveLocationOperation = skeleton.resolveRenameLocation(cts1.token);
             this._progressService.showWhile(resolveLocationOperation, 250);
             loc = await resolveLocationOperation;
+            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',
@@ -164,13 +173,16 @@ let RenameController = class RenameController {
             cts1.dispose();
         }
         if (!loc) {
+            trace('returning early - no loc');
             return undefined;
         }
         if (loc.rejectReason) {
+            trace(`returning early - rejected with reason: ${loc.rejectReason}`, loc.rejectReason);
             MessageController.get(this.editor)?.showMessage(loc.rejectReason, position);
             return undefined;
         }
         if (cts1.token.isCancellationRequested) {
+            trace('returning early - cts1 cancelled');
             return undefined;
         }
         const cts2 = ( new EditorStateCancellationTokenSource(
@@ -179,6 +191,11 @@ let RenameController = class RenameController {
             loc.range,
             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;
@@ -186,9 +203,15 @@ let RenameController = class RenameController {
             selectionStart = Math.max(0, selection.startColumn - loc.range.startColumn);
             selectionEnd = Math.min(loc.range.endColumn, selection.endColumn) - loc.range.startColumn;
         }
+        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, cts2.token);
+        const inputFieldResult = await this._renameInputField.getInput(loc.range, loc.text, selectionStart, selectionEnd, supportPreview, newSymbolNameProvidersResults, renameCandidatesCts);
+        trace('received response from rename input field');
+        if (newSymbolNamesProviders.length > 0) {
+            this._reportTelemetry(newSymbolNamesProviders.length, model.getLanguageId(), inputFieldResult);
+        }
         if (typeof inputFieldResult === 'boolean') {
+            trace(`returning early - rename input field response - ${inputFieldResult}`);
             if (inputFieldResult) {
                 this.editor.focus();
             }
@@ -196,15 +219,23 @@ let RenameController = class RenameController {
             return undefined;
         }
         this.editor.focus();
+        trace('requesting rename edits');
         const renameOperation = raceCancellation(skeleton.provideRenameEdits(inputFieldResult.newName, cts2.token), cts2.token).then(async (renameResult) => {
-            if (!renameResult || !this.editor.hasModel()) {
+            if (!renameResult) {
+                trace('returning early - no rename edits result');
+                return;
+            }
+            if (!this.editor.hasModel()) {
+                trace('returning early - no model after rename edits are provided');
                 return;
             }
             if (renameResult.rejectReason) {
+                trace(`returning early - rejected with reason: ${renameResult.rejectReason}`);
                 this._notificationService.info(renameResult.rejectReason);
                 return;
             }
             this.editor.setSelection(Range.fromPositions(this.editor.getSelection().getPosition()));
+            trace('applying edits');
             this._bulkEditService.apply(renameResult, {
                 editor: this.editor,
                 showPreview: inputFieldResult.wantsPreview,
@@ -225,6 +256,7 @@ let RenameController = class RenameController {
                 )),
                 respectAutoSaveConfig: true
             }).then(result => {
+                trace('edits applied');
                 if (result.ariaSummary) {
                     alert(( localizeWithPath(
                         'vs/editor/contrib/rename/browser/rename',
@@ -236,6 +268,7 @@ let RenameController = class RenameController {
                     )));
                 }
             }).catch(err => {
+                trace(`error when applying edits ${JSON.stringify(err, null, '\t')}`);
                 this._notificationService.error(( localizeWithPath(
                     'vs/editor/contrib/rename/browser/rename',
                     'rename.failedApply',
@@ -244,6 +277,7 @@ let RenameController = class RenameController {
                 this._logService.error(err);
             });
         }, err => {
+            trace('error when providing rename edits', JSON.stringify(err, null, '\t'));
             this._notificationService.error(( localizeWithPath(
                 'vs/editor/contrib/rename/browser/rename',
                 'rename.failed',
@@ -253,6 +287,7 @@ let RenameController = class RenameController {
         }).finally(() => {
             cts2.dispose();
         });
+        trace('returning rename operation');
         this._progressService.showWhile(renameOperation, 250);
         return renameOperation;
     }
@@ -260,7 +295,30 @@ let RenameController = class RenameController {
         this._renameInputField.acceptInput(wantsPreview);
     }
     cancelRenameInput() {
-        this._renameInputField.cancelInput(true);
+        this._renameInputField.cancelInput(true, 'cancelRenameInput command');
+    }
+    focusNextRenameSuggestion() {
+        this._renameInputField.focusNextRenameSuggestion();
+    }
+    focusPreviousRenameSuggestion() {
+        this._renameInputField.focusPreviousRenameSuggestion();
+    }
+    _reportTelemetry(nRenameSuggestionProviders, languageId, inputFieldResult) {
+        const value = typeof inputFieldResult === 'boolean'
+            ? {
+                kind: 'cancelled',
+                languageId,
+                nRenameSuggestionProviders,
+            }
+            : {
+                kind: 'accepted',
+                languageId,
+                nRenameSuggestionProviders,
+                source: inputFieldResult.source,
+                nRenameSuggestions: inputFieldResult.nRenameSuggestions,
+                wantsPreview: inputFieldResult.wantsPreview,
+            };
+        this._telemetryService.publicLog2('renameInvokedEvent', value);
     }
 };
 RenameController = RenameController_1 = ( __decorate([
@@ -270,7 +328,8 @@ RenameController = RenameController_1 = ( __decorate([
     ( __param(4, IEditorProgressService)),
     ( __param(5, ILogService)),
     ( __param(6, ITextResourceConfigurationService)),
-    ( __param(7, ILanguageFeaturesService))
+    ( __param(7, ILanguageFeaturesService)),
+    ( __param(8, ITelemetryService))
 ], RenameController));
 class RenameAction extends EditorAction {
     constructor() {
@@ -308,10 +367,13 @@ class RenameAction extends EditorAction {
         return super.runCommand(accessor, args);
     }
     run(accessor, editor) {
+        const logService = accessor.get(ILogService);
         const controller = RenameController.get(editor);
         if (controller) {
+            logService.trace('[RenameAction] got controller, running...');
             return controller.run();
         }
+        logService.trace('[RenameAction] returning early - controller missing');
         return Promise.resolve();
     }
 }
@@ -349,6 +411,78 @@ registerEditorCommand(( new RenameCommand({
         secondary: [1024  | 9 ]
     }
 })));
+registerAction2(class FocusNextRenameSuggestion extends Action2 {
+    constructor() {
+        super({
+            id: 'focusNextRenameSuggestion',
+            title: {
+                ...( localize2WithPath(
+                    'vs/editor/contrib/rename/browser/rename',
+                    'focusNextRenameSuggestion',
+                    "Focus Next Rename Suggestion"
+                )),
+            },
+            precondition: CONTEXT_RENAME_INPUT_VISIBLE,
+            keybinding: [
+                {
+                    primary: 2 ,
+                    secondary: [18 ],
+                    weight: 100  + 99,
+                }
+            ]
+        });
+    }
+    run(accessor) {
+        const currentEditor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
+        if (!currentEditor) {
+            return;
+        }
+        const controller = RenameController.get(currentEditor);
+        if (!controller) {
+            return;
+        }
+        controller.focusNextRenameSuggestion();
+    }
+});
+registerAction2(class FocusPreviousRenameSuggestion extends Action2 {
+    constructor() {
+        super({
+            id: 'focusPreviousRenameSuggestion',
+            title: {
+                ...( localize2WithPath(
+                    'vs/editor/contrib/rename/browser/rename',
+                    'focusPreviousRenameSuggestion',
+                    "Focus Previous Rename Suggestion"
+                )),
+            },
+            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,
+                }
+            ]
+        });
+    }
+    run(accessor) {
+        const currentEditor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
+        if (!currentEditor) {
+            return;
+        }
+        const controller = RenameController.get(currentEditor);
+        if (!controller) {
+            return;
+        }
+        controller.focusPreviousRenameSuggestion();
+    }
+});
 registerModelAndPositionCommand('_executeDocumentRenameProvider', function (accessor, model, position, ...args) {
     const [newName] = args;
     assertType(typeof newName === 'string');

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .rename-box{border-radius:4px;color:inherit;z-index:100}.monaco-editor .rename-box.preview{padding:4px 4px 0}.monaco-editor .rename-box .rename-input{border-radius:2px;padding:3px}.monaco-editor .rename-box .rename-label{display:none;opacity:.8}.monaco-editor .rename-box.preview .rename-label{display:inherit}";
+var css = ".monaco-editor .rename-box{border-radius:4px;color:inherit;z-index:100}.monaco-editor .rename-box.preview{padding:4px 4px 0}.monaco-editor .rename-box .rename-input{border-radius:2px;padding:3px;width:calc(100% - 8px)}.monaco-editor .rename-box .rename-label{display:none;opacity:.8}.monaco-editor .rename-box.preview .rename-label{display:inherit}";
 n(css,{});
 export { css, css as default };