bingocode 1.1.159 → 1.1.161

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bingocode",
-  "version": "1.1.159",
+  "version": "1.1.161",
   "type": "module",
   "bin": {
     "claude": "bin/claude-win.cjs",

package/src/tools/FileEditTool/utils.test.ts

@@ -0,0 +1,42 @@
+import { describe, it, expect } from "bun:test";
+import { findActualString, normalizeIndentation } from "./utils";
+
+describe("findActualString", () => {
+  it("exact match works", () => {
+    const file = "  foo\n  bar";
+    expect(findActualString(file, "  bar")).toBe("  bar");
+  });
+
+  it("tab in file, spaces in search => matches via indent normalization", () => {
+    const file = "\t\tfoo\n\t\tbar";
+    const result = findActualString(file, "    bar"); // model sent spaced ver
+    expect(result).toBe("\t\tbar");
+  });
+
+  it("spaces in file, tabs in search => matches via indent normalization", () => {
+    const file = "    bar"; // 4-space indented file
+    const result = findActualString(file, "\tbar"); // model sent tab version
+    expect(result).toBe("    bar"); // should return actual content from file
+  });
+
+  it("normalizeIndentation trims leading whitespace", () => {
+    expect(normalizeIndentation("  hello")).toBe("hello");
+    expect(normalizeIndentation("\t\tfoo\n\t\tbar")).toBe("foo\nbar");
+  });
+
+  it("indent normalization preserves original string content", () => {
+    const file = "function test() {\n\tif (true) {\n\t\tconsole.log('hello');\n\t}\n}";
+    const search = "function test() {\n  if (true) {\n    console.log('hello');\n  }\n}";
+    const result = findActualString(file, search);
+    expect(result).toBe(file);
+  });
+
+  it("exact match preferred over indent normalization when both possible", () => {
+    // File has tab-indented line
+    const file = "\t\tfoo\n\t\tbar";
+    const search = "\t\tbar"; // exact match - tab
+
+    // exact match should win (check via includes returning true first)
+    expect(findActualString(file, search)).toBe("\t\tbar");
+  });
+});

package/src/tools/FileEditTool/utils.ts

@@ -92,10 +92,8 @@ export function findActualString(
   // Try with normalized quotes
   const normalizedSearch = normalizeQuotes(searchString)
   const normalizedFile = normalizeQuotes(fileContent)
-
   const searchIndex = normalizedFile.indexOf(normalizedSearch)
   if (searchIndex !== -1) {
-    // Find the actual string in the file that matches
     return fileContent.substring(searchIndex, searchIndex + searchString.length)
   }
 
@@ -108,11 +106,26 @@ export function findActualString(
   }
 
   // Try with normalized leading whitespace (tab <-> space)
-  const normalizedSearch = normalizeIndentation(searchString)
-  const normalizedFile = normalizeIndentation(fileContent)
-  const indentIndex = normalizedFile.indexOf(normalizedSearch)
-  if (indentIndex !== -1) {
-    return fileContent.substring(indentIndex, indentIndex + searchString.length)
+  const indentNormalizedSearch = normalizeIndentation(searchString)
+  const indentTrimmedFile = normalizeIndentation(fileContent)
+  const matchPoint = indentTrimmedFile.indexOf(indentNormalizedSearch)
+  if (matchPoint !== -1) {
+    // Leading whitespace normalization is NOT length-preserving,
+    // so compute bounds by matching each trimmed line back to its original.
+    const origLines = fileContent.split('\n')
+    const trimmedLines = indentTrimmedFile.split('\n')
+    const searchLines = indentNormalizedSearch.split('\n')
+    for (let i = 0; i <= trimmedLines.length - searchLines.length; i++) {
+      let k = 0
+      while (k < searchLines.length && trimmedLines[i + k] === searchLines[k]) k++
+      if (k !== searchLines.length) continue
+      let start = 0
+      for (let j = 0; j < i; j++) start += origLines[j].length + 1
+      let end = start
+      for (let j = i; j < i + k; j++) end += origLines[j].length + 1
+      return fileContent.substring(start, Math.max(start, end - 1))
+    }
+    return null
   }
 
   return null