@adecore/editor-react 0.31.11 → 0.32.0

package/dist/editor-language.js

@@ -32,159 +32,184 @@ import { SymbolsFeature } from './symbols.js';
  * the editor and lets go of it again. Every language feature of the editor hangs off this object.
  */
 export class EditorLanguage {
-    editor;
-    apple;
-    keymap;
-    shortcuts;
-    project;
-    document;
-    languageId;
-    /* What the features of this editor have open over it: the hover card, the suggestions, the signature. */
-    popups = createPopupStore();
-    diagnostics;
-    hover;
-    inlayHints;
-    completion;
-    signature;
-    snippets;
-    highlights;
-    pick;
-    codeActions;
-    rename;
-    navigation;
-    peek;
-    callHierarchy;
-    symbolPicker;
-    contextMenu;
-    history;
-    definitionLink;
-    symbols;
-    codeVision;
-    formatOnType;
-    renderedDocs;
-    disposers = [];
-    keys = new KeyDispatcher();
-    disposed = false;
-    constructor(project, editor, uri, languageId, timers = realTimers, options = {}) {
-        this.editor = editor;
-        this.apple = project.host.apple ?? false;
-        this.keymap = project.host.keymap ?? KEYMAP;
-        this.shortcuts = shortcutsOf(this.keymap, this.apple);
-        this.project = project;
-        this.languageId = languageId;
-        this.document = project.acquire(uri, languageId, editor);
-        this.onDispose(editor.onKeyDown((event) => this.keys.dispatch(event)));
-        this.pick = new PickFeature(this, timers);
-        this.diagnostics = new DiagnosticsFeature(this);
-        this.hover = new HoverFeature(this, timers);
-        this.completion = new CompletionFeature(this, timers);
-        this.snippets = new SnippetFeature(this, timers);
-        this.signature = new SignatureFeature(this, timers);
-        this.highlights = new HighlightsFeature(this, timers);
-        this.symbols = new SymbolsFeature(this, timers);
-        new SelectionRangesFeature(this);
-        new SemanticTokensFeature(this, timers, options.semanticTokens);
-        this.inlayHints = new InlayHintsFeature(this, timers);
-        this.codeActions = new CodeActionsFeature(this, timers);
-        this.rename = new RenameFeature(this);
-        this.navigation = new NavigationFeature(this);
-        this.peek = new PeekFeature(this, timers);
-        this.callHierarchy = new CallHierarchyFeature(this, timers);
-        this.symbolPicker = new SymbolPickerFeature(this);
-        this.contextMenu = new ContextMenuFeature(this);
-        this.history = new HistoryFeature(this);
-        this.definitionLink = new DefinitionLinkFeature(this);
-        this.codeVision = new CodeVisionFeature(this, (listener) => this.symbols.onResult(listener), timers);
-        this.formatOnType = new FormatOnTypeFeature(this);
-        this.renderedDocs = new RenderedDocsFeature(this, timers);
-        new FoldingFeature(this, (listener) => this.symbols.onResult(listener), timers);
-        this.placeOpenedCaret(editor.getCaret());
-        this.onDispose(editor.onCaret((position) => this.placeOpenedCaret(position)));
+  editor;
+  apple;
+  keymap;
+  shortcuts;
+  project;
+  document;
+  languageId;
+  /* What the features of this editor have open over it: the hover card, the suggestions, the signature. */
+  popups = createPopupStore();
+  diagnostics;
+  hover;
+  inlayHints;
+  completion;
+  signature;
+  snippets;
+  highlights;
+  pick;
+  codeActions;
+  rename;
+  navigation;
+  peek;
+  callHierarchy;
+  symbolPicker;
+  contextMenu;
+  history;
+  definitionLink;
+  symbols;
+  codeVision;
+  formatOnType;
+  renderedDocs;
+  disposers = [];
+  keys = new KeyDispatcher();
+  disposed = false;
+  constructor(project, editor, uri, languageId, timers = realTimers, options = {}) {
+    this.editor = editor;
+    this.apple = project.host.apple ?? false;
+    this.keymap = project.host.keymap ?? KEYMAP;
+    this.shortcuts = shortcutsOf(this.keymap, this.apple);
+    this.project = project;
+    this.languageId = languageId;
+    this.document = project.acquire(uri, languageId, editor);
+    this.onDispose(editor.onKeyDown(event => this.keys.dispatch(event)));
+    this.pick = new PickFeature(this, timers);
+    this.diagnostics = new DiagnosticsFeature(this);
+    this.hover = new HoverFeature(this, timers);
+    this.completion = new CompletionFeature(this, timers);
+    this.snippets = new SnippetFeature(this, timers);
+    this.signature = new SignatureFeature(this, timers);
+    this.highlights = new HighlightsFeature(this, timers);
+    this.symbols = new SymbolsFeature(this, timers);
+    new SelectionRangesFeature(this);
+    new SemanticTokensFeature(this, timers, options.semanticTokens);
+    this.inlayHints = new InlayHintsFeature(this, timers);
+    this.codeActions = new CodeActionsFeature(this, timers);
+    this.rename = new RenameFeature(this);
+    this.navigation = new NavigationFeature(this);
+    this.peek = new PeekFeature(this, timers);
+    this.callHierarchy = new CallHierarchyFeature(this, timers);
+    this.symbolPicker = new SymbolPickerFeature(this);
+    this.contextMenu = new ContextMenuFeature(this);
+    this.history = new HistoryFeature(this);
+    this.definitionLink = new DefinitionLinkFeature(this);
+    this.codeVision = new CodeVisionFeature(this, listener => this.symbols.onResult(listener), timers);
+    this.formatOnType = new FormatOnTypeFeature(this);
+    this.renderedDocs = new RenderedDocsFeature(this, timers);
+    new FoldingFeature(this, listener => this.symbols.onResult(listener), timers);
+    this.placeOpenedCaret(editor.getCaret());
+    this.onDispose(editor.onCaret(position => this.placeOpenedCaret(position)));
+  }
+  get uri() {
+    return this.document.uri;
+  }
+  get isDisposed() {
+    return this.disposed;
+  }
+  /* Where the caret is, as a place the history can come back to. */
+  get place() {
+    return {
+      uri: this.uri,
+      position: this.editor.getCaret()
+    };
+  }
+  /* Takes the caret to a place the servers named, in this file or in another one that opens beside it, and remembers where it was. */
+  goTo(location) {
+    this.project.history.record(this.place);
+    this.visit({
+      uri: location.uri,
+      position: location.range.start
+    });
+  }
+  /* Takes the caret to a position of this file and remembers where it was. */
+  jump(position) {
+    this.goTo({
+      uri: this.uri,
+      range: {
+        start: position,
+        end: position
+      }
+    });
+  }
+  /* Goes to a place without touching the history, which is how Back and Forward move. */
+  visit(place) {
+    if (place.uri === this.uri) {
+      this.editor.setCaret(place.position, 'center');
+      this.editor.focus();
+    } else {
+      this.project.openPlace(place);
     }
-    get uri() {
-        return this.document.uri;
+  }
+  /* Lists places under a position to choose from; choosing one goes there. */
+  locations(places, anchor, title) {
+    const rows = places.map((place, index) => ({
+      id: String(index),
+      ...locationRow(place, this.project.pathOfLocation(place.uri))
+    }));
+    this.pick.open({
+      anchor,
+      title,
+      groups: [{
+        title: null,
+        rows
+      }],
+      accept: id => this.goTo(places[Number(id)])
+    });
+  }
+  /*
+   * Runs `listener` once the document is open and again whenever the service says what it can ask for
+   * this document changed. A service that is ready before the document opens never says so, so the
+   * opening counts as the first change.
+   */
+  onProvidersChanged(listener) {
+    let listening = true;
+    void this.document.ready.then(() => {
+      if (listening && !this.disposed) {
+        listener();
+      }
+    }, () => undefined);
+    const providers = this.project.service.onProvidersChanged(uri => {
+      if (uri === this.uri) {
+        listener();
+      }
+    });
+    return () => {
+      listening = false;
+      providers.dispose();
+    };
+  }
+  /*
+   * Lets `handler` see the editor's keys before every handler of a lower `priority`, the first to take a key
+   * winning. `KEY_PRIORITY` holds the features'; the default, 0, comes after all of them.
+   */
+  onKey(handler, priority = 0) {
+    return this.keys.add(handler, priority);
+  }
+  /* Runs `dispose` when the editor lets go of its document. */
+  onDispose(dispose) {
+    this.disposers.push(dispose);
+  }
+  dispose() {
+    if (this.disposed) {
+      return;
     }
-    get isDisposed() {
-        return this.disposed;
+    this.disposed = true;
+    for (const dispose of this.disposers.splice(0).reverse()) {
+      dispose();
     }
-    /* Where the caret is, as a place the history can come back to. */
-    get place() {
-        return { uri: this.uri, position: this.editor.getCaret() };
+    this.document.release();
+  }
+  /* A file opened from another one lands on the line; this puts the caret on the column the jump meant. */
+  placeOpenedCaret(position) {
+    const column = this.project.takeCaret(this.uri, position.line);
+    if (column !== null && column.character !== position.character) {
+      this.editor.setCaret(column);
+      return;
     }
-    /* Takes the caret to a place the servers named, in this file or in another one that opens beside it, and remembers where it was. */
-    goTo(location) {
-        this.project.history.record(this.place);
-        this.visit({ uri: location.uri, position: location.range.start });
-    }
-    /* Takes the caret to a position of this file and remembers where it was. */
-    jump(position) {
-        this.goTo({ uri: this.uri, range: { start: position, end: position } });
-    }
-    /* Goes to a place without touching the history, which is how Back and Forward move. */
-    visit(place) {
-        if (place.uri === this.uri) {
-            this.editor.setCaret(place.position, 'center');
-            this.editor.focus();
-        }
-        else {
-            this.project.openPlace(place);
-        }
-    }
-    /* Lists places under a position to choose from; choosing one goes there. */
-    locations(places, anchor, title) {
-        const rows = places.map((place, index) => ({ id: String(index), ...locationRow(place, this.project.pathOfLocation(place.uri)) }));
-        this.pick.open({ anchor, title, groups: [{ title: null, rows }], accept: (id) => this.goTo(places[Number(id)]) });
-    }
-    /*
-     * Runs `listener` once the document is open and again whenever the service says what it can ask for
-     * this document changed. A service that is ready before the document opens never says so, so the
-     * opening counts as the first change.
-     */
-    onProvidersChanged(listener) {
-        let listening = true;
-        void this.document.ready.then(() => {
-            if (listening && !this.disposed) {
-                listener();
-            }
-        }, () => undefined);
-        const providers = this.project.service.onProvidersChanged((uri) => {
-            if (uri === this.uri) {
-                listener();
-            }
-        });
-        return () => {
-            listening = false;
-            providers.dispose();
-        };
-    }
-    /*
-     * Lets `handler` see the editor's keys before every handler of a lower `priority`, the first to take a key
-     * winning. `KEY_PRIORITY` holds the features'; the default, 0, comes after all of them.
-     */
-    onKey(handler, priority = 0) {
-        return this.keys.add(handler, priority);
-    }
-    /* Runs `dispose` when the editor lets go of its document. */
-    onDispose(dispose) {
-        this.disposers.push(dispose);
-    }
-    dispose() {
-        if (this.disposed) {
-            return;
-        }
-        this.disposed = true;
-        for (const dispose of this.disposers.splice(0).reverse()) {
-            dispose();
-        }
-        this.document.release();
-    }
-    /* A file opened from another one lands on the line; this puts the caret on the column the jump meant. */
-    placeOpenedCaret(position) {
-        const column = this.project.takeCaret(this.uri, position.line);
-        if (column !== null && column.character !== position.character) {
-            this.editor.setCaret(column);
-            return;
-        }
-        this.project.noteCaret({ uri: this.uri, position });
-    }
-}
+    this.project.noteCaret({
+      uri: this.uri,
+      position
+    });
+  }
+}

package/dist/error-message.js

@@ -1,3 +1,3 @@
 export function messageOf(error) {
-    return error instanceof Error ? error.message : String(error);
-}
+  return error instanceof Error ? error.message : String(error);
+}

package/dist/find-query.js

@@ -1,51 +1,64 @@
-export const EMPTY_FIND_QUERY = { text: '', caseSensitive: false, wholeWord: false, regex: false };
+export const EMPTY_FIND_QUERY = {
+  text: '',
+  caseSensitive: false,
+  wholeWord: false,
+  regex: false
+};
 /* Past this a count stops meaning anything to a reader, and marking every one would stall the page. */
 export const MATCH_LIMIT = 10000;
 // A letter or digit in any script, so a whole word in Dutch ends at the same place as one in English.
 const WORD_CHAR = '[\\p{L}\\p{N}_]';
 function escapeRegExp(text) {
-    return text.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
+  return text.replace(/[.*+?^${}()|[\]\\/]/g, '\\$&');
 }
 /* `u` in both modes, since a whole word needs Unicode classes; a pattern that only parses without it counts as invalid. */
 export function compileFind(query) {
-    if (query.text === '') {
-        return { kind: 'empty' };
-    }
-    const body = query.regex ? query.text : escapeRegExp(query.text);
-    const source = query.wholeWord ? `(?<!${WORD_CHAR})(?:${body})(?!${WORD_CHAR})` : body;
-    // Multiline, so `^` and `$` in a pattern mean a line, the way an editor's find reads them.
-    const flags = `gmu${query.caseSensitive ? '' : 'i'}`;
-    try {
-        return { kind: 'pattern', pattern: new RegExp(source, flags) };
-    }
-    catch {
-        return { kind: 'invalid' };
-    }
+  if (query.text === '') {
+    return {
+      kind: 'empty'
+    };
+  }
+  const body = query.regex ? query.text : escapeRegExp(query.text);
+  const source = query.wholeWord ? `(?<!${WORD_CHAR})(?:${body})(?!${WORD_CHAR})` : body;
+  // Multiline, so `^` and `$` in a pattern mean a line, the way an editor's find reads them.
+  const flags = `gmu${query.caseSensitive ? '' : 'i'}`;
+  try {
+    return {
+      kind: 'pattern',
+      pattern: new RegExp(source, flags)
+    };
+  } catch {
+    return {
+      kind: 'invalid'
+    };
+  }
 }
 /* Every match in a text, in order. An empty match (`a*` between two letters) is nothing to show, so it is stepped over. */
 export function matchesIn(text, pattern, limit = MATCH_LIMIT) {
-    const matches = [];
-    const global = new RegExp(pattern.source, pattern.flags.includes('g') ? pattern.flags : `${pattern.flags}g`);
-    let found = global.exec(text);
-    while (found !== null && matches.length < limit) {
-        if (found[0] === '') {
-            // A `u` pattern moves a lastIndex inside a surrogate pair back to its start, so one step would never leave it.
-            global.lastIndex = found.index + ((text.codePointAt(found.index) ?? 0) > 0xffff ? 2 : 1);
-        }
-        else {
-            matches.push({ start: found.index, end: found.index + found[0].length });
-        }
-        found = global.exec(text);
+  const matches = [];
+  const global = new RegExp(pattern.source, pattern.flags.includes('g') ? pattern.flags : `${pattern.flags}g`);
+  let found = global.exec(text);
+  while (found !== null && matches.length < limit) {
+    if (found[0] === '') {
+      // A `u` pattern moves a lastIndex inside a surrogate pair back to its start, so one step would never leave it.
+      global.lastIndex = found.index + ((text.codePointAt(found.index) ?? 0) > 0xffff ? 2 : 1);
+    } else {
+      matches.push({
+        start: found.index,
+        end: found.index + found[0].length
+      });
     }
-    return matches;
+    found = global.exec(text);
+  }
+  return matches;
 }
 /* The step from one match to the next or the one before, round at either end. */
 export function stepIndex(current, count, direction) {
-    if (count === 0) {
-        return null;
-    }
-    if (current === null) {
-        return direction === 1 ? 0 : count - 1;
-    }
-    return (current + direction + count) % count;
-}
+  if (count === 0) {
+    return null;
+  }
+  if (current === null) {
+    return direction === 1 ? 0 : count - 1;
+  }
+  return (current + direction + count) % count;
+}

package/dist/folding.js

@@ -5,36 +5,46 @@ const METHOD = 'textDocument/foldingRange';
 const PAUSE_MS = 500;
 /* The kind of body a symbol has, by LSP symbol kind; a namespace, a property of a type or an enum member has none worth folding. */
 const BODIES = {
-    5: 'class',
-    6: 'method',
-    7: 'value',
-    8: 'value',
-    9: 'method',
-    10: 'class',
-    11: 'class',
-    12: 'function',
-    13: 'value',
-    14: 'value',
-    23: 'class'
+  5: 'class',
+  6: 'method',
+  7: 'value',
+  8: 'value',
+  9: 'method',
+  10: 'class',
+  11: 'class',
+  12: 'function',
+  13: 'value',
+  14: 'value',
+  23: 'class'
 };
 /* The symbols that have a body of more than one line, as what the editor folds them by. */
 export function foldSymbolsOf(result) {
-    return symbolSpansOf(result).flatMap(({ kind, range }) => {
-        const body = BODIES[kind];
-        return body !== undefined && range.end.line > range.start.line ? [{ range, body }] : [];
-    });
+  return symbolSpansOf(result).flatMap(({
+    kind,
+    range
+  }) => {
+    const body = BODIES[kind];
+    return body !== undefined && range.end.line > range.start.line ? [{
+      range,
+      body
+    }] : [];
+  });
 }
 /* The ranges a server folds that span more than one line, with where a range starts and ends within its lines when it says. */
 export function foldRangesOf(ranges) {
-    return (ranges ?? [])
-        .filter((range) => range.endLine > range.startLine)
-        .map((range) => ({
-        startLine: range.startLine,
-        endLine: range.endLine,
-        ...(range.kind === undefined ? {} : { kind: range.kind }),
-        ...(range.startCharacter === undefined ? {} : { startCharacter: range.startCharacter }),
-        ...(range.endCharacter === undefined ? {} : { endCharacter: range.endCharacter })
-    }));
+  return (ranges ?? []).filter(range => range.endLine > range.startLine).map(range => ({
+    startLine: range.startLine,
+    endLine: range.endLine,
+    ...(range.kind === undefined ? {} : {
+      kind: range.kind
+    }),
+    ...(range.startCharacter === undefined ? {} : {
+      startCharacter: range.startCharacter
+    }),
+    ...(range.endCharacter === undefined ? {} : {
+      endCharacter: range.endCharacter
+    })
+  }));
 }
 /*
  * What the servers know about folding: the bodies of the symbols (read from the symbols the document already
@@ -42,41 +52,50 @@ export function foldRangesOf(ranges) {
  * editor folds what the settings choose by them when the file opens, and keeps them with their text after.
  */
 export class FoldingFeature {
-    symbols = [];
-    ranges = [];
-    refresher;
-    language;
-    constructor(language, onSymbols, timers = realTimers) {
-        this.language = language;
-        const { editor, project, uri } = language;
-        this.refresher = new Refresher(async (signal) => {
-            if (!project.service.supports(METHOD, uri)) {
-                return;
-            }
-            const ranges = await project.service.foldingRanges(uri, { signal });
-            if (!signal.aborted) {
-                this.ranges = foldRangesOf(ranges);
-                this.publish();
-            }
-        }, PAUSE_MS, timers);
-        const symbols = onSymbols((result) => {
-            this.symbols = foldSymbolsOf(result);
-            this.publish();
-        });
-        const edits = editor.onTextChange(() => this.refresher.later());
-        const providers = language.onProvidersChanged(() => {
-            this.refresher.now();
-        });
-        language.onDispose(() => {
-            symbols();
-            edits();
-            providers();
-            this.refresher.dispose();
-            editor.setFoldHints(null);
-        });
-    }
-    publish() {
-        const hints = { symbols: this.symbols, ranges: this.ranges };
-        this.language.editor.setFoldHints(hints);
-    }
-}
+  symbols = [];
+  ranges = [];
+  refresher;
+  language;
+  constructor(language, onSymbols, timers = realTimers) {
+    this.language = language;
+    const {
+      editor,
+      project,
+      uri
+    } = language;
+    this.refresher = new Refresher(async signal => {
+      if (!project.service.supports(METHOD, uri)) {
+        return;
+      }
+      const ranges = await project.service.foldingRanges(uri, {
+        signal
+      });
+      if (!signal.aborted) {
+        this.ranges = foldRangesOf(ranges);
+        this.publish();
+      }
+    }, PAUSE_MS, timers);
+    const symbols = onSymbols(result => {
+      this.symbols = foldSymbolsOf(result);
+      this.publish();
+    });
+    const edits = editor.onTextChange(() => this.refresher.later());
+    const providers = language.onProvidersChanged(() => {
+      this.refresher.now();
+    });
+    language.onDispose(() => {
+      symbols();
+      edits();
+      providers();
+      this.refresher.dispose();
+      editor.setFoldHints(null);
+    });
+  }
+  publish() {
+    const hints = {
+      symbols: this.symbols,
+      ranges: this.ranges
+    };
+    this.language.editor.setFoldHints(hints);
+  }
+}