@d3lm/lint-preset 1.5.5 → 1.5.6

package/dist/comments.cjs

@@ -1061,9 +1061,9 @@ function analyzeParagraph(paragraph, options) {
     parentheticalOverflow: options.maxWidth === void 0 ? void 0 : options.maxWidth - options.width,
     keepFirstLine: paragraph.kind === "tag"
   };
-  const layOut = (from, settings) => {
-    const even2 = layoutTokens(from, firstLimit, restLimit, settings);
-    return { even: even2, wrapped: breakAfterSentence(even2, firstLimit, restLimit, settings) };
+  const layOut = (from, settings, extra) => {
+    const even2 = layoutTokens(from, firstLimit + extra, restLimit + extra, settings);
+    return { even: even2, wrapped: breakAfterSentence(even2, firstLimit + extra, restLimit + extra, settings) };
   };
   const units = bindLineStarts(paragraph.kind === "tag" ? bindTagHead(tokens) : tokens, startsLine);
   const hardLimit = restLimit + (options.maxWidth === void 0 ? options.tolerance : options.maxWidth - options.width);
@@ -1080,9 +1080,9 @@ function analyzeParagraph(paragraph, options) {
       return { ...first, text, verbatim: false, hardBreak: HARD_BREAK.test(text) };
     });
   };
-  const settle = (settings) => {
+  const settle = (settings, extra = 0) => {
     let current = units;
-    let { even: even2, wrapped: wrapped2 } = layOut(current, settings);
+    let { even: even2, wrapped: wrapped2 } = layOut(current, settings, extra);
     for (; ; ) {
       const body = bodyOf(wrapped2);
       const rewrap = structureOf(body);
@@ -1097,11 +1097,19 @@ function analyzeParagraph(paragraph, options) {
         return { tier: "manual", reason: `rewrap would read as ${reading}` };
       }
       current = current.toSpliced(start - 1, 2, pair);
-      ({ even: even2, wrapped: wrapped2 } = layOut(current, settings));
+      ({ even: even2, wrapped: wrapped2 } = layOut(current, settings, extra));
     }
   };
-  const settled = settle(layoutOptions);
-  const layout = "wrapped" in settled ? settled : settle({ ...layoutOptions, keepSteps: true });
+  const layoutAt = (extra) => {
+    const settings = {
+      ...layoutOptions,
+      tolerance: layoutOptions.tolerance - extra,
+      parentheticalOverflow: layoutOptions.parentheticalOverflow === void 0 ? void 0 : layoutOptions.parentheticalOverflow - extra
+    };
+    const settled = settle(settings, extra);
+    return "wrapped" in settled ? settled : settle({ ...settings, keepSteps: true }, extra);
+  };
+  const layout = layoutAt(0);
   if (!("wrapped" in layout)) {
     return keep(layout);
   }
@@ -1166,10 +1174,22 @@ function analyzeParagraph(paragraph, options) {
       }
     }
   }
-  const suggestion = wrapped.map(
+  const isVerdict = (issue) => ISSUE_TIERS[issue.type] === "verdict";
+  const matchesWiderLayout = () => {
+    for (let extra = 1; extra <= layoutOptions.tolerance; extra += 1) {
+      const wider = layoutAt(extra);
+      if ("wrapped" in wider && sameLayout(wider.wrapped, currentLines)) {
+        return true;
+      }
+    }
+    return false;
+  };
+  const accepted = lineIssues.some((issue) => isVerdict(issue)) && matchesWiderLayout();
+  const suggested = accepted ? currentLines : wrapped;
+  const suggestion = suggested.map(
     (words, position) => `${prefix}${position === 0 ? paragraph.marker : hang}${words.join(" ")}`
   );
-  const wrapIssues = lineIssues.map((issue) => lineIssue(issue.type, paragraph.lines[issue.line], options));
+  const wrapIssues = lineIssues.filter((issue) => !accepted || !isVerdict(issue)).map((issue) => lineIssue(issue.type, paragraph.lines[issue.line], options));
   const issues = byLine([...overflow, ...wrapIssues, ...styleIssues(paragraph, options)]);
   return { ...base, reflowable: true, issues, suggestion };
 }