@adecore/editor-react 0.31.12 → 0.33.0

package/dist/hover.js

@@ -16,267 +16,307 @@ const TOAST_ID = 'language-hover';
  * the word or on the card itself, and goes when the text, the scroll or the focus moves.
  */
 export class HoverFeature {
-    language;
-    timers;
-    /* The counts asked for since the text last changed, by the symbol's position, so moving back to a name does not ask again. */
-    counts = new Map();
-    showTimer;
-    hideTimer;
-    countTimer;
-    inCard = false;
-    referenceCount = true;
-    /* Counts every request, so an answer that arrives after the pointer moved on is dropped. */
-    request = 0;
-    lookup = null;
-    /* A card the keyboard opened: scrolling does not take it away, since it was never under a pointer. Moving the caret does. */
-    pinned = false;
-    /* The card is being read: an explanation runs in it or is shown, so the pointer going elsewhere neither closes nor replaces it. */
-    held = false;
-    constructor(language, timers = realTimers) {
-        this.language = language;
-        this.timers = timers;
-        const { editor } = language;
-        const offs = [
-            editor.onHover((hover) => this.moved(hover)),
-            editor.onTextChange(() => {
-                this.counts.clear();
-                this.hide();
-            }),
-            editor.onClick(() => {
-                if (this.held) {
-                    this.hide();
-                }
-                return false;
-            }),
-            editor.onViewChange(() => {
-                if (!this.pinned) {
-                    this.hide();
-                }
-            }),
-            editor.onCaret(() => {
-                if (this.pinned) {
-                    this.hide();
-                }
-            }),
-            language.onKey((event) => {
-                if (isShortcut(this.language.shortcuts.quickInfo, event)) {
-                    this.quickInfo();
-                    return true;
-                }
-                if (event.key === 'Escape' && this.language.popups.getState().hover !== null && this.language.popups.getState().callHierarchy === null) {
-                    this.hide();
-                    return true;
-                }
-                return false;
-            }, KEY_PRIORITY.hover)
-        ];
-        language.onDispose(() => {
-            for (const off of offs) {
-                off();
-            }
-            this.hide();
-        });
+  language;
+  timers;
+  /* The counts asked for since the text last changed, by the symbol's position, so moving back to a name does not ask again. */
+  counts = new Map();
+  showTimer;
+  hideTimer;
+  countTimer;
+  inCard = false;
+  referenceCount = true;
+  /* Counts every request, so an answer that arrives after the pointer moved on is dropped. */
+  request = 0;
+  lookup = null;
+  /* A card the keyboard opened: scrolling does not take it away, since it was never under a pointer. Moving the caret does. */
+  pinned = false;
+  /* The card is being read: an explanation runs in it or is shown, so the pointer going elsewhere neither closes nor replaces it. */
+  held = false;
+  constructor(language, timers = realTimers) {
+    this.language = language;
+    this.timers = timers;
+    const {
+      editor
+    } = language;
+    const offs = [editor.onHover(hover => this.moved(hover)), editor.onTextChange(() => {
+      this.counts.clear();
+      this.hide();
+    }), editor.onClick(() => {
+      if (this.held) {
+        this.hide();
+      }
+      return false;
+    }), editor.onViewChange(() => {
+      if (!this.pinned) {
+        this.hide();
+      }
+    }), editor.onCaret(() => {
+      if (this.pinned) {
+        this.hide();
+      }
+    }), language.onKey(event => {
+      if (isShortcut(this.language.shortcuts.quickInfo, event)) {
+        this.quickInfo();
+        return true;
+      }
+      if (event.key === 'Escape' && this.language.popups.getState().hover !== null && this.language.popups.getState().callHierarchy === null) {
+        this.hide();
+        return true;
+      }
+      return false;
+    }, KEY_PRIORITY.hover)];
+    language.onDispose(() => {
+      for (const off of offs) {
+        off();
+      }
+      this.hide();
+    });
+  }
+  configure(settings) {
+    this.referenceCount = settings.referenceCount !== false;
+    if (!this.referenceCount) {
+      this.timers.clear(this.countTimer);
     }
-    configure(settings) {
-        this.referenceCount = settings.referenceCount !== false;
-        if (!this.referenceCount) {
-            this.timers.clear(this.countTimer);
-        }
+  }
+  /* The pointer entered or left the card, which is where a link in it is clicked. */
+  holdCard(inside) {
+    this.inCard = inside;
+    if (inside) {
+      this.timers.clear(this.hideTimer);
+    } else {
+      this.scheduleHide();
     }
-    /* The pointer entered or left the card, which is where a link in it is clicked. */
-    holdCard(inside) {
-        this.inCard = inside;
-        if (inside) {
-            this.timers.clear(this.hideTimer);
-        }
-        else {
-            this.scheduleHide();
-        }
+  }
+  /* The card for the caret, as a pointer resting there would open it. */
+  quickInfo() {
+    const request = ++this.request;
+    this.timers.clear(this.showTimer);
+    void this.show(this.language.editor.getCaret(), request, true);
+  }
+  /* The problems at a position as a card, at once; what the servers say about the symbol is left for the pointer and Quick Info. */
+  showProblemsAt(position) {
+    const problems = this.language.diagnostics.at(position);
+    if (problems.length === 0) {
+      return false;
     }
-    /* The card for the caret, as a pointer resting there would open it. */
-    quickInfo() {
-        const request = ++this.request;
-        this.timers.clear(this.showTimer);
-        void this.show(this.language.editor.getCaret(), request, true);
+    this.hide();
+    this.pinned = true;
+    this.present(position, problems, null, problems[0].diagnostic.range);
+    return true;
+  }
+  /* Keeps the card up until Escape, a press in the text, an edit or a move of the caret. */
+  keep() {
+    this.pinned = true;
+    this.held = true;
+    this.timers.clear(this.hideTimer);
+  }
+  /* A card of its own for a range, such as the explanation of a selection, which stays like the card Quick Info opens. */
+  showRange(range) {
+    this.hide();
+    this.keep();
+    this.present(range.start, [], null, range);
+  }
+  /* A card of text another feature brings, such as the tooltip of an inlay hint, which goes the way any hover card does. */
+  showText(position, text) {
+    this.hide();
+    this.present(position, [], {
+      text,
+      definition: null,
+      word: '',
+      references: null,
+      plain: true
+    }, null);
+  }
+  /* The pointer left what a card was opened for: it closes unless the pointer reaches the card in time. */
+  release() {
+    this.scheduleHide();
+  }
+  hide() {
+    this.pinned = false;
+    this.held = false;
+    this.request++;
+    this.lookup?.abort();
+    this.timers.clear(this.showTimer);
+    this.timers.clear(this.hideTimer);
+    this.timers.clear(this.countTimer);
+    this.inCard = false;
+    if (this.language.popups.getState().hover !== null) {
+      this.language.popups.setState({
+        hover: null
+      });
     }
-    /* The problems at a position as a card, at once; what the servers say about the symbol is left for the pointer and Quick Info. */
-    showProblemsAt(position) {
-        const problems = this.language.diagnostics.at(position);
-        if (problems.length === 0) {
-            return false;
-        }
-        this.hide();
-        this.pinned = true;
-        this.present(position, problems, null, problems[0].diagnostic.range);
-        return true;
+  }
+  moved(hover) {
+    if (this.held) {
+      return;
     }
-    /* Keeps the card up until Escape, a press in the text, an edit or a move of the caret. */
-    keep() {
-        this.pinned = true;
-        this.held = true;
-        this.timers.clear(this.hideTimer);
+    this.timers.clear(this.showTimer);
+    if (hover === null) {
+      this.request++;
+      this.scheduleHide();
+      return;
     }
-    /* A card of its own for a range, such as the explanation of a selection, which stays like the card Quick Info opens. */
-    showRange(range) {
-        this.hide();
-        this.keep();
-        this.present(range.start, [], null, range);
+    const shown = this.language.popups.getState().hover;
+    if (shown !== null && rangeHolds(shown.subject, hover.position)) {
+      this.timers.clear(this.hideTimer);
+      return;
     }
-    /* A card of text another feature brings, such as the tooltip of an inlay hint, which goes the way any hover card does. */
-    showText(position, text) {
-        this.hide();
-        this.present(position, [], { text, definition: null, word: '', references: null, plain: true }, null);
+    this.scheduleHide();
+    const request = ++this.request;
+    this.showTimer = this.timers.set(() => void this.show(hover.position, request, false), SHOW_DELAY_MS);
+  }
+  scheduleHide() {
+    this.timers.clear(this.hideTimer);
+    if (this.language.popups.getState().hover === null || this.inCard || this.held) {
+      return;
     }
-    /* The pointer left what a card was opened for: it closes unless the pointer reaches the card in time. */
-    release() {
-        this.scheduleHide();
+    this.hideTimer = this.timers.set(() => {
+      if (!this.inCard) {
+        this.hide();
+      }
+    }, HIDE_DELAY_MS);
+  }
+  /* What the servers say at a position: the hover text and the definition, each of which may be missing without the other. */
+  async ask(position, signal) {
+    const {
+      service
+    } = this.language.project;
+    const {
+      uri
+    } = this.language;
+    if (!service.supports('textDocument/hover', uri)) {
+      return {
+        info: null,
+        range: null
+      };
     }
-    hide() {
-        this.pinned = false;
-        this.held = false;
-        this.request++;
-        this.lookup?.abort();
-        this.timers.clear(this.showTimer);
-        this.timers.clear(this.hideTimer);
-        this.timers.clear(this.countTimer);
-        this.inCard = false;
-        if (this.language.popups.getState().hover !== null) {
-            this.language.popups.setState({ hover: null });
-        }
+    const [hover, definition] = await Promise.all([service.hover(uri, position, {
+      signal
+    }).catch(() => null), service.supports('textDocument/definition', uri) ? service.definition(uri, position, {
+      signal
+    }).catch(() => null) : null]);
+    if (hover === null) {
+      return {
+        info: null,
+        range: null
+      };
     }
-    moved(hover) {
-        if (this.held) {
-            return;
-        }
-        this.timers.clear(this.showTimer);
-        if (hover === null) {
-            this.request++;
-            this.scheduleHide();
-            return;
-        }
-        const shown = this.language.popups.getState().hover;
-        if (shown !== null && rangeHolds(shown.subject, hover.position)) {
-            this.timers.clear(this.hideTimer);
-            return;
-        }
-        this.scheduleHide();
-        const request = ++this.request;
-        this.showTimer = this.timers.set(() => void this.show(hover.position, request, false), SHOW_DELAY_MS);
+    const text = hoverTextOf(hover);
+    if (isEmptyHover(text)) {
+      return {
+        info: null,
+        range: null
+      };
     }
-    scheduleHide() {
-        this.timers.clear(this.hideTimer);
-        if (this.language.popups.getState().hover === null || this.inCard || this.held) {
-            return;
-        }
-        this.hideTimer = this.timers.set(() => {
-            if (!this.inCard) {
-                this.hide();
-            }
-        }, HIDE_DELAY_MS);
+    const {
+      editor
+    } = this.language;
+    const line = lineTextOf(editor, position.line);
+    const word = wordRangeAt(line, position);
+    return {
+      info: {
+        text,
+        definition: locationsOf(definition)[0] ?? null,
+        word: word === null ? '' : line.slice(word.start.character, word.end.character),
+        references: null
+      },
+      range: hover.range ?? null
+    };
+  }
+  async show(position, request, pinned) {
+    const problems = this.language.diagnostics.at(position);
+    this.lookup?.abort();
+    const controller = new AbortController();
+    this.lookup = controller;
+    const {
+      info,
+      range
+    } = await this.ask(position, controller.signal);
+    if (request !== this.request) {
+      return;
     }
-    /* What the servers say at a position: the hover text and the definition, each of which may be missing without the other. */
-    async ask(position, signal) {
-        const { service } = this.language.project;
-        const { uri } = this.language;
-        if (!service.supports('textDocument/hover', uri)) {
-            return { info: null, range: null };
-        }
-        const [hover, definition] = await Promise.all([
-            service.hover(uri, position, { signal }).catch(() => null),
-            service.supports('textDocument/definition', uri) ? service.definition(uri, position, { signal }).catch(() => null) : null
-        ]);
-        if (hover === null) {
-            return { info: null, range: null };
-        }
-        const text = hoverTextOf(hover);
-        if (isEmptyHover(text)) {
-            return { info: null, range: null };
-        }
-        const { editor } = this.language;
-        const line = lineTextOf(editor, position.line);
-        const word = wordRangeAt(line, position);
-        return {
-            info: {
-                text,
-                definition: locationsOf(definition)[0] ?? null,
-                word: word === null ? '' : line.slice(word.start.character, word.end.character),
-                references: null
-            },
-            range: hover.range ?? null
-        };
+    if (problems.length === 0 && info === null) {
+      this.hide();
+      if (pinned && (await this.language.inlayHints.showTooltipAt(position))) {
+        this.pinned = true;
+        return;
+      }
+      if (pinned) {
+        this.language.project.host.notify?.({
+          id: TOAST_ID,
+          kind: 'error',
+          title: this.language.project.i18n.t('editor:language.hover.none')
+        });
+      }
+      return;
     }
-    async show(position, request, pinned) {
-        const problems = this.language.diagnostics.at(position);
-        this.lookup?.abort();
-        const controller = new AbortController();
-        this.lookup = controller;
-        const { info, range } = await this.ask(position, controller.signal);
-        if (request !== this.request) {
-            return;
-        }
-        if (problems.length === 0 && info === null) {
-            this.hide();
-            if (pinned && (await this.language.inlayHints.showTooltipAt(position))) {
-                this.pinned = true;
-                return;
-            }
-            if (pinned) {
-                this.language.project.host.notify?.({ id: TOAST_ID, kind: 'error', title: this.language.project.i18n.t('editor:language.hover.none') });
-            }
-            return;
-        }
-        this.pinned = pinned;
-        this.present(position, problems, info, problems[0]?.diagnostic.range ?? range);
-        if (info !== null && this.referenceCount) {
-            this.scheduleCount(position, request, controller.signal);
-        }
+    this.pinned = pinned;
+    this.present(position, problems, info, problems[0]?.diagnostic.range ?? range);
+    if (info !== null && this.referenceCount) {
+      this.scheduleCount(position, request, controller.signal);
     }
-    present(position, problems, info, range) {
-        const subject = range ?? { start: position, end: position };
-        this.timers.clear(this.hideTimer);
-        this.language.popups.setState({
-            hover: {
-                anchor: subject.start.line === position.line ? subject.start : position,
-                position,
-                subject,
-                problems,
-                info
-            }
-        });
+  }
+  present(position, problems, info, range) {
+    const subject = range ?? {
+      start: position,
+      end: position
+    };
+    this.timers.clear(this.hideTimer);
+    this.language.popups.setState({
+      hover: {
+        anchor: subject.start.line === position.line ? subject.start : position,
+        position,
+        subject,
+        problems,
+        info
+      }
+    });
+  }
+  /* The references of the symbol are counted once the card has stayed up a while, or at once when the text has not changed since they were. */
+  scheduleCount(position, request, signal) {
+    const key = `${position.line}:${this.wordStart(position)}`;
+    const known = this.counts.get(key);
+    if (known !== undefined) {
+      this.showCount(known, request);
+      return;
     }
-    /* The references of the symbol are counted once the card has stayed up a while, or at once when the text has not changed since they were. */
-    scheduleCount(position, request, signal) {
-        const key = `${position.line}:${this.wordStart(position)}`;
-        const known = this.counts.get(key);
-        if (known !== undefined) {
-            this.showCount(known, request);
-            return;
-        }
-        this.timers.clear(this.countTimer);
-        this.countTimer = this.timers.set(() => void this.count(position, key, request, signal), COUNT_DELAY_MS);
+    this.timers.clear(this.countTimer);
+    this.countTimer = this.timers.set(() => void this.count(position, key, request, signal), COUNT_DELAY_MS);
+  }
+  /* How many places use the symbol, which can take a while in a large project and so arrives after the card does. */
+  async count(position, key, request, signal) {
+    const {
+      service
+    } = this.language.project;
+    if (request !== this.request || !this.referenceCount || !service.supports('textDocument/references', this.language.uri)) {
+      return;
     }
-    /* How many places use the symbol, which can take a while in a large project and so arrives after the card does. */
-    async count(position, key, request, signal) {
-        const { service } = this.language.project;
-        if (request !== this.request || !this.referenceCount || !service.supports('textDocument/references', this.language.uri)) {
-            return;
-        }
-        const found = await service.references(this.language.uri, position, false, { signal }).catch(() => null);
-        if (found === null) {
-            return;
-        }
-        this.counts.set(key, found.length);
-        this.showCount(found.length, request);
+    const found = await service.references(this.language.uri, position, false, {
+      signal
+    }).catch(() => null);
+    if (found === null) {
+      return;
     }
-    showCount(count, request) {
-        const shown = this.language.popups.getState().hover;
-        if (request === this.request && shown?.info != null) {
-            this.language.popups.setState({ hover: { ...shown, info: { ...shown.info, references: count } } });
+    this.counts.set(key, found.length);
+    this.showCount(found.length, request);
+  }
+  showCount(count, request) {
+    const shown = this.language.popups.getState().hover;
+    if (request === this.request && shown?.info != null) {
+      this.language.popups.setState({
+        hover: {
+          ...shown,
+          info: {
+            ...shown.info,
+            references: count
+          }
         }
+      });
     }
-    /* Where the word at a position starts, which names the symbol for the cache. */
-    wordStart(position) {
-        const line = lineTextOf(this.language.editor, position.line);
-        return wordRangeAt(line, position)?.start.character ?? position.character;
-    }
-}
+  }
+  /* Where the word at a position starts, which names the symbol for the cache. */
+  wordStart(position) {
+    const line = lineTextOf(this.language.editor, position.line);
+    return wordRangeAt(line, position)?.start.character ?? position.character;
+  }
+}

package/dist/index.js

@@ -3,15 +3,15 @@ export { KEY_PRIORITY } from './key-priority.js';
 export { realTimers } from './timers.js';
 export {} from './semantic-tokens.js';
 export { ProjectLanguage } from './project-language.js';
-export { EditorView } from './EditorView.js';
+export { EditorView } from "./EditorView.js";
 export { createHolder } from './holder.js';
-export { LanguagePopups } from './LanguagePopups.js';
-export { AnchoredPopup } from './AnchoredPopup.js';
-export { SignatureCard } from './SignatureCard.js';
+export { LanguagePopups } from "./LanguagePopups.js";
+export { AnchoredPopup } from "./AnchoredPopup.js";
+export { SignatureCard } from "./SignatureCard.js";
 export {} from './rendered-docs.js';
-export { EditorRenderingProvider } from './rendering.js';
-export { FindReplace } from './FindReplace.js';
-export { ChangeReview } from './ChangeReview.js';
+export { EditorRenderingProvider } from "./rendering.js";
+export { FindReplace } from "./FindReplace.js";
+export { ChangeReview } from "./ChangeReview.js";
 export { ProjectProblems, serviceProblems, countsOf } from './project-problems.js';
 export { applyWorkspaceEdit, supportedResourceOperations } from './workspace-edit.js';
 export { useProblemCounts } from './use-problem-counts.js';
@@ -20,8 +20,8 @@ export { highlightLayers } from './highlight-layers.js';
 export {} from './navigation-history.js';
 export { openingPlace, viewStates, followViewStates, viewStateKey, forgetMovesFrom } from './view-state.js';
 export { lspLanguageIdOf, shikiLanguageOf, shikiLanguageOfPath } from './language-ids.js';
-export { AttributionCard } from './AttributionCard.js';
+export { AttributionCard } from "./AttributionCard.js";
 export { ReviewGroup, joinReviewGroup } from './review-group.js';
-export { DiffView } from './DiffView.js';
+export { DiffView } from "./DiffView.js";
 export { diffSyntaxDocument } from './diff-syntax.js';
-export { decoratePatch, usePatchDecorations } from './patch-decorations.js';
+export { decoratePatch, usePatchDecorations } from './patch-decorations.js';