@codingame/monaco-vscode-api 4.5.1 → 5.0.0

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

@@ -13,6 +13,7 @@ import { ICodeEditorService } from '../../../browser/services/codeEditorService.
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { NewSymbolNameTriggerKind } from '../../../common/languages.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { ITextResourceConfigurationService } from '../../../common/services/textResourceConfiguration.js';
 import { EditorStateCancellationTokenSource } from '../../editorState/browser/editorState.js';
@@ -29,6 +30,7 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { RenameWidget, CONTEXT_RENAME_INPUT_VISIBLE } from './renameWidget.js';
 var RenameController_1;
+const _moduleId = "vs/editor/contrib/rename/browser/rename";
 class RenameSkeleton {
     constructor(model, position, registry) {
         this.model = model;
@@ -66,12 +68,12 @@ class RenameSkeleton {
             };
         }
         return {
-            range: ( new Range(
+            range: ( (new Range(
                 this.position.lineNumber,
                 word.startColumn,
                 this.position.lineNumber,
                 word.endColumn
-            )),
+            ))),
             text: word.word,
             rejectReason: rejects.length > 0 ? rejects.join('\n') : undefined
         };
@@ -89,7 +91,7 @@ class RenameSkeleton {
         }
         const result = await provider.provideRenameEdits(this.model, this.position, newName, token);
         if (!result) {
-            return this._provideRenameEdits(newName, i + 1, rejects.concat(( localizeWithPath('vs/editor/contrib/rename/browser/rename', 'no result', "No result."))), token);
+            return this._provideRenameEdits(newName, i + 1, rejects.concat(( localizeWithPath(_moduleId, 0, "No result."))), token);
         }
         else if (result.rejectReason) {
             return this._provideRenameEdits(newName, i + 1, rejects.concat(result.rejectReason), token);
@@ -98,7 +100,7 @@ class RenameSkeleton {
     }
 }
 async function rename(registry, model, position, newName) {
-    const skeleton = ( new RenameSkeleton(model, position, registry));
+    const skeleton = ( (new RenameSkeleton(model, position, registry)));
     const loc = await skeleton.resolveRenameLocation(CancellationToken.None);
     if (loc?.rejectReason) {
         return { edits: [], rejectReason: loc.rejectReason };
@@ -121,8 +123,8 @@ let RenameController = class RenameController {
         this._configService = _configService;
         this._languageFeaturesService = _languageFeaturesService;
         this._telemetryService = _telemetryService;
-        this._disposableStore = ( new DisposableStore());
-        this._cts = ( new CancellationTokenSource());
+        this._disposableStore = ( (new DisposableStore()));
+        this._cts = ( (new CancellationTokenSource()));
         this._renameWidget = this._disposableStore.add(this._instaService.createInstance(RenameWidget, this.editor, ['acceptRenameInput', 'acceptRenameInputWithPreview']));
     }
     dispose() {
@@ -132,27 +134,27 @@ let RenameController = class RenameController {
     async run() {
         const trace = this._logService.trace.bind(this._logService, '[rename]');
         this._cts.dispose(true);
-        this._cts = ( new CancellationTokenSource());
+        this._cts = ( (new CancellationTokenSource()));
         if (!this.editor.hasModel()) {
             trace('editor has no model');
             return undefined;
         }
         const position = this.editor.getPosition();
-        const skeleton = ( new RenameSkeleton(
+        const skeleton = ( (new RenameSkeleton(
             this.editor.getModel(),
             position,
             this._languageFeaturesService.renameProvider
-        ));
+        )));
         if (!skeleton.hasProvider()) {
             trace('skeleton has no provider');
             return undefined;
         }
-        const cts1 = ( new EditorStateCancellationTokenSource(
+        const cts1 = ( (new EditorStateCancellationTokenSource(
             this.editor,
             4  | 1 ,
             undefined,
             this._cts.token
-        ));
+        )));
         let loc;
         try {
             trace('resolving rename location');
@@ -168,11 +170,7 @@ let RenameController = class RenameController {
             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);
+                    MessageController.get(this.editor)?.showMessage(e || ( localizeWithPath(_moduleId, 1, "An unknown error occurred while resolving rename location")), position);
                 }
             }
             return undefined;
@@ -193,18 +191,29 @@ let RenameController = class RenameController {
             trace('returning early - cts1 cancelled');
             return undefined;
         }
-        const cts2 = ( new EditorStateCancellationTokenSource(
+        const cts2 = ( (new EditorStateCancellationTokenSource(
             this.editor,
             4  | 1 ,
             loc.range,
             this._cts.token
-        ));
+        )));
         const model = this.editor.getModel();
         const newSymbolNamesProviders = this._languageFeaturesService.newSymbolNamesProvider.all(model);
-        const requestRenameSuggestions = (cts) => ( newSymbolNamesProviders.map(p => p.provideNewSymbolNames(model, loc.range, cts)));
+        const resolvedNewSymbolnamesProviders = await Promise.all(( (newSymbolNamesProviders.map(
+            async (p) => [p, (await p.supportsAutomaticNewSymbolNamesTriggerKind) ?? false]
+        ))));
+        const requestRenameSuggestions = (triggerKind, cts) => {
+            let providers = resolvedNewSymbolnamesProviders.slice();
+            if (triggerKind === NewSymbolNameTriggerKind.Automatic) {
+                providers = providers.filter(([_, supportsAutomatic]) => supportsAutomatic);
+            }
+            return (
+                 (providers.map(([p,]) => p.provideNewSymbolNames(model, loc.range, triggerKind, 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._renameWidget.getInput(loc.range, loc.text, supportPreview, requestRenameSuggestions, cts2);
+        const inputFieldResult = await this._renameWidget.getInput(loc.range, loc.text, supportPreview, newSymbolNamesProviders.length > 0 ? requestRenameSuggestions : undefined, cts2);
         trace('received response from rename input field');
         if (newSymbolNamesProviders.length > 0) {
             this._reportTelemetry(newSymbolNamesProviders.length, model.getLanguageId(), inputFieldResult);
@@ -239,27 +248,21 @@ let RenameController = class RenameController {
                 editor: this.editor,
                 showPreview: inputFieldResult.wantsPreview,
                 label: ( localizeWithPath(
-                    'vs/editor/contrib/rename/browser/rename',
-                    'label',
+                    _moduleId,
+                    2,
                     "Renaming '{0}' to '{1}'",
                     loc?.text,
                     inputFieldResult.newName
                 )),
                 code: 'undoredo.rename',
-                quotableLabel: ( localizeWithPath(
-                    'vs/editor/contrib/rename/browser/rename',
-                    'quotableLabel',
-                    "Renaming {0} to {1}",
-                    loc?.text,
-                    inputFieldResult.newName
-                )),
+                quotableLabel: ( localizeWithPath(_moduleId, 3, "Renaming {0} to {1}", loc?.text, inputFieldResult.newName)),
                 respectAutoSaveConfig: true
             }).then(result => {
                 trace('edits applied');
                 if (result.ariaSummary) {
                     alert(( localizeWithPath(
-                        'vs/editor/contrib/rename/browser/rename',
-                        'aria',
+                        _moduleId,
+                        4,
                         "Successfully renamed '{0}' to '{1}'. Summary: {2}",
                         loc.text,
                         inputFieldResult.newName,
@@ -268,20 +271,12 @@ 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',
-                    "Rename failed to apply edits"
-                )));
+                this._notificationService.error(( localizeWithPath(_moduleId, 5, "Rename failed to apply edits")));
                 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',
-                "Rename failed to compute edits"
-            )));
+            this._notificationService.error(( localizeWithPath(_moduleId, 6, "Rename failed to compute edits")));
             this._logService.error(err);
         }).finally(() => {
             cts2.dispose();
@@ -317,27 +312,29 @@ let RenameController = class RenameController {
                 nRenameSuggestions: inputFieldResult.stats.nRenameSuggestions,
                 timeBeforeFirstInputFieldEdit: inputFieldResult.stats.timeBeforeFirstInputFieldEdit,
                 wantsPreview: inputFieldResult.wantsPreview,
+                nRenameSuggestionsInvocations: inputFieldResult.stats.nRenameSuggestionsInvocations,
+                hadAutomaticRenameSuggestionsInvocation: inputFieldResult.stats.hadAutomaticRenameSuggestionsInvocation,
             };
         this._telemetryService.publicLog2('renameInvokedEvent', value);
     }
 };
-RenameController = RenameController_1 = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, INotificationService)),
-    ( __param(3, IBulkEditService)),
-    ( __param(4, IEditorProgressService)),
-    ( __param(5, ILogService)),
-    ( __param(6, ITextResourceConfigurationService)),
-    ( __param(7, ILanguageFeaturesService)),
-    ( __param(8, ITelemetryService))
-], RenameController));
+RenameController = RenameController_1 = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, INotificationService))),
+    ( (__param(3, IBulkEditService))),
+    ( (__param(4, IEditorProgressService))),
+    ( (__param(5, ILogService))),
+    ( (__param(6, ITextResourceConfigurationService))),
+    ( (__param(7, ILanguageFeaturesService))),
+    ( (__param(8, ITelemetryService)))
+], RenameController)));
 class RenameAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.rename',
-            label: ( localizeWithPath('vs/editor/contrib/rename/browser/rename', 'rename.label', "Rename Symbol")),
+            label: ( localizeWithPath(_moduleId, 7, "Rename Symbol")),
             alias: 'Rename Symbol',
-            precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasRenameProvider)),
+            precondition: ( (ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasRenameProvider))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
                 primary: 60 ,
@@ -380,27 +377,30 @@ class RenameAction extends EditorAction {
 registerEditorContribution(RenameController.ID, RenameController, 4 );
 registerEditorAction(RenameAction);
 const RenameCommand = EditorCommand.bindToContribution(RenameController.get);
-registerEditorCommand(( new RenameCommand({
+registerEditorCommand(( (new RenameCommand({
     id: 'acceptRenameInput',
     precondition: CONTEXT_RENAME_INPUT_VISIBLE,
     handler: x => x.acceptRenameInput(false),
     kbOpts: {
         weight: 100  + 99,
-        kbExpr: ( ContextKeyExpr.and(EditorContextKeys.focus, ContextKeyExpr.not('isComposing'))),
+        kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.focus, ContextKeyExpr.not('isComposing')))),
         primary: 3
     }
-})));
-registerEditorCommand(( new RenameCommand({
+}))));
+registerEditorCommand(( (new RenameCommand({
     id: 'acceptRenameInputWithPreview',
-    precondition: ( ContextKeyExpr.and(CONTEXT_RENAME_INPUT_VISIBLE, ( ContextKeyExpr.has('config.editor.rename.enablePreview')))),
+    precondition: ( (ContextKeyExpr.and(
+        CONTEXT_RENAME_INPUT_VISIBLE,
+         (ContextKeyExpr.has('config.editor.rename.enablePreview'))
+    ))),
     handler: x => x.acceptRenameInput(true),
     kbOpts: {
         weight: 100  + 99,
-        kbExpr: ( ContextKeyExpr.and(EditorContextKeys.focus, ContextKeyExpr.not('isComposing'))),
+        kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.focus, ContextKeyExpr.not('isComposing')))),
         primary: 2048  + 3
     }
-})));
-registerEditorCommand(( new RenameCommand({
+}))));
+registerEditorCommand(( (new RenameCommand({
     id: 'cancelRenameInput',
     precondition: CONTEXT_RENAME_INPUT_VISIBLE,
     handler: x => x.cancelRenameInput(),
@@ -410,23 +410,18 @@ registerEditorCommand(( new RenameCommand({
         primary: 9 ,
         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"
-                )),
+                ...( localize2WithPath(_moduleId, 8, "Focus Next Rename Suggestion")),
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
                 {
-                    primary: 2 ,
-                    secondary: [18 ],
+                    primary: 18 ,
                     weight: 100  + 99,
                 }
             ]
@@ -449,17 +444,12 @@ registerAction2(class FocusPreviousRenameSuggestion extends Action2 {
         super({
             id: 'focusPreviousRenameSuggestion',
             title: {
-                ...( localize2WithPath(
-                    'vs/editor/contrib/rename/browser/rename',
-                    'focusPreviousRenameSuggestion',
-                    "Focus Previous Rename Suggestion"
-                )),
+                ...( localize2WithPath(_moduleId, 9, "Focus Previous Rename Suggestion")),
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
                 {
-                    primary: 1024  | 2 ,
-                    secondary: [16 ],
+                    primary: 16 ,
                     weight: 100  + 99,
                 }
             ]
@@ -485,21 +475,21 @@ registerModelAndPositionCommand('_executeDocumentRenameProvider', function (acce
 });
 registerModelAndPositionCommand('_executePrepareRename', async function (accessor, model, position) {
     const { renameProvider } = accessor.get(ILanguageFeaturesService);
-    const skeleton = ( new RenameSkeleton(model, position, renameProvider));
+    const skeleton = ( (new RenameSkeleton(model, position, renameProvider)));
     const loc = await skeleton.resolveRenameLocation(CancellationToken.None);
     if (loc?.rejectReason) {
-        throw new Error(loc.rejectReason);
+        throw ( (new Error(loc.rejectReason)));
     }
     return loc;
 });
-( Registry.as(Extensions.Configuration)).registerConfiguration({
+( (Registry.as(Extensions.Configuration))).registerConfiguration({
     id: 'editor',
     properties: {
         'editor.rename.enablePreview': {
             scope: 5 ,
             description: ( localizeWithPath(
-                'vs/editor/contrib/rename/browser/rename',
-                'enablePreview',
+                _moduleId,
+                10,
                 "Enable/disable the ability to preview changes before renaming"
             )),
             default: true,

package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.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;width:calc(100% - 8px)}.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-with-button{border-radius:2px;padding:3px;width:calc(100% - 8px)}.monaco-editor .rename-box .rename-input{padding:0;width:calc(100% - 8px)}.monaco-editor .rename-box .rename-input:focus{outline:none}.monaco-editor .rename-box .rename-suggestions-button{align-items:center;background-color:transparent;border:none;border-radius:5px;cursor:pointer;display:flex;padding:3px}.monaco-editor .rename-box .rename-suggestions-button:hover{background-color:var(--vscode-toolbar-hoverBackground)}.monaco-editor .rename-box .rename-candidate-list-container .monaco-list-row{border-radius:2px}.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 };