@codingame/monaco-vscode-api 14.0.5 → 15.0.0

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

@@ -9,33 +9,33 @@ import { URI } from '../../../../base/common/uri.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { CompletionTriggerKind, CompletionItemTag, CompletionItemInsertTextRule, CompletionItemKind } from '../../../common/languages.js';
-import { ITextModelService } from '../../../common/services/resolverService.js';
+import { ITextModelService } from '../../../common/services/resolverService.service.js';
 import { SnippetParser } from '../../snippet/browser/snippetParser.js';
 import { localize } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
 import { historyNavigationVisible } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
 import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
 
 const Context = {
     Visible: historyNavigationVisible,
-    HasFocusedSuggestion: ( new RawContextKey('suggestWidgetHasFocusedSuggestion', false, ( localize(1459, "Whether any suggestion is focused")))),
-    DetailsVisible: ( new RawContextKey('suggestWidgetDetailsVisible', false, ( localize(1460, "Whether suggestion details are visible")))),
-    MultipleSuggestions: ( new RawContextKey('suggestWidgetMultipleSuggestions', false, ( localize(1461, "Whether there are multiple suggestions to pick from")))),
+    HasFocusedSuggestion: ( new RawContextKey('suggestWidgetHasFocusedSuggestion', false, ( localize(1472, "Whether any suggestion is focused")))),
+    DetailsVisible: ( new RawContextKey('suggestWidgetDetailsVisible', false, ( localize(1473, "Whether suggestion details are visible")))),
+    MultipleSuggestions: ( new RawContextKey('suggestWidgetMultipleSuggestions', false, ( localize(1474, "Whether there are multiple suggestions to pick from")))),
     MakesTextEdit: ( new RawContextKey('suggestionMakesTextEdit', true, ( localize(
-        1462,
+        1475,
         "Whether inserting the current suggestion yields in a change or has everything already been typed"
     )))),
-    AcceptSuggestionsOnEnter: ( new RawContextKey('acceptSuggestionOnEnter', true, ( localize(1463, "Whether suggestions are inserted when pressing Enter")))),
-    HasInsertAndReplaceRange: ( new RawContextKey('suggestionHasInsertAndReplaceRange', false, ( localize(1464, "Whether the current suggestion has insert and replace behaviour")))),
+    AcceptSuggestionsOnEnter: ( new RawContextKey('acceptSuggestionOnEnter', true, ( localize(1476, "Whether suggestions are inserted when pressing Enter")))),
+    HasInsertAndReplaceRange: ( new RawContextKey('suggestionHasInsertAndReplaceRange', false, ( localize(1477, "Whether the current suggestion has insert and replace behaviour")))),
     InsertMode: ( new RawContextKey(
         'suggestionInsertMode',
         undefined,
-        { type: 'string', description: ( localize(1465, "Whether the default behaviour is to insert or replace")) }
+        { type: 'string', description: ( localize(1478, "Whether the default behaviour is to insert or replace")) }
     )),
-    CanResolve: ( new RawContextKey('suggestionCanResolve', false, ( localize(1466, "Whether the current suggestion supports to resolve further details")))),
+    CanResolve: ( new RawContextKey('suggestionCanResolve', false, ( localize(1479, "Whether the current suggestion supports to resolve further details")))),
 };
 const suggestWidgetStatusbarMenu = ( new MenuId('suggestWidgetStatusBar'));
 class CompletionItem {

package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.d.ts

@@ -4,7 +4,7 @@ import { ICodeEditor } from "../../../browser/editorBrowser.js";
 import { EditorAction, ServicesAccessor } from "../../../browser/editorExtensions.js";
 import { IEditorContribution } from "../../../common/editorCommon.js";
 import { CompletionItemProvider } from "../../../common/languages.js";
-import { ISuggestMemoryService } from "./suggestMemory.js";
+import { ISuggestMemoryService } from "./suggestMemory.service.js";
 import { ICommandService } from "../../../../platform/commands/common/commands.service.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";

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

@@ -23,7 +23,7 @@ import { TrackedRangeStickiness } from '../../../common/model.js';
 import { CompletionItemInsertTextRule, CompletionTriggerKind } from '../../../common/languages.js';
 import { SnippetController2 } from '../../snippet/browser/snippetController2.js';
 import { SnippetParser } from '../../snippet/browser/snippetParser.js';
-import { ISuggestMemoryService } from './suggestMemory.js';
+import { ISuggestMemoryService } from './suggestMemory.service.js';
 import { WordContextKey } from './wordContextKey.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
@@ -449,7 +449,7 @@ let SuggestController = class SuggestController {
     _alertCompletionItem(item) {
         if (isNonEmptyArray(item.completion.additionalTextEdits)) {
             const msg = ( localize(
-                1467,
+                1480,
                 "Accepting '{0}' made {1} additional edits",
                 item.textLabel,
                 item.completion.additionalTextEdits.length
@@ -626,7 +626,7 @@ class TriggerSuggestAction extends EditorAction {
     constructor() {
         super({
             id: TriggerSuggestAction.id,
-            label: ( localize2(1468, "Trigger Suggest")),
+            label: ( localize2(1481, "Trigger Suggest")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 EditorContextKeys.hasCompletionItemProvider,
@@ -681,19 +681,19 @@ registerEditorCommand(( new SuggestCommand({
         }],
     menuOpts: [{
             menuId: suggestWidgetStatusbarMenu,
-            title: ( localize(1469, "Insert")),
+            title: ( localize(1482, "Insert")),
             group: 'left',
             order: 1,
             when: ( Context.HasInsertAndReplaceRange.toNegated())
         }, {
             menuId: suggestWidgetStatusbarMenu,
-            title: ( localize(1469, "Insert")),
+            title: ( localize(1482, "Insert")),
             group: 'left',
             order: 1,
             when: ( ContextKeyExpr.and(Context.HasInsertAndReplaceRange, ( Context.InsertMode.isEqualTo('insert'))))
         }, {
             menuId: suggestWidgetStatusbarMenu,
-            title: ( localize(1470, "Replace")),
+            title: ( localize(1483, "Replace")),
             group: 'left',
             order: 1,
             when: ( ContextKeyExpr.and(Context.HasInsertAndReplaceRange, ( Context.InsertMode.isEqualTo('replace'))))
@@ -720,13 +720,13 @@ registerEditorCommand(( new SuggestCommand({
             group: 'left',
             order: 2,
             when: ( ContextKeyExpr.and(Context.HasInsertAndReplaceRange, ( Context.InsertMode.isEqualTo('insert')))),
-            title: ( localize(1470, "Replace"))
+            title: ( localize(1483, "Replace"))
         }, {
             menuId: suggestWidgetStatusbarMenu,
             group: 'left',
             order: 2,
             when: ( ContextKeyExpr.and(Context.HasInsertAndReplaceRange, ( Context.InsertMode.isEqualTo('replace')))),
-            title: ( localize(1469, "Insert"))
+            title: ( localize(1482, "Insert"))
         }]
 })));
 CommandsRegistry.registerCommandAlias('acceptSelectedSuggestionOnEnter', 'acceptSelectedSuggestion');
@@ -833,13 +833,13 @@ registerEditorCommand(( new SuggestCommand({
             group: 'right',
             order: 1,
             when: ( ContextKeyExpr.and(Context.DetailsVisible, Context.CanResolve)),
-            title: ( localize(1471, "Show Less"))
+            title: ( localize(1484, "Show Less"))
         }, {
             menuId: suggestWidgetStatusbarMenu,
             group: 'right',
             order: 1,
             when: ( ContextKeyExpr.and(( Context.DetailsVisible.toNegated()), Context.CanResolve)),
-            title: ( localize(1472, "Show More"))
+            title: ( localize(1485, "Show More"))
         }]
 })));
 registerEditorCommand(( new SuggestCommand({
@@ -897,7 +897,7 @@ registerEditorAction(class extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.resetSuggestSize',
-            label: ( localize2(1473, "Reset Suggest Widget Size")),
+            label: ( localize2(1486, "Reset Suggest Widget Size")),
             precondition: undefined
         });
     }

package/vscode/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.d.ts

@@ -1,16 +1,16 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Disposable, RefCountedDisposable } from "../../../../base/common/lifecycle.js";
-import { ICodeEditorService } from "../../../browser/services/codeEditorService.js";
+import { ICodeEditorService } from "../../../browser/services/codeEditorService.service.js";
 import { ISingleEditOperation } from "../../../common/core/editOperation.js";
 import { Position } from "../../../common/core/position.js";
 import { IRange } from "../../../common/core/range.js";
 import { IWordAtPosition } from "../../../common/core/wordHelper.js";
 import { Command, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider } from "../../../common/languages.js";
 import { ITextModel } from "../../../common/model.js";
-import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.js";
+import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.service.js";
 import { CompletionModel } from "./completionModel.js";
 import { CompletionItem, CompletionItemModel } from "./suggest.js";
-import { ISuggestMemoryService } from "./suggestMemory.js";
+import { ISuggestMemoryService } from "./suggestMemory.service.js";
 import { IClipboardService } from "../../../../platform/clipboard/common/clipboardService.service.js";
 declare class SuggestInlineCompletion implements InlineCompletion {
     readonly range: IRange;
@@ -20,10 +20,11 @@ declare class SuggestInlineCompletion implements InlineCompletion {
     readonly filterText: string;
     readonly additionalTextEdits: ISingleEditOperation[] | undefined;
     readonly command: Command | undefined;
+    readonly action: Command | undefined;
     readonly completion: CompletionItem;
     constructor(range: IRange, insertText: string | {
         snippet: string;
-    }, filterText: string, additionalTextEdits: ISingleEditOperation[] | undefined, command: Command | undefined, completion: CompletionItem);
+    }, filterText: string, additionalTextEdits: ISingleEditOperation[] | undefined, command: Command | undefined, action: Command | undefined, completion: CompletionItem);
 }
 declare class InlineCompletionResults extends RefCountedDisposable implements InlineCompletions<SuggestInlineCompletion> {
     readonly model: ITextModel;

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

@@ -4,26 +4,27 @@ import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { FuzzyScore } from '../../../../base/common/filters.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { RefCountedDisposable, Disposable } from '../../../../base/common/lifecycle.js';
-import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.service.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { registerEditorFeature } from '../../../common/editorFeatures.js';
 import { CompletionItemInsertTextRule, CompletionTriggerKind } from '../../../common/languages.js';
-import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
 import { LineContext, CompletionModel } from './completionModel.js';
 import { QuickSuggestionsOptions, provideSuggestionItems, CompletionOptions } from './suggest.js';
-import { ISuggestMemoryService } from './suggestMemory.js';
+import { ISuggestMemoryService } from './suggestMemory.service.js';
 import { SuggestModel } from './suggestModel.js';
 import { WordDistance } from './wordDistance.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
 
 class SuggestInlineCompletion {
-    constructor(range, insertText, filterText, additionalTextEdits, command, completion) {
+    constructor(range, insertText, filterText, additionalTextEdits, command, action, completion) {
         this.range = range;
         this.insertText = insertText;
         this.filterText = filterText;
         this.additionalTextEdits = additionalTextEdits;
         this.command = command;
+        this.action = action;
         this.completion = completion;
     }
 }
@@ -69,6 +70,7 @@ let InlineCompletionResults = class InlineCompletionResults extends RefCountedDi
                 item.filterTextLow ?? item.labelLow,
                 item.completion.additionalTextEdits,
                 item.completion.command,
+                item.completion.action,
                 item
             )));
             if (resolveCount-- >= 0) {

package/vscode/src/vs/editor/contrib/suggest/browser/suggestMemory.service.d.ts

@@ -0,0 +1,9 @@
+import { IPosition } from "../../../common/core/position.js";
+import { ITextModel } from "../../../common/model.js";
+import { CompletionItem } from "./suggest.js";
+export declare const ISuggestMemoryService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ISuggestMemoryService>;
+export interface ISuggestMemoryService {
+    readonly _serviceBrand: undefined;
+    memorize(model: ITextModel, pos: IPosition, item: CompletionItem): void;
+    select(model: ITextModel, pos: IPosition, items: CompletionItem[]): number;
+}

package/vscode/src/vs/editor/contrib/suggest/browser/suggestMemory.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+const ISuggestMemoryService = ( createDecorator('ISuggestMemories'));
+
+export { ISuggestMemoryService };

package/vscode/src/vs/editor/contrib/suggest/browser/suggestModel.d.ts

@@ -4,7 +4,7 @@ import { ICodeEditor } from "../../../browser/editorBrowser.js";
 import { IPosition, Position } from "../../../common/core/position.js";
 import { ITextModel } from "../../../common/model.js";
 import { CompletionItemKind, CompletionTriggerKind } from "../../../common/languages.js";
-import { IEditorWorkerService } from "../../../common/services/editorWorker.js";
+import { IEditorWorkerService } from "../../../common/services/editorWorker.service.js";
 import { IClipboardService } from "../../../../platform/clipboard/common/clipboardService.service.js";
 import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
@@ -13,7 +13,7 @@ import { ITelemetryService } from "../../../../platform/telemetry/common/telemet
 import { CompletionModel } from "./completionModel.js";
 import { CompletionOptions } from "./suggest.js";
 import { IWordAtPosition } from "../../../common/core/wordHelper.js";
-import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.js";
+import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.service.js";
 import { IEnvironmentService } from "../../../../platform/environment/common/environment.service.js";
 export interface ICancelEvent {
     readonly retrigger: boolean;

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

@@ -10,7 +10,7 @@ import { EditorOption } from '../../../common/config/editorOptions.js';
 import { CursorChangeReason } from '../../../common/cursorEvents.js';
 import { Selection } from '../../../common/core/selection.js';
 import { CompletionTriggerKind, CompletionItemKind } from '../../../common/languages.js';
-import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
+import { IEditorWorkerService } from '../../../common/services/editorWorker.service.js';
 import { WordDistance } from './wordDistance.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
@@ -19,7 +19,7 @@ import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { CompletionModel } from './completionModel.js';
 import { getSnippetSuggestSupport, QuickSuggestionsOptions, SnippetSortOrder, CompletionOptions, provideSuggestionItems } from './suggest.js';
-import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
 import { FuzzyScoreOptions } from '../../../../base/common/filters.js';
 import { assertType } from '../../../../base/common/types.js';
 import { InlineCompletionContextKeys } from '../../inlineCompletions/browser/controller/inlineCompletionContextKeys.js';

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

@@ -42,18 +42,18 @@ import { getListStyles } from '../../../../platform/theme/browser/defaultStyles.
 import { status } from '../../../../base/browser/ui/aria/aria.js';
 
 var SuggestWidget_1;
-registerColor('editorSuggestWidget.background', editorWidgetBackground, ( localize(1474, 'Background color of the suggest widget.')));
-registerColor('editorSuggestWidget.border', editorWidgetBorder, ( localize(1475, 'Border color of the suggest widget.')));
-const editorSuggestWidgetForeground = registerColor('editorSuggestWidget.foreground', editorForeground, ( localize(1476, 'Foreground color of the suggest widget.')));
-registerColor('editorSuggestWidget.selectedForeground', quickInputListFocusForeground, ( localize(1477, 'Foreground color of the selected entry in the suggest widget.')));
-registerColor('editorSuggestWidget.selectedIconForeground', quickInputListFocusIconForeground, ( localize(1478, 'Icon foreground color of the selected entry in the suggest widget.')));
-const editorSuggestWidgetSelectedBackground = registerColor('editorSuggestWidget.selectedBackground', quickInputListFocusBackground, ( localize(1479, 'Background color of the selected entry in the suggest widget.')));
-registerColor('editorSuggestWidget.highlightForeground', listHighlightForeground, ( localize(1480, 'Color of the match highlights in the suggest widget.')));
+registerColor('editorSuggestWidget.background', editorWidgetBackground, ( localize(1487, 'Background color of the suggest widget.')));
+registerColor('editorSuggestWidget.border', editorWidgetBorder, ( localize(1488, 'Border color of the suggest widget.')));
+const editorSuggestWidgetForeground = registerColor('editorSuggestWidget.foreground', editorForeground, ( localize(1489, 'Foreground color of the suggest widget.')));
+registerColor('editorSuggestWidget.selectedForeground', quickInputListFocusForeground, ( localize(1490, 'Foreground color of the selected entry in the suggest widget.')));
+registerColor('editorSuggestWidget.selectedIconForeground', quickInputListFocusIconForeground, ( localize(1491, 'Icon foreground color of the selected entry in the suggest widget.')));
+const editorSuggestWidgetSelectedBackground = registerColor('editorSuggestWidget.selectedBackground', quickInputListFocusBackground, ( localize(1492, 'Background color of the selected entry in the suggest widget.')));
+registerColor('editorSuggestWidget.highlightForeground', listHighlightForeground, ( localize(1493, 'Color of the match highlights in the suggest widget.')));
 registerColor('editorSuggestWidget.focusHighlightForeground', listFocusHighlightForeground, ( localize(
-    1481,
+    1494,
     'Color of the match highlights in the suggest widget when an item is focused.'
 )));
-registerColor('editorSuggestWidgetStatus.foreground', ( transparent(editorSuggestWidgetForeground, .5)), ( localize(1482, 'Foreground color of the suggest widget status.')));
+registerColor('editorSuggestWidgetStatus.foreground', ( transparent(editorSuggestWidgetForeground, .5)), ( localize(1495, 'Foreground color of the suggest widget status.')));
 var State;
 (function (State) {
     State[State["Hidden"] = 0] = "Hidden";
@@ -90,8 +90,8 @@ class PersistedWidgetSize {
 }
 let SuggestWidget = class SuggestWidget {
     static { SuggestWidget_1 = this; }
-    static { this.LOADING_MESSAGE = ( localize(1483, "Loading...")); }
-    static { this.NO_SUGGESTIONS_MESSAGE = ( localize(1484, "No suggestions.")); }
+    static { this.LOADING_MESSAGE = ( localize(1496, "Loading...")); }
+    static { this.NO_SUGGESTIONS_MESSAGE = ( localize(1497, "No suggestions.")); }
     constructor(editor, _storageService, _contextKeyService, _themeService, instantiationService) {
         this.editor = editor;
         this._storageService = _storageService;
@@ -175,20 +175,20 @@ let SuggestWidget = class SuggestWidget {
             multipleSelectionSupport: false,
             accessibilityProvider: {
                 getRole: () => 'option',
-                getWidgetAriaLabel: () => ( localize(1485, "Suggest")),
+                getWidgetAriaLabel: () => ( localize(1498, "Suggest")),
                 getWidgetRole: () => 'listbox',
                 getAriaLabel: (item) => {
                     let label = item.textLabel;
                     if (typeof item.completion.label !== 'string') {
                         const { detail, description } = item.completion.label;
                         if (detail && description) {
-                            label = ( localize(1486, '{0} {1}, {2}', label, detail, description));
+                            label = ( localize(1499, '{0} {1}, {2}', label, detail, description));
                         }
                         else if (detail) {
-                            label = ( localize(1487, '{0} {1}', label, detail));
+                            label = ( localize(1500, '{0} {1}', label, detail));
                         }
                         else if (description) {
-                            label = ( localize(1488, '{0}, {1}', label, description));
+                            label = ( localize(1501, '{0}, {1}', label, description));
                         }
                     }
                     if (!item.isResolved || !this._isDetailsVisible()) {
@@ -196,7 +196,7 @@ let SuggestWidget = class SuggestWidget {
                     }
                     const { documentation, detail } = item.completion;
                     const docs = format('{0}{1}', detail || '', documentation ? (typeof documentation === 'string' ? documentation : documentation.value) : '');
-                    return localize(1489, "{0}, docs: {1}", label, docs);
+                    return localize(1502, "{0}, docs: {1}", label, docs);
                 },
             }
         }));
@@ -207,7 +207,7 @@ let SuggestWidget = class SuggestWidget {
         this._status = instantiationService.createInstance(SuggestWidgetStatus, this.element.domNode, suggestWidgetStatusbarMenu);
         const applyStatusBarStyle = () => this.element.domNode.classList.toggle('with-status-bar', this.editor.getOption(EditorOption.suggest).showStatusBar);
         applyStatusBarStyle();
-        this._disposables.add(_themeService.onDidColorThemeChange(t => this._onThemeChange(t)));
+        this._disposables.add(_themeService.onDidColorThemeChange(t => this._onThemeChange(t.theme)));
         this._onThemeChange(_themeService.getColorTheme());
         this._disposables.add(this._list.onMouseDown(e => this._onListMouseDownOrTap(e)));
         this._disposables.add(this._list.onTap(e => this._onListMouseDownOrTap(e)));

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

@@ -38,7 +38,7 @@ let SuggestDetailsWidget = class SuggestDetailsWidget {
         this._disposables.add(this._scrollbar);
         this._header = append(this._body, $('.header'));
         this._close = append(this._header, $('span' + ThemeIcon.asCSSSelector(Codicon.close)));
-        this._close.title = ( localize(1490, "Close"));
+        this._close.title = ( localize(1503, "Close"));
         this._close.role = 'button';
         this._close.tabIndex = -1;
         this._type = append(this._header, $('p.type'));
@@ -84,7 +84,7 @@ let SuggestDetailsWidget = class SuggestDetailsWidget {
         };
     }
     renderLoading() {
-        this._type.textContent = ( localize(1491, "Loading..."));
+        this._type.textContent = ( localize(1504, "Loading..."));
         this._docs.textContent = '';
         this.domNode.classList.remove('no-docs', 'no-type');
         this.layout(this.size.width, this.getLayoutInfo().lineHeight * 2);

package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.d.ts

@@ -3,8 +3,8 @@ import { IListRenderer } from "../../../../base/browser/ui/list/list.js";
 import { Event } from "../../../../base/common/event.js";
 import { DisposableStore } from "../../../../base/common/lifecycle.js";
 import { ICodeEditor } from "../../../browser/editorBrowser.js";
-import { IModelService } from "../../../common/services/model.js";
-import { ILanguageService } from "../../../common/languages/language.js";
+import { IModelService } from "../../../common/services/model.service.js";
+import { ILanguageService } from "../../../common/languages/language.service.js";
 import { IThemeService } from "../../../../platform/theme/common/themeService.service.js";
 import { CompletionItem } from "./suggest.js";
 export interface ISuggestionTemplateData {

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

@@ -11,15 +11,15 @@ import { URI } from '../../../../base/common/uri.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { CompletionItemKind, CompletionItemKinds, CompletionItemTag } from '../../../common/languages.js';
 import { getIconClasses } from '../../../common/services/getIconClasses.js';
-import { IModelService } from '../../../common/services/model.js';
-import { ILanguageService } from '../../../common/languages/language.js';
+import { IModelService } from '../../../common/services/model.service.js';
+import { ILanguageService } from '../../../common/languages/language.service.js';
 import { localize } from '../../../../nls.js';
 import { FileKind } from '../../../../platform/files/common/files.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { canExpandCompletionItem } from './suggestWidgetDetails.js';
 
-const suggestMoreInfoIcon = registerIcon('suggest-more-info', Codicon.chevronRight, ( localize(1492, 'Icon for more information in the suggest widget.')));
+const suggestMoreInfoIcon = registerIcon('suggest-more-info', Codicon.chevronRight, ( localize(1505, 'Icon for more information in the suggest widget.')));
 const _completionItemColor = new (class ColorExtractor {
     static { this._regexRelaxed = /(#([\da-fA-F]{3}){1,2}|(rgb|hsl)a\(\s*(\d{1,3}%?\s*,\s*){3}(1|0?\.\d+)\)|(rgb|hsl)\(\s*\d{1,3}%?(\s*,\s*\d{1,3}%?){2}\s*\))/; }
     static { this._regexStrict = ( new RegExp(`^${ColorExtractor._regexRelaxed.source}$`, 'i')); }
@@ -75,7 +75,7 @@ let ItemRenderer = class ItemRenderer {
         const qualifierLabel = append(left, $('span.qualifier-label'));
         const detailsLabel = append(right, $('span.details-label'));
         const readMore = append(right, $('span.readMore' + ThemeIcon.asCSSSelector(suggestMoreInfoIcon)));
-        readMore.title = ( localize(1493, "Read More"));
+        readMore.title = ( localize(1506, "Read More"));
         const configureFont = () => {
             const options = this._editor.getOptions();
             const fontInfo = options.get(EditorOption.fontInfo);

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

@@ -9,7 +9,7 @@ var WordContextKey_1;
 let WordContextKey = class WordContextKey {
     static { WordContextKey_1 = this; }
     static { this.AtEnd = ( new RawContextKey('atEndOfWord', false, { type: 'boolean', description: ( localize(
-        1494,
+        1507,
         "A context key that is true when at the end of a word. Note that this is only defined when tab-completions are enabled"
     )) })); }
     constructor(_editor, contextKeyService) {
@@ -43,7 +43,7 @@ let WordContextKey = class WordContextKey {
                     this._ckAtEnd.set(false);
                     return;
                 }
-                this._ckAtEnd.set(word.endColumn === selection.getStartPosition().column);
+                this._ckAtEnd.set(word.endColumn === selection.getStartPosition().column && selection.getStartPosition().lineNumber === selection.getEndPosition().lineNumber);
             };
             this._selectionListener = this._editor.onDidChangeCursorSelection(checkForWordEnd);
             checkForWordEnd();

package/vscode/src/vs/editor/contrib/suggest/browser/wordDistance.d.ts

@@ -1,7 +1,7 @@
 import { ICodeEditor } from "../../../browser/editorBrowser.js";
 import { IPosition } from "../../../common/core/position.js";
 import { CompletionItem } from "../../../common/languages.js";
-import { IEditorWorkerService } from "../../../common/services/editorWorker.js";
+import { IEditorWorkerService } from "../../../common/services/editorWorker.service.js";
 export declare abstract class WordDistance {
     static readonly None: {
         distance(): number;