@adecore/editor-react 0.31.11 → 0.32.0

package/dist/locales/nl.json

@@ -2,32 +2,32 @@
     "language": {
         "hover": {
             "quickFix": "Quick fix…",
-            "quickFixNone": "Deze language server biedt geen quick fixes",
+            "quickFixNone": "Geen quick fixes",
             "definition": "Ga naar definitie",
             "references_one": "{{formatted}} referentie",
             "references_other": "{{formatted}} referenties",
             "line": "Regel {{line}}",
-            "none": "Geen informatie voor deze plek"
+            "none": "Hier geen informatie"
         },
         "inlay": {
-            "failed": "De actie van de hint is mislukt: {{message}}"
+            "failed": "Kon de hintactie niet uitvoeren: {{message}}"
         },
         "edit": {
-            "staged_one": "{{count}} bestand gewijzigd en nog niet opgeslagen",
-            "staged_other": "{{count}} bestanden gewijzigd en nog niet opgeslagen",
+            "staged_one": "{{count}} niet-opgeslagen bestand",
+            "staged_other": "{{count}} niet-opgeslagen bestanden",
             "stagedMore": "{{names}} en nog {{count}}",
             "saveAll": "Alles opslaan",
-            "notSaved": "{{name}} kon niet worden opgeslagen"
+            "notSaved": "Kon {{name}} niet opslaan"
         },
         "actions": {
             "show": "Toon code actions",
             "none": "Geen code actions hier",
-            "unavailable": "Geen language server biedt hier code actions",
-            "organized": "De imports zijn al georganiseerd",
-            "noFormatter": "Geen language server formatteert dit bestand",
-            "readOnly": "Dit bestand is alleen-lezen",
-            "failed": "De actie kon niet worden toegepast: {{message}}",
-            "refused": "De wijziging is geweigerd",
+            "unavailable": "Hier geen code actions beschikbaar",
+            "organized": "Imports zijn al georganiseerd",
+            "noFormatter": "Geen formatter voor dit bestand",
+            "readOnly": "Bestand is alleen-lezen",
+            "failed": "Kon de actie niet toepassen: {{message}}",
+            "refused": "Wijziging geweigerd",
             "moreLines": "nog {{count}} regels",
             "otherFiles_one": "en nog {{count}} bestand",
             "otherFiles_other": "en nog {{count}} bestanden",
@@ -49,11 +49,11 @@
             }
         },
         "rename": {
-            "unavailable": "Geen language server hernoemt in dit bestand",
-            "nothing": "Hier is niets om te hernoemen",
-            "refused": "De language server weigerde de nieuwe naam",
-            "stale": "De tekst veranderde terwijl de hernoeming werd opgevraagd",
-            "failed": "Hernoemen mislukt: {{message}}",
+            "unavailable": "Hernoemen niet beschikbaar in dit bestand",
+            "nothing": "Niets om te hernoemen",
+            "refused": "Nieuwe naam geweigerd",
+            "stale": "De tekst veranderde voordat de hernoeming klaar was. Probeer het opnieuw.",
+            "failed": "Kon niet hernoemen: {{message}}",
             "occurrences_one": "{{formatted}} voorkomen",
             "occurrences_other": "{{formatted}} voorkomens",
             "occurrencesFiles_one": "{{formatted}} voorkomen in {{files}} bestanden",
@@ -71,9 +71,9 @@
             }
         },
         "navigation": {
-            "unavailable": "Geen language server die dat hier beantwoordt",
+            "unavailable": "Hier niet beschikbaar",
             "none": "Niets gevonden",
-            "failed": "Opzoeken mislukt: {{message}}",
+            "failed": "Kon het niet opzoeken: {{message}}",
             "titles": {
                 "definition": "Definities",
                 "declaration": "Declaraties",
@@ -86,9 +86,9 @@
             "resize": "Paneel vergroten of verkleinen"
         },
         "peek": {
-            "unavailable": "Geen language server vindt referenties in dit bestand",
+            "unavailable": "Referenties niet beschikbaar in dit bestand",
             "none": "Geen referenties gevonden",
-            "failed": "Referenties opzoeken mislukt: {{message}}",
+            "failed": "Kon de referenties niet opzoeken: {{message}}",
             "references_one": "{{formatted}} referentie",
             "references_other": "{{formatted}} referenties",
             "close": "Sluit",
@@ -97,12 +97,12 @@
             "definitions_one": "{{formatted}} definitie",
             "definitions_other": "{{formatted}} definities",
             "noDefinition": "Geen definitie gevonden",
-            "unavailableDefinition": "Geen language server vindt definities in dit bestand"
+            "unavailableDefinition": "Definities niet beschikbaar in dit bestand"
         },
         "callHierarchy": {
-            "unavailable": "Geen language server vindt aanroepen in dit bestand",
-            "none": "Hier is geen symbool met aanroepen gevonden",
-            "failed": "Aanroepen opzoeken mislukt: {{message}}",
+            "unavailable": "Aanroepen niet beschikbaar in dit bestand",
+            "none": "Hier geen aanroepen",
+            "failed": "Kon de aanroepen niet opzoeken: {{message}}",
             "label": "Aanroephiërarchie",
             "direction": "Richting",
             "incoming": "Aanroepers",
@@ -111,7 +111,7 @@
             "loading": "Laden…",
             "noIncoming": "Geen aanroepers",
             "noOutgoing": "Roept niets aan",
-            "retry": "Aanroepen laden mislukt: {{message}}. Druk om opnieuw te proberen",
+            "retry": "Kon de aanroepen niet laden: {{message}}. Klik om het opnieuw te proberen",
             "more_one": "Toon nog {{formatted}} aanroep ({{hidden}} over)",
             "more_other": "Toon nog {{formatted}} aanroepen ({{hidden}} over)",
             "sites_one": "{{formatted}} aanroep",
@@ -133,20 +133,20 @@
             "newCode": "nieuw *",
             "lines_one": "{{formatted}} regel",
             "lines_other": "{{formatted}} regels",
-            "uncommitted": "Nog niet gecommit",
+            "uncommitted": "Niet gecommit",
             "latest": "Laatste wijziging",
             "showCommit": "Commit tonen"
         },
         "symbols": {
-            "unavailable": "Geen language server kent de symbolen van dit bestand",
-            "failed": "De symbolen konden niet worden gelezen: {{message}}",
+            "unavailable": "Symbolen niet beschikbaar in dit bestand",
+            "failed": "Kon de symbolen niet lezen: {{message}}",
             "placeholder": "Ga naar symbool in {{file}}",
             "navigate": "Navigeer",
             "open": "Open",
             "workspace": "Symbolen in het project",
             "line": "Ga naar regel",
             "none": "Geen symbolen gevonden",
-            "workspaceHint": "Typ de naam van een symbool in het project",
+            "workspaceHint": "Typ een symboolnaam",
             "lineHint": "Typ een regelnummer",
             "goToLine": "Ga naar regel {{line}}",
             "groups": {
@@ -180,14 +180,14 @@
             "choices": "Snippetkeuze"
         },
         "completion": {
-            "tooLarge": "Deze aanvulling is te groot om in te voegen",
+            "tooLarge": "Te groot om in te voegen",
             "insert": "Invoegen",
             "replace": "Vervangen",
             "details": "Details",
             "none": "Geen suggesties",
-            "transformBusy": "Snippettransformaties zijn bezig; probeer het opnieuw",
-            "transformFailed": "Snippettransformatie kon niet worden toegepast",
-            "failed": "De suggestie kon niet worden ingevoegd: {{message}}"
+            "transformBusy": "Het snippet is nog niet klaar. Probeer het opnieuw.",
+            "transformFailed": "Kon het snippet niet invullen",
+            "failed": "Kon de suggestie niet invoegen: {{message}}"
         },
         "history": {
             "recent": "Recente plekken"
@@ -265,21 +265,21 @@
             "toggle": "Vervangen tonen",
             "hide": "Vervangen verbergen",
             "failed": {
-                "limit": "Te veel om ineens te vervangen ({{edits}} edits of {{characters}} uitvoertekens)",
-                "timeout": "Vervangen duurde te lang; de tekst is niet gewijzigd",
-                "unavailable": "Vervangen vereist de zoekworker",
-                "error": "Vervangen is niet gelukt; de tekst is niet gewijzigd"
+                "limit": "Te veel om ineens te vervangen (meer dan {{edits}} treffers of {{characters}} tekens)",
+                "timeout": "Vervangen duurde te lang. Er is niets gewijzigd",
+                "unavailable": "Vervangen is nu niet beschikbaar",
+                "error": "Kon niet vervangen. Er is niets gewijzigd"
             }
         },
         "countMore": "{{total}}+ resultaten",
         "searching": "Zoeken…",
-        "large": "Groot document: druk op Enter om te zoeken",
+        "large": "Dit document is groot. Druk op Enter om te zoeken",
         "replaced": "{{count}} resultaten vervangen",
         "failed": {
-            "timeout": "Zoeken duurde te lang; druk op Enter om opnieuw te proberen",
+            "timeout": "Zoeken duurde te lang. Druk op Enter om het opnieuw te proberen",
             "unavailable": "Zoeken met regex is niet beschikbaar",
             "invalid": "Ongeldige reguliere expressie",
-            "error": "Zoeken kon niet worden voltooid"
+            "error": "Kon de zoekopdracht niet voltooien"
         }
     },
     "diff": {

package/dist/models.js

@@ -19,4 +19,4 @@ export { replacedWords } from './word-diff.js';
 export { EMPTY_FIND_QUERY, MATCH_LIMIT, compileFind, matchesIn, stepIndex } from './find-query.js';
 export {} from './popup-placement.js';
 export { planConflict } from './conflict-model.js';
-export { patchLayoutOf } from './patch-layout.js';
+export { patchLayoutOf } from './patch-layout.js';

package/dist/navigation-history.js

@@ -1,7 +1,7 @@
 const LIMIT = 100;
 /* Two places on one line of one file are one place: a jump lands wherever, and walking back should not stop twice on the same line. */
 function samePlace(left, right) {
-    return left.uri === right.uri && left.position.line === right.position.line;
+  return left.uri === right.uri && left.position.line === right.position.line;
 }
 /*
  * Where the caret was before each jump, for Back and Forward. A jump records the place it left and
@@ -9,45 +9,44 @@ function samePlace(left, right) {
  * One history serves every editor of a project, so it walks across files.
  */
 export class NavigationHistory {
-    backs = [];
-    forwards = [];
-    record(from) {
-        if (this.backs.length > 0 && samePlace(this.backs[this.backs.length - 1], from)) {
-            this.backs[this.backs.length - 1] = from;
-        }
-        else {
-            this.backs.push(from);
-            if (this.backs.length > LIMIT) {
-                this.backs.shift();
-            }
-        }
-        this.forwards = [];
+  backs = [];
+  forwards = [];
+  record(from) {
+    if (this.backs.length > 0 && samePlace(this.backs[this.backs.length - 1], from)) {
+      this.backs[this.backs.length - 1] = from;
+    } else {
+      this.backs.push(from);
+      if (this.backs.length > LIMIT) {
+        this.backs.shift();
+      }
     }
-    /* The place before `current`, which Forward then returns to; null when there is none. */
-    back(current) {
-        return this.walk(this.backs, this.forwards, current);
+    this.forwards = [];
+  }
+  /* The place before `current`, which Forward then returns to; null when there is none. */
+  back(current) {
+    return this.walk(this.backs, this.forwards, current);
+  }
+  forward(current) {
+    return this.walk(this.forwards, this.backs, current);
+  }
+  canGoBack(current) {
+    return this.backs.some(place => !samePlace(place, current));
+  }
+  canGoForward(current) {
+    return this.forwards.some(place => !samePlace(place, current));
+  }
+  /* Every place in the history but the one the caret is on, the latest first: where Back would go, then where Forward would. */
+  recent(current) {
+    return [...this.backs.toReversed(), ...this.forwards.toReversed()].filter(place => !samePlace(place, current));
+  }
+  walk(from, to, current) {
+    while (from.length > 0) {
+      const place = from.pop();
+      if (!samePlace(place, current)) {
+        to.push(current);
+        return place;
+      }
     }
-    forward(current) {
-        return this.walk(this.forwards, this.backs, current);
-    }
-    canGoBack(current) {
-        return this.backs.some((place) => !samePlace(place, current));
-    }
-    canGoForward(current) {
-        return this.forwards.some((place) => !samePlace(place, current));
-    }
-    /* Every place in the history but the one the caret is on, the latest first: where Back would go, then where Forward would. */
-    recent(current) {
-        return [...this.backs.toReversed(), ...this.forwards.toReversed()].filter((place) => !samePlace(place, current));
-    }
-    walk(from, to, current) {
-        while (from.length > 0) {
-            const place = from.pop();
-            if (!samePlace(place, current)) {
-                to.push(current);
-                return place;
-            }
-        }
-        return null;
-    }
-}
+    return null;
+  }
+}

package/dist/navigation.js

@@ -6,44 +6,51 @@ import { placesOfName } from './symbol-links.js';
 import { isShortcut } from './shortcut-keys.js';
 import { messageOf } from './error-message.js';
 const METHODS = {
-    definition: 'textDocument/definition',
-    declaration: 'textDocument/declaration',
-    typeDefinition: 'textDocument/typeDefinition',
-    implementation: 'textDocument/implementation'
+  definition: 'textDocument/definition',
+  declaration: 'textDocument/declaration',
+  typeDefinition: 'textDocument/typeDefinition',
+  implementation: 'textDocument/implementation'
 };
 const REQUESTS = {
-    definition: (service, uri, position) => service.definition(uri, position),
-    declaration: (service, uri, position) => service.declaration(uri, position),
-    typeDefinition: (service, uri, position) => service.typeDefinition(uri, position),
-    implementation: (service, uri, position) => service.implementation(uri, position)
+  definition: (service, uri, position) => service.definition(uri, position),
+  declaration: (service, uri, position) => service.declaration(uri, position),
+  typeDefinition: (service, uri, position) => service.typeDefinition(uri, position),
+  implementation: (service, uri, position) => service.implementation(uri, position)
 };
-const SHORTCUT_KINDS = [
-    ['definition', 'goToDefinition'],
-    ['typeDefinition', 'goToTypeDefinition'],
-    ['implementation', 'goToImplementation']
-];
+const SHORTCUT_KINDS = [['definition', 'goToDefinition'], ['typeDefinition', 'goToTypeDefinition'], ['implementation', 'goToImplementation']];
 const TOAST_ID = 'language-navigation';
 /* The places of a result, each once: the two servers of a Vue file may both know the same one. `target` is the whole declaration when the server gave it. */
 export function uniquePlaces(result) {
-    const seen = new Set();
-    const list = result === null ? [] : Array.isArray(result) ? result : [result];
-    return list
-        .map((entry) => 'targetUri' in entry
-        ? { location: { uri: entry.targetUri, range: entry.targetSelectionRange }, target: entry.targetRange }
-        : { location: entry, target: null })
-        .filter(({ location }) => {
-        const { start } = location.range;
-        const key = `${location.uri}\0${start.line}\0${start.character}`;
-        if (seen.has(key)) {
-            return false;
-        }
-        seen.add(key);
-        return true;
-    });
+  const seen = new Set();
+  const list = result === null ? [] : Array.isArray(result) ? result : [result];
+  return list.map(entry => 'targetUri' in entry ? {
+    location: {
+      uri: entry.targetUri,
+      range: entry.targetSelectionRange
+    },
+    target: entry.targetRange
+  } : {
+    location: entry,
+    target: null
+  }).filter(({
+    location
+  }) => {
+    const {
+      start
+    } = location.range;
+    const key = `${location.uri}\0${start.line}\0${start.character}`;
+    if (seen.has(key)) {
+      return false;
+    }
+    seen.add(key);
+    return true;
+  });
 }
 /* The places of a result, each once. */
 export function uniqueLocations(result) {
-    return uniquePlaces(result).map(({ location }) => location);
+  return uniquePlaces(result).map(({
+    location
+  }) => location);
 }
 /*
  * Going to where a name is defined, declared, typed or implemented: Mod+click on the name or a shortcut
@@ -51,106 +58,117 @@ export function uniqueLocations(result) {
  * the host; several are listed under the name to choose from.
  */
 export class NavigationFeature {
-    language;
-    constructor(language) {
-        this.language = language;
-        const { editor } = language;
-        const offs = [
-            editor.onClick((click) => {
-                if (!click.mod || click.alt || click.shift || !this.supports('definition')) {
-                    return false;
-                }
-                void this.go('definition', click.position);
-                return true;
-            }),
-            language.onKey((event) => {
-                const found = SHORTCUT_KINDS.find(([, name]) => isShortcut(this.language.shortcuts[name], event));
-                if (found === undefined) {
-                    return false;
-                }
-                void this.go(found[0]);
-                return true;
-            }, KEY_PRIORITY.navigation)
-        ];
-        language.onDispose(() => {
-            for (const off of offs) {
-                off();
-            }
-        });
+  language;
+  constructor(language) {
+    this.language = language;
+    const {
+      editor
+    } = language;
+    const offs = [editor.onClick(click => {
+      if (!click.mod || click.alt || click.shift || !this.supports('definition')) {
+        return false;
+      }
+      void this.go('definition', click.position);
+      return true;
+    }), language.onKey(event => {
+      const found = SHORTCUT_KINDS.find(([, name]) => isShortcut(this.language.shortcuts[name], event));
+      if (found === undefined) {
+        return false;
+      }
+      void this.go(found[0]);
+      return true;
+    }, KEY_PRIORITY.navigation)];
+    language.onDispose(() => {
+      for (const off of offs) {
+        off();
+      }
+    });
+  }
+  supports(kind) {
+    return this.language.project.service.supports(METHODS[kind], this.language.uri);
+  }
+  async go(kind, position = this.language.editor.getCaret()) {
+    const {
+      project,
+      uri,
+      editor
+    } = this.language;
+    if (!this.supports(kind)) {
+      this.tell(this.say('unavailable'));
+      return;
     }
-    supports(kind) {
-        return this.language.project.service.supports(METHODS[kind], this.language.uri);
+    let result;
+    try {
+      result = await REQUESTS[kind](project.service, uri, position);
+    } catch (error) {
+      if (!(error instanceof StaleResultError)) {
+        this.tell(this.say('failed', {
+          message: messageOf(error)
+        }));
+      }
+      return;
     }
-    async go(kind, position = this.language.editor.getCaret()) {
-        const { project, uri, editor } = this.language;
-        if (!this.supports(kind)) {
-            this.tell(this.say('unavailable'));
-            return;
-        }
-        let result;
-        try {
-            result = await REQUESTS[kind](project.service, uri, position);
-        }
-        catch (error) {
-            if (!(error instanceof StaleResultError)) {
-                this.tell(this.say('failed', { message: messageOf(error) }));
-            }
-            return;
-        }
-        const places = uniqueLocations(result);
-        if (places.length === 0) {
-            this.tell(this.say('none'));
-        }
-        else if (kind === 'definition' && places.length === 1 && places[0].uri === uri && rangeHolds(places[0].range, position)) {
-            // The name is its own definition, so what a person wants to see is where it is used.
-            void this.language.peek.open(position);
-        }
-        else if (places.length === 1) {
-            this.language.goTo(places[0]);
-        }
-        else {
-            this.language.locations(places, position, this.say(`titles.${kind}`));
-        }
-        editor.focus();
+    const places = uniqueLocations(result);
+    if (places.length === 0) {
+      this.tell(this.say('none'));
+    } else if (kind === 'definition' && places.length === 1 && places[0].uri === uri && rangeHolds(places[0].range, position)) {
+      // The name is its own definition, so what a person wants to see is where it is used.
+      void this.language.peek.open(position);
+    } else if (places.length === 1) {
+      this.language.goTo(places[0]);
+    } else {
+      this.language.locations(places, position, this.say(`titles.${kind}`));
     }
-    /*
-     * A name in the signature of a hover, which is a snippet and no document a server can be asked about by position.
-     * The symbol the signature declares goes to the definition the hover already knows; any other name is looked
-     * up by name among the symbols of the project. One match goes there at once, several are listed, and none says nothing.
-     */
-    async goToName(name, anchor, own) {
-        const { project, uri, editor } = this.language;
-        if (own !== null) {
-            this.language.goTo(own);
-            return;
-        }
-        if (!project.service.supports('workspace/symbol', uri)) {
-            return;
-        }
-        try {
-            const places = placesOfName(await project.service.workspaceSymbols(uri, name), name, editor.getText());
-            if (places.length === 1) {
-                this.language.goTo(places[0]);
-            }
-            else if (places.length > 1) {
-                this.language.locations(places, anchor, this.say('titles.symbol'));
-            }
-        }
-        catch {
-            // A name that cannot be found is a link that does nothing, not an error.
-        }
+    editor.focus();
+  }
+  /*
+   * A name in the signature of a hover, which is a snippet and no document a server can be asked about by position.
+   * The symbol the signature declares goes to the definition the hover already knows; any other name is looked
+   * up by name among the symbols of the project. One match goes there at once, several are listed, and none says nothing.
+   */
+  async goToName(name, anchor, own) {
+    const {
+      project,
+      uri,
+      editor
+    } = this.language;
+    if (own !== null) {
+      this.language.goTo(own);
+      return;
     }
-    tell(title) {
-        this.language.project.host.notify?.({ id: TOAST_ID, kind: 'error', title });
+    if (!project.service.supports('workspace/symbol', uri)) {
+      return;
     }
-    say(key, options) {
-        return this.language.project.i18n.t(`editor:language.navigation.${key}`, options);
+    try {
+      const places = placesOfName(await project.service.workspaceSymbols(uri, name), name, editor.getText());
+      if (places.length === 1) {
+        this.language.goTo(places[0]);
+      } else if (places.length > 1) {
+        this.language.locations(places, anchor, this.say('titles.symbol'));
+      }
+    } catch {
+      // A name that cannot be found is a link that does nothing, not an error.
     }
+  }
+  tell(title) {
+    this.language.project.host.notify?.({
+      id: TOAST_ID,
+      kind: 'error',
+      title
+    });
+  }
+  say(key, options) {
+    return this.language.project.i18n.t(`editor:language.navigation.${key}`, options);
+  }
 }
 /* How a place reads in a list: the file and the line, with the folder it is in. */
 export function locationRow(location, stored) {
-    const path = stored ?? fileUriToPath(location.uri) ?? location.uri;
-    const name = basenameOf(path);
-    const folder = path.slice(0, Math.max(0, path.length - name.length)).replace(/\/$/, '');
-    return { label: `${name}:${location.range.start.line + 1}`, detail: folder, path: true };
-}
+  const path = stored ?? fileUriToPath(location.uri) ?? location.uri;
+  const name = basenameOf(path);
+  const folder = path.slice(0, Math.max(0, path.length - name.length)).replace(/\/$/, '');
+  return {
+    label: `${name}:${location.range.start.line + 1}`,
+    detail: folder,
+    path: true
+  };
+}

package/dist/panel-size.js

@@ -10,16 +10,16 @@ const PANEL_FALLBACK_AVAILABLE = 800;
 export const PANEL_KEY_STEP = 22;
 /* The tallest body for an editor that is `available` pixels high; never below the minimum, so a tiny editor still gets a usable panel. */
 export function panelBodyMax(available) {
-    return Math.max(PANEL_BODY_MIN, Math.floor(available * PANEL_MAX_SHARE) - PANEL_CHROME);
+  return Math.max(PANEL_BODY_MIN, Math.floor(available * PANEL_MAX_SHARE) - PANEL_CHROME);
 }
 export function clampPanelBody(height, available = PANEL_FALLBACK_AVAILABLE) {
-    if (!Number.isFinite(height)) {
-        return PANEL_BODY_HEIGHT;
-    }
-    return Math.min(panelBodyMax(available), Math.max(PANEL_BODY_MIN, Math.round(height)));
+  if (!Number.isFinite(height)) {
+    return PANEL_BODY_HEIGHT;
+  }
+  return Math.min(panelBodyMax(available), Math.max(PANEL_BODY_MIN, Math.round(height)));
 }
 /* The height of the editor's scrolling area around a panel's row; the fallback stands in where nothing is laid out. */
 export function availableHeightOf(container) {
-    const height = container?.closest('.se-viewport')?.clientHeight ?? 0;
-    return height > 0 ? height : PANEL_FALLBACK_AVAILABLE;
-}
+  const height = container?.closest('.se-viewport')?.clientHeight ?? 0;
+  return height > 0 ? height : PANEL_FALLBACK_AVAILABLE;
+}