@adecore/editor-react 0.31.12 → 0.33.0

package/dist/project-language.js

@@ -1,5 +1,5 @@
 import { disposeSnippetTransforms } from './snippet-transform-queue.js';
-import i18next, {} from 'i18next';
+import i18next from 'i18next';
 import { fileUriToPath, pathToFileUri } from '@adecore/lsp';
 import { NavigationHistory } from './navigation-history.js';
 import { ProjectProblems, serviceProblems } from './project-problems.js';
@@ -8,236 +8,253 @@ import { relativeTo } from './paths.js';
 import { PANEL_BODY_HEIGHT } from './panel-size.js';
 /* Sends one editor's edits to the document, holding them until the document is open. */
 class DocumentSync {
-    ready;
-    editor;
-    service;
-    uri;
-    stop;
-    pending = [];
-    opened = false;
-    disposed = false;
-    constructor(service, uri, languageId, editor) {
-        this.service = service;
-        this.uri = uri;
-        this.editor = editor;
-        this.stop = editor.onTextChange((change) => this.changed(change.changes));
-        this.ready = service.openDocument({ uri, languageId, text: editor.getText() }).then(() => {
-            this.opened = true;
-            if (!this.disposed) {
-                this.flush();
-            }
-        });
-        // A failed open is also a document nothing can be asked of; the features' own requests say so.
-        this.ready.catch(() => undefined);
-    }
-    get text() {
-        return this.editor.getText();
-    }
-    dispose() {
-        this.disposed = true;
-        this.pending = [];
-        this.stop();
-    }
-    changed(changes) {
-        this.pending.push(...changes);
-        if (this.opened) {
-            this.flush();
-        }
+  ready;
+  editor;
+  service;
+  uri;
+  stop;
+  pending = [];
+  opened = false;
+  disposed = false;
+  constructor(service, uri, languageId, editor) {
+    this.service = service;
+    this.uri = uri;
+    this.editor = editor;
+    this.stop = editor.onTextChange(change => this.changed(change.changes));
+    this.ready = service.openDocument({
+      uri,
+      languageId,
+      text: editor.getText()
+    }).then(() => {
+      this.opened = true;
+      if (!this.disposed) {
+        this.flush();
+      }
+    });
+    // A failed open is also a document nothing can be asked of; the features' own requests say so.
+    this.ready.catch(() => undefined);
+  }
+  get text() {
+    return this.editor.getText();
+  }
+  dispose() {
+    this.disposed = true;
+    this.pending = [];
+    this.stop();
+  }
+  changed(changes) {
+    this.pending.push(...changes);
+    if (this.opened) {
+      this.flush();
     }
-    flush() {
-        if (this.pending.length === 0) {
-            return;
-        }
-        const changes = this.pending;
-        this.pending = [];
-        void this.service.changeDocument(this.uri, changes).catch(() => undefined);
+  }
+  flush() {
+    if (this.pending.length === 0) {
+      return;
     }
+    const changes = this.pending;
+    this.pending = [];
+    void this.service.changeDocument(this.uri, changes).catch(() => undefined);
+  }
 }
 function filesOf(targets) {
-    return targets.map((target) => {
-        const { path, directory } = typeof target === 'string' ? { path: target, directory: false } : { path: target.path, directory: target.directory === true };
-        return { uri: pathToFileUri(path), directory };
-    });
+  return targets.map(target => {
+    const {
+      path,
+      directory
+    } = typeof target === 'string' ? {
+      path: target,
+      directory: false
+    } : {
+      path: target.path,
+      directory: target.directory === true
+    };
+    return {
+      uri: pathToFileUri(path),
+      directory
+    };
+  });
 }
 /*
  * A shared language service and document ownership for the editors of a project. Two editors on the same
  * file hold one document, and only the first one sends changes, since both would report the same edit.
  */
 export class ProjectLanguage {
-    service;
-    host;
-    i18n;
-    folder;
-    problems;
-    history = new NavigationHistory();
-    holders = new Map();
-    files;
-    /* The body height of the peek and call hierarchy panels, shared by the editors of the project. */
-    panelBodyHeight;
-    panelListeners = new Set();
-    pendingCaret = null;
-    lastPlace = null;
-    disposed = false;
-    constructor(service, host = {}) {
-        this.service = service;
-        this.host = host;
-        this.i18n = host.i18n ?? i18next;
-        this.folder = host.folder ?? '';
-        this.files = host.files ?? null;
-        this.panelBodyHeight = host.panelBodyHeight ?? PANEL_BODY_HEIGHT;
-        this.problems = new ProjectProblems(host.problemSource ?? serviceProblems(service, (uri) => this.pathOfLocation(uri) ?? uri));
-    }
-    /* Open panels of other editors of the project follow a resize. */
-    onPanelBodyChange(listener) {
-        this.panelListeners.add(listener);
-        return () => this.panelListeners.delete(listener);
-    }
-    resizePanelBody(height) {
-        if (height === this.panelBodyHeight) {
-            return;
-        }
-        this.panelBodyHeight = height;
-        this.panelListeners.forEach((listener) => listener(height));
-        this.host.onPanelResize?.(height);
-    }
-    pathOfLocation(uri) {
-        if (this.host.pathOfUri !== undefined) {
-            return this.host.pathOfUri(uri);
-        }
-        const path = fileUriToPath(uri);
-        return path !== null && this.folder !== '' ? relativeTo(path, this.folder) : path;
-    }
-    /* Makes an edit of a language server: an open document takes it as one undo step and any other file gets an unsaved draft. */
-    applyWorkspaceEdit(edit) {
-        const { service } = this;
-        return applyWorkspaceEdit(edit, {
-            editorOf: (uri) => this.holders.get(uri)?.editors[0],
-            files: this.files,
-            ...(service.versionOf === undefined ? {} : { versionOf: (uri) => service.versionOf(uri) })
-        });
+  service;
+  host;
+  i18n;
+  folder;
+  problems;
+  history = new NavigationHistory();
+  holders = new Map();
+  files;
+  /* The body height of the peek and call hierarchy panels, shared by the editors of the project. */
+  panelBodyHeight;
+  panelListeners = new Set();
+  pendingCaret = null;
+  lastPlace = null;
+  disposed = false;
+  constructor(service, host = {}) {
+    this.service = service;
+    this.host = host;
+    this.i18n = host.i18n ?? i18next;
+    this.folder = host.folder ?? '';
+    this.files = host.files ?? null;
+    this.panelBodyHeight = host.panelBodyHeight ?? PANEL_BODY_HEIGHT;
+    this.problems = new ProjectProblems(host.problemSource ?? serviceProblems(service, uri => this.pathOfLocation(uri) ?? uri));
+  }
+  /* Open panels of other editors of the project follow a resize. */
+  onPanelBodyChange(listener) {
+    this.panelListeners.add(listener);
+    return () => this.panelListeners.delete(listener);
+  }
+  resizePanelBody(height) {
+    if (height === this.panelBodyHeight) {
+      return;
     }
-    /*
-     * What the servers want changed before files are made, for a host that makes them outside a language server's
-     * edit: apply the edit with `applyWorkspaceEdit`, then make the files. Null when no server has anything to say.
-     */
-    willCreateFiles(targets) {
-        return this.service.willCreateFiles?.(filesOf(targets)) ?? Promise.resolve(null);
+    this.panelBodyHeight = height;
+    this.panelListeners.forEach(listener => listener(height));
+    this.host.onPanelResize?.(height);
+  }
+  pathOfLocation(uri) {
+    if (this.host.pathOfUri !== undefined) {
+      return this.host.pathOfUri(uri);
     }
-    /* Tells the servers that files were made, once they are. */
-    didCreateFiles(targets) {
-        return this.service.didCreateFiles?.(filesOf(targets)) ?? Promise.resolve();
-    }
-    /* What the servers want changed before files are deleted, such as the references to them; null when no server has anything to say. */
-    willDeleteFiles(targets) {
-        return this.service.willDeleteFiles?.(filesOf(targets)) ?? Promise.resolve(null);
-    }
-    /* Tells the servers that files were deleted, once they are. */
-    didDeleteFiles(targets) {
-        return this.service.didDeleteFiles?.(filesOf(targets)) ?? Promise.resolve();
+    const path = fileUriToPath(uri);
+    return path !== null && this.folder !== '' ? relativeTo(path, this.folder) : path;
+  }
+  /* Makes an edit of a language server: an open document takes it as one undo step and any other file gets an unsaved draft. */
+  applyWorkspaceEdit(edit) {
+    const {
+      service
+    } = this;
+    return applyWorkspaceEdit(edit, {
+      editorOf: uri => this.holders.get(uri)?.editors[0],
+      files: this.files,
+      ...(service.versionOf === undefined ? {} : {
+        versionOf: uri => service.versionOf(uri)
+      })
+    });
+  }
+  /*
+   * What the servers want changed before files are made, for a host that makes them outside a language server's
+   * edit: apply the edit with `applyWorkspaceEdit`, then make the files. Null when no server has anything to say.
+   */
+  willCreateFiles(targets) {
+    return this.service.willCreateFiles?.(filesOf(targets)) ?? Promise.resolve(null);
+  }
+  /* Tells the servers that files were made, once they are. */
+  didCreateFiles(targets) {
+    return this.service.didCreateFiles?.(filesOf(targets)) ?? Promise.resolve();
+  }
+  /* What the servers want changed before files are deleted, such as the references to them; null when no server has anything to say. */
+  willDeleteFiles(targets) {
+    return this.service.willDeleteFiles?.(filesOf(targets)) ?? Promise.resolve(null);
+  }
+  /* Tells the servers that files were deleted, once they are. */
+  didDeleteFiles(targets) {
+    return this.service.didDeleteFiles?.(filesOf(targets)) ?? Promise.resolve();
+  }
+  /* The text of a file as it stands now: an open document's, else a draft's or the machine's; null when it is no text file. */
+  async readText(uri) {
+    const open = this.holders.get(uri)?.sync.text;
+    if (open !== undefined) {
+      return open;
     }
-    /* The text of a file as it stands now: an open document's, else a draft's or the machine's; null when it is no text file. */
-    async readText(uri) {
-        const open = this.holders.get(uri)?.sync.text;
-        if (open !== undefined) {
-            return open;
-        }
-        const path = fileUriToPath(uri);
-        return path === null || this.files === null ? null : ((await this.files.read(path))?.text ?? null);
+    const path = fileUriToPath(uri);
+    return path === null || this.files === null ? null : (await this.files.read(path))?.text ?? null;
+  }
+  /*
+   * Opens the file of a place on its line. A file opens on a line only, so the column is kept here until the editor
+   * that shows the line asks for it with `takeCaret`.
+   */
+  openPlace(place) {
+    this.pendingCaret = place;
+    this.host.openPlace?.(place);
+  }
+  /* Where an editor's caret stands now, so a jump from a surface without an editor, such as the Problems panel, still knows what it left. */
+  noteCaret(place) {
+    this.lastPlace = place;
+  }
+  /* Opens a place from outside any editor and remembers the caret that was last seen. */
+  jumpTo(place) {
+    if (this.lastPlace !== null) {
+      this.history.record(this.lastPlace);
     }
-    /*
-     * Opens the file of a place on its line. A file opens on a line only, so the column is kept here until the editor
-     * that shows the line asks for it with `takeCaret`.
-     */
-    openPlace(place) {
-        this.pendingCaret = place;
-        this.host.openPlace?.(place);
+    this.openPlace(place);
+  }
+  /* The column an opened place waits for, once the editor of its file has put its caret on the line; each place is asked for once. */
+  takeCaret(uri, line) {
+    const pending = this.pendingCaret;
+    if (pending === null || pending.uri !== uri || pending.position.line !== line) {
+      return null;
     }
-    /* Where an editor's caret stands now, so a jump from a surface without an editor, such as the Problems panel, still knows what it left. */
-    noteCaret(place) {
-        this.lastPlace = place;
+    this.pendingCaret = null;
+    return pending.position;
+  }
+  /* Opens `uri` for the editor, or joins the editors that already hold it. */
+  acquire(uri, languageId, editor) {
+    if (this.disposed) {
+      throw new Error('The project language is disposed');
     }
-    /* Opens a place from outside any editor and remembers the caret that was last seen. */
-    jumpTo(place) {
-        if (this.lastPlace !== null) {
-            this.history.record(this.lastPlace);
-        }
-        this.openPlace(place);
+    let holder = this.holders.get(uri);
+    if (holder === undefined) {
+      holder = {
+        editors: [],
+        sync: new DocumentSync(this.service, uri, languageId, editor),
+        languageId
+      };
+      this.holders.set(uri, holder);
     }
-    /* The column an opened place waits for, once the editor of its file has put its caret on the line; each place is asked for once. */
-    takeCaret(uri, line) {
-        const pending = this.pendingCaret;
-        if (pending === null || pending.uri !== uri || pending.position.line !== line) {
-            return null;
+    holder.editors.push(editor);
+    let released = false;
+    return {
+      uri,
+      service: this.service,
+      get ready() {
+        return holder.sync.ready;
+      },
+      release: () => {
+        if (!released) {
+          released = true;
+          this.release(uri, editor);
         }
-        this.pendingCaret = null;
-        return pending.position;
+      }
+    };
+  }
+  release(uri, editor) {
+    const holder = this.holders.get(uri);
+    if (holder === undefined) {
+      return;
     }
-    /* Opens `uri` for the editor, or joins the editors that already hold it. */
-    acquire(uri, languageId, editor) {
-        if (this.disposed) {
-            throw new Error('The project language is disposed');
-        }
-        let holder = this.holders.get(uri);
-        if (holder === undefined) {
-            holder = { editors: [], sync: new DocumentSync(this.service, uri, languageId, editor), languageId };
-            this.holders.set(uri, holder);
+    holder.editors.splice(holder.editors.indexOf(editor), 1);
+    const next = holder.editors[0];
+    if (next === undefined) {
+      holder.sync.dispose();
+      this.holders.delete(uri);
+      void holder.sync.ready.catch(() => undefined).then(() => {
+        if (this.holders.has(uri)) {
+          return undefined;
         }
-        holder.editors.push(editor);
-        let released = false;
-        return {
-            uri,
-            service: this.service,
-            get ready() {
-                return holder.sync.ready;
-            },
-            release: () => {
-                if (!released) {
-                    released = true;
-                    this.release(uri, editor);
-                }
-            }
-        };
+        return this.service.closeDocument(uri);
+      }).catch(() => undefined);
+    } else if (holder.sync.editor === editor) {
+      // The editor that sent the changes is gone; the next one takes over and opens the document with its own text.
+      holder.sync.dispose();
+      holder.sync = new DocumentSync(this.service, uri, holder.languageId, next);
     }
-    release(uri, editor) {
-        const holder = this.holders.get(uri);
-        if (holder === undefined) {
-            return;
-        }
-        holder.editors.splice(holder.editors.indexOf(editor), 1);
-        const next = holder.editors[0];
-        if (next === undefined) {
-            holder.sync.dispose();
-            this.holders.delete(uri);
-            void holder.sync.ready
-                .catch(() => undefined)
-                .then(() => {
-                if (this.holders.has(uri)) {
-                    return undefined;
-                }
-                return this.service.closeDocument(uri);
-            })
-                .catch(() => undefined);
-        }
-        else if (holder.sync.editor === editor) {
-            // The editor that sent the changes is gone; the next one takes over and opens the document with its own text.
-            holder.sync.dispose();
-            holder.sync = new DocumentSync(this.service, uri, holder.languageId, next);
-        }
+  }
+  dispose() {
+    if (this.disposed) {
+      return;
     }
-    dispose() {
-        if (this.disposed) {
-            return;
-        }
-        this.disposed = true;
-        disposeSnippetTransforms(this);
-        for (const [uri, holder] of this.holders) {
-            holder.sync.dispose();
-            void holder.sync.ready
-                .catch(() => undefined)
-                .then(() => this.service.closeDocument(uri))
-                .catch(() => undefined);
-        }
-        this.holders.clear();
-        this.problems.dispose();
+    this.disposed = true;
+    disposeSnippetTransforms(this);
+    for (const [uri, holder] of this.holders) {
+      holder.sync.dispose();
+      void holder.sync.ready.catch(() => undefined).then(() => this.service.closeDocument(uri)).catch(() => undefined);
     }
-}
+    this.holders.clear();
+    this.problems.dispose();
+  }
+}

package/dist/project-problems.js

@@ -1,85 +1,97 @@
 import { comparePositions, problemCountsOf, severityOf } from './diagnostics-model.js';
-const SEVERITY_ORDER = { error: 0, warning: 1, info: 2, hint: 3 };
+const SEVERITY_ORDER = {
+  error: 0,
+  warning: 1,
+  info: 2,
+  hint: 3
+};
 /* Worst first, then in the order of the file. */
 export function compareRows(left, right) {
-    return (SEVERITY_ORDER[severityOf(left.diagnostic)] - SEVERITY_ORDER[severityOf(right.diagnostic)] ||
-        comparePositions(left.diagnostic.range.start, right.diagnostic.range.start));
+  return SEVERITY_ORDER[severityOf(left.diagnostic)] - SEVERITY_ORDER[severityOf(right.diagnostic)] || comparePositions(left.diagnostic.range.start, right.diagnostic.range.start);
 }
 /* The diagnostics a service reports, by the stored path `pathOf` gives each URI. */
-export function serviceProblems(service, pathOf = (uri) => uri) {
-    return (listener) => {
-        const subscription = service.onDiagnostics((report) => listener({ path: pathOf(report.uri), server: report.source, diagnostics: report.diagnostics }));
-        return () => subscription.dispose();
-    };
+export function serviceProblems(service, pathOf = uri => uri) {
+  return listener => {
+    const subscription = service.onDiagnostics(report => listener({
+      path: pathOf(report.uri),
+      server: report.source,
+      diagnostics: report.diagnostics
+    }));
+    return () => subscription.dispose();
+  };
 }
 /*
  * Each report replaces the previous diagnostics from that source for the file. Files with no
  * remaining problems drop out. Hints remain editor annotations rather than listed problems.
  */
 export class ProjectProblems {
-    reports = new Map();
-    files = new Map();
-    listeners = new Set();
-    stop;
-    /* The paths of `files` in order; null once a file came or went. */
-    order = [];
-    /* Made on first read after a report, so a project nobody lists does no sorting. */
-    snapshot = [];
-    /* A service stands for `serviceProblems(service, pathOf)`. */
-    constructor(source, pathOf) {
-        const listen = typeof source === 'function' ? source : serviceProblems(source, pathOf);
-        this.stop = listen((report) => this.report(report.path, report.server, report.diagnostics));
+  reports = new Map();
+  files = new Map();
+  listeners = new Set();
+  stop;
+  /* The paths of `files` in order; null once a file came or went. */
+  order = [];
+  /* Made on first read after a report, so a project nobody lists does no sorting. */
+  snapshot = [];
+  /* A service stands for `serviceProblems(service, pathOf)`. */
+  constructor(source, pathOf) {
+    const listen = typeof source === 'function' ? source : serviceProblems(source, pathOf);
+    this.stop = listen(report => this.report(report.path, report.server, report.diagnostics));
+  }
+  report(path, server, diagnostics) {
+    const kept = diagnostics.filter(diagnostic => severityOf(diagnostic) !== 'hint');
+    const servers = this.reports.get(path) ?? new Map();
+    if (kept.length === 0 && !servers.has(server)) {
+      // A clean file reported clean again, as servers do after every edit.
+      return;
     }
-    report(path, server, diagnostics) {
-        const kept = diagnostics.filter((diagnostic) => severityOf(diagnostic) !== 'hint');
-        const servers = this.reports.get(path) ?? new Map();
-        if (kept.length === 0 && !servers.has(server)) {
-            // A clean file reported clean again, as servers do after every edit.
-            return;
-        }
-        if (kept.length === 0) {
-            servers.delete(server);
-        }
-        else {
-            servers.set(server, kept);
-        }
-        if (servers.size === 0) {
-            this.reports.delete(path);
-            this.files.delete(path);
-            this.order = null;
-        }
-        else {
-            if (!this.files.has(path)) {
-                this.order = null;
-            }
-            this.reports.set(path, servers);
-            const rows = [...servers].flatMap(([name, list]) => list.map((diagnostic) => ({ diagnostic, server: name }))).sort(compareRows);
-            this.files.set(path, { path, rows });
-        }
-        this.snapshot = null;
-        for (const listener of [...this.listeners]) {
-            listener();
-        }
+    if (kept.length === 0) {
+      servers.delete(server);
+    } else {
+      servers.set(server, kept);
     }
-    /* The same array until the next report, which is what a store a component reads must hand out. */
-    getSnapshot = () => {
-        if (this.snapshot === null) {
-            this.order ??= [...this.files.keys()].sort((left, right) => left.localeCompare(right));
-            this.snapshot = this.order.map((path) => this.files.get(path));
-        }
-        return this.snapshot;
-    };
-    subscribe = (listener) => {
-        this.listeners.add(listener);
-        return () => {
-            this.listeners.delete(listener);
-        };
-    };
-    dispose() {
-        this.stop();
-        this.listeners.clear();
+    if (servers.size === 0) {
+      this.reports.delete(path);
+      this.files.delete(path);
+      this.order = null;
+    } else {
+      if (!this.files.has(path)) {
+        this.order = null;
+      }
+      this.reports.set(path, servers);
+      const rows = [...servers].flatMap(([name, list]) => list.map(diagnostic => ({
+        diagnostic,
+        server: name
+      }))).sort(compareRows);
+      this.files.set(path, {
+        path,
+        rows
+      });
+    }
+    this.snapshot = null;
+    for (const listener of [...this.listeners]) {
+      listener();
     }
+  }
+  /* The same array until the next report, which is what a store a component reads must hand out. */
+  getSnapshot = () => {
+    if (this.snapshot === null) {
+      this.order ??= [...this.files.keys()].sort((left, right) => left.localeCompare(right));
+      this.snapshot = this.order.map(path => this.files.get(path));
+    }
+    return this.snapshot;
+  };
+  subscribe = listener => {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  };
+  dispose() {
+    this.stop();
+    this.listeners.clear();
+  }
 }
 export function countsOf(files) {
-    return problemCountsOf(files.flatMap((file) => file.rows.map((row) => row.diagnostic)));
-}
+  return problemCountsOf(files.flatMap(file => file.rows.map(row => row.diagnostic)));
+}