ic-mops 2.1.0 → 2.2.1

package/helpers/autofix-motoko.ts

@@ -6,12 +6,6 @@ import {
   type TextEdit,
 } from "vscode-languageserver-textdocument";
 
-interface Fix {
-  file: string;
-  code: string;
-  edit: TextEdit;
-}
-
 interface MocSpan {
   file: string;
   line_start: number;
@@ -46,35 +40,127 @@ export function parseDiagnostics(stdout: string): MocDiagnostic[] {
     .filter((d) => d !== null);
 }
 
-function extractFixes(diagnostics: MocDiagnostic[]): Fix[] {
-  const fixes: Fix[] = [];
+interface DiagnosticFix {
+  code: string;
+  edits: TextEdit[];
+}
+
+function extractDiagnosticFixes(
+  diagnostics: MocDiagnostic[],
+): Map<string, DiagnosticFix[]> {
+  const result = new Map<string, DiagnosticFix[]>();
+
   for (const diag of diagnostics) {
+    const editsByFile = new Map<string, TextEdit[]>();
+
     for (const span of diag.spans) {
       if (
         span.suggestion_applicability === "MachineApplicable" &&
         span.suggested_replacement !== null
       ) {
-        fixes.push({
-          file: span.file,
-          code: diag.code,
-          edit: {
-            range: {
-              start: {
-                line: span.line_start - 1,
-                character: span.column_start - 1,
-              },
-              end: {
-                line: span.line_end - 1,
-                character: span.column_end - 1,
-              },
+        const file = resolve(span.file);
+        const edits = editsByFile.get(file) ?? [];
+        edits.push({
+          range: {
+            start: {
+              line: span.line_start - 1,
+              character: span.column_start - 1,
+            },
+            end: {
+              line: span.line_end - 1,
+              character: span.column_end - 1,
             },
-            newText: span.suggested_replacement,
           },
+          newText: span.suggested_replacement,
         });
+        editsByFile.set(file, edits);
       }
     }
+
+    for (const [file, edits] of editsByFile) {
+      const existing = result.get(file) ?? [];
+      existing.push({ code: diag.code, edits });
+      result.set(file, existing);
+    }
+  }
+
+  return result;
+}
+
+type Range = TextEdit["range"];
+
+function normalizeRange(range: Range): Range {
+  const { start, end } = range;
+  if (
+    start.line > end.line ||
+    (start.line === end.line && start.character > end.character)
+  ) {
+    return { start: end, end: start };
+  }
+  return range;
+}
+
+interface OffsetEdit {
+  start: number;
+  end: number;
+  newText: string;
+}
+
+/**
+ * Applies diagnostic fixes to a document, processing each diagnostic as
+ * an atomic unit. If any edit from a diagnostic overlaps with an already-accepted
+ * edit, the entire diagnostic is skipped (picked up in subsequent iterations).
+ * Based on vscode-languageserver-textdocument's TextDocument.applyEdits.
+ */
+function applyDiagnosticFixes(
+  doc: TextDocument,
+  fixes: DiagnosticFix[],
+): { text: string; appliedCodes: string[] } {
+  const acceptedEdits: OffsetEdit[] = [];
+  const appliedCodes: string[] = [];
+
+  for (const fix of fixes) {
+    const offsets: OffsetEdit[] = fix.edits.map((e) => {
+      const range = normalizeRange(e.range);
+      return {
+        start: doc.offsetAt(range.start),
+        end: doc.offsetAt(range.end),
+        newText: e.newText,
+      };
+    });
+
+    const overlaps = offsets.some((o) =>
+      acceptedEdits.some((a) => o.start < a.end && o.end > a.start),
+    );
+    if (overlaps) {
+      continue;
+    }
+
+    acceptedEdits.push(...offsets);
+    appliedCodes.push(fix.code);
+  }
+
+  acceptedEdits.sort((a, b) => a.start - b.start);
+
+  const text = doc.getText();
+  const spans: string[] = [];
+  let lastOffset = 0;
+
+  for (const edit of acceptedEdits) {
+    if (edit.start < lastOffset) {
+      continue;
+    }
+    if (edit.start > lastOffset) {
+      spans.push(text.substring(lastOffset, edit.start));
+    }
+    if (edit.newText.length) {
+      spans.push(edit.newText);
+    }
+    lastOffset = edit.end;
   }
-  return fixes;
+
+  spans.push(text.substring(lastOffset));
+  return { text: spans.join(""), appliedCodes };
 }
 
 const MAX_FIX_ITERATIONS = 10;
@@ -93,47 +179,33 @@ export async function autofixMotoko(
   const fixedFilesCodes = new Map<string, string[]>();
 
   for (let iteration = 0; iteration < MAX_FIX_ITERATIONS; iteration++) {
-    const allFixes: Fix[] = [];
+    const fixesByFile = new Map<string, DiagnosticFix[]>();
 
     for (const file of files) {
       const result = await execa(
         mocPath,
-        [file, "--error-format=json", ...mocArgs],
+        [file, ...mocArgs, "--error-format=json"],
         { stdio: "pipe", reject: false },
       );
 
       const diagnostics = parseDiagnostics(result.stdout);
-      allFixes.push(...extractFixes(diagnostics));
+      for (const [targetFile, fixes] of extractDiagnosticFixes(diagnostics)) {
+        const existing = fixesByFile.get(targetFile) ?? [];
+        existing.push(...fixes);
+        fixesByFile.set(targetFile, existing);
+      }
     }
 
-    if (allFixes.length === 0) {
+    if (fixesByFile.size === 0) {
       break;
     }
 
-    const fixesByFile = new Map<string, Fix[]>();
-    for (const fix of allFixes) {
-      const normalizedPath = resolve(fix.file);
-      const existing = fixesByFile.get(normalizedPath) ?? [];
-      existing.push(fix);
-      fixesByFile.set(normalizedPath, existing);
-    }
-
     let progress = false;
 
     for (const [file, fixes] of fixesByFile) {
       const original = await readFile(file, "utf-8");
       const doc = TextDocument.create(`file://${file}`, "motoko", 0, original);
-
-      let result: string;
-      try {
-        result = TextDocument.applyEdits(
-          doc,
-          fixes.map((f) => f.edit),
-        );
-      } catch (err) {
-        console.warn(`Warning: could not apply fixes to ${file}: ${err}`);
-        continue;
-      }
+      const { text: result, appliedCodes } = applyDiagnosticFixes(doc, fixes);
 
       if (result === original) {
         continue;
@@ -143,9 +215,7 @@ export async function autofixMotoko(
       progress = true;
 
       const existing = fixedFilesCodes.get(file) ?? [];
-      for (const fix of fixes) {
-        existing.push(fix.code);
-      }
+      existing.push(...appliedCodes);
       fixedFilesCodes.set(file, existing);
     }
 

package/mops.ts

@@ -5,9 +5,8 @@ import { Identity } from "@icp-sdk/core/agent";
 import TOML from "@iarna/toml";
 import chalk from "chalk";
 import prompts from "prompts";
-import fetch from "node-fetch";
-
 import { decodeFile } from "./pem.js";
+import { cliError } from "./error.js";
 import { Config, Dependency } from "./types.js";
 import { mainActor, storageActor } from "./api/actors.js";
 import { getNetwork } from "./api/network.js";
@@ -15,10 +14,6 @@ import { getHighestVersion } from "./api/getHighestVersion.js";
 import { getPackageId } from "./helpers/get-package-id.js";
 import { FILE_PATH_REGEX } from "./constants.js";
 
-if (!globalThis.fetch) {
-  globalThis.fetch = fetch as any;
-}
-
 // (!) make changes in pair with backend
 export let apiVersion = "1.3";
 
@@ -204,6 +199,18 @@ export function readConfig(configFile = getClosestConfigFile()): Config {
   return config;
 }
 
+export function getGlobalMocArgs(config: Config): string[] {
+  if (!config.moc?.args) {
+    return [];
+  }
+  if (typeof config.moc.args === "string") {
+    cliError(
+      `[moc] config 'args' should be an array of strings in mops.toml config file`,
+    );
+  }
+  return config.moc.args;
+}
+
 export function writeConfig(
   config: Config,
   configFile = getClosestConfigFile(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",
@@ -36,8 +36,8 @@
     "build:wasm:web": "wasm-pack build wasm --target web --out-dir pkg/web && rm wasm/pkg/web/.gitignore",
     "dist": "npm run build:wasm && tsc && mkdir -p dist/wasm && cp -r wasm/pkg dist/wasm",
     "bundle": "rm -rf ./bundle && bun build ./environments/web/cli.ts --outdir ./bundle --target node --minify --external @napi-rs/lzma --external fsevents --format esm --define '__dirname=import.meta.dirname' && run-s bundle:fix bundle:copy bundle:package-json bundle:tar",
-    "bundle:fix": "rexreplace 'new URL\\(\"\\.\\./templates' 'new URL(\"./templates' bundle/cli.js && rexreplace 'resolve\\(\".*?/xhr-sync-worker\\.js\"\\)' 'resolve(\"./xhr-sync-worker.js\")' bundle/cli.js && rexreplace '\"import.meta.dirname\",\"wasm_bg.wasm\"' 'import.meta.dirname || new URL(\".\", import.meta.url).pathname,\"wasm_bg.wasm\"' bundle/cli.js",
-    "bundle:copy": "cp -r commands/bench bundle && cp -r bin declarations templates package.json bundle && cp -r node_modules/prettier-plugin-motoko/wasm/pkg/nodejs/wasm_bg.wasm node_modules/jsdom/lib/jsdom/living/xhr/xhr-sync-worker.js bundle",
+    "bundle:fix": "rexreplace 'new URL\\(\"\\.\\./templates' 'new URL(\"./templates' bundle/cli.js && rexreplace 'resolve\\(\".*?/xhr-sync-worker\\.js\"\\)' 'resolve(\"./xhr-sync-worker.js\")' bundle/cli.js && rexreplace '\"import.meta.dirname\",\"wasm_bg.wasm\"' 'import.meta.dirname || new URL(\".\", import.meta.url).pathname,\"wasm_bg.wasm\"' bundle/cli.js && rexreplace 'resolve\\(\"import.meta.dirname\",\".*?/default-stylesheet\\.css\"\\)' 'resolve(import.meta.dirname,\"./default-stylesheet.css\")' bundle/cli.js",
+    "bundle:copy": "cp -r commands/bench bundle && cp -r bin declarations templates package.json bundle && cp -r node_modules/prettier-plugin-motoko/wasm/pkg/nodejs/wasm_bg.wasm node_modules/jsdom/lib/jsdom/living/xhr/xhr-sync-worker.js node_modules/jsdom/lib/jsdom/browser/default-stylesheet.css bundle",
     "bundle:package-json": "tsx bundle-package-json.ts",
     "bundle:tar": "rm -f bundle/cli.tgz && touch -t 200101010101 bundle/cli.tgz && find bundle -exec touch -d '1970-01-01 00:00:00' {} + && tar --sort name --exclude bundle/cli.tgz -cvf - bundle | gzip -n > bundle/cli.tgz",
     "copy": "cp -r commands/bench dist/commands && cp -r declarations templates package.json bin dist | true",
@@ -69,29 +69,28 @@
     "filesize": "10.1.6",
     "fs-extra": "11.2.0",
     "get-folder-size": "5.0.0",
-    "glob": "11.0.1",
+    "glob": "13.0.6",
     "globby": "14.0.2",
     "got": "14.4.6",
-    "jsdom": "26.1.0",
+    "jsdom": "28.1.0",
     "log-update": "6.1.0",
     "markdown-table": "3.0.4",
     "mdast-util-from-markdown": "2.0.2",
     "mdast-util-to-markdown": "2.1.2",
     "minimatch": "10.0.1",
     "ncp": "2.0.0",
-    "node-fetch": "3.3.2",
     "octokit": "3.1.2",
     "pem-file": "1.0.1",
     "pic-ic": "0.5.4",
     "pic-js-mops": "0.14.8",
     "prettier": "3.5.3",
-    "prettier-plugin-motoko": "0.11.0",
+    "prettier-plugin-motoko": "0.12.5",
     "promisify-child-process": "4.1.2",
     "prompts": "2.4.2",
     "semver": "7.7.1",
     "stream-to-promise": "3.0.0",
     "string-width": "7.2.0",
-    "tar": "7.5.6",
+    "tar": "7.5.9",
     "terminal-size": "4.0.0",
     "vscode-languageserver-textdocument": "1.0.12"
   },
@@ -101,7 +100,7 @@
     "@types/decompress": "4.2.7",
     "@types/fs-extra": "11.0.4",
     "@types/glob": "8.1.0",
-    "@types/jsdom": "21.1.7",
+    "@types/jsdom": "28.0.0",
     "@types/ncp": "2.0.8",
     "@types/node": "24.0.3",
     "@types/prompts": "2.4.9",

package/tests/__snapshots__/check-fix.test.ts.snap

@@ -37,9 +37,9 @@ persistent actor {
 `;
 
 exports[`check --fix M0236: fix output 1`] = `
-"Fixed run/M0236.mo (2 fixes: M0236)
+"Fixed run/M0236.mo (1 fix: M0236)
 
-✓ 2 fixes applied to 1 file"
+✓ 1 fix applied to 1 file"
 `;
 
 exports[`check --fix M0237 1`] = `
@@ -203,16 +203,35 @@ do {
 `;
 
 exports[`check --fix edit-suggestions: fix output 1`] = `
-"Fixed run/edit-suggestions.mo (41 fixes: M0223, M0236, M0237)
+"Fixed run/edit-suggestions.mo (30 fixes: M0223, M0236, M0237)
+
+✓ 30 fixes applied to 1 file"
+`;
+
+exports[`check --fix overlapping edits 1`] = `
+"import Array "mo:core/Array";
+
+// Overlapping fixable errors (nested calls produce overlapping M0223 + M0236 edits)
+do {
+  let ar = [1, 2, 3];
+  let _ = ar.filter(func(x) { x > 0 }).filter(
+    func(x) { x > 0 },
+  );
+};
+"
+`;
+
+exports[`check --fix overlapping edits: fix output 1`] = `
+"Fixed run/overlapping.mo (4 fixes: M0223, M0236)
 
-✓ 41 fixes applied to 1 file"
+✓ 4 fixes applied to 1 file"
 `;
 
 exports[`check --fix transitive imports: fix output 1`] = `
-"Fixed run/transitive-lib.mo (2 fixes: M0236)
+"Fixed run/transitive-lib.mo (1 fix: M0236)
 Fixed run/transitive-main.mo (1 fix: M0223)
 
-✓ 3 fixes applied to 2 files"
+✓ 2 fixes applied to 2 files"
 `;
 
 exports[`check --fix transitive imports: lib file 1`] = `

package/tests/__snapshots__/check.test.ts.snap

@@ -1,5 +1,14 @@
 // Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
+exports[`check [moc] args are passed to moc 1`] = `
+{
+  "exitCode": 1,
+  "stderr": "Warning.mo:3.9-3.15: warning [M0194], unused identifier unused (delete or rename to wildcard \`_\` or \`_unused\`)
+✗ Check failed for file Warning.mo (exit code: 1)",
+  "stdout": "moc < 1.3.0: some diagnostic hints may be missing",
+}
+`;
+
 exports[`check error 1`] = `
 {
   "exitCode": 1,

package/tests/build/success/.dfx/local/canister_ids.json

@@ -0,0 +1,17 @@
+{
+  "__Candid_UI": {
+    "local": "ufxgi-4p777-77774-qaadq-cai"
+  },
+  "a": {
+    "local": "uzt4z-lp777-77774-qaabq-cai"
+  },
+  "b": {
+    "local": "umunu-kh777-77774-qaaca-cai"
+  },
+  "bar": {
+    "local": "ulvla-h7777-77774-qaacq-cai"
+  },
+  "foo": {
+    "local": "ucwa4-rx777-77774-qaada-cai"
+  }
+}

package/tests/build/success/.dfx/local/canisters/bar/bar.did

@@ -0,0 +1,3 @@
+service : {
+  call: () -> (text);
+}

package/tests/build/success/.dfx/local/canisters/bar/bar.most

@@ -0,0 +1,4 @@
+// Version: 1.0.0
+actor {
+  
+};

package/tests/build/success/.dfx/local/canisters/bar/constructor.did

@@ -0,0 +1,3 @@
+service : {
+  call: () -> (text);
+}

package/tests/build/success/.dfx/local/canisters/bar/index.js

@@ -0,0 +1,42 @@
+import { Actor, HttpAgent } from "@dfinity/agent";
+
+// Imports and re-exports candid interface
+import { idlFactory } from './bar.did.js';
+export { idlFactory } from './bar.did.js';
+// CANISTER_ID is replaced by webpack based on node environment
+export const canisterId = process.env.CANISTER_ID_BAR;
+
+/**
+ * @deprecated since dfx 0.11.1
+ * Do not import from `.dfx`, instead switch to using `dfx generate` to generate your JS interface.
+ * @param {string | import("@dfinity/principal").Principal} canisterId Canister ID of Agent
+ * @param {{agentOptions?: import("@dfinity/agent").HttpAgentOptions; actorOptions?: import("@dfinity/agent").ActorConfig} | { agent?: import("@dfinity/agent").Agent; actorOptions?: import("@dfinity/agent").ActorConfig }} [options]
+ * @return {import("@dfinity/agent").ActorSubclass<import("./bar.did.js")._SERVICE>}
+ */
+export const createActor = (canisterId, options = {}) => {
+  console.warn(`Deprecation warning: you are currently importing code from .dfx. Going forward, refactor to use the dfx generate command for JavaScript bindings.
+
+See https://internetcomputer.org/docs/current/developer-docs/updates/release-notes/ for migration instructions`);
+  const agent = options.agent || new HttpAgent({ ...options.agentOptions });
+  
+  // Fetch root key for certificate validation during development
+  if (process.env.DFX_NETWORK !== "ic") {
+    agent.fetchRootKey().catch(err => {
+      console.warn("Unable to fetch root key. Check to ensure that your local replica is running");
+      console.error(err);
+    });
+  }
+
+  // Creates an actor with using the candid interface and the HttpAgent
+  return Actor.createActor(idlFactory, {
+    agent,
+    canisterId,
+    ...(options ? options.actorOptions : {}),
+  });
+};
+  
+/**
+ * A ready-to-use agent for the bar canister
+ * @type {import("@dfinity/agent").ActorSubclass<import("./bar.did.js")._SERVICE>}
+ */
+export const bar = createActor(canisterId);

package/tests/build/success/.dfx/local/canisters/bar/init_args.txt

@@ -0,0 +1 @@
+()

package/tests/build/success/.dfx/local/canisters/bar/service.did

@@ -0,0 +1,3 @@
+service : {
+  call: () -> (text);
+}

package/tests/build/success/.dfx/local/canisters/bar/service.did.d.ts

@@ -0,0 +1,7 @@
+import type { Principal } from '@dfinity/principal';
+import type { ActorMethod } from '@dfinity/agent';
+import type { IDL } from '@dfinity/candid';
+
+export interface _SERVICE { 'call' : ActorMethod<[], string> }
+export declare const idlFactory: IDL.InterfaceFactory;
+export declare const init: (args: { IDL: typeof IDL }) => IDL.Type[];

package/tests/build/success/.dfx/local/canisters/bar/service.did.js

@@ -0,0 +1,4 @@
+export const idlFactory = ({ IDL }) => {
+  return IDL.Service({ 'call' : IDL.Func([], [IDL.Text], []) });
+};
+export const init = ({ IDL }) => { return []; };

package/tests/build/success/.dfx/local/canisters/foo/constructor.did

@@ -0,0 +1,3 @@
+service : {
+  call: () -> (text);
+}

package/tests/build/success/.dfx/local/canisters/foo/foo.did

@@ -0,0 +1,3 @@
+service : {
+  call: () -> (text);
+}

package/tests/build/success/.dfx/local/canisters/foo/foo.most

@@ -0,0 +1,4 @@
+// Version: 1.0.0
+actor {
+  
+};

package/tests/build/success/.dfx/local/canisters/foo/index.js

@@ -0,0 +1,42 @@
+import { Actor, HttpAgent } from "@dfinity/agent";
+
+// Imports and re-exports candid interface
+import { idlFactory } from './foo.did.js';
+export { idlFactory } from './foo.did.js';
+// CANISTER_ID is replaced by webpack based on node environment
+export const canisterId = process.env.CANISTER_ID_FOO;
+
+/**
+ * @deprecated since dfx 0.11.1
+ * Do not import from `.dfx`, instead switch to using `dfx generate` to generate your JS interface.
+ * @param {string | import("@dfinity/principal").Principal} canisterId Canister ID of Agent
+ * @param {{agentOptions?: import("@dfinity/agent").HttpAgentOptions; actorOptions?: import("@dfinity/agent").ActorConfig} | { agent?: import("@dfinity/agent").Agent; actorOptions?: import("@dfinity/agent").ActorConfig }} [options]
+ * @return {import("@dfinity/agent").ActorSubclass<import("./foo.did.js")._SERVICE>}
+ */
+export const createActor = (canisterId, options = {}) => {
+  console.warn(`Deprecation warning: you are currently importing code from .dfx. Going forward, refactor to use the dfx generate command for JavaScript bindings.
+
+See https://internetcomputer.org/docs/current/developer-docs/updates/release-notes/ for migration instructions`);
+  const agent = options.agent || new HttpAgent({ ...options.agentOptions });
+  
+  // Fetch root key for certificate validation during development
+  if (process.env.DFX_NETWORK !== "ic") {
+    agent.fetchRootKey().catch(err => {
+      console.warn("Unable to fetch root key. Check to ensure that your local replica is running");
+      console.error(err);
+    });
+  }
+
+  // Creates an actor with using the candid interface and the HttpAgent
+  return Actor.createActor(idlFactory, {
+    agent,
+    canisterId,
+    ...(options ? options.actorOptions : {}),
+  });
+};
+  
+/**
+ * A ready-to-use agent for the foo canister
+ * @type {import("@dfinity/agent").ActorSubclass<import("./foo.did.js")._SERVICE>}
+ */
+export const foo = createActor(canisterId);

package/tests/build/success/.dfx/local/canisters/foo/init_args.txt

@@ -0,0 +1 @@
+()

package/tests/build/success/.dfx/local/canisters/foo/service.did

@@ -0,0 +1,3 @@
+service : {
+  call: () -> (text);
+}

package/tests/build/success/.dfx/local/canisters/foo/service.did.d.ts

@@ -0,0 +1,7 @@
+import type { Principal } from '@dfinity/principal';
+import type { ActorMethod } from '@dfinity/agent';
+import type { IDL } from '@dfinity/candid';
+
+export interface _SERVICE { 'call' : ActorMethod<[], string> }
+export declare const idlFactory: IDL.InterfaceFactory;
+export declare const init: (args: { IDL: typeof IDL }) => IDL.Type[];

package/tests/build/success/.dfx/local/canisters/foo/service.did.js

@@ -0,0 +1,4 @@
+export const idlFactory = ({ IDL }) => {
+  return IDL.Service({ 'call' : IDL.Func([], [IDL.Text], []) });
+};
+export const init = ({ IDL }) => { return []; };

package/tests/build/success/.dfx/local/lsp/ucwa4-rx777-77774-qaada-cai.did

@@ -0,0 +1,3 @@
+service : {
+  call: () -> (text);
+}

package/tests/build/success/.dfx/local/lsp/ulvla-h7777-77774-qaacq-cai.did

@@ -0,0 +1,3 @@
+service : {
+  call: () -> (text);
+}

package/tests/build/success/.dfx/local/network-id

@@ -0,0 +1,4 @@
+{
+  "created": "2025-09-11 02:20:43.69975 +00:00:00",
+  "settings_digest": "685af83dea9d217efa2077ec50e8b0ed561d1c292a5454dacdc43d3b5e45306f"
+}

package/tests/check/fix/overlapping.mo

@@ -0,0 +1,10 @@
+import Array "mo:core/Array";
+
+// Overlapping fixable errors (nested calls produce overlapping M0223 + M0236 edits)
+do {
+  let ar = [1, 2, 3];
+  let _ = Array.filter<Nat>(
+    Array.filter<Nat>(ar, func(x) { x > 0 }),
+    func(x) { x > 0 },
+  );
+};

package/tests/check/moc-args/Warning.mo

@@ -0,0 +1,5 @@
+persistent actor {
+  public func example() : async () {
+    let unused = 123;
+  };
+};

package/tests/check/moc-args/mops.toml

@@ -0,0 +1,2 @@
+[moc]
+args = ["-Werror"]

package/tests/check-fix.test.ts

@@ -80,6 +80,10 @@ describe("check --fix", () => {
     });
   });
 
+  test("overlapping edits", async () => {
+    await testCheckFix("overlapping.mo", { M0223: 1, M0236: 2 });
+  });
+
   test("transitive imports", async () => {
     const runMainPath = copyFixture("transitive-main.mo");
     const runLibPath = copyFixture("transitive-lib.mo");
@@ -100,6 +104,25 @@ describe("check --fix", () => {
     expect(countCodes(afterResult.stdout)).toEqual({});
   });
 
+  test("--error-format=human does not break --fix", async () => {
+    const runFilePath = copyFixture("M0223.mo");
+
+    const fixResult = await cli(
+      [
+        "check",
+        runFilePath,
+        "--fix",
+        "--",
+        warningFlags,
+        "--error-format=human",
+      ],
+      { cwd: fixDir },
+    );
+
+    expect(fixResult.stdout).toContain("1 fix applied");
+    expect(readFileSync(runFilePath, "utf-8")).not.toContain("<Nat>");
+  });
+
   test("verbose", async () => {
     const result = await cli(["check", "Ok.mo", "--fix", "--verbose"], {
       cwd: fixDir,