@adecore/editor-react 0.25.9 → 0.26.1

package/dist/EditorContextMenu.js

@@ -1,7 +1,13 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment, useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ContextMenu, Kbd } from '@adecore/ui';
+import { ContextMenu, EDIT_SHORTCUTS, Kbd } from '@adecore/ui';
+import { menuGroupsOf } from './context-menu-rows.js';
+/*
+ * The menu in groups: where to go, what refers to a symbol, what changes it, the app's own rows, the
+ * clipboard and formatting. A group left empty draws no line, since the theme hides a separator that
+ * comes first, last or twice.
+ */
 export function EditorContextMenu({ language, view, children }) {
     const { t } = useTranslation('editor');
     const trigger = useRef(null);
@@ -9,16 +15,33 @@ export function EditorContextMenu({ language, view, children }) {
         trigger.current?.dispatchEvent(new MouseEvent('contextmenu', { bubbles: true, clientX: view.x, clientY: view.y }));
     }, [view.x, view.y]);
     const { service } = language.project;
-    const rows = [
-        { id: 'goToDefinition', method: 'textDocument/definition', run: () => void language.navigation.go('definition') },
-        { id: 'goToTypeDefinition', method: 'textDocument/typeDefinition', run: () => void language.navigation.go('typeDefinition') },
-        { id: 'goToImplementation', method: 'textDocument/implementation', run: () => void language.navigation.go('implementation') },
-        { id: 'peekReferences', method: 'textDocument/references', run: () => void language.peek.open() },
-        { id: 'callHierarchy', method: 'textDocument/prepareCallHierarchy', run: () => void language.callHierarchy.open() },
-        { id: 'renameSymbol', method: 'textDocument/rename', run: () => void language.rename.start() },
-        { id: 'codeActions', method: 'textDocument/codeAction', run: () => void language.codeActions.open() }
-    ];
-    return (_jsxs(ContextMenu.Root, { onOpenChange: (open) => !open && language.contextMenu.close(), children: [_jsx(ContextMenu.Trigger, { ref: trigger, className: "fixed top-0 left-0 h-0 w-0", "aria-hidden": true }), _jsxs(ContextMenu.Popup, { children: [rows
-                        .filter((row) => service.supports(row.method, language.uri))
-                        .map((row) => (_jsxs(ContextMenu.Item, { onClick: row.run, children: [t(`commands.${row.id}`), language.shortcuts[row.id] !== null && _jsx(Kbd, { shortcut: language.shortcuts[row.id] })] }, row.id))), view.refactors.length > 0 && (_jsxs(ContextMenu.SubmenuRoot, { children: [_jsx(ContextMenu.SubmenuTrigger, { children: t('language.context.refactor') }), _jsx(ContextMenu.Popup, { children: view.refactors.map((entry, index) => (_jsxs(Fragment, { children: [index > 0 && view.refactors[index - 1].group !== entry.group && _jsx(ContextMenu.Separator, {}), _jsx(ContextMenu.Item, { onClick: () => void language.codeActions.apply(entry), children: entry.action.title })] }, entry.id))) })] })), children, _jsx(ContextMenu.Separator, {}), ['cut', 'copy', 'paste'].map((action) => (_jsx(ContextMenu.Item, { onClick: () => language.contextMenu.clipboard(action), children: t(`language.context.${action}`) }, action))), service.supports('textDocument/formatting', language.uri) && (_jsxs(_Fragment, { children: [_jsx(ContextMenu.Separator, {}), _jsxs(ContextMenu.Item, { onClick: () => void language.codeActions.formatDocument(), children: [t('commands.formatDocument'), language.shortcuts.formatDocument !== null && _jsx(Kbd, { shortcut: language.shortcuts.formatDocument })] })] }))] })] }));
+    const groups = menuGroupsOf((method) => service.supports(method, language.uri));
+    const run = {
+        definition: () => void language.navigation.go('definition'),
+        declaration: () => void language.navigation.go('declaration'),
+        typeDefinition: () => void language.navigation.go('typeDefinition'),
+        implementation: () => void language.navigation.go('implementation'),
+        peekReferences: () => void language.peek.open(),
+        callHierarchy: () => void language.callHierarchy.open(),
+        renameSymbol: () => void language.rename.start(),
+        codeActions: () => void language.codeActions.open()
+    };
+    const label = (id) => {
+        switch (id) {
+            case 'definition':
+            case 'declaration':
+            case 'typeDefinition':
+            case 'implementation':
+                return t(`language.context.goTo.${id}`);
+            case 'renameSymbol':
+                return t('language.context.renameSymbol');
+            default:
+                return t(`commands.${id}`);
+        }
+    };
+    const item = (row) => {
+        const shortcut = row.shortcut === null ? null : language.shortcuts[row.shortcut];
+        return (_jsxs(ContextMenu.Item, { onClick: run[row.id], children: [label(row.id), shortcut !== null && _jsx(Kbd, { shortcut: shortcut })] }, row.id));
+    };
+    return (_jsxs(ContextMenu.Root, { onOpenChange: (open) => !open && language.contextMenu.close(), children: [_jsx(ContextMenu.Trigger, { ref: trigger, className: "fixed top-0 left-0 h-0 w-0", "aria-hidden": true }), _jsxs(ContextMenu.Popup, { children: [groups.goTo.length > 0 && (_jsxs(ContextMenu.SubmenuRoot, { children: [_jsx(ContextMenu.SubmenuTrigger, { children: t('language.context.goTo.menu') }), _jsx(ContextMenu.Popup, { children: groups.goTo.map(item) })] })), _jsx(ContextMenu.Separator, {}), groups.references.map(item), _jsx(ContextMenu.Separator, {}), groups.changes.map(item), view.refactors.length > 0 && (_jsxs(ContextMenu.SubmenuRoot, { children: [_jsx(ContextMenu.SubmenuTrigger, { children: t('language.context.refactor') }), _jsx(ContextMenu.Popup, { children: view.refactors.map((entry, index) => (_jsxs(Fragment, { children: [index > 0 && view.refactors[index - 1].group !== entry.group && _jsx(ContextMenu.Separator, {}), _jsx(ContextMenu.Item, { onClick: () => void language.codeActions.apply(entry), children: entry.action.title })] }, entry.id))) })] })), _jsx(ContextMenu.Separator, {}), children, _jsx(ContextMenu.Separator, {}), ['cut', 'copy', 'paste'].map((action) => (_jsxs(ContextMenu.Item, { onClick: () => language.contextMenu.clipboard(action), children: [t(`language.context.${action}`), _jsx(Kbd, { shortcut: EDIT_SHORTCUTS[action] })] }, action))), service.supports('textDocument/formatting', language.uri) && (_jsxs(_Fragment, { children: [_jsx(ContextMenu.Separator, {}), _jsxs(ContextMenu.Item, { onClick: () => void language.codeActions.formatDocument(), children: [t('commands.formatDocument'), language.shortcuts.formatDocument !== null && _jsx(Kbd, { shortcut: language.shortcuts.formatDocument })] })] }))] })] }));
 }

package/dist/context-menu-rows.d.ts

@@ -0,0 +1,14 @@
+import type { KeymapId } from '@adecore/editor/keymap';
+import type { NavigationKind } from './navigation.ts';
+export type MenuRowId = NavigationKind | 'peekReferences' | 'callHierarchy' | 'renameSymbol' | 'codeActions';
+export interface MenuRowSpec {
+    readonly id: MenuRowId;
+    readonly method: string;
+    readonly shortcut: KeymapId | null;
+}
+export interface MenuGroups {
+    readonly goTo: readonly MenuRowSpec[];
+    readonly references: readonly MenuRowSpec[];
+    readonly changes: readonly MenuRowSpec[];
+}
+export declare function menuGroupsOf(supports: (method: string) => boolean): MenuGroups;

package/dist/context-menu-rows.js

@@ -0,0 +1,20 @@
+/* The rows of the Go to submenu. Declaration has no key of its own in the table. */
+const GO_TO = [
+    { id: 'definition', method: 'textDocument/definition', shortcut: 'goToDefinition' },
+    { id: 'declaration', method: 'textDocument/declaration', shortcut: null },
+    { id: 'typeDefinition', method: 'textDocument/typeDefinition', shortcut: 'goToTypeDefinition' },
+    { id: 'implementation', method: 'textDocument/implementation', shortcut: 'goToImplementation' }
+];
+const REFERENCES = [
+    { id: 'peekReferences', method: 'textDocument/references', shortcut: 'peekReferences' },
+    { id: 'callHierarchy', method: 'textDocument/prepareCallHierarchy', shortcut: 'callHierarchy' }
+];
+const CHANGES = [
+    { id: 'renameSymbol', method: 'textDocument/rename', shortcut: 'renameSymbol' },
+    { id: 'codeActions', method: 'textDocument/codeAction', shortcut: 'codeActions' }
+];
+/* The language rows of the context menu in their groups, each holding only the rows a server answers. */
+export function menuGroupsOf(supports) {
+    const supported = (rows) => rows.filter((row) => supports(row.method));
+    return { goTo: supported(GO_TO), references: supported(REFERENCES), changes: supported(CHANGES) };
+}

package/dist/language-ids.js

@@ -17,7 +17,8 @@ const LSP_IDS = {
     shellscript: 'shellscript',
     docker: 'dockerfile',
     twig: 'twig',
-    sql: 'sql'
+    sql: 'sql',
+    rust: 'rust'
 };
 /* The LSP language id of a file, or null when no language server here knows its language. */
 export function lspLanguageIdOf(language) {
@@ -45,7 +46,8 @@ const PATH_IDS = {
     html: 'html',
     md: 'markdown',
     twig: 'twig',
-    sql: 'sql'
+    sql: 'sql',
+    rs: 'rust'
 };
 /* The highlighter id for the code of a file we only know by its path, such as a place another file refers to. */
 export function shikiLanguageOfPath(path) {

package/dist/locales/en.json

@@ -166,7 +166,15 @@
             "refactor": "Refactor",
             "cut": "Cut",
             "copy": "Copy",
-            "paste": "Paste"
+            "paste": "Paste",
+            "renameSymbol": "Rename symbol…",
+            "goTo": {
+                "menu": "Go to",
+                "definition": "Definition",
+                "declaration": "Declaration",
+                "typeDefinition": "Type definition",
+                "implementation": "Implementation"
+            }
         },
         "snippet": {
             "choices": "Snippet choice"

package/dist/locales/nl.json

@@ -166,7 +166,15 @@
             "refactor": "Refactor",
             "cut": "Knip",
             "copy": "Kopieer",
-            "paste": "Plak"
+            "paste": "Plak",
+            "renameSymbol": "Symbool hernoemen…",
+            "goTo": {
+                "menu": "Ga naar",
+                "definition": "Definitie",
+                "declaration": "Declaratie",
+                "typeDefinition": "Typedefinitie",
+                "implementation": "Implementatie"
+            }
         },
         "snippet": {
             "choices": "Snippetkeuze"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/editor-react",
-  "version": "0.25.9",
+  "version": "0.26.1",
   "type": "module",
   "description": "Language-enabled editors, feature coordination and React popups over injected language services.",
   "license": "FSL-1.1-MIT",
@@ -62,9 +62,9 @@
     "test": "bun test --conditions=source"
   },
   "dependencies": {
-    "@adecore/editor": "0.25.9",
-    "@adecore/lsp": "0.25.9",
-    "@adecore/merge": "0.25.9",
+    "@adecore/editor": "0.26.1",
+    "@adecore/lsp": "0.26.1",
+    "@adecore/merge": "0.26.1",
     "lucide-react": "^1.47.0",
     "react-markdown": "^10.1.0",
     "remark-breaks": "^4.0.0",
@@ -72,14 +72,14 @@
     "zustand": "^5.0.15"
   },
   "peerDependencies": {
-    "@adecore/ui": "^0.25.9",
+    "@adecore/ui": "^0.26.1",
     "i18next": "^26.4.2",
     "react": "^19.3.0",
     "react-dom": "^19.3.0",
     "react-i18next": "^17.0.15"
   },
   "devDependencies": {
-    "@adecore/ui": "0.25.9",
+    "@adecore/ui": "0.26.1",
     "@types/bun": "^1.4.2",
     "@types/react": "^19.3.0",
     "@types/react-dom": "^19.3.0",

package/src/EditorContextMenu.tsx

@@ -1,10 +1,15 @@
 import { Fragment, useEffect, useRef, type ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
-import { ContextMenu, Kbd } from '@adecore/ui';
-import type { KeymapId } from '@adecore/editor/keymap';
+import { ContextMenu, EDIT_SHORTCUTS, Kbd } from '@adecore/ui';
 import type { EditorLanguage } from './editor-language.ts';
+import { menuGroupsOf, type MenuRowId, type MenuRowSpec } from './context-menu-rows.ts';
 import type { MenuView } from './popups.ts';
 
+/*
+ * The menu in groups: where to go, what refers to a symbol, what changes it, the app's own rows, the
+ * clipboard and formatting. A group left empty draws no line, since the theme hides a separator that
+ * comes first, last or twice.
+ */
 export function EditorContextMenu({ language, view, children }: { language: EditorLanguage; view: MenuView; children?: ReactNode }) {
     const { t } = useTranslation('editor');
     const trigger = useRef<HTMLDivElement>(null);
@@ -12,27 +17,53 @@ export function EditorContextMenu({ language, view, children }: { language: Edit
         trigger.current?.dispatchEvent(new MouseEvent('contextmenu', { bubbles: true, clientX: view.x, clientY: view.y }));
     }, [view.x, view.y]);
     const { service } = language.project;
-    const rows: { id: KeymapId; method: string; run(): void }[] = [
-        { id: 'goToDefinition', method: 'textDocument/definition', run: () => void language.navigation.go('definition') },
-        { id: 'goToTypeDefinition', method: 'textDocument/typeDefinition', run: () => void language.navigation.go('typeDefinition') },
-        { id: 'goToImplementation', method: 'textDocument/implementation', run: () => void language.navigation.go('implementation') },
-        { id: 'peekReferences', method: 'textDocument/references', run: () => void language.peek.open() },
-        { id: 'callHierarchy', method: 'textDocument/prepareCallHierarchy', run: () => void language.callHierarchy.open() },
-        { id: 'renameSymbol', method: 'textDocument/rename', run: () => void language.rename.start() },
-        { id: 'codeActions', method: 'textDocument/codeAction', run: () => void language.codeActions.open() }
-    ];
+    const groups = menuGroupsOf((method) => service.supports(method, language.uri));
+    const run: Record<MenuRowId, () => void> = {
+        definition: () => void language.navigation.go('definition'),
+        declaration: () => void language.navigation.go('declaration'),
+        typeDefinition: () => void language.navigation.go('typeDefinition'),
+        implementation: () => void language.navigation.go('implementation'),
+        peekReferences: () => void language.peek.open(),
+        callHierarchy: () => void language.callHierarchy.open(),
+        renameSymbol: () => void language.rename.start(),
+        codeActions: () => void language.codeActions.open()
+    };
+    const label = (id: MenuRowId): string => {
+        switch (id) {
+            case 'definition':
+            case 'declaration':
+            case 'typeDefinition':
+            case 'implementation':
+                return t(`language.context.goTo.${id}`);
+            case 'renameSymbol':
+                return t('language.context.renameSymbol');
+            default:
+                return t(`commands.${id}`);
+        }
+    };
+    const item = (row: MenuRowSpec): ReactNode => {
+        const shortcut = row.shortcut === null ? null : language.shortcuts[row.shortcut];
+        return (
+            <ContextMenu.Item key={row.id} onClick={run[row.id]}>
+                {label(row.id)}
+                {shortcut !== null && <Kbd shortcut={shortcut} />}
+            </ContextMenu.Item>
+        );
+    };
     return (
         <ContextMenu.Root onOpenChange={(open) => !open && language.contextMenu.close()}>
             <ContextMenu.Trigger ref={trigger} className="fixed top-0 left-0 h-0 w-0" aria-hidden />
             <ContextMenu.Popup>
-                {rows
-                    .filter((row) => service.supports(row.method, language.uri))
-                    .map((row) => (
-                        <ContextMenu.Item key={row.id} onClick={row.run}>
-                            {t(`commands.${row.id}`)}
-                            {language.shortcuts[row.id] !== null && <Kbd shortcut={language.shortcuts[row.id]!} />}
-                        </ContextMenu.Item>
-                    ))}
+                {groups.goTo.length > 0 && (
+                    <ContextMenu.SubmenuRoot>
+                        <ContextMenu.SubmenuTrigger>{t('language.context.goTo.menu')}</ContextMenu.SubmenuTrigger>
+                        <ContextMenu.Popup>{groups.goTo.map(item)}</ContextMenu.Popup>
+                    </ContextMenu.SubmenuRoot>
+                )}
+                <ContextMenu.Separator />
+                {groups.references.map(item)}
+                <ContextMenu.Separator />
+                {groups.changes.map(item)}
                 {view.refactors.length > 0 && (
                     <ContextMenu.SubmenuRoot>
                         <ContextMenu.SubmenuTrigger>{t('language.context.refactor')}</ContextMenu.SubmenuTrigger>
@@ -46,11 +77,13 @@ export function EditorContextMenu({ language, view, children }: { language: Edit
                         </ContextMenu.Popup>
                     </ContextMenu.SubmenuRoot>
                 )}
+                <ContextMenu.Separator />
                 {children}
                 <ContextMenu.Separator />
                 {(['cut', 'copy', 'paste'] as const).map((action) => (
                     <ContextMenu.Item key={action} onClick={() => language.contextMenu.clipboard(action)}>
                         {t(`language.context.${action}`)}
+                        <Kbd shortcut={EDIT_SHORTCUTS[action]} />
                     </ContextMenu.Item>
                 ))}
                 {service.supports('textDocument/formatting', language.uri) && (

package/src/EditorView.tsx

@@ -32,7 +32,7 @@ export interface EditorViewProps {
     ref?: Ref<HTMLDivElement>;
     /* Read when the editor mounts, so an inline function does not mount it again. */
     onMount?(editor: Editor, language: EditorLanguage | null): void | (() => void);
-    /* Rows of the app in the context menu, between the refactorings and the clipboard rows. */
+    /* A group of the app's own rows in the context menu, set apart between the refactorings and the clipboard rows. */
     contextMenuItems?(language: EditorLanguage): ReactNode;
     /* Sections of the app at the foot of the hover card, such as actions on its problems. */
     hoverFooter?(view: HoverView, language: EditorLanguage): ReactNode;

package/src/LanguagePopups.tsx

@@ -17,7 +17,7 @@ import type { HoverView } from './popups.ts';
 
 export interface LanguagePopupsProps<Language extends EditorLanguage = EditorLanguage> {
     language: Language;
-    /* Rows of the app in the context menu, between the refactorings and the clipboard rows. */
+    /* A group of the app's own rows in the context menu, set apart between the refactorings and the clipboard rows. */
     contextMenuItems?(language: Language): ReactNode;
     /* Sections of the app at the foot of the hover card, such as actions on its problems; each element gets a divider above it. */
     hoverFooter?(view: HoverView, language: Language): ReactNode;

package/src/context-menu-rows.ts

@@ -0,0 +1,40 @@
+import type { KeymapId } from '@adecore/editor/keymap';
+import type { NavigationKind } from './navigation.ts';
+
+export type MenuRowId = NavigationKind | 'peekReferences' | 'callHierarchy' | 'renameSymbol' | 'codeActions';
+
+export interface MenuRowSpec {
+    readonly id: MenuRowId;
+    readonly method: string;
+    readonly shortcut: KeymapId | null;
+}
+
+/* The rows of the Go to submenu. Declaration has no key of its own in the table. */
+const GO_TO: readonly MenuRowSpec[] = [
+    { id: 'definition', method: 'textDocument/definition', shortcut: 'goToDefinition' },
+    { id: 'declaration', method: 'textDocument/declaration', shortcut: null },
+    { id: 'typeDefinition', method: 'textDocument/typeDefinition', shortcut: 'goToTypeDefinition' },
+    { id: 'implementation', method: 'textDocument/implementation', shortcut: 'goToImplementation' }
+];
+
+const REFERENCES: readonly MenuRowSpec[] = [
+    { id: 'peekReferences', method: 'textDocument/references', shortcut: 'peekReferences' },
+    { id: 'callHierarchy', method: 'textDocument/prepareCallHierarchy', shortcut: 'callHierarchy' }
+];
+
+const CHANGES: readonly MenuRowSpec[] = [
+    { id: 'renameSymbol', method: 'textDocument/rename', shortcut: 'renameSymbol' },
+    { id: 'codeActions', method: 'textDocument/codeAction', shortcut: 'codeActions' }
+];
+
+export interface MenuGroups {
+    readonly goTo: readonly MenuRowSpec[];
+    readonly references: readonly MenuRowSpec[];
+    readonly changes: readonly MenuRowSpec[];
+}
+
+/* The language rows of the context menu in their groups, each holding only the rows a server answers. */
+export function menuGroupsOf(supports: (method: string) => boolean): MenuGroups {
+    const supported = (rows: readonly MenuRowSpec[]): MenuRowSpec[] => rows.filter((row) => supports(row.method));
+    return { goTo: supported(GO_TO), references: supported(REFERENCES), changes: supported(CHANGES) };
+}

package/src/language-ids.ts

@@ -17,7 +17,8 @@ const LSP_IDS: Record<string, string> = {
     shellscript: 'shellscript',
     docker: 'dockerfile',
     twig: 'twig',
-    sql: 'sql'
+    sql: 'sql',
+    rust: 'rust'
 };
 
 /* The LSP language id of a file, or null when no language server here knows its language. */
@@ -49,7 +50,8 @@ const PATH_IDS: Record<string, string> = {
     html: 'html',
     md: 'markdown',
     twig: 'twig',
-    sql: 'sql'
+    sql: 'sql',
+    rs: 'rust'
 };
 
 /* The highlighter id for the code of a file we only know by its path, such as a place another file refers to. */

package/src/locales/en.json

@@ -166,7 +166,15 @@
             "refactor": "Refactor",
             "cut": "Cut",
             "copy": "Copy",
-            "paste": "Paste"
+            "paste": "Paste",
+            "renameSymbol": "Rename symbol…",
+            "goTo": {
+                "menu": "Go to",
+                "definition": "Definition",
+                "declaration": "Declaration",
+                "typeDefinition": "Type definition",
+                "implementation": "Implementation"
+            }
         },
         "snippet": {
             "choices": "Snippet choice"

package/src/locales/nl.json

@@ -166,7 +166,15 @@
             "refactor": "Refactor",
             "cut": "Knip",
             "copy": "Kopieer",
-            "paste": "Plak"
+            "paste": "Plak",
+            "renameSymbol": "Symbool hernoemen…",
+            "goTo": {
+                "menu": "Ga naar",
+                "definition": "Definitie",
+                "declaration": "Declaratie",
+                "typeDefinition": "Typedefinitie",
+                "implementation": "Implementatie"
+            }
         },
         "snippet": {
             "choices": "Snippetkeuze"