@eclipse-glsp/client 2.6.0-next.1 → 2.6.0-next.11

package/src/base/auto-complete/auto-complete-widget.ts

@@ -21,7 +21,8 @@ import {
     ValidationStatus,
     codiconCSSClasses,
     matchesKeystroke,
-    toArray
+    toArray,
+    type MaybePromise
 } from '@eclipse-glsp/sprotty';
 import { AutocompleteResult, AutocompleteSettings } from 'autocompleter';
 import { AutoCompleteValue } from './auto-complete-actions';
@@ -48,7 +49,7 @@ export interface InputValueInitializer {
 }
 
 export interface SuggestionSubmitHandler {
-    executeFromSuggestion(input: LabeledAction | Action | Action[]): void;
+    executeFromSuggestion(input: LabeledAction | Action | Action[]): MaybePromise<void>;
 }
 
 export interface TextSubmitHandler {
@@ -303,8 +304,9 @@ export class AutoCompleteWidget {
             // trigger update of suggestions with an keyup event
             window.setTimeout(() => this.inputElement.dispatchEvent(new Event('input')));
         } else {
-            this.executeFromSuggestion(item);
-            this.notifyClose('submission');
+            Promise.resolve(this.executeFromSuggestion(item)).then(() => {
+                this.notifyClose('submission');
+            });
         }
     }
 
@@ -362,6 +364,7 @@ export class AutoCompleteWidget {
         if (this.autoCompleteResult) {
             this.autoCompleteResult.destroy();
         }
+        this.observer?.disconnect();
     }
 }
 

package/src/base/auto-complete/autocomplete-suggestion-provider.ts

@@ -0,0 +1,86 @@
+/********************************************************************************
+ * Copyright (c) 2023-2025 Business Informatics Group (TU Wien) and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import {
+    GModelRoot,
+    InstanceRegistry,
+    LazyInjector,
+    TYPES,
+    type GModelElement,
+    type LabeledAction,
+    type MaybePromise
+} from '@eclipse-glsp/sprotty';
+import { inject, injectable } from 'inversify';
+
+/**
+ * Interface for autocomplete suggestions.
+ */
+export interface AutocompleteSuggestion {
+    element?: GModelElement;
+    action: LabeledAction;
+}
+
+/**
+ * A provider for autocomplete suggestions.
+ */
+export interface IAutocompleteSuggestionProvider {
+    id: string;
+
+    /**
+     * Returns whether this provider can handle the given autocomplete context.
+     * @param context The context to check.
+     */
+    canHandle(context: string): boolean;
+
+    /**
+     * Provides suggestions for the given input
+     */
+    getSuggestions(root: Readonly<GModelRoot>, text: string, context?: unknown): Promise<AutocompleteSuggestion[]>;
+}
+
+/**
+ * Default contexts for autocomplete suggestions.
+ */
+export namespace AutocompleteSuggestionProviderContext {
+    export const CANVAS = 'canvas' as const;
+}
+
+/**
+ * Registry for autocomplete suggestion providers.
+ */
+export interface AutocompleteSuggestionRegistry extends InstanceRegistry<IAutocompleteSuggestionProvider> {
+    providersForContext(context: string[]): IAutocompleteSuggestionProvider[];
+}
+
+@injectable()
+export class DefaultAutocompleteSuggestionRegistry
+    extends InstanceRegistry<IAutocompleteSuggestionProvider>
+    implements AutocompleteSuggestionRegistry
+{
+    @inject(LazyInjector)
+    protected lazyInjector: LazyInjector;
+
+    preLoadDiagram(): MaybePromise<void> {
+        const suggestionProviders = this.lazyInjector.getAll<IAutocompleteSuggestionProvider>(TYPES.IAutocompleteSuggestionProvider);
+        suggestionProviders.forEach(provider => {
+            this.register(provider.id, provider);
+        });
+    }
+
+    providersForContext(searchContext: string[]): IAutocompleteSuggestionProvider[] {
+        return Array.from(this.elements.values()).filter(provider => searchContext.some(c => provider.canHandle(c)));
+    }
+}

package/src/base/auto-complete/base-autocomplete-palette.ts

@@ -14,12 +14,12 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { Action, GModelRoot, IActionDispatcher, LabeledAction, TYPES } from '@eclipse-glsp/sprotty';
+import { Action, GModelRoot, IActionDispatcher, LabeledAction, TYPES, type MaybePromise } from '@eclipse-glsp/sprotty';
 import { inject } from 'inversify';
 import '../../../css/autocomplete-palette.css';
-import { GLSPAbstractUIExtension } from '../ui-extension/ui-extension';
-import { AutoCompleteWidget, CloseReason, toActionArray } from './auto-complete-widget';
 import { messages } from '../messages';
+import { GLSPAbstractUIExtension } from '../ui-extension/ui-extension';
+import { AutoCompleteWidget, CloseReason, toActionArray, type AutoCompleteSettings } from './auto-complete-widget';
 
 /**
  * A reusable base implementation for `UIExtensions` that want to provide autocomplete functionality
@@ -27,7 +27,7 @@ import { messages } from '../messages';
  *
  */
 export abstract class BaseAutocompletePalette extends GLSPAbstractUIExtension {
-    protected readonly autoSuggestionSettings = {
+    protected readonly autoSuggestionSettings: AutoCompleteSettings = {
         noSuggestionsMessage: messages.autocomplete.no_suggestions,
         suggestionsClass: 'command-palette-suggestions',
         debounceWaitMs: 50,
@@ -87,7 +87,7 @@ export abstract class BaseAutocompletePalette extends GLSPAbstractUIExtension {
         this.hide();
     }
 
-    protected executeSuggestion(input: LabeledAction | Action[] | Action): void {
-        this.actionDispatcher.dispatchAll(toActionArray(input));
+    protected executeSuggestion(input: LabeledAction | Action[] | Action): MaybePromise<void> {
+        return this.actionDispatcher.dispatchAll(toActionArray(input));
     }
 }

package/src/base/default.module.ts

@@ -36,6 +36,7 @@ import '@vscode/codicons/dist/codicon.css';
 import '../../css/glsp-sprotty.css';
 import { GLSPActionDispatcher } from './action-dispatcher';
 import { GLSPActionHandlerRegistry } from './action-handler-registry';
+import { DefaultAutocompleteSuggestionRegistry } from './auto-complete/autocomplete-suggestion-provider';
 import { GLSPCommandStack } from './command-stack';
 import { EditorContextService } from './editor-context-service';
 import { ModifyCssFeedbackCommand } from './feedback/css-feedback';
@@ -148,6 +149,10 @@ export const defaultModule = new FeatureModule(
 
         // Shortcut manager initialization ------------------------------------
         bindAsService(context, TYPES.IShortcutManager, ShortcutManager);
+
+        // Autocomplete suggestion provider initialization ------------------------------------
+        bind(TYPES.IAutocompleteSuggestionProviderRegistry).to(DefaultAutocompleteSuggestionRegistry).inSingletonScope();
+        bind(TYPES.IDiagramStartup).toService(TYPES.IAutocompleteSuggestionProviderRegistry);
     },
     {
         featureId: Symbol('default')

package/src/base/messages.json

@@ -1,87 +1,98 @@
 {
-  "navigation": {
-    "default_navigation_mode_activated": "Navigation On: Use arrow keys to select preceding (←) or succeding (→) elements. Use the up (↑) and down (↓) arrows to navigate paths. Press 'N' to exit.",
-    "default_navigation_mode_deactivated": "Navigation Off: Press 'N' for default navigation, 'ALT+N' for position based navigation.",
-    "local_navigation_mode_activated": "Position based Nav On: Navigate nearest elements using arrow keys: (↑) for above, (↓) for below, (←) for previous, (→) for next element. Press 'ALT+N' to exit.",
-    "local_navigation_mode_deactivated": "Position based Nav Off: Press 'N' for default navigation, 'ALT+N' for position based navigation.",
-    "shortcut_local_mode": "Activate local navigation mode",
-    "shortcut_global_mode": "Activate global navigation mode"
+  "autocomplete": {
+    "no_suggestions": "No suggestions available"
+  },
+  "context_menu": {
+    "copy": "Copy",
+    "cut": "Cut",
+    "delete": "Delete",
+    "marker": {
+      "navigation": "Go to",
+      "next": "Next marker",
+      "previous": "Previous marker"
+    },
+    "paste": "Paste"
+  },
+  "diagram": {
+    "label": "Diagram"
   },
   "focus": {
     "focus_not_set": "Focus not set",
-    "focus_on": "Currently focused: ",
     "focus_off": "Currently no element is focused.",
+    "focus_on": "Currently focused: ",
     "focus_within": "Within",
-    "shortcut_focus_palette": "Focus on tool palette",
-    "shortcut_focus_graph": "Focus on graph"
+    "shortcut_focus_graph": "Focus on graph",
+    "shortcut_focus_palette": "Focus on tool palette"
+  },
+  "grid": {
+    "shortcut_zoom_in": "Zoom in via grid",
+    "zoom_in_grid": "Select a digit from 1-9 to zoom in on the respective box."
+  },
+  "issue_marker": {
+    "severity_error": "ERROR",
+    "severity_info": "INFO",
+    "severity_warning": "WARNING"
+  },
+  "move": {
+    "shortcut_move": "Move element"
+  },
+  "navigation": {
+    "default_navigation_mode_activated": "Navigation On: Use arrow keys to select preceding (←) or succeding (→) elements. Use the up (↑) and down (↓) arrows to navigate paths. Press 'N' to exit.",
+    "default_navigation_mode_deactivated": "Navigation Off: Press 'N' for default navigation, 'ALT+N' for position based navigation.",
+    "local_navigation_mode_activated": "Position based Nav On: Navigate nearest elements using arrow keys: (↑) for above, (↓) for below, (←) for previous, (→) for next element. Press 'ALT+N' to exit.",
+    "local_navigation_mode_deactivated": "Position based Nav Off: Press 'N' for default navigation, 'ALT+N' for position based navigation.",
+    "shortcut_global_mode": "Activate global navigation mode",
+    "shortcut_local_mode": "Activate local navigation mode"
   },
   "resize": {
     "resize_mode_activated": "Resize On: Use plus(+) and minus(-) to resize, 'CTRL'+'0' for default size. Press 'ESC' to exit.",
     "resize_mode_deactivated": "Resize Off: Press 'ALT'+'A' for resize mode.",
     "shortcut_activate": "Activate resize mode for selected element",
     "shortcut_deactivate": "Deactivate resize handler",
-    "shortcut_increase": "Increase size of element",
     "shortcut_decrease": "Decrease size of element",
+    "shortcut_increase": "Increase size of element",
     "shortcut_reset": "Set element size to default"
   },
-  "move": {
-    "shortcut_move": "Move element"
-  },
-  "grid": {
-    "zoom_in_grid": "Select a digit from 1-9 to zoom in on the respective box.",
-    "shortcut_zoom_in": "Zoom in via grid"
-  },
   "search": {
-    "shortcut_activate": "Activate search for elements",
+    "label": "Search Field",
     "placeholder": "Search for elements...",
-    "label": "Search Field"
+    "shortcut_activate": "Activate search for elements"
+  },
+  "shortcut": {
+    "group_focus": "Focus",
+    "group_graph": "Graph",
+    "group_grid": "Grid",
+    "group_move": "Move",
+    "group_navigation": "Navigation",
+    "group_resize": "Resize",
+    "group_search": "Search",
+    "group_tool_palette": "Tool Palette",
+    "group_viewport": "Viewport",
+    "group_zoom": "Zoom",
+    "header_command": "Command",
+    "header_shortcut": "Keybinding",
+    "menu_title": "Shortcut Menu",
+    "title": "Keyboard Shortcuts"
   },
   "tool_palette": {
-    "label": "Tool Palette",
+    "debug_mode_button": "Debug Mode",
     "delete_button": "Enable deletion tool",
+    "label": "Tool Palette",
     "marquee_button": "Enable marquee tool",
     "marquee_message": "Currently marquee tool is only usable with mouse.",
-    "search_placeholder": "Search...",
+    "maximize": "Maximize palette",
+    "minimize": "Minimize palette",
+    "no_items": "No results found.",
+    "reset_viewport_button": "Reset Viewport",
     "search_button": "Filter palette entries",
+    "search_placeholder": "Search...",
     "selection_button": "Enable selection tool",
-    "validate_button": "Validate model",
-    "reset_viewport_button": "Reset Viewport",
     "toggle_grid_button": "Toggle Grid",
-    "debug_mode_button": "Debug Mode",
-    "minimize": "Minimize palette",
-    "maximize": "Maximize palette",
-    "no_items": "No results found."
+    "validate_button": "Validate model"
   },
   "viewport": {
     "shortcut_move_viewport": "Move viewport",
-    "shortcut_zoom_viewport": "Zoom viewport",
-    "shortcut_zoom_element": "Zoom element"
-  },
-  "shortcut": {
-    "title": "Keyboard Shortcuts",
-    "header_command": "Command",
-    "header_shortcut": "Keybinding",
-    "menu_title": "Shortcut Menu",
-    "group_move": "Move",
-    "group_graph": "Graph",
-    "group_resize": "Resize",
-    "group_focus": "Focus",
-    "group_zoom": "Zoom",
-    "group_navigation": "Navigation",
-    "group_grid": "Grid",
-    "group_search": "Search",
-    "group_tool_palette": "Tool Palette",
-    "group_viewport": "Viewport"
-  },
-  "diagram": {
-    "label": "Diagram"
-  },
-  "autocomplete": {
-    "no_suggestions": "No suggestions available"
-  },
-  "issue_marker": {
-    "severity_error": "ERROR",
-    "severity_warning": "WARNING",
-    "severity_info": "INFO"
+    "shortcut_zoom_element": "Zoom element",
+    "shortcut_zoom_viewport": "Zoom viewport"
   }
 }

package/src/base/tool-manager/tool-manager.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2024 EclipseSource and others.
+ * Copyright (c) 2019-2025 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -133,8 +133,8 @@ export class ToolManager implements IToolManager, IDiagramStartup, IEditModeList
         this.actives.splice(0, this.actives.length);
     }
 
-    enableDefaultTools(): void {
-        if (this.defaultToolsEnabled) {
+    enableDefaultTools(force = false): void {
+        if (this.defaultToolsEnabled && !force) {
             return;
         }
         this.enable(pluck(this.defaultTools, 'id'));
@@ -171,7 +171,7 @@ export class ToolManager implements IToolManager, IDiagramStartup, IEditModeList
         if (newValue === EditMode.READONLY) {
             this.disableEditTools();
         } else if (newValue === EditMode.EDITABLE) {
-            this.enableDefaultTools();
+            this.enableDefaultTools(true);
         }
     }
 }

package/src/default-modules.ts

@@ -47,6 +47,7 @@ import { labelEditModule } from './features/label-edit/label-edit-module';
 import { layoutModule } from './features/layout/layout-module';
 import { navigationModule } from './features/navigation/navigation-module';
 import { routingModule } from './features/routing/routing-module';
+import { searchPaletteDefaultSuggestionsModule, searchPaletteModule } from './features/search-palette/search-palette-module';
 import { selectModule } from './features/select/select-module';
 import { sourceModelWatcherModule } from './features/source-model-watcher/source-model-watcher-module';
 import { statusModule } from './features/status/status-module';
@@ -101,7 +102,9 @@ export const DEFAULT_MODULES = [
     zorderModule,
     svgMetadataModule,
     statusModule,
-    resizeModule
+    resizeModule,
+    searchPaletteModule,
+    searchPaletteDefaultSuggestionsModule
 ] as const;
 
 /**

package/src/features/accessibility/accessibility-module.ts

@@ -17,9 +17,8 @@
 import { FeatureModule } from '@eclipse-glsp/sprotty';
 import { configureElementNavigationTool } from './element-navigation/element-navigation-module';
 import { configureFocusTrackerTool } from './focus-tracker/focus-tracker-module';
-import { configureKeyboardControlTools } from './keyboard-pointer/keyboard-pointer-module';
 import { configureKeyboardToolPaletteTool } from './keyboard-tool-palette/keyboard-tool-palette-module';
-import { configureSearchPaletteModule } from './search/search-palette-module';
+import { configureKeyboardControlTools } from './keyboard/keyboard-module';
 import { configureToastTool } from './toast/toast-module';
 import { configureViewKeyTools } from './view-key-tools/view-key-tools-module';
 
@@ -30,7 +29,6 @@ export const accessibilityModule = new FeatureModule(
     (bind, unbind, isBound, rebind) => {
         const context = { bind, unbind, isBound, rebind };
         configureViewKeyTools(context);
-        configureSearchPaletteModule(context);
         configureKeyboardToolPaletteTool(context);
         configureKeyboardControlTools(context);
         configureElementNavigationTool(context);

package/src/features/accessibility/edge-autocomplete/edge-autocomplete-palette.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2025 Business Informatics Group (TU Wien) and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,76 +29,89 @@ import {
 } from '@eclipse-glsp/sprotty';
 import { injectable } from 'inversify';
 import { CloseReason, toActionArray } from '../../../base/auto-complete/auto-complete-widget';
-import { AutocompleteSuggestion, IAutocompleteSuggestionProvider } from '../../../base/auto-complete/autocomplete-suggestion-providers';
+import { IAutocompleteSuggestionProvider, type AutocompleteSuggestion } from '../../../base/auto-complete/autocomplete-suggestion-provider';
 import { EnableDefaultToolsAction } from '../../../base/tool-manager/tool';
 import { GEdge } from '../../../model';
-import { SearchAutocompletePalette } from '../search/search-palette';
+import { SearchAutocompletePalette, SearchAutocompleteSuggestion } from '../../search-palette/search-palette';
 import { SetEdgeTargetSelectionAction } from './action';
-import { EdgeAutocompleteContext } from './edge-autocomplete-context';
 
 export namespace EdgeAutocompletePaletteMetadata {
     export const ID = 'edge-autocomplete-palette';
 }
 
+export interface EdgeAutocompleteContext {
+    role: 'source' | 'target';
+    triggerAction: TriggerEdgeCreationAction;
+    sourceId?: string;
+    targetId?: string;
+}
+
+export type EdgeAutocompletePaletteStages = 'initial' | 'source' | 'target' | 'reloading';
+
 @injectable()
 export class EdgeAutocompletePalette extends SearchAutocompletePalette implements IActionHandler {
-    protected context?: EdgeAutocompleteContext;
-
-    protected readonly targetSuggestionProvider = new PossibleEdgeTargetAutocompleteSuggestionProvider();
+    protected edgeAutocompleteContext?: EdgeAutocompleteContext;
+    protected stage: EdgeAutocompletePaletteStages = 'initial';
 
     override id(): string {
         return EdgeAutocompletePaletteMetadata.ID;
     }
 
+    override get searchContext(): string[] {
+        return [EdgeAutocompletePaletteMetadata.ID];
+    }
+
     handle(action: Action): Action | void {
         if (TriggerEdgeCreationAction.is(action)) {
-            this.context = {
-                trigger: action,
+            this.stage = 'source';
+            this.edgeAutocompleteContext = {
+                triggerAction: action,
                 role: 'source'
             };
-            this.targetSuggestionProvider.setContext(action, this.context);
         }
     }
 
     protected override onBeforeShow(containerElement: HTMLElement, root: Readonly<GModelRoot>, ...contextElementIds: string[]): void {
         super.onBeforeShow(containerElement, root, ...contextElementIds);
 
-        this.autocompleteWidget.inputField.placeholder = `Search for ${this.context?.role} elements`;
+        this.autocompleteWidget.inputField.placeholder = `Search for ${this.edgeAutocompleteContext?.role} elements`;
     }
 
-    protected override getSuggestionProviders(root: Readonly<GModelRoot>, input: string): IAutocompleteSuggestionProvider[] {
-        return [this.targetSuggestionProvider];
+    protected async reload(): Promise<void> {
+        this.stage = 'reloading';
+        this.hide();
     }
 
-    protected reload(): void {
-        const context = this.context;
-        this.hide();
-        this.context = context;
-        this.actionDispatcher.dispatch(
-            SetUIExtensionVisibilityAction.create({
-                extensionId: EdgeAutocompletePaletteMetadata.ID,
-                visible: true
-            })
-        );
+    protected override async provideSearchSuggestions(root: Readonly<GModelRoot>, input: string): Promise<SearchAutocompleteSuggestion[]> {
+        return (
+            await Promise.all(
+                this.suggestionRegistry
+                    .providersForContext(this.searchContext)
+                    .flatMap(provider => provider.getSuggestions(root, input, this.edgeAutocompleteContext))
+            )
+        )
+            .flat(1)
+            .filter(SearchAutocompleteSuggestion.is);
     }
 
-    protected override executeSuggestion(input: LabeledAction | Action[] | Action): void {
+    protected override async executeSuggestion(input: LabeledAction | Action[] | Action): Promise<void> {
         const action = toActionArray(input)[0] as SetEdgeTargetSelectionAction;
 
-        if (this.context?.role === 'source') {
-            this.context.sourceId = action.elementId;
-            this.context.role = 'target';
+        if (this.edgeAutocompleteContext?.role === 'source') {
+            this.edgeAutocompleteContext.sourceId = action.elementId;
+            this.edgeAutocompleteContext.role = 'target';
             this.reload();
-        } else if (this.context?.role === 'target') {
-            this.context.targetId = action.elementId;
+        } else if (this.edgeAutocompleteContext?.role === 'target') {
+            this.edgeAutocompleteContext.targetId = action.elementId;
         }
-        if (this.context?.sourceId !== undefined && this.context?.targetId !== undefined) {
-            this.actionDispatcher.dispatchAll([
+
+        if (this.edgeAutocompleteContext?.sourceId !== undefined && this.edgeAutocompleteContext?.targetId !== undefined) {
+            await this.actionDispatcher.dispatchAll([
                 CreateEdgeOperation.create({
-                    elementTypeId: this.context.trigger.elementTypeId,
-                    sourceElementId: this.context.sourceId,
-                    targetElementId: this.context.targetId,
-                    args: this.context.trigger.args
+                    elementTypeId: this.edgeAutocompleteContext.triggerAction.elementTypeId,
+                    sourceElementId: this.edgeAutocompleteContext.sourceId,
+                    targetElementId: this.edgeAutocompleteContext.targetId,
+                    args: this.edgeAutocompleteContext.triggerAction.args
                 }),
                 EnableDefaultToolsAction.create()
             ]);
@@ -107,41 +120,51 @@ export class EdgeAutocompletePalette extends SearchAutocompletePalette implement
     }
 
     protected override autocompleteHide(reason: CloseReason): void {
-        if (reason !== 'submission') {
+        if (this.stage === 'reloading') {
+            // Wait until the auto complete is closed before reloading
+            if (reason === 'blur') {
+                this.actionDispatcher.dispatch(
+                    SetUIExtensionVisibilityAction.create({
+                        extensionId: EdgeAutocompletePaletteMetadata.ID,
+                        visible: true
+                    })
+                );
+                this.stage = 'target';
+            }
+        } else if (reason !== 'submission') {
             this.hide();
         }
     }
 }
 
 @injectable()
-export class PossibleEdgeTargetAutocompleteSuggestionProvider implements IAutocompleteSuggestionProvider {
-    protected proxyEdge?: GEdge;
-    protected context?: EdgeAutocompleteContext;
-
-    setContext(triggerAction: TriggerEdgeCreationAction, edgeAutocompleteContext: EdgeAutocompleteContext): void {
-        this.proxyEdge = new GEdge();
-        this.proxyEdge.type = triggerAction.elementTypeId;
-        this.context = edgeAutocompleteContext;
-    }
+export class SetEdgeTargetGridSuggestionProvider implements IAutocompleteSuggestionProvider {
+    id = 'glsp.set-edge-target-autocomplete-suggestions';
 
-    isAllowedSource(element: GModelElement | undefined, role: 'source' | 'target'): boolean {
-        return element !== undefined && this.proxyEdge !== undefined && isConnectable(element) && element.canConnect(this.proxyEdge, role);
+    canHandle(searchContext: string): boolean {
+        return searchContext === EdgeAutocompletePaletteMetadata.ID;
     }
 
-    async retrieveSuggestions(root: Readonly<GModelRoot>, text: string): Promise<AutocompleteSuggestion[]> {
-        const context = this.context;
-        if (this.context === undefined) {
+    async getSuggestions(root: Readonly<GModelRoot>, text: string, context: EdgeAutocompleteContext): Promise<AutocompleteSuggestion[]> {
+        if (context === undefined) {
             return [];
         }
 
-        const nodes = toArray(root.index.all().filter(element => this.isAllowedSource(element, context!.role))) as GEdge[];
+        const proxyEdge = new GEdge();
+        proxyEdge.type = context.triggerAction.elementTypeId;
+
+        const nodes = toArray(root.index.all().filter(element => this.isAllowedSource(proxyEdge, element, context.role))) as GEdge[];
         return nodes.map(node => ({
             element: node,
             action: {
                 label: `[${node.type}] ${name(node) ?? '<no-name>'}`,
-                actions: [SetEdgeTargetSelectionAction.create(node.id, context!.role)],
+                actions: [SetEdgeTargetSelectionAction.create(node.id, context.role)],
                 icon: codiconCSSString('arrow-both')
             }
         }));
     }
+
+    protected isAllowedSource(proxyEdge: GEdge, element: GModelElement | undefined, role: 'source' | 'target'): boolean {
+        return element !== undefined && proxyEdge !== undefined && isConnectable(element) && element.canConnect(proxyEdge, role);
+    }
 }

package/src/features/accessibility/element-navigation/diagram-navigation-tool.ts

@@ -38,7 +38,6 @@ import { GEdge } from '../../../model';
 import { SelectableBoundsAware } from '../../../utils/gmodel-util';
 import { BaseTool } from '../../tools/base-tools';
 import { RepositionAction } from '../../viewport/reposition';
-import { SearchAutocompletePaletteTool } from '../search/search-tool';
 import { ShowToastMessageAction } from '../toast/toast-handler';
 import { ElementNavigator } from './element-navigator';
 
@@ -144,7 +143,7 @@ export class ElementNavigatorKeyListener extends KeyListener {
             if (this.mode !== NavigationMode.POSITION) {
                 this.clean();
                 this.tool.dispatchActions([
-                    EnableToolsAction.create([ElementNavigatorTool.ID, SearchAutocompletePaletteTool.ID, AvailableShortcutsTool.ID]),
+                    EnableToolsAction.create([ElementNavigatorTool.ID, AvailableShortcutsTool.ID]),
                     ShowToastMessageAction.create({
                         id: Symbol.for(ElementNavigatorKeyListener.name),
                         message: messages.navigation.local_navigation_mode_activated
@@ -180,9 +179,8 @@ export class ElementNavigatorKeyListener extends KeyListener {
         if (this.matchesActivateDefaultNavigation(event)) {
             if (this.mode !== NavigationMode.DEFAULT) {
                 this.clean();
-
                 this.tool.dispatchActions([
-                    EnableToolsAction.create([ElementNavigatorTool.ID, SearchAutocompletePaletteTool.ID, AvailableShortcutsTool.ID]),
+                    EnableToolsAction.create([ElementNavigatorTool.ID, AvailableShortcutsTool.ID]),
                     ShowToastMessageAction.create({
                         id: Symbol.for(ElementNavigatorKeyListener.name),
                         message: messages.navigation.default_navigation_mode_activated