symfony-expression-editor 0.2.0 → 1.0.0

package/dist/index.cjs

@@ -870,14 +870,14 @@ const replaceNext = /* @__PURE__ */ searchCommand((view$1, { query }) => {
     next = query.nextMatch(state$1, next.from, next.to);
     effects.push(view.EditorView.announce.of(state$1.phrase("replaced match on line $", state$1.doc.lineAt(from).number) + "."));
   }
+  let changeSet = view$1.state.changes(changes);
   if (next) {
-    let off = changes.length == 0 || changes[0].from >= match.to ? 0 : match.to - match.from - replacement.length;
-    selection = state.EditorSelection.single(next.from - off, next.to - off);
+    selection = state.EditorSelection.single(next.from, next.to).map(changeSet);
     effects.push(announceMatch(view$1, next));
     effects.push(state$1.facet(searchConfigFacet).scrollToMatch(selection.main, view$1));
   }
   view$1.dispatch({
-    changes,
+    changes: changeSet,
     selection,
     effects,
     userEvent: "input.replace"
@@ -1148,6 +1148,22 @@ const searchExtensions = [
   baseTheme$2
 ];
 
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
 class SelectedDiagnostic {
   constructor(from, to, diagnostic) {
     this.from = from;
@@ -1167,6 +1183,7 @@ class LintState {
       diagnostics = diagnosticFilter(diagnostics, state$1);
     let sorted = diagnostics.slice().sort((a, b) => a.from - b.from || a.to - b.to);
     let deco = new state.RangeSetBuilder(), active = [], pos = 0;
+    let scan = state$1.doc.iter(), scanPos = 0, docLen = state$1.doc.length;
     for (let i = 0; ; ) {
       let next = i == sorted.length ? null : sorted[i];
       if (!next && !active.length)
@@ -1177,6 +1194,8 @@ class LintState {
         to = active.reduce((p, d) => Math.min(p, d.to), next && next.from > from ? next.from : 1e8);
       } else {
         from = next.from;
+        if (from > docLen)
+          break;
         to = next.to;
         active.push(next);
         i++;
@@ -1192,8 +1211,31 @@ class LintState {
           break;
         }
       }
+      to = Math.min(to, docLen);
+      let widget = false;
+      if (active.some((d) => d.from == from && (d.to == to || to == docLen))) {
+        widget = from == to;
+        if (!widget && to - from < 10) {
+          let behind = from - (scanPos + scan.value.length);
+          if (behind > 0) {
+            scan.next(behind);
+            scanPos = from;
+          }
+          for (let check = from; ; ) {
+            if (check >= to) {
+              widget = true;
+              break;
+            }
+            if (!scan.lineBreak && scanPos + scan.value.length > check)
+              break;
+            check = scanPos + scan.value.length;
+            scanPos += scan.value.length;
+            scan.next();
+          }
+        }
+      }
       let sev = maxSeverity(active);
-      if (active.some((d) => d.from == d.to || d.from == d.to - 1 && state$1.doc.lineAt(d.from).to == d.from)) {
+      if (widget) {
         deco.add(from, from, view.Decoration.widget({
           widget: new DiagnosticWidget(sev),
           diagnostics: active.slice()
@@ -1207,6 +1249,8 @@ class LintState {
         }));
       }
       pos = to;
+      if (pos == docLen)
+        break;
       for (let i2 = 0; i2 < active.length; i2++)
         if (active[i2].to <= pos)
           active.splice(i2--, 1);
@@ -1339,17 +1383,27 @@ const lintKeymap = [
 ];
 const lintConfig = /* @__PURE__ */ state.Facet.define({
   combine(input) {
-    return Object.assign({ sources: input.map((i) => i.source).filter((x) => x != null) }, state.combineConfig(input.map((i) => i.config), {
+    return __spreadValues({
+      sources: input.map((i) => i.source).filter((x) => x != null)
+    }, state.combineConfig(input.map((i) => i.config), {
       delay: 750,
       markerFilter: null,
       tooltipFilter: null,
       needsRefresh: null,
       hideOn: () => null
     }, {
-      needsRefresh: (a, b) => !a ? b : !b ? a : (u) => a(u) || b(u)
+      delay: Math.max,
+      markerFilter: combineFilter,
+      tooltipFilter: combineFilter,
+      needsRefresh: (a, b) => !a ? b : !b ? a : (u) => a(u) || b(u),
+      hideOn: (a, b) => !a ? b : !b ? a : (t, x, y) => a(t, x, y) || b(t, x, y),
+      autoPanel: (a, b) => a || b
     }));
   }
 });
+function combineFilter(a, b) {
+  return !a ? b : !b ? a : (d, s) => b(a(d, s), s);
+}
 function assignKeys(actions) {
   let assigned = [];
   if (actions)
@@ -1384,9 +1438,10 @@ function renderDiagnostic(view, diagnostic, inPanel) {
       crelt("u", name.slice(keyIndex, keyIndex + 1)),
       name.slice(keyIndex + 1)
     ];
+    let markClass = action.markClass ? " " + action.markClass : "";
     return crelt("button", {
       type: "button",
-      class: "cm-diagnosticAction",
+      class: "cm-diagnosticAction" + markClass,
       onclick: click,
       onmousedown: click,
       "aria-label": ` Action: ${name}${keyIndex < 0 ? "" : ` (access key "${keys[i]})"`}.`

package/dist/index.mjs

@@ -868,14 +868,14 @@ const replaceNext = /* @__PURE__ */ searchCommand((view, { query }) => {
     next = query.nextMatch(state, next.from, next.to);
     effects.push(EditorView.announce.of(state.phrase("replaced match on line $", state.doc.lineAt(from).number) + "."));
   }
+  let changeSet = view.state.changes(changes);
   if (next) {
-    let off = changes.length == 0 || changes[0].from >= match.to ? 0 : match.to - match.from - replacement.length;
-    selection = EditorSelection.single(next.from - off, next.to - off);
+    selection = EditorSelection.single(next.from, next.to).map(changeSet);
     effects.push(announceMatch(view, next));
     effects.push(state.facet(searchConfigFacet).scrollToMatch(selection.main, view));
   }
   view.dispatch({
-    changes,
+    changes: changeSet,
     selection,
     effects,
     userEvent: "input.replace"
@@ -1146,6 +1146,22 @@ const searchExtensions = [
   baseTheme$2
 ];
 
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
 class SelectedDiagnostic {
   constructor(from, to, diagnostic) {
     this.from = from;
@@ -1165,6 +1181,7 @@ class LintState {
       diagnostics = diagnosticFilter(diagnostics, state);
     let sorted = diagnostics.slice().sort((a, b) => a.from - b.from || a.to - b.to);
     let deco = new RangeSetBuilder(), active = [], pos = 0;
+    let scan = state.doc.iter(), scanPos = 0, docLen = state.doc.length;
     for (let i = 0; ; ) {
       let next = i == sorted.length ? null : sorted[i];
       if (!next && !active.length)
@@ -1175,6 +1192,8 @@ class LintState {
         to = active.reduce((p, d) => Math.min(p, d.to), next && next.from > from ? next.from : 1e8);
       } else {
         from = next.from;
+        if (from > docLen)
+          break;
         to = next.to;
         active.push(next);
         i++;
@@ -1190,8 +1209,31 @@ class LintState {
           break;
         }
       }
+      to = Math.min(to, docLen);
+      let widget = false;
+      if (active.some((d) => d.from == from && (d.to == to || to == docLen))) {
+        widget = from == to;
+        if (!widget && to - from < 10) {
+          let behind = from - (scanPos + scan.value.length);
+          if (behind > 0) {
+            scan.next(behind);
+            scanPos = from;
+          }
+          for (let check = from; ; ) {
+            if (check >= to) {
+              widget = true;
+              break;
+            }
+            if (!scan.lineBreak && scanPos + scan.value.length > check)
+              break;
+            check = scanPos + scan.value.length;
+            scanPos += scan.value.length;
+            scan.next();
+          }
+        }
+      }
       let sev = maxSeverity(active);
-      if (active.some((d) => d.from == d.to || d.from == d.to - 1 && state.doc.lineAt(d.from).to == d.from)) {
+      if (widget) {
         deco.add(from, from, Decoration.widget({
           widget: new DiagnosticWidget(sev),
           diagnostics: active.slice()
@@ -1205,6 +1247,8 @@ class LintState {
         }));
       }
       pos = to;
+      if (pos == docLen)
+        break;
       for (let i2 = 0; i2 < active.length; i2++)
         if (active[i2].to <= pos)
           active.splice(i2--, 1);
@@ -1337,17 +1381,27 @@ const lintKeymap = [
 ];
 const lintConfig = /* @__PURE__ */ Facet.define({
   combine(input) {
-    return Object.assign({ sources: input.map((i) => i.source).filter((x) => x != null) }, combineConfig(input.map((i) => i.config), {
+    return __spreadValues({
+      sources: input.map((i) => i.source).filter((x) => x != null)
+    }, combineConfig(input.map((i) => i.config), {
       delay: 750,
       markerFilter: null,
       tooltipFilter: null,
       needsRefresh: null,
       hideOn: () => null
     }, {
-      needsRefresh: (a, b) => !a ? b : !b ? a : (u) => a(u) || b(u)
+      delay: Math.max,
+      markerFilter: combineFilter,
+      tooltipFilter: combineFilter,
+      needsRefresh: (a, b) => !a ? b : !b ? a : (u) => a(u) || b(u),
+      hideOn: (a, b) => !a ? b : !b ? a : (t, x, y) => a(t, x, y) || b(t, x, y),
+      autoPanel: (a, b) => a || b
     }));
   }
 });
+function combineFilter(a, b) {
+  return !a ? b : !b ? a : (d, s) => b(a(d, s), s);
+}
 function assignKeys(actions) {
   let assigned = [];
   if (actions)
@@ -1382,9 +1436,10 @@ function renderDiagnostic(view, diagnostic, inPanel) {
       crelt("u", name.slice(keyIndex, keyIndex + 1)),
       name.slice(keyIndex + 1)
     ];
+    let markClass = action.markClass ? " " + action.markClass : "";
     return crelt("button", {
       type: "button",
-      class: "cm-diagnosticAction",
+      class: "cm-diagnosticAction" + markClass,
       onclick: click,
       onmousedown: click,
       "aria-label": ` Action: ${name}${keyIndex < 0 ? "" : ` (access key "${keys[i]})"`}.`

package/package.json

@@ -17,7 +17,8 @@
     "build": "pkgroll",
     "dev": "pkgroll --watch",
     "pretest": "npm run-script build",
-    "test": "exit 0 # some day we have tests here"
+    "test": "playwright test",
+    "test:e2e": "playwright test"
   },
   "description": "Advanced editor for Symfony Expression Language",
   "dependencies": {
@@ -32,7 +33,10 @@
   },
   "devDependencies": {
     "pkgroll": "^2.11.2",
-    "typescript": "^5.8.2"
+    "typescript": "^5.8.2",
+    "@types/node": "^20.11.0",
+    "@playwright/test": "^1.40.0",
+    "playwright": "^1.40.0"
   },
   "license": "MIT",
   "repository": {
@@ -43,5 +47,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "0.2.0"
+  "version": "1.0.0"
 }