@adecore/editor-react 0.31.11 → 0.32.0

package/dist/semantic-tokens.js

@@ -20,177 +20,216 @@ export const DEFAULT_RANGE_CHARACTERS = 500_000;
  * for the lines in view first when the document is large, and for them alone when it offers nothing else.
  */
 export class SemanticTokensFeature {
-    refresher;
-    scrolled;
-    language;
-    options;
-    held = null;
-    heldLegend = '';
-    /* True once the whole document is drawn from a full answer; a range answer then no longer paints. */
-    complete = false;
-    /* The lines a range answer drew, null when nothing of that kind is on screen. */
-    covered = null;
-    drawn = [];
-    epoch = 0;
-    constructor(language, timers = realTimers, options = {}) {
-        const { editor } = language;
-        this.language = language;
-        this.options = options;
-        this.refresher = new Refresher((signal) => this.refresh(signal), PAUSE_MS, timers);
-        this.scrolled = new Refresher((signal) => this.fillViewport(signal), SCROLL_PAUSE_MS, timers);
-        const edits = editor.onTextChange(() => {
-            this.epoch++;
-            this.covered = null;
-            this.refresher.later();
-        });
-        const view = editor.onViewChange(() => {
-            if (!this.complete && this.covered !== null && !covers(this.covered, editor.getVisibleRange())) {
-                this.scrolled.later();
-            }
-        });
-        const providers = language.onProvidersChanged(() => {
-            this.epoch++;
-            this.scrolled.cancel();
-            this.forget();
-            this.refresher.now();
-        });
-        language.onDispose(() => {
-            edits();
-            view();
-            providers();
-            this.refresher.dispose();
-            this.scrolled.dispose();
-            this.forget();
-            editor.setSemanticTokens(null);
-        });
+  refresher;
+  scrolled;
+  language;
+  options;
+  held = null;
+  heldLegend = '';
+  /* True once the whole document is drawn from a full answer; a range answer then no longer paints. */
+  complete = false;
+  /* The lines a range answer drew, null when nothing of that kind is on screen. */
+  covered = null;
+  drawn = [];
+  epoch = 0;
+  constructor(language, timers = realTimers, options = {}) {
+    const {
+      editor
+    } = language;
+    this.language = language;
+    this.options = options;
+    this.refresher = new Refresher(signal => this.refresh(signal), PAUSE_MS, timers);
+    this.scrolled = new Refresher(signal => this.fillViewport(signal), SCROLL_PAUSE_MS, timers);
+    const edits = editor.onTextChange(() => {
+      this.epoch++;
+      this.covered = null;
+      this.refresher.later();
+    });
+    const view = editor.onViewChange(() => {
+      if (!this.complete && this.covered !== null && !covers(this.covered, editor.getVisibleRange())) {
+        this.scrolled.later();
+      }
+    });
+    const providers = language.onProvidersChanged(() => {
+      this.epoch++;
+      this.scrolled.cancel();
+      this.forget();
+      this.refresher.now();
+    });
+    language.onDispose(() => {
+      edits();
+      view();
+      providers();
+      this.refresher.dispose();
+      this.scrolled.dispose();
+      this.forget();
+      editor.setSemanticTokens(null);
+    });
+  }
+  /* Drops what the next delta would be computed against, which a refresh, a restart or a new legend makes meaningless. */
+  forget() {
+    this.held = null;
+    this.complete = false;
+    this.covered = null;
+  }
+  legend() {
+    const {
+      service
+    } = this.language.project;
+    const {
+      uri
+    } = this.language;
+    const legend = (service.providerOptions(FULL, uri) ?? service.providerOptions(RANGE, uri))?.legend;
+    const key = legend === undefined ? '' : JSON.stringify(legend);
+    if (key !== this.heldLegend) {
+      this.heldLegend = key;
+      this.forget();
     }
-    /* Drops what the next delta would be computed against, which a refresh, a restart or a new legend makes meaningless. */
-    forget() {
-        this.held = null;
-        this.complete = false;
-        this.covered = null;
+    return legend;
+  }
+  isLarge() {
+    const {
+      editor
+    } = this.language;
+    const end = editor.positionAt(Number.MAX_SAFE_INTEGER);
+    return end.line + 1 > (this.options.rangeLines ?? DEFAULT_RANGE_LINES) || editor.offsetAt(end) > (this.options.rangeCharacters ?? DEFAULT_RANGE_CHARACTERS);
+  }
+  viewport() {
+    const {
+      editor
+    } = this.language;
+    return withMargin(editor.getVisibleRange(), editor.positionAt(Number.MAX_SAFE_INTEGER), line => ({
+      line,
+      character: lineTextOf(editor, line).length
+    }));
+  }
+  async refresh(signal) {
+    const {
+      service
+    } = this.language.project;
+    const {
+      editor,
+      uri
+    } = this.language;
+    const legend = this.legend();
+    const full = service.supports(FULL, uri);
+    const range = service.supports(RANGE, uri);
+    if (legend === undefined || !full && !range) {
+      return;
     }
-    legend() {
-        const { service } = this.language.project;
-        const { uri } = this.language;
-        const legend = (service.providerOptions(FULL, uri) ?? service.providerOptions(RANGE, uri))?.legend;
-        const key = legend === undefined ? '' : JSON.stringify(legend);
-        if (key !== this.heldLegend) {
-            this.heldLegend = key;
-            this.forget();
-        }
-        return legend;
-    }
-    isLarge() {
-        const { editor } = this.language;
-        const end = editor.positionAt(Number.MAX_SAFE_INTEGER);
-        return (end.line + 1 > (this.options.rangeLines ?? DEFAULT_RANGE_LINES) || editor.offsetAt(end) > (this.options.rangeCharacters ?? DEFAULT_RANGE_CHARACTERS));
+    if (!full || range && !this.complete && this.held === null && this.isLarge()) {
+      await this.askRange(this.viewport(), legend, signal, true);
+      if (!full) {
+        return;
+      }
     }
-    viewport() {
-        const { editor } = this.language;
-        return withMargin(editor.getVisibleRange(), editor.positionAt(Number.MAX_SAFE_INTEGER), (line) => ({
-            line,
-            character: lineTextOf(editor, line).length
-        }));
+    const epoch = this.epoch;
+    const tokens = await this.askFull(signal);
+    if (signal.aborted || epoch !== this.epoch) {
+      return;
     }
-    async refresh(signal) {
-        const { service } = this.language.project;
-        const { editor, uri } = this.language;
-        const legend = this.legend();
-        const full = service.supports(FULL, uri);
-        const range = service.supports(RANGE, uri);
-        if (legend === undefined || (!full && !range)) {
-            return;
-        }
-        if (!full || (range && !this.complete && this.held === null && this.isLarge())) {
-            await this.askRange(this.viewport(), legend, signal, true);
-            if (!full) {
-                return;
-            }
+    this.complete = tokens !== null;
+    this.covered = null;
+    this.drawn = [];
+    editor.setSemanticTokens(tokens === null ? null : decodeSemanticTokens(tokens, legend));
+  }
+  /* The whole document: as a delta when the last answer can be built on, else in full. Null when the server has no tokens. */
+  async askFull(signal) {
+    const {
+      service
+    } = this.language.project;
+    const {
+      uri
+    } = this.language;
+    const base = this.held;
+    if (base !== null && service.supports(DELTA, uri)) {
+      const answer = await service.semanticTokensDelta(uri, base.resultId, {
+        signal
+      }).catch(error => {
+        if (signal.aborted || error instanceof StaleResultError) {
+          throw error;
         }
-        const epoch = this.epoch;
-        const tokens = await this.askFull(signal);
-        if (signal.aborted || epoch !== this.epoch) {
-            return;
+        // A server that no longer knows our result id is asked in full instead, once.
+        return null;
+      });
+      signal.throwIfAborted();
+      if (answer !== null && this.held === base) {
+        const tokens = this.fromDelta(base, answer);
+        if (tokens !== null) {
+          this.hold(tokens);
+          return tokens;
         }
-        this.complete = tokens !== null;
-        this.covered = null;
-        this.drawn = [];
-        editor.setSemanticTokens(tokens === null ? null : decodeSemanticTokens(tokens, legend));
+      }
+      this.held = null;
     }
-    /* The whole document: as a delta when the last answer can be built on, else in full. Null when the server has no tokens. */
-    async askFull(signal) {
-        const { service } = this.language.project;
-        const { uri } = this.language;
-        const base = this.held;
-        if (base !== null && service.supports(DELTA, uri)) {
-            const answer = await service.semanticTokensDelta(uri, base.resultId, { signal }).catch((error) => {
-                if (signal.aborted || error instanceof StaleResultError) {
-                    throw error;
-                }
-                // A server that no longer knows our result id is asked in full instead, once.
-                return null;
-            });
-            signal.throwIfAborted();
-            if (answer !== null && this.held === base) {
-                const tokens = this.fromDelta(base, answer);
-                if (tokens !== null) {
-                    this.hold(tokens);
-                    return tokens;
-                }
-            }
-            this.held = null;
-        }
-        const tokens = await service.semanticTokens(uri, { signal });
-        signal.throwIfAborted();
-        this.hold(tokens);
-        return tokens;
+    const tokens = await service.semanticTokens(uri, {
+      signal
+    });
+    signal.throwIfAborted();
+    this.hold(tokens);
+    return tokens;
+  }
+  /* Null when the answer is a delta that does not fit the data it should be applied to. */
+  fromDelta(base, answer) {
+    if (!('edits' in answer)) {
+      return answer;
     }
-    /* Null when the answer is a delta that does not fit the data it should be applied to. */
-    fromDelta(base, answer) {
-        if (!('edits' in answer)) {
-            return answer;
-        }
-        const data = applySemanticEdits(base.data, answer.edits);
-        return data === null ? null : { ...(answer.resultId === undefined ? {} : { resultId: answer.resultId }), data };
+    const data = applySemanticEdits(base.data, answer.edits);
+    return data === null ? null : {
+      ...(answer.resultId === undefined ? {} : {
+        resultId: answer.resultId
+      }),
+      data
+    };
+  }
+  hold(tokens) {
+    this.held = tokens?.resultId === undefined ? null : {
+      resultId: tokens.resultId,
+      data: tokens.data
+    };
+  }
+  /* Draws the lines of a range answer. A fresh one replaces everything drawn, an extension keeps the lines it did not cover. */
+  async askRange(range, legend, signal, fresh) {
+    const {
+      service
+    } = this.language.project;
+    const {
+      editor,
+      uri
+    } = this.language;
+    const epoch = this.epoch;
+    const before = this.covered;
+    const tokens = await service.semanticTokensRange(uri, range, {
+      signal
+    });
+    if (signal.aborted || epoch !== this.epoch || this.complete) {
+      return;
     }
-    hold(tokens) {
-        this.held = tokens?.resultId === undefined ? null : { resultId: tokens.resultId, data: tokens.data };
+    const decoded = tokens === null ? [] : decodeSemanticTokens(tokens, legend);
+    if (fresh || before === null || range.start.line > before.end.line + 1 || range.end.line < before.start.line - 1) {
+      this.covered = range;
+      this.drawn = decoded;
+    } else {
+      const kept = this.drawn.filter(token => token.line < range.start.line || token.line > range.end.line);
+      this.drawn = [...kept, ...decoded];
+      this.covered = {
+        start: before.start.line < range.start.line ? before.start : range.start,
+        end: before.end.line > range.end.line ? before.end : range.end
+      };
     }
-    /* Draws the lines of a range answer. A fresh one replaces everything drawn, an extension keeps the lines it did not cover. */
-    async askRange(range, legend, signal, fresh) {
-        const { service } = this.language.project;
-        const { editor, uri } = this.language;
-        const epoch = this.epoch;
-        const before = this.covered;
-        const tokens = await service.semanticTokensRange(uri, range, { signal });
-        if (signal.aborted || epoch !== this.epoch || this.complete) {
-            return;
-        }
-        const decoded = tokens === null ? [] : decodeSemanticTokens(tokens, legend);
-        if (fresh || before === null || range.start.line > before.end.line + 1 || range.end.line < before.start.line - 1) {
-            this.covered = range;
-            this.drawn = decoded;
-        }
-        else {
-            const kept = this.drawn.filter((token) => token.line < range.start.line || token.line > range.end.line);
-            this.drawn = [...kept, ...decoded];
-            this.covered = {
-                start: before.start.line < range.start.line ? before.start : range.start,
-                end: before.end.line > range.end.line ? before.end : range.end
-            };
-        }
-        editor.setSemanticTokens(this.drawn);
-        if (!this.complete && this.covered !== null && !covers(this.covered, editor.getVisibleRange())) {
-            this.scrolled.later();
-        }
+    editor.setSemanticTokens(this.drawn);
+    if (!this.complete && this.covered !== null && !covers(this.covered, editor.getVisibleRange())) {
+      this.scrolled.later();
     }
-    async fillViewport(signal) {
-        const { service } = this.language.project;
-        const legend = this.legend();
-        if (legend === undefined || !service.supports(RANGE, this.language.uri) || this.complete) {
-            return;
-        }
-        await this.askRange(this.viewport(), legend, signal, false);
+  }
+  async fillViewport(signal) {
+    const {
+      service
+    } = this.language.project;
+    const legend = this.legend();
+    if (legend === undefined || !service.supports(RANGE, this.language.uri) || this.complete) {
+      return;
     }
-}
+    await this.askRange(this.viewport(), legend, signal, false);
+  }
+}

package/dist/shortcut-keys.js

@@ -1,16 +1,22 @@
 import { chordOf, KEYMAP_IDS, parseChord, typesInsteadOfChord } from '@adecore/editor/keymap';
 import { matchesShortcut } from '@adecore/ui';
 export function shortcutsOf(keymap, apple) {
-    const shortcuts = Object.fromEntries(KEYMAP_IDS.map((id) => {
-        const text = chordOf(id, apple, keymap);
-        return [id, text === null ? null : { ...parseChord(text), apple }];
-    }));
-    return { ...shortcuts, rename: shortcuts.renameSymbol };
+  const shortcuts = Object.fromEntries(KEYMAP_IDS.map(id => {
+    const text = chordOf(id, apple, keymap);
+    return [id, text === null ? null : {
+      ...parseChord(text),
+      apple
+    }];
+  }));
+  return {
+    ...shortcuts,
+    rename: shortcuts.renameSymbol
+  };
 }
 /* Ctrl and Alt together that type a character, as AltGr does on some layouts, are no shortcut. */
 export function isShortcut(target, event) {
-    if (target === null || typesInsteadOfChord(event, target.apple)) {
-        return false;
-    }
-    return matchesShortcut(target, event, target.apple);
-}
+  if (target === null || typesInsteadOfChord(event, target.apple)) {
+    return false;
+  }
+  return matchesShortcut(target, event, target.apple);
+}

package/dist/signature-model.js

@@ -1,33 +1,39 @@
 import { documentationText } from './completion-model.js';
 /* Where a parameter's label stands in the signature's: given as a pair of offsets, or as the text to find in it. */
 export function parameterSpan(signature, index) {
-    const parameter = signature.parameters?.[index];
-    if (parameter === undefined) {
-        return null;
-    }
-    if (typeof parameter.label !== 'string') {
-        const [start, end] = parameter.label;
-        return start >= 0 && end <= signature.label.length && start < end ? { start, end } : null;
-    }
-    const start = signature.label.indexOf(parameter.label);
-    return start < 0 ? null : { start, end: start + parameter.label.length };
+  const parameter = signature.parameters?.[index];
+  if (parameter === undefined) {
+    return null;
+  }
+  if (typeof parameter.label !== 'string') {
+    const [start, end] = parameter.label;
+    return start >= 0 && end <= signature.label.length && start < end ? {
+      start,
+      end
+    } : null;
+  }
+  const start = signature.label.indexOf(parameter.label);
+  return start < 0 ? null : {
+    start,
+    end: start + parameter.label.length
+  };
 }
 export function signatureViewOf(help) {
-    if (help === null || help.signatures.length === 0) {
-        return null;
-    }
-    const index = Math.min(Math.max(0, help.activeSignature ?? 0), help.signatures.length - 1);
-    const signature = help.signatures[index];
-    const parameterIndex = signature.activeParameter ?? help.activeParameter ?? 0;
-    const active = parameterSpan(signature, parameterIndex);
-    const parameter = signature.parameters?.[parameterIndex];
-    return {
-        label: signature.label,
-        active,
-        parameterName: active === null ? '' : signature.label.slice(active.start, active.end).replace(/[?:].*$/s, ''),
-        parameterDocumentation: documentationText(parameter?.documentation),
-        documentation: documentationText(signature.documentation),
-        index,
-        count: help.signatures.length
-    };
-}
+  if (help === null || help.signatures.length === 0) {
+    return null;
+  }
+  const index = Math.min(Math.max(0, help.activeSignature ?? 0), help.signatures.length - 1);
+  const signature = help.signatures[index];
+  const parameterIndex = signature.activeParameter ?? help.activeParameter ?? 0;
+  const active = parameterSpan(signature, parameterIndex);
+  const parameter = signature.parameters?.[parameterIndex];
+  return {
+    label: signature.label,
+    active,
+    parameterName: active === null ? '' : signature.label.slice(active.start, active.end).replace(/[?:].*$/s, ''),
+    parameterDocumentation: documentationText(parameter?.documentation),
+    documentation: documentationText(signature.documentation),
+    index,
+    count: help.signatures.length
+  };
+}