@adecore/editor-react 0.31.12 → 0.32.0

package/dist/conflict-model.js

@@ -4,33 +4,39 @@ import { splitBlocks, splitLines } from '@adecore/merge';
  * are ours to take without asking; only a stretch both sides changed needs a person.
  */
 export function planConflict(base, ours, theirs) {
-    const blocks = splitBlocks(splitLines(base), splitLines(ours), splitLines(theirs));
-    const merges = [];
-    const conflicts = [];
-    let oursAt = 0;
-    let theirsAt = 0;
-    let mergedAt = 0;
-    for (const block of blocks) {
-        if (block.kind === 'theirs') {
-            merges.push({ from: oursAt, to: oursAt + block.ours.length, lines: block.theirs });
-            mergedAt += block.theirs.length;
-        }
-        else {
-            if (block.kind === 'conflict') {
-                conflicts.push({
-                    base: block.base,
-                    ours: block.ours,
-                    theirs: block.theirs,
-                    from: mergedAt,
-                    to: mergedAt + block.ours.length,
-                    theirsStart: theirsAt + 1,
-                    theirsEnd: theirsAt + block.theirs.length
-                });
-            }
-            mergedAt += block.ours.length;
-        }
-        oursAt += block.ours.length;
-        theirsAt += block.theirs.length;
+  const blocks = splitBlocks(splitLines(base), splitLines(ours), splitLines(theirs));
+  const merges = [];
+  const conflicts = [];
+  let oursAt = 0;
+  let theirsAt = 0;
+  let mergedAt = 0;
+  for (const block of blocks) {
+    if (block.kind === 'theirs') {
+      merges.push({
+        from: oursAt,
+        to: oursAt + block.ours.length,
+        lines: block.theirs
+      });
+      mergedAt += block.theirs.length;
+    } else {
+      if (block.kind === 'conflict') {
+        conflicts.push({
+          base: block.base,
+          ours: block.ours,
+          theirs: block.theirs,
+          from: mergedAt,
+          to: mergedAt + block.ours.length,
+          theirsStart: theirsAt + 1,
+          theirsEnd: theirsAt + block.theirs.length
+        });
+      }
+      mergedAt += block.ours.length;
     }
-    return { merges, conflicts };
-}
+    oursAt += block.ours.length;
+    theirsAt += block.theirs.length;
+  }
+  return {
+    merges,
+    conflicts
+  };
+}

package/dist/context-menu-rows.js

@@ -1,20 +1,45 @@
 /* The rows of the Go to submenu. Declaration has no key of its own in the table. */
-const GO_TO = [
-    { id: 'definition', method: 'textDocument/definition', shortcut: 'goToDefinition' },
-    { id: 'declaration', method: 'textDocument/declaration', shortcut: null },
-    { id: 'typeDefinition', method: 'textDocument/typeDefinition', shortcut: 'goToTypeDefinition' },
-    { id: 'implementation', method: 'textDocument/implementation', shortcut: 'goToImplementation' }
-];
-const REFERENCES = [
-    { id: 'peekReferences', method: 'textDocument/references', shortcut: 'peekReferences' },
-    { id: 'callHierarchy', method: 'textDocument/prepareCallHierarchy', shortcut: 'callHierarchy' }
-];
-const CHANGES = [
-    { id: 'renameSymbol', method: 'textDocument/rename', shortcut: 'renameSymbol' },
-    { id: 'codeActions', method: 'textDocument/codeAction', shortcut: 'codeActions' }
-];
+const GO_TO = [{
+  id: 'definition',
+  method: 'textDocument/definition',
+  shortcut: 'goToDefinition'
+}, {
+  id: 'declaration',
+  method: 'textDocument/declaration',
+  shortcut: null
+}, {
+  id: 'typeDefinition',
+  method: 'textDocument/typeDefinition',
+  shortcut: 'goToTypeDefinition'
+}, {
+  id: 'implementation',
+  method: 'textDocument/implementation',
+  shortcut: 'goToImplementation'
+}];
+const REFERENCES = [{
+  id: 'peekReferences',
+  method: 'textDocument/references',
+  shortcut: 'peekReferences'
+}, {
+  id: 'callHierarchy',
+  method: 'textDocument/prepareCallHierarchy',
+  shortcut: 'callHierarchy'
+}];
+const CHANGES = [{
+  id: 'renameSymbol',
+  method: 'textDocument/rename',
+  shortcut: 'renameSymbol'
+}, {
+  id: 'codeActions',
+  method: 'textDocument/codeAction',
+  shortcut: 'codeActions'
+}];
 /* The language rows of the context menu in their groups, each holding only the rows a server answers. */
 export function menuGroupsOf(supports) {
-    const supported = (rows) => rows.filter((row) => supports(row.method));
-    return { goTo: supported(GO_TO), references: supported(REFERENCES), changes: supported(CHANGES) };
-}
+  const supported = rows => rows.filter(row => supports(row.method));
+  return {
+    goTo: supported(GO_TO),
+    references: supported(REFERENCES),
+    changes: supported(CHANGES)
+  };
+}

package/dist/context-menu.js

@@ -3,52 +3,70 @@
  * servers support at the caret. The refactors are asked for while it opens, so it never waits for them.
  */
 export class ContextMenuFeature {
-    language;
-    request = 0;
-    constructor(language) {
-        this.language = language;
-        const off = language.editor.onContextMenu((menu) => {
-            // A right click outside the selection moves the caret first, so the menu is about what was clicked.
-            if (!menu.inSelection) {
-                language.editor.setCaret(menu.position);
-            }
-            this.open(menu.x, menu.y);
-        });
-        language.onDispose(() => {
-            off();
-            this.close();
-        });
+  language;
+  request = 0;
+  constructor(language) {
+    this.language = language;
+    const off = language.editor.onContextMenu(menu => {
+      // A right click outside the selection moves the caret first, so the menu is about what was clicked.
+      if (!menu.inSelection) {
+        language.editor.setCaret(menu.position);
+      }
+      this.open(menu.x, menu.y);
+    });
+    language.onDispose(() => {
+      off();
+      this.close();
+    });
+  }
+  close() {
+    this.request++;
+    if (this.language.popups.getState().menu !== null) {
+      this.language.popups.setState({
+        menu: null
+      });
     }
-    close() {
-        this.request++;
-        if (this.language.popups.getState().menu !== null) {
-            this.language.popups.setState({ menu: null });
-        }
+  }
+  /* The browser's own commands on the editor's input, which keep the clipboard and the undo history one thing. */
+  clipboard(action) {
+    const {
+      editor
+    } = this.language;
+    editor.focus();
+    const done = document.execCommand(action);
+    if (!done && action === 'paste') {
+      void navigator.clipboard?.readText().then(text => {
+        const range = editor.getSelection();
+        editor.applyEdits([{
+          range,
+          text
+        }]);
+      }).catch(() => undefined);
     }
-    /* The browser's own commands on the editor's input, which keep the clipboard and the undo history one thing. */
-    clipboard(action) {
-        const { editor } = this.language;
-        editor.focus();
-        const done = document.execCommand(action);
-        if (!done && action === 'paste') {
-            void navigator.clipboard
-                ?.readText()
-                .then((text) => {
-                const range = editor.getSelection();
-                editor.applyEdits([{ range, text }]);
-            })
-                .catch(() => undefined);
-        }
-    }
-    open(x, y) {
-        const request = ++this.request;
-        const { popups, codeActions } = this.language;
-        popups.setState({ menu: { x, y, refactors: [] } });
-        void codeActions.list(['refactor']).then((entries) => {
-            const shown = popups.getState().menu;
-            if (request === this.request && shown !== null && entries !== null) {
-                popups.setState({ menu: { ...shown, refactors: entries } });
-            }
+  }
+  open(x, y) {
+    const request = ++this.request;
+    const {
+      popups,
+      codeActions
+    } = this.language;
+    popups.setState({
+      menu: {
+        x,
+        y,
+        refactors: []
+      }
+    });
+    void codeActions.list(['refactor']).then(entries => {
+      const shown = popups.getState().menu;
+      if (request === this.request && shown !== null && entries !== null) {
+        popups.setState({
+          menu: {
+            ...shown,
+            refactors: entries
+          }
         });
-    }
-}
+      }
+    });
+  }
+}

package/dist/definition-link.js

@@ -8,93 +8,96 @@ import { wordRangeAt } from './rename-model.js';
  * key comes from the window.
  */
 export class DefinitionLinkFeature {
-    language;
-    held = false;
-    pointer = null;
-    shownKey = '';
-    drawn = false;
-    request = 0;
-    lookup = null;
-    constructor(language) {
-        this.language = language;
-        const { editor } = language;
-        const offs = [
-            editor.onHover((hover) => {
-                this.pointer = hover?.position ?? null;
-                this.update();
-            }),
-            editor.onTextChange(() => this.clear()),
-            editor.onViewChange(() => this.clear())
-        ];
-        if (typeof window !== 'undefined') {
-            const modKey = language.apple ? 'Meta' : 'Control';
-            const keys = (event) => {
-                if (event.key === modKey) {
-                    this.setModHeld(event.type === 'keydown');
-                }
-            };
-            const lost = () => this.setModHeld(false);
-            window.addEventListener('keydown', keys);
-            window.addEventListener('keyup', keys);
-            window.addEventListener('blur', lost);
-            offs.push(() => {
-                window.removeEventListener('keydown', keys);
-                window.removeEventListener('keyup', keys);
-                window.removeEventListener('blur', lost);
-            });
+  language;
+  held = false;
+  pointer = null;
+  shownKey = '';
+  drawn = false;
+  request = 0;
+  lookup = null;
+  constructor(language) {
+    this.language = language;
+    const {
+      editor
+    } = language;
+    const offs = [editor.onHover(hover => {
+      this.pointer = hover?.position ?? null;
+      this.update();
+    }), editor.onTextChange(() => this.clear()), editor.onViewChange(() => this.clear())];
+    if (typeof window !== 'undefined') {
+      const modKey = language.apple ? 'Meta' : 'Control';
+      const keys = event => {
+        if (event.key === modKey) {
+          this.setModHeld(event.type === 'keydown');
         }
-        language.onDispose(() => {
-            for (const off of offs) {
-                off();
-            }
-            this.clear();
-        });
+      };
+      const lost = () => this.setModHeld(false);
+      window.addEventListener('keydown', keys);
+      window.addEventListener('keyup', keys);
+      window.addEventListener('blur', lost);
+      offs.push(() => {
+        window.removeEventListener('keydown', keys);
+        window.removeEventListener('keyup', keys);
+        window.removeEventListener('blur', lost);
+      });
     }
-    setModHeld(held) {
-        if (held !== this.held) {
-            this.held = held;
-            this.update();
-        }
+    language.onDispose(() => {
+      for (const off of offs) {
+        off();
+      }
+      this.clear();
+    });
+  }
+  setModHeld(held) {
+    if (held !== this.held) {
+      this.held = held;
+      this.update();
     }
-    clear() {
-        this.request++;
-        this.lookup?.abort();
-        this.shownKey = '';
-        if (this.drawn) {
-            this.drawn = false;
-            this.language.editor.setLink(null);
-        }
+  }
+  clear() {
+    this.request++;
+    this.lookup?.abort();
+    this.shownKey = '';
+    if (this.drawn) {
+      this.drawn = false;
+      this.language.editor.setLink(null);
     }
-    update() {
-        const { pointer } = this;
-        if (!this.held || pointer === null || !this.language.project.service.supports('textDocument/definition', this.language.uri)) {
-            this.clear();
-            return;
-        }
-        const { editor, project, uri } = this.language;
-        const line = lineTextOf(editor, pointer.line);
-        const word = isIdentifierCharacter(line[pointer.character] ?? '') ? wordRangeAt(line, pointer) : null;
-        if (word === null) {
-            this.clear();
-            return;
-        }
-        const key = `${word.start.line}:${word.start.character}`;
-        if (key === this.shownKey) {
-            return;
-        }
-        this.clear();
-        this.shownKey = key;
-        const request = ++this.request;
-        const controller = new AbortController();
-        this.lookup = controller;
-        project.service
-            .definition(uri, pointer, { signal: controller.signal })
-            .then((result) => {
-            if (request === this.request && locationsOf(result).length > 0) {
-                this.drawn = true;
-                editor.setLink(word);
-            }
-        })
-            .catch(() => undefined);
+  }
+  update() {
+    const {
+      pointer
+    } = this;
+    if (!this.held || pointer === null || !this.language.project.service.supports('textDocument/definition', this.language.uri)) {
+      this.clear();
+      return;
+    }
+    const {
+      editor,
+      project,
+      uri
+    } = this.language;
+    const line = lineTextOf(editor, pointer.line);
+    const word = isIdentifierCharacter(line[pointer.character] ?? '') ? wordRangeAt(line, pointer) : null;
+    if (word === null) {
+      this.clear();
+      return;
+    }
+    const key = `${word.start.line}:${word.start.character}`;
+    if (key === this.shownKey) {
+      return;
     }
-}
+    this.clear();
+    this.shownKey = key;
+    const request = ++this.request;
+    const controller = new AbortController();
+    this.lookup = controller;
+    project.service.definition(uri, pointer, {
+      signal: controller.signal
+    }).then(result => {
+      if (request === this.request && locationsOf(result).length > 0) {
+        this.drawn = true;
+        editor.setLink(word);
+      }
+    }).catch(() => undefined);
+  }
+}

package/dist/diagnostics-model.js

@@ -1,4 +1,9 @@
-const SEVERITIES = { 1: 'error', 2: 'warning', 3: 'info', 4: 'hint' };
+const SEVERITIES = {
+  1: 'error',
+  2: 'warning',
+  3: 'info',
+  4: 'hint'
+};
 const HINT = 4;
 const UNNECESSARY = 1;
 const DEPRECATED = 2;
@@ -6,84 +11,98 @@ const DEPRECATED = 2;
 const TICK_MESSAGE_LENGTH = 300;
 /* A report that names no severity is an error, which is the safer side to be wrong on. */
 export function severityOf(diagnostic) {
-    return SEVERITIES[diagnostic.severity ?? 1] ?? 'error';
+  return SEVERITIES[diagnostic.severity ?? 1] ?? 'error';
 }
 export function markerOf(diagnostic) {
-    return {
-        range: diagnostic.range,
-        severity: severityOf(diagnostic),
-        unnecessary: diagnostic.tags?.includes(UNNECESSARY) === true,
-        deprecated: diagnostic.tags?.includes(DEPRECATED) === true,
-        message: diagnostic.message.length > TICK_MESSAGE_LENGTH ? `${diagnostic.message.slice(0, TICK_MESSAGE_LENGTH)}…` : diagnostic.message
-    };
+  return {
+    range: diagnostic.range,
+    severity: severityOf(diagnostic),
+    unnecessary: diagnostic.tags?.includes(UNNECESSARY) === true,
+    deprecated: diagnostic.tags?.includes(DEPRECATED) === true,
+    message: diagnostic.message.length > TICK_MESSAGE_LENGTH ? `${diagnostic.message.slice(0, TICK_MESSAGE_LENGTH)}…` : diagnostic.message
+  };
 }
 /* A diagnostic that names no severity counts as an error. */
 export function problemCountsOf(diagnostics) {
-    const count = (severity) => diagnostics.filter((diagnostic) => (diagnostic.severity ?? 1) === severity).length;
-    return { error: count(1), warning: count(2), info: count(3) };
+  const count = severity => diagnostics.filter(diagnostic => (diagnostic.severity ?? 1) === severity).length;
+  return {
+    error: count(1),
+    warning: count(2),
+    info: count(3)
+  };
 }
 export function comparePositions(left, right) {
-    return left.line === right.line ? left.character - right.character : left.line - right.line;
+  return left.line === right.line ? left.character - right.character : left.line - right.line;
 }
 /* Where an insertion of `text` at `start` ends, counting a line break of any kind once. */
 export function endOfInsertion(start, text) {
-    const lines = text.split(/\r\n|\r|\n/);
-    return lines.length === 1
-        ? { line: start.line, character: start.character + text.length }
-        : { line: start.line + lines.length - 1, character: lines[lines.length - 1].length };
+  const lines = text.split(/\r\n|\r|\n/);
+  return lines.length === 1 ? {
+    line: start.line,
+    character: start.character + text.length
+  } : {
+    line: start.line + lines.length - 1,
+    character: lines[lines.length - 1].length
+  };
 }
 /* Where a position is once one change is applied to the text it was in. One inside the replaced range lands after the new text. */
 export function shiftPosition(position, change) {
-    const { start, end } = change.range;
-    if (comparePositions(position, start) < 0) {
-        return position;
-    }
-    const inserted = endOfInsertion(start, change.text);
-    if (comparePositions(position, end) < 0) {
-        return inserted;
-    }
-    return position.line === end.line
-        ? { line: inserted.line, character: inserted.character + (position.character - end.character) }
-        : { line: position.line + (inserted.line - end.line), character: position.character };
+  const {
+    start,
+    end
+  } = change.range;
+  if (comparePositions(position, start) < 0) {
+    return position;
+  }
+  const inserted = endOfInsertion(start, change.text);
+  if (comparePositions(position, end) < 0) {
+    return inserted;
+  }
+  return position.line === end.line ? {
+    line: inserted.line,
+    character: inserted.character + (position.character - end.character)
+  } : {
+    line: position.line + (inserted.line - end.line),
+    character: position.character
+  };
 }
 export function shiftRange(range, changes) {
-    let start = range.start;
-    let end = range.end;
-    for (const change of changes) {
-        start = shiftPosition(start, change);
-        end = shiftPosition(end, change);
-    }
-    return { start, end };
+  let start = range.start;
+  let end = range.end;
+  for (const change of changes) {
+    start = shiftPosition(start, change);
+    end = shiftPosition(end, change);
+  }
+  return {
+    start,
+    end
+  };
 }
 /* A range holds a position from its start up to and including its end, so a caret at either edge of a word is on it. An empty range holds only its own place. */
 export function rangeHolds(range, position) {
-    return comparePositions(range.start, position) <= 0 && comparePositions(position, range.end) <= 0;
+  return comparePositions(range.start, position) <= 0 && comparePositions(position, range.end) <= 0;
 }
 /* The problems under a position, worst first. A hint is not a problem, so it is left to the colors and the faded text. */
 export function problemsAt(problems, position) {
-    const rank = (problem) => problem.diagnostic.severity ?? 1;
-    return problems
-        .filter((problem) => (problem.diagnostic.severity ?? 1) < HINT && rangeHolds(problem.diagnostic.range, position))
-        .sort((left, right) => rank(left) - rank(right));
+  const rank = problem => problem.diagnostic.severity ?? 1;
+  return problems.filter(problem => (problem.diagnostic.severity ?? 1) < HINT && rangeHolds(problem.diagnostic.range, position)).sort((left, right) => rank(left) - rank(right));
 }
 /* The start of the first problem after the position, or the last one before it when `direction` is back; it wraps round the document. */
 export function neighborProblem(problems, from, direction) {
-    const candidates = problems
-        .filter((problem) => (problem.diagnostic.severity ?? 1) < HINT)
-        .sort((left, right) => comparePositions(left.diagnostic.range.start, right.diagnostic.range.start));
-    if (candidates.length === 0) {
-        return null;
-    }
-    if (direction === 1) {
-        return candidates.find((problem) => comparePositions(problem.diagnostic.range.start, from) > 0) ?? candidates[0];
-    }
-    return [...candidates].reverse().find((problem) => comparePositions(problem.diagnostic.range.start, from) < 0) ?? candidates[candidates.length - 1];
+  const candidates = problems.filter(problem => (problem.diagnostic.severity ?? 1) < HINT).sort((left, right) => comparePositions(left.diagnostic.range.start, right.diagnostic.range.start));
+  if (candidates.length === 0) {
+    return null;
+  }
+  if (direction === 1) {
+    return candidates.find(problem => comparePositions(problem.diagnostic.range.start, from) > 0) ?? candidates[0];
+  }
+  return [...candidates].reverse().find(problem => comparePositions(problem.diagnostic.range.start, from) < 0) ?? candidates[candidates.length - 1];
 }
 /* `ts(2551)`, or the code alone, or the source alone, whichever the server gave. */
 export function codeLabelOf(diagnostic) {
-    const code = diagnostic.code === undefined ? '' : String(diagnostic.code);
-    if (diagnostic.source !== undefined && code !== '') {
-        return `${diagnostic.source}(${code})`;
-    }
-    return code !== '' ? code : (diagnostic.source ?? '');
-}
+  const code = diagnostic.code === undefined ? '' : String(diagnostic.code);
+  if (diagnostic.source !== undefined && code !== '') {
+    return `${diagnostic.source}(${code})`;
+  }
+  return code !== '' ? code : diagnostic.source ?? '';
+}