@adecore/editor-react 0.31.12 → 0.33.0

package/dist/code-vision.js

@@ -17,223 +17,241 @@ export const MAX_LINES = 20_000;
  * stays on its row until the new one is in.
  */
 export class CodeVisionFeature {
-    language;
-    timers;
-    settings = { usages: false, authors: false };
-    declarations = [];
-    /* What the declarations were read from, so a count never outlives the text it was asked for. */
-    epoch = 0;
-    edited = false;
-    counts = new Map();
-    queue = [];
-    /* Scrolling changes the pending queue but keeps requests already in flight. */
-    running = new Map();
-    /* Declarations a server could not count for this text, which are not asked again until it says it can. */
-    failed = new Set();
-    blame = null;
-    /* The text the declarations were read from, which the lines of their authors are counted in. */
-    lines = [];
-    mapped = null;
-    authorships = new Map();
-    scrollTimer;
-    publishing = false;
-    disposed = false;
-    constructor(language, onSymbols, timers = realTimers) {
-        this.language = language;
-        this.timers = timers;
-        const { editor } = language;
-        const offs = [
-            onSymbols((result) => this.read(result)),
-            editor.onTextChange(() => {
-                this.edited = true;
-                this.closeAuthors();
-            }),
-            editor.onViewChange(() => {
-                this.timers.clear(this.scrollTimer);
-                this.scrollTimer = this.timers.set(() => this.plan(), SCROLL_PAUSE_MS);
-            })
-        ];
-        const providers = language.onProvidersChanged(() => {
-            this.failed.clear();
-            this.publish();
-            this.plan();
-        });
-        language.onDispose(() => {
-            this.disposed = true;
-            for (const off of offs) {
-                off();
-            }
-            providers();
-            this.timers.clear(this.scrollTimer);
-            for (const controller of this.running.values()) {
-                controller.abort();
-            }
-            this.closeAuthors();
-            editor.setCodeVision([]);
-        });
+  language;
+  timers;
+  settings = {
+    usages: false,
+    authors: false
+  };
+  declarations = [];
+  /* What the declarations were read from, so a count never outlives the text it was asked for. */
+  epoch = 0;
+  edited = false;
+  counts = new Map();
+  queue = [];
+  /* Scrolling changes the pending queue but keeps requests already in flight. */
+  running = new Map();
+  /* Declarations a server could not count for this text, which are not asked again until it says it can. */
+  failed = new Set();
+  blame = null;
+  /* The text the declarations were read from, which the lines of their authors are counted in. */
+  lines = [];
+  mapped = null;
+  authorships = new Map();
+  scrollTimer;
+  publishing = false;
+  disposed = false;
+  constructor(language, onSymbols, timers = realTimers) {
+    this.language = language;
+    this.timers = timers;
+    const {
+      editor
+    } = language;
+    const offs = [onSymbols(result => this.read(result)), editor.onTextChange(() => {
+      this.edited = true;
+      this.closeAuthors();
+    }), editor.onViewChange(() => {
+      this.timers.clear(this.scrollTimer);
+      this.scrollTimer = this.timers.set(() => this.plan(), SCROLL_PAUSE_MS);
+    })];
+    const providers = language.onProvidersChanged(() => {
+      this.failed.clear();
+      this.publish();
+      this.plan();
+    });
+    language.onDispose(() => {
+      this.disposed = true;
+      for (const off of offs) {
+        off();
+      }
+      providers();
+      this.timers.clear(this.scrollTimer);
+      for (const controller of this.running.values()) {
+        controller.abort();
+      }
+      this.closeAuthors();
+      editor.setCodeVision([]);
+    });
+  }
+  /* Which rows to draw, from the settings of the client. */
+  configure(settings) {
+    if (settings.usages === this.settings.usages && settings.authors === this.settings.authors) {
+      return;
     }
-    /* Which rows to draw, from the settings of the client. */
-    configure(settings) {
-        if (settings.usages === this.settings.usages && settings.authors === this.settings.authors) {
-            return;
-        }
-        this.settings = settings;
-        this.publish();
-        this.plan();
+    this.settings = settings;
+    this.publish();
+    this.plan();
+  }
+  /* What git says about the file, from the client that asked it. */
+  setBlame(blame) {
+    this.blame = blame;
+    this.mapped = null;
+    this.authorships.clear();
+    this.publish();
+  }
+  read(result) {
+    const {
+      editor,
+      languageId
+    } = this.language;
+    const lines = splitLines(editor.getText());
+    this.lines = lines;
+    this.mapped = null;
+    this.authorships.clear();
+    this.edited = false;
+    this.declarations = lines.length > MAX_LINES ? [] : declarationsOf(result, {
+      lineCount: lines.length,
+      lineAt: line => lines[line] ?? '',
+      languageId
+    });
+    this.epoch++;
+    this.failed.clear();
+    this.publish();
+    this.plan();
+  }
+  get canCount() {
+    return this.settings.usages && this.language.project.service.supports(REFERENCES, this.language.uri);
+  }
+  /* Queues the declarations in view whose count is not from the current text, nearest the top of the view first. */
+  plan() {
+    if (this.disposed || this.edited || !this.canCount) {
+      return;
     }
-    /* What git says about the file, from the client that asked it. */
-    setBlame(blame) {
-        this.blame = blame;
-        this.mapped = null;
-        this.authorships.clear();
-        this.publish();
+    const view = this.language.editor.getVisibleRange();
+    const first = view.start.line - MARGIN_LINES;
+    const last = view.end.line + MARGIN_LINES;
+    this.queue = this.declarations.filter(declaration => declaration.usages && declaration.line >= first && declaration.line <= last && this.counts.get(declaration.id)?.epoch !== this.epoch && !this.running.has(declaration.id) && !this.failed.has(declaration.id)).sort((left, right) => Math.abs(left.line - view.start.line) - Math.abs(right.line - view.start.line));
+    while (this.running.size < MAX_PARALLEL && this.queue.length > 0) {
+      void this.count(this.queue.shift());
     }
-    read(result) {
-        const { editor, languageId } = this.language;
-        const lines = splitLines(editor.getText());
-        this.lines = lines;
-        this.mapped = null;
-        this.authorships.clear();
-        this.edited = false;
-        this.declarations =
-            lines.length > MAX_LINES ? [] : declarationsOf(result, { lineCount: lines.length, lineAt: (line) => lines[line] ?? '', languageId });
-        this.epoch++;
-        this.failed.clear();
+  }
+  async count(declaration) {
+    const {
+      project,
+      uri
+    } = this.language;
+    const controller = new AbortController();
+    this.running.set(declaration.id, controller);
+    const epoch = this.epoch;
+    try {
+      const locations = await project.service.references(uri, declaration.position, false, {
+        signal: controller.signal,
+        parallel: true
+      });
+      if (!this.disposed && epoch === this.epoch) {
+        this.counts.set(declaration.id, {
+          count: distinctPlaces(locations ?? []),
+          epoch
+        });
         this.publish();
-        this.plan();
-    }
-    get canCount() {
-        return this.settings.usages && this.language.project.service.supports(REFERENCES, this.language.uri);
+      }
+    } catch {
+      // A text that moved on is counted again from its own symbols; for a server that is not up the declaration waits for it to say so.
+      if (epoch === this.epoch) {
+        this.failed.add(declaration.id);
+      }
+    } finally {
+      this.running.delete(declaration.id);
+      this.plan();
     }
-    /* Queues the declarations in view whose count is not from the current text, nearest the top of the view first. */
-    plan() {
-        if (this.disposed || this.edited || !this.canCount) {
-            return;
-        }
-        const view = this.language.editor.getVisibleRange();
-        const first = view.start.line - MARGIN_LINES;
-        const last = view.end.line + MARGIN_LINES;
-        this.queue = this.declarations
-            .filter((declaration) => declaration.usages &&
-            declaration.line >= first &&
-            declaration.line <= last &&
-            this.counts.get(declaration.id)?.epoch !== this.epoch &&
-            !this.running.has(declaration.id) &&
-            !this.failed.has(declaration.id))
-            .sort((left, right) => Math.abs(left.line - view.start.line) - Math.abs(right.line - view.start.line));
-        while (this.running.size < MAX_PARALLEL && this.queue.length > 0) {
-            void this.count(this.queue.shift());
-        }
+  }
+  /* Said once for every change that lands in the same turn, since each is a pass over the rows of the layout. */
+  publish() {
+    if (this.publishing) {
+      return;
     }
-    async count(declaration) {
-        const { project, uri } = this.language;
-        const controller = new AbortController();
-        this.running.set(declaration.id, controller);
-        const epoch = this.epoch;
-        try {
-            const locations = await project.service.references(uri, declaration.position, false, { signal: controller.signal, parallel: true });
-            if (!this.disposed && epoch === this.epoch) {
-                this.counts.set(declaration.id, { count: distinctPlaces(locations ?? []), epoch });
-                this.publish();
-            }
-        }
-        catch {
-            // A text that moved on is counted again from its own symbols; for a server that is not up the declaration waits for it to say so.
-            if (epoch === this.epoch) {
-                this.failed.add(declaration.id);
-            }
-        }
-        finally {
-            this.running.delete(declaration.id);
-            this.plan();
-        }
-    }
-    /* Said once for every change that lands in the same turn, since each is a pass over the rows of the layout. */
-    publish() {
-        if (this.publishing) {
-            return;
-        }
-        this.publishing = true;
-        queueMicrotask(() => {
-            this.publishing = false;
-            if (!this.disposed) {
-                this.language.editor.setCodeVision(this.rows());
-            }
+    this.publishing = true;
+    queueMicrotask(() => {
+      this.publishing = false;
+      if (!this.disposed) {
+        this.language.editor.setCodeVision(this.rows());
+      }
+    });
+  }
+  rows() {
+    const rows = [];
+    const taken = new Set();
+    const counted = this.canCount;
+    const withAuthors = this.settings.authors && this.blame !== null;
+    const commits = this.blame?.kind === 'ready' ? this.blame.blame.commits : [];
+    const mapped = this.blame?.kind === 'ready' && this.settings.authors ? this.mapOfBlame(this.blame) : null;
+    for (const declaration of this.declarations) {
+      const reserved = counted && declaration.usages || withAuthors && declaration.authors;
+      if (!reserved || taken.has(declaration.line)) {
+        continue;
+      }
+      taken.add(declaration.line);
+      const entries = [];
+      const known = this.counts.get(declaration.id);
+      if (counted && declaration.usages && known !== undefined) {
+        entries.push({
+          id: 'usages',
+          text: usagesText(known.count, this.language.project.i18n),
+          activate: () => void this.language.peek.open(declaration.position)
         });
+      }
+      if (mapped !== null && declaration.authors) {
+        const authorship = this.authorshipOf(declaration, commits, mapped);
+        entries.push({
+          id: 'authors',
+          text: authorsText(authorship, this.language.project.i18n),
+          ...(authorship.authors.length > 0 ? {
+            icon: authorship.authors.length > 1 ? 'users' : 'user'
+          } : {}),
+          activate: anchor => this.showAuthors(declaration, authorship, anchor)
+        });
+      }
+      rows.push({
+        id: declaration.id,
+        line: declaration.line,
+        entries
+      });
     }
-    rows() {
-        const rows = [];
-        const taken = new Set();
-        const counted = this.canCount;
-        const withAuthors = this.settings.authors && this.blame !== null;
-        const commits = this.blame?.kind === 'ready' ? this.blame.blame.commits : [];
-        const mapped = this.blame?.kind === 'ready' && this.settings.authors ? this.mapOfBlame(this.blame) : null;
-        for (const declaration of this.declarations) {
-            const reserved = (counted && declaration.usages) || (withAuthors && declaration.authors);
-            if (!reserved || taken.has(declaration.line)) {
-                continue;
-            }
-            taken.add(declaration.line);
-            const entries = [];
-            const known = this.counts.get(declaration.id);
-            if (counted && declaration.usages && known !== undefined) {
-                entries.push({
-                    id: 'usages',
-                    text: usagesText(known.count, this.language.project.i18n),
-                    activate: () => void this.language.peek.open(declaration.position)
-                });
-            }
-            if (mapped !== null && declaration.authors) {
-                const authorship = this.authorshipOf(declaration, commits, mapped);
-                entries.push({
-                    id: 'authors',
-                    text: authorsText(authorship, this.language.project.i18n),
-                    ...(authorship.authors.length > 0 ? { icon: authorship.authors.length > 1 ? 'users' : 'user' } : {}),
-                    activate: (anchor) => this.showAuthors(declaration, authorship, anchor)
-                });
-            }
-            rows.push({ id: declaration.id, line: declaration.line, entries });
-        }
-        return rows;
-    }
-    authorshipOf(declaration, commits, mapped) {
-        const known = this.authorships.get(declaration.id);
-        if (known !== undefined) {
-            return known;
-        }
-        const authorship = authorshipOf(commits, mapped, this.lines, declaration.authorFrom, declaration.authorTo);
-        this.authorships.set(declaration.id, authorship);
-        return authorship;
-    }
-    mapOfBlame(source) {
-        if (this.mapped?.blame !== source.blame) {
-            this.mapped = { blame: source.blame, lines: mapBlame(source.blame, source.base, this.lines) };
-        }
-        return this.mapped.lines;
+    return rows;
+  }
+  authorshipOf(declaration, commits, mapped) {
+    const known = this.authorships.get(declaration.id);
+    if (known !== undefined) {
+      return known;
     }
-    showAuthors(declaration, authorship, anchor) {
-        const source = this.blame;
-        const openCommit = source?.kind === 'ready' ? source.openCommit : undefined;
-        this.language.popups.setState({
-            authors: {
-                anchor,
-                name: declaration.name,
-                authorship,
-                openCommit: openCommit === undefined || authorship.latest === null ? null : () => openCommit(authorship.latest.hash)
-            }
-        });
+    const authorship = authorshipOf(commits, mapped, this.lines, declaration.authorFrom, declaration.authorTo);
+    this.authorships.set(declaration.id, authorship);
+    return authorship;
+  }
+  mapOfBlame(source) {
+    if (this.mapped?.blame !== source.blame) {
+      this.mapped = {
+        blame: source.blame,
+        lines: mapBlame(source.blame, source.base, this.lines)
+      };
     }
-    /* Closes the card of the authors; `restoreFocus` is for a close that came from the keyboard, which gives the editor its keys back. */
-    closeAuthors(restoreFocus = false) {
-        if (this.language.popups.getState().authors !== null) {
-            this.language.popups.setState({ authors: null });
-            if (restoreFocus) {
-                this.language.editor.focus();
-            }
-        }
+    return this.mapped.lines;
+  }
+  showAuthors(declaration, authorship, anchor) {
+    const source = this.blame;
+    const openCommit = source?.kind === 'ready' ? source.openCommit : undefined;
+    this.language.popups.setState({
+      authors: {
+        anchor,
+        name: declaration.name,
+        authorship,
+        openCommit: openCommit === undefined || authorship.latest === null ? null : () => openCommit(authorship.latest.hash)
+      }
+    });
+  }
+  /* Closes the card of the authors; `restoreFocus` is for a close that came from the keyboard, which gives the editor its keys back. */
+  closeAuthors(restoreFocus = false) {
+    if (this.language.popups.getState().authors !== null) {
+      this.language.popups.setState({
+        authors: null
+      });
+      if (restoreFocus) {
+        this.language.editor.focus();
+      }
     }
+  }
 }
 /* The places a server named, each counted once however many ways it was reached. */
 function distinctPlaces(locations) {
-    return new Set(locations.map((location) => `${location.uri}\0${location.range.start.line}\0${location.range.start.character}`)).size;
-}
+  return new Set(locations.map(location => `${location.uri}\0${location.range.start.line}\0${location.range.start.character}`)).size;
+}

package/dist/completion-call.js

@@ -11,68 +11,66 @@ const EXISTING_CALL = /^\s*\(/;
 const SIGNATURE_KIND_PREFIX = /^\([a-z]+(?: [a-z]+)*\)\s+(?!=>)/;
 /* Whether the item is something that is called where it stands: a function, a method, a constructor, or a class after `new`. */
 export function isCallItem(item, lineBefore) {
-    return isCallableKind(item.kind) || (item.kind === CLASS_KIND && AFTER_NEW.test(lineBefore));
+  return isCallableKind(item.kind) || item.kind === CLASS_KIND && AFTER_NEW.test(lineBefore);
 }
 /* Whether the parameter list in a signature has anything in it; null when the text names no list. */
 function listedParameters(signature) {
-    const text = signature.replace(SIGNATURE_KIND_PREFIX, '');
-    const open = text.indexOf('(');
-    if (open < 0) {
-        return null;
-    }
-    let depth = 0;
-    for (let i = open; i < text.length; i++) {
-        if (text[i] === '(') {
-            depth++;
-        }
-        else if (text[i] === ')' && --depth === 0) {
-            return text.slice(open + 1, i).trim() !== '';
-        }
-    }
+  const text = signature.replace(SIGNATURE_KIND_PREFIX, '');
+  const open = text.indexOf('(');
+  if (open < 0) {
     return null;
+  }
+  let depth = 0;
+  for (let i = open; i < text.length; i++) {
+    if (text[i] === '(') {
+      depth++;
+    } else if (text[i] === ')' && --depth === 0) {
+      return text.slice(open + 1, i).trim() !== '';
+    }
+  }
+  return null;
 }
 /* From what the server says of the item: `(method) Box.open(flag: boolean): void` has parameters and `(): void` has none. Null when it says nothing about them. */
 export function hasParameters(item) {
-    const lines = (item.detail ?? '').split('\n').filter((line) => !SOURCE_LINE.test(line.trim()));
-    for (const signature of [item.labelDetails?.detail ?? '', ...lines]) {
-        const listed = listedParameters(signature);
-        if (listed !== null) {
-            return listed;
-        }
+  const lines = (item.detail ?? '').split('\n').filter(line => !SOURCE_LINE.test(line.trim()));
+  for (const signature of [item.labelDetails?.detail ?? '', ...lines]) {
+    const listed = listedParameters(signature);
+    if (listed !== null) {
+      return listed;
     }
-    return null;
+  }
+  return null;
 }
 /* The text before the innermost brace that is still open, which says whether the caret is in an import or export list. */
 function beforeOpenBrace(before) {
-    let depth = 0;
-    for (let i = before.length - 1; i >= 0; i--) {
-        if (before[i] === '}') {
-            depth++;
-        }
-        else if (before[i] === '{' && depth-- === 0) {
-            return before.slice(0, i);
-        }
+  let depth = 0;
+  for (let i = before.length - 1; i >= 0; i--) {
+    if (before[i] === '}') {
+      depth++;
+    } else if (before[i] === '{' && depth-- === 0) {
+      return before.slice(0, i);
     }
-    return null;
+  }
+  return null;
 }
 /* Where a name is not called: in an import or export list, a `use`, a type operator's operand, an attribute or a tag. */
 function isNameOnly(languageId, before) {
-    const lineBefore = before.slice(before.lastIndexOf('\n') + 1);
-    const brace = beforeOpenBrace(before);
-    if (brace !== null && (IMPORT_BRACE.test(brace) || (languageId === 'php' && PHP_USE_BRACE.test(brace)))) {
-        return true;
-    }
-    if (TYPE_OPERATOR.test(lineBefore) || /^\s*export\s+default\s+[\w$]*$/.test(lineBefore)) {
-        return true;
-    }
-    switch (languageId) {
-        case 'php':
-            return /^\s*use\s/.test(lineBefore) || /#\[[^\]]*$/.test(lineBefore);
-        case 'python':
-            return /^\s*(?:from\s+\S+\s+)?import\b/.test(lineBefore);
-        default:
-            return /^\s*import\b/.test(lineBefore) || (MARKUP_LANGUAGES.has(languageId) && /<\/?[\w$.:-]*$/.test(lineBefore));
-    }
+  const lineBefore = before.slice(before.lastIndexOf('\n') + 1);
+  const brace = beforeOpenBrace(before);
+  if (brace !== null && (IMPORT_BRACE.test(brace) || languageId === 'php' && PHP_USE_BRACE.test(brace))) {
+    return true;
+  }
+  if (TYPE_OPERATOR.test(lineBefore) || /^\s*export\s+default\s+[\w$]*$/.test(lineBefore)) {
+    return true;
+  }
+  switch (languageId) {
+    case 'php':
+      return /^\s*use\s/.test(lineBefore) || /#\[[^\]]*$/.test(lineBefore);
+    case 'python':
+      return /^\s*(?:from\s+\S+\s+)?import\b/.test(lineBefore);
+    default:
+      return /^\s*import\b/.test(lineBefore) || MARKUP_LANGUAGES.has(languageId) && /<\/?[\w$.:-]*$/.test(lineBefore);
+  }
 }
 /*
  * Decides what accepting `item` does about a call, as the platform's parentheses handler does: a callable
@@ -81,26 +79,55 @@ function isNameOnly(languageId, before) {
  * parenthesis, carries its own call and wins.
  */
 export function planCall(site) {
-    const { item, languageId, insertion, before, rest, replace } = site;
-    const lineBefore = before.slice(before.lastIndexOf('\n') + 1);
-    if (!CALL_LANGUAGES.has(languageId) || !isCallItem(item, lineBefore) || item.insertTextFormat === SNIPPET_FORMAT || insertion.text.includes('(')) {
-        return { action: 'none' };
-    }
-    if (isNameOnly(languageId, before)) {
-        return { action: 'none' };
-    }
-    const existing = EXISTING_CALL.exec(rest);
-    if (existing !== null) {
-        return replace ? { action: 'enter', shift: existing[0].length } : { action: 'none' };
-    }
-    if (rest.startsWith('<')) {
-        return { action: 'none' };
-    }
-    return { action: 'add', inside: hasParameters(item) !== false };
+  const {
+    item,
+    languageId,
+    insertion,
+    before,
+    rest,
+    replace
+  } = site;
+  const lineBefore = before.slice(before.lastIndexOf('\n') + 1);
+  if (!CALL_LANGUAGES.has(languageId) || !isCallItem(item, lineBefore) || item.insertTextFormat === SNIPPET_FORMAT || insertion.text.includes('(')) {
+    return {
+      action: 'none'
+    };
+  }
+  if (isNameOnly(languageId, before)) {
+    return {
+      action: 'none'
+    };
+  }
+  const existing = EXISTING_CALL.exec(rest);
+  if (existing !== null) {
+    return replace ? {
+      action: 'enter',
+      shift: existing[0].length
+    } : {
+      action: 'none'
+    };
+  }
+  if (rest.startsWith('<')) {
+    return {
+      action: 'none'
+    };
+  }
+  return {
+    action: 'add',
+    inside: hasParameters(item) !== false
+  };
 }
 /* The insertion with its parentheses, and the one tab stop that puts the caret where the plan says. */
 export function withParentheses(insertion, inside) {
-    const text = `${insertion.text}()`;
-    const caret = inside ? text.length - 1 : text.length;
-    return { range: insertion.range, text, stops: [{ index: 0, start: caret, end: caret }] };
-}
+  const text = `${insertion.text}()`;
+  const caret = inside ? text.length - 1 : text.length;
+  return {
+    range: insertion.range,
+    text,
+    stops: [{
+      index: 0,
+      start: caret,
+      end: caret
+    }]
+  };
+}