@adecore/editor-react 0.22.1 → 0.23.1

package/dist/symbols.js

@@ -19,7 +19,7 @@ const KINDS = {
 };
 function walk(symbols, spans) {
     for (const symbol of symbols) {
-        spans.push({ name: symbol.name, kind: symbol.kind, range: symbol.range });
+        spans.push({ name: symbol.name, kind: symbol.kind, range: symbol.range, nameLine: symbol.selectionRange?.start.line });
         walk(symbol.children ?? [], spans);
     }
 }
@@ -35,16 +35,48 @@ export function symbolSpansOf(result) {
     }
     return result.map((symbol) => ({ name: symbol.name, kind: symbol.kind, range: symbol.location.range }));
 }
-function blockOf({ name, kind, range }) {
+/* A line a declaration can have above it: blank, a comment, or an attribute. A bare `#` is no comment, since it heads a Markdown section. */
+const PRELUDE = /^\s*(?:$|\/\/|\/\*|\*|#\[)/;
+/*
+ * The line a block is pinned by. A range may begin at the doc comment or the attributes of a declaration, so the
+ * line of the name wins, and without it the first line below the comment that holds the name.
+ */
+function headerLineOf({ name, range, nameLine }, lines) {
+    const { start, end } = range;
+    if (nameLine !== undefined && nameLine >= start.line && nameLine <= end.line) {
+        return nameLine;
+    }
+    if (lines === undefined) {
+        return start.line;
+    }
+    const last = Math.min(end.line, lines.length - 1);
+    let first = start.line;
+    while (first < last && PRELUDE.test(lines[first] ?? '')) {
+        first++;
+    }
+    const short = name.slice(name.lastIndexOf('\\') + 1);
+    for (let line = first; line <= last; line++) {
+        if (!PRELUDE.test(lines[line] ?? '') && (lines[line] ?? '').includes(short)) {
+            return line;
+        }
+    }
+    return first;
+}
+function blockOf(span, lines) {
+    const { name, kind, range } = span;
     const label = KINDS[kind];
     // A one-line symbol has no body to pin, and a property or an enum member is part of the block around it.
     return label === undefined || range.end.line <= range.start.line
         ? null
-        : { startLine: range.start.line + 1, endLine: range.end.line + 1, name, kind: label };
+        : { startLine: headerLineOf(span, lines) + 1, endLine: range.end.line + 1, name, kind: label };
 }
-/* The multi-line symbols of a file as blocks, outermost first, in one-based lines. */
-export function blocksOf(result) {
-    const blocks = symbolSpansOf(result).flatMap((span) => blockOf(span) ?? []);
+/*
+ * The multi-line symbols of a file as blocks, outermost first, in one-based lines. The text of the document
+ * lets a block start at its declaration rather than at the comment a server counts into the symbol.
+ */
+export function blocksOf(result, text) {
+    const lines = text?.split('\n');
+    const blocks = symbolSpansOf(result).flatMap((span) => blockOf(span, lines) ?? []);
     return blocks.sort((left, right) => left.startLine - right.startLine || right.endLine - left.endLine);
 }
 /*
@@ -62,7 +94,7 @@ export class SymbolsFeature {
             }
             const result = await project.service.documentSymbols(uri, { signal });
             if (!signal.aborted) {
-                editor.setBlocks(result === null ? null : blocksOf(result));
+                editor.setBlocks(result === null ? null : blocksOf(result, editor.getText()));
                 for (const listener of [...this.listeners]) {
                     listener(result);
                 }

package/dist/testing.d.ts

@@ -1,4 +1,4 @@
-import { type LanguageService, type LanguageDocument, type LanguageRequestOptions, type DiagnosticsReport, type ContentChange, type Disposable, type ProviderOptions, type CodeAction, type CodeActionContext, type CodeLens, type Command, type CompletionContext, type CompletionItem, type CompletionResult, type DocumentHighlight, type DocumentSymbolResult, type FoldingRange, type FormattingOptions, type Hover, type InlayHint, type Location, type NavigationResult, type Position, type PrepareRenameResult, type Range, type SelectionRange, type SemanticTokens, type SemanticTokensDelta, type SignatureHelp, type SignatureHelpContext, type TextEdit, type WorkspaceEdit, type WorkspaceSymbolResult } from '@adecore/lsp';
+import { type LanguageService, type LanguageDocument, type LanguageRequestOptions, type DiagnosticsReport, type ContentChange, type Disposable, type ProviderOptions, type CallHierarchyIncomingCall, type CallHierarchyItem, type CallHierarchyOutgoingCall, type CodeAction, type CodeActionContext, type CodeLens, type Command, type CompletionContext, type CompletionItem, type CompletionResult, type DocumentHighlight, type DocumentSymbolResult, type FoldingRange, type FormattingOptions, type Hover, type InlayHint, type Location, type NavigationResult, type Position, type PrepareRenameResult, type Range, type SelectionRange, type SemanticTokens, type SemanticTokensDelta, type SignatureHelp, type SignatureHelpContext, type TextEdit, type WorkspaceEdit, type WorkspaceSymbolResult } from '@adecore/lsp';
 export { ManualTimers } from './timers.ts';
 export interface LanguageCall {
     method: string;
@@ -44,6 +44,7 @@ export declare class FakeLanguageService implements LanguageService {
     executeCommand(uri: string, command: Command, options?: LanguageRequestOptions): Promise<unknown>;
     formatting(uri: string, formatting: FormattingOptions, options?: LanguageRequestOptions): Promise<TextEdit[] | null>;
     rangeFormatting(uri: string, range: Range, formatting: FormattingOptions, options?: LanguageRequestOptions): Promise<TextEdit[] | null>;
+    onTypeFormatting(uri: string, position: Position, ch: string, formatting: FormattingOptions, options?: LanguageRequestOptions): Promise<TextEdit[] | null>;
     semanticTokens(uri: string, options?: LanguageRequestOptions): Promise<SemanticTokens | null>;
     semanticTokensDelta(uri: string, previousResultId: string, options?: LanguageRequestOptions): Promise<SemanticTokens | SemanticTokensDelta | null>;
     semanticTokensRange(uri: string, range: Range, options?: LanguageRequestOptions): Promise<SemanticTokens | null>;
@@ -52,6 +53,9 @@ export declare class FakeLanguageService implements LanguageService {
     workspaceSymbols(uri: string, query: string, options?: LanguageRequestOptions): Promise<WorkspaceSymbolResult>;
     foldingRanges(uri: string, options?: LanguageRequestOptions): Promise<FoldingRange[] | null>;
     selectionRanges(uri: string, positions: readonly Position[], options?: LanguageRequestOptions): Promise<SelectionRange[] | null>;
+    prepareCallHierarchy(uri: string, position: Position, options?: LanguageRequestOptions): Promise<CallHierarchyItem[] | null>;
+    incomingCalls(uri: string, item: CallHierarchyItem, options?: LanguageRequestOptions): Promise<CallHierarchyIncomingCall[] | null>;
+    outgoingCalls(uri: string, item: CallHierarchyItem, options?: LanguageRequestOptions): Promise<CallHierarchyOutgoingCall[] | null>;
     codeLenses(uri: string, options?: LanguageRequestOptions): Promise<CodeLens[] | null>;
     resolveCodeLens(uri: string, lens: CodeLens, options?: LanguageRequestOptions): Promise<CodeLens>;
 }

package/dist/testing.js

@@ -123,6 +123,9 @@ export class FakeLanguageService {
     rangeFormatting(uri, range, formatting, options = {}) {
         return this.request('textDocument/rangeFormatting', uri, { range, options: formatting }, options);
     }
+    onTypeFormatting(uri, position, ch, formatting, options = {}) {
+        return this.request('textDocument/onTypeFormatting', uri, { position, ch, options: formatting }, options);
+    }
     semanticTokens(uri, options = {}) {
         return this.request('textDocument/semanticTokens/full', uri, {}, options);
     }
@@ -147,6 +150,15 @@ export class FakeLanguageService {
     selectionRanges(uri, positions, options = {}) {
         return this.request('textDocument/selectionRange', uri, { positions }, options);
     }
+    prepareCallHierarchy(uri, position, options = {}) {
+        return this.request('textDocument/prepareCallHierarchy', uri, { position }, options);
+    }
+    incomingCalls(uri, item, options = {}) {
+        return this.request('callHierarchy/incomingCalls', uri, { item }, options);
+    }
+    outgoingCalls(uri, item, options = {}) {
+        return this.request('callHierarchy/outgoingCalls', uri, { item }, options);
+    }
     codeLenses(uri, options = {}) {
         return this.request('textDocument/codeLens', uri, {}, options);
     }

package/dist/timers.d.ts

@@ -12,3 +12,4 @@ export declare class ManualTimers implements Timers {
     advance(milliseconds: number): void;
     get size(): number;
 }
+export declare function revealRow(timers: Timers, container: HTMLElement): void;

package/dist/timers.js

@@ -32,3 +32,7 @@ export class ManualTimers {
         return this.pending.size;
     }
 }
+/* Scrolls a row the editor opened under the caret line into view, which may sit at the bottom of the view with the row below the fold. The element is in the page a turn later. */
+export function revealRow(timers, container) {
+    timers.set(() => container.scrollIntoView?.({ block: 'nearest' }), 0);
+}

package/dist/use-panel-body.d.ts

@@ -0,0 +1,6 @@
+import type { EditorLanguage } from './editor-language.ts';
+export declare function usePanelBody(language: EditorLanguage): {
+    height: number;
+    set(height: number): void;
+    commit(height: number): void;
+};

package/dist/use-panel-body.js

@@ -0,0 +1,13 @@
+import { useEffect, useState } from 'react';
+import { clampPanelBody } from './panel-size.js';
+/* The body height of a panel, from the project that remembers it for the next one; `commit` hands it to the host. */
+export function usePanelBody(language) {
+    const { project } = language;
+    const [height, set] = useState(() => clampPanelBody(project.panelBodyHeight));
+    useEffect(() => project.onPanelBodyChange((value) => set(clampPanelBody(value))), [project]);
+    return {
+        height,
+        set,
+        commit: (value) => project.resizePanelBody(value)
+    };
+}

package/dist/workspace-edit.d.ts

@@ -1,5 +1,5 @@
 import type { Editor } from '@adecore/editor';
-import { type ApplyWorkspaceEditResult, type RenameFile, type TextEdit, type WorkspaceEdit } from '@adecore/lsp';
+import { type ApplyWorkspaceEditResult, type ResourceOperationKind, type RenameFile, type TextEdit, type WorkspaceEdit } from '@adecore/lsp';
 import type { DiskText } from './host-types.ts';
 export interface StagedFile {
     readonly path: string;
@@ -10,13 +10,35 @@ export interface ProjectFiles {
     read(path: string): Promise<DiskText | null>;
     stage(files: readonly StagedFile[]): void;
     save(files: readonly StagedFile[]): Promise<string | null>;
-    rename(from: string, to: string): Promise<string | null>;
-    create?(path: string, text: string): Promise<string | null>;
+    rename(from: string, to: string, options?: {
+        readonly overwrite: boolean;
+    }): Promise<string | null>;
+    create?(path: string, text: string, options?: {
+        readonly overwrite: boolean;
+    }): Promise<string | null>;
+    delete?(path: string, options: {
+        readonly recursive: boolean;
+    }): Promise<string | null>;
+    readonly supportsOverwrite?: boolean;
+    isUnsaved?(path: string): boolean;
+    exists?(path: string): Promise<boolean>;
+    isFolder?(path: string): Promise<boolean>;
 }
 export interface WorkspaceEditHost {
     editorOf(uri: string): Editor | undefined;
     readonly files: ProjectFiles | null;
+    versionOf?(uri: string): number | null;
+    isReadOnly?(uri: string): boolean;
+    openUris?(): readonly string[];
 }
+export interface ResourceOperationView {
+    readonly kind: ResourceOperationKind;
+    readonly uri: string;
+    readonly newUri?: string;
+}
+export declare function textEntriesOf(edit: WorkspaceEdit): Map<string, TextEdit[][]>;
 export declare function entriesOf(edit: WorkspaceEdit): Map<string, TextEdit[][]> | null;
 export declare function renamesOf(edit: WorkspaceEdit): RenameFile[];
+export declare function resourceOperationsOf(edit: WorkspaceEdit): ResourceOperationView[];
+export declare function supportedResourceOperations(files: ProjectFiles | null | undefined): ResourceOperationKind[];
 export declare function applyWorkspaceEdit(edit: WorkspaceEdit, host: WorkspaceEditHost): Promise<ApplyWorkspaceEditResult>;