@adecore/editor-react 0.31.12 → 0.33.0

package/dist/symbol-picker.js

@@ -11,68 +11,107 @@ const TOAST_ID = 'language-symbols';
  * its own input, so the editor only has to open it.
  */
 export class SymbolPickerFeature {
-    language;
-    constructor(language) {
-        this.language = language;
-        const off = language.onKey((event) => {
-            if (!isShortcut(this.language.shortcuts.goToSymbol, event)) {
-                return false;
-            }
-            void this.open();
-            return true;
-        }, KEY_PRIORITY.symbolPicker);
-        language.onDispose(() => {
-            off();
-            this.close();
-        });
-    }
-    async open() {
-        const { project, uri, popups } = this.language;
-        if (!project.service.supports('textDocument/documentSymbol', uri)) {
-            this.language.project.host.notify?.({ id: TOAST_ID, kind: 'error', title: this.language.project.i18n.t('editor:language.symbols.unavailable') });
-            return;
-        }
-        try {
-            const entries = entriesOf(await project.service.documentSymbols(uri));
-            popups.setState({ symbols: { file: basenameOf(this.language.uri), entries } });
-        }
-        catch (error) {
-            if (!(error instanceof StaleResultError)) {
-                this.language.project.host.notify?.({
-                    id: TOAST_ID,
-                    kind: 'error',
-                    title: this.language.project.i18n.t('editor:language.symbols.failed', { message: messageOf(error) })
-                });
-            }
-        }
+  language;
+  constructor(language) {
+    this.language = language;
+    const off = language.onKey(event => {
+      if (!isShortcut(this.language.shortcuts.goToSymbol, event)) {
+        return false;
+      }
+      void this.open();
+      return true;
+    }, KEY_PRIORITY.symbolPicker);
+    language.onDispose(() => {
+      off();
+      this.close();
+    });
+  }
+  async open() {
+    const {
+      project,
+      uri,
+      popups
+    } = this.language;
+    if (!project.service.supports('textDocument/documentSymbol', uri)) {
+      this.language.project.host.notify?.({
+        id: TOAST_ID,
+        kind: 'error',
+        title: this.language.project.i18n.t('editor:language.symbols.unavailable')
+      });
+      return;
     }
-    close() {
-        if (this.language.popups.getState().symbols !== null) {
-            this.language.popups.setState({ symbols: null });
-            this.language.editor.focus();
+    try {
+      const entries = entriesOf(await project.service.documentSymbols(uri));
+      popups.setState({
+        symbols: {
+          file: basenameOf(this.language.uri),
+          entries
         }
+      });
+    } catch (error) {
+      if (!(error instanceof StaleResultError)) {
+        this.language.project.host.notify?.({
+          id: TOAST_ID,
+          kind: 'error',
+          title: this.language.project.i18n.t('editor:language.symbols.failed', {
+            message: messageOf(error)
+          })
+        });
+      }
     }
-    /* Puts the caret on a symbol of the file. */
-    goTo(entry) {
-        this.close();
-        this.language.jump({ line: entry.line, character: entry.character });
+  }
+  close() {
+    if (this.language.popups.getState().symbols !== null) {
+      this.language.popups.setState({
+        symbols: null
+      });
+      this.language.editor.focus();
     }
-    /* Puts the caret on a one-based line. */
-    goToLine(line) {
-        this.close();
-        this.language.jump({ line: line - 1, character: 0 });
+  }
+  /* Puts the caret on a symbol of the file. */
+  goTo(entry) {
+    this.close();
+    this.language.jump({
+      line: entry.line,
+      character: entry.character
+    });
+  }
+  /* Puts the caret on a one-based line. */
+  goToLine(line) {
+    this.close();
+    this.language.jump({
+      line: line - 1,
+      character: 0
+    });
+  }
+  /* The symbols of the project that answer to a name, which is a request to the server and so waits for a pause in the typing. */
+  async search(text, signal) {
+    const {
+      project,
+      uri
+    } = this.language;
+    if (text === '' || !project.service.supports('workspace/symbol', uri)) {
+      return [];
     }
-    /* The symbols of the project that answer to a name, which is a request to the server and so waits for a pause in the typing. */
-    async search(text, signal) {
-        const { project, uri } = this.language;
-        if (text === '' || !project.service.supports('workspace/symbol', uri)) {
-            return [];
+    return workspaceEntriesOf(await project.service.workspaceSymbols(uri, text, {
+      signal
+    }));
+  }
+  goToWorkspace(entry) {
+    this.close();
+    const location = {
+      uri: entry.uri,
+      range: {
+        start: {
+          line: entry.line,
+          character: 0
+        },
+        end: {
+          line: entry.line,
+          character: 0
         }
-        return workspaceEntriesOf(await project.service.workspaceSymbols(uri, text, { signal }));
-    }
-    goToWorkspace(entry) {
-        this.close();
-        const location = { uri: entry.uri, range: { start: { line: entry.line, character: 0 }, end: { line: entry.line, character: 0 } } };
-        this.language.goTo(location);
-    }
-}
+      }
+    };
+    this.language.goTo(location);
+  }
+}

package/dist/symbols.js

@@ -4,36 +4,45 @@ const METHOD = 'textDocument/documentSymbol';
 const PAUSE_MS = 500;
 /* The names a breadcrumb and a sticky header know a symbol kind by; a kind left out is not a block worth pinning. */
 const KINDS = {
-    2: 'module',
-    3: 'namespace',
-    4: 'package',
-    5: 'class',
-    6: 'method',
-    9: 'constructor',
-    10: 'enum',
-    11: 'interface',
-    12: 'function',
-    13: 'variable',
-    14: 'constant',
-    23: 'struct'
+  2: 'module',
+  3: 'namespace',
+  4: 'package',
+  5: 'class',
+  6: 'method',
+  9: 'constructor',
+  10: 'enum',
+  11: 'interface',
+  12: 'function',
+  13: 'variable',
+  14: 'constant',
+  23: 'struct'
 };
 function walk(symbols, spans) {
-    for (const symbol of symbols) {
-        spans.push({ name: symbol.name, kind: symbol.kind, range: symbol.range, nameLine: symbol.selectionRange?.start.line });
-        walk(symbol.children ?? [], spans);
-    }
+  for (const symbol of symbols) {
+    spans.push({
+      name: symbol.name,
+      kind: symbol.kind,
+      range: symbol.range,
+      nameLine: symbol.selectionRange?.start.line
+    });
+    walk(symbol.children ?? [], spans);
+  }
 }
 /* Every symbol of an answer, a parent before its children, whether the server sent a tree or a flat list. */
 export function symbolSpansOf(result) {
-    const spans = [];
-    if (result === null || result.length === 0) {
-        return spans;
-    }
-    if ('range' in result[0]) {
-        walk(result, spans);
-        return spans;
-    }
-    return result.map((symbol) => ({ name: symbol.name, kind: symbol.kind, range: symbol.location.range }));
+  const spans = [];
+  if (result === null || result.length === 0) {
+    return spans;
+  }
+  if ('range' in result[0]) {
+    walk(result, spans);
+    return spans;
+  }
+  return result.map(symbol => ({
+    name: symbol.name,
+    kind: symbol.kind,
+    range: symbol.location.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*(?:$|\/\/|\/\*|\*|#\[)/;
@@ -41,81 +50,101 @@ 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;
+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;
     }
-    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;
+  }
+  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: headerLineOf(span, lines) + 1, endLine: range.end.line + 1, name, kind: label };
+  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: 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. 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);
+  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);
 }
 /*
  * The symbols of the file as the blocks sticky scroll and the breadcrumb go by, with their real names. Until
  * the first answer, and wherever no server has symbols, the editor reads blocks off the text itself.
  */
 export class SymbolsFeature {
-    refresher;
-    listeners = new Set();
-    constructor(language, timers = realTimers) {
-        const { editor, project, uri } = language;
-        this.refresher = new Refresher(async (signal) => {
-            if (!project.service.supports(METHOD, uri)) {
-                return;
-            }
-            const result = await project.service.documentSymbols(uri, { signal });
-            if (!signal.aborted) {
-                editor.setBlocks(result === null ? null : blocksOf(result, editor.getText()));
-                for (const listener of [...this.listeners]) {
-                    listener(result);
-                }
-            }
-        }, PAUSE_MS, timers);
-        const edits = editor.onTextChange(() => this.refresher.later());
-        const providers = language.onProvidersChanged(() => {
-            this.refresher.now();
-        });
-        language.onDispose(() => {
-            edits();
-            providers();
-            this.refresher.dispose();
-            editor.setBlocks(null);
-        });
-    }
-    /* Called with every answer that was not replaced before it came. */
-    onResult(listener) {
-        this.listeners.add(listener);
-        return () => {
-            this.listeners.delete(listener);
-        };
-    }
-}
+  refresher;
+  listeners = new Set();
+  constructor(language, timers = realTimers) {
+    const {
+      editor,
+      project,
+      uri
+    } = language;
+    this.refresher = new Refresher(async signal => {
+      if (!project.service.supports(METHOD, uri)) {
+        return;
+      }
+      const result = await project.service.documentSymbols(uri, {
+        signal
+      });
+      if (!signal.aborted) {
+        editor.setBlocks(result === null ? null : blocksOf(result, editor.getText()));
+        for (const listener of [...this.listeners]) {
+          listener(result);
+        }
+      }
+    }, PAUSE_MS, timers);
+    const edits = editor.onTextChange(() => this.refresher.later());
+    const providers = language.onProvidersChanged(() => {
+      this.refresher.now();
+    });
+    language.onDispose(() => {
+      edits();
+      providers();
+      this.refresher.dispose();
+      editor.setBlocks(null);
+    });
+  }
+  /* Called with every answer that was not replaced before it came. */
+  onResult(listener) {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  }
+}