fix(amazonq): use diffWordsWithSpace instead of diffChars to calculate highlightedRanges

Author: atonaamz

packages/amazonq/src/app/inline/EditRendering/svgGenerator.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { diffChars } from 'diff'
+import { diffWordsWithSpace } from 'diff'
 import * as vscode from 'vscode'
 import { ToolkitError, getLogger } from 'aws-core-vscode/shared'
 import { diffUtilities } from 'aws-core-vscode/shared'
@@ -416,41 +416,41 @@ export class SvgGenerationService {
         /**
          * Merges ranges on the same line that are separated by only one character
          */
-        const mergeAdjacentRanges = (ranges: Range[]): Range[] => {
-            const sortedRanges = [...ranges].sort((a, b) => {
-                if (a.line !== b.line) {
-                    return a.line - b.line
-                }
-                return a.start - b.start
-            })
-
-            const result: Range[] = []
-
-            // Process all ranges
-            for (let i = 0; i < sortedRanges.length; i++) {
-                const current = sortedRanges[i]
-
-                // If this is the last range or ranges are on different lines, add it directly
-                if (i === sortedRanges.length - 1 || current.line !== sortedRanges[i + 1].line) {
-                    result.push(current)
-                    continue
-                }
-
-                // Check if current range and next range can be merged
-                const next = sortedRanges[i + 1]
-                if (current.line === next.line && next.start - current.end <= 1) {
-                    sortedRanges[i + 1] = {
-                        line: current.line,
-                        start: current.start,
-                        end: Math.max(current.end, next.end),
-                    }
-                } else {
-                    result.push(current)
-                }
-            }
-
-            return result
-        }
+        // const mergeAdjacentRanges = (ranges: Range[]): Range[] => {
+        //     const sortedRanges = [...ranges].sort((a, b) => {
+        //         if (a.line !== b.line) {
+        //             return a.line - b.line
+        //         }
+        //         return a.start - b.start
+        //     })
+
+        //     const result: Range[] = []
+
+        //     // Process all ranges
+        //     for (let i = 0; i < sortedRanges.length; i++) {
+        //         const current = sortedRanges[i]
+
+        //         // If this is the last range or ranges are on different lines, add it directly
+        //         if (i === sortedRanges.length - 1 || current.line !== sortedRanges[i + 1].line) {
+        //             result.push(current)
+        //             continue
+        //         }
+
+        //         // Check if current range and next range can be merged
+        //         const next = sortedRanges[i + 1]
+        //         if (current.line === next.line && next.start - current.end <= 1) {
+        //             sortedRanges[i + 1] = {
+        //                 line: current.line,
+        //                 start: current.start,
+        //                 end: Math.max(current.end, next.end),
+        //             }
+        //         } else {
+        //             result.push(current)
+        //         }
+        //     }
+
+        //     return result
+        // }
 
         // Create reverse mapping for quicker lookups
         const reverseMap = new Map<string, string>()
@@ -465,7 +465,7 @@ export class SvgGenerationService {
             // If line exists in modifiedLines as a key, process character diffs
             if (Array.from(modifiedLines.keys()).includes(line)) {
                 const modifiedLine = modifiedLines.get(line)!
-                const changes = diffChars(line, modifiedLine)
+                const changes = diffWordsWithSpace(line, modifiedLine)
 
                 let charPos = 0
                 for (const part of changes) {
@@ -497,7 +497,7 @@ export class SvgGenerationService {
 
             if (reverseMap.has(line)) {
                 const originalLine = reverseMap.get(line)!
-                const changes = diffChars(originalLine, line)
+                const changes = diffWordsWithSpace(originalLine, line)
 
                 let charPos = 0
                 for (const part of changes) {
@@ -522,12 +522,12 @@ export class SvgGenerationService {
             }
         }
 
-        const mergedOriginalRanges = mergeAdjacentRanges(originalRanges)
-        const mergedAfterRanges = mergeAdjacentRanges(afterRanges)
+        // const mergedOriginalRanges = mergeAdjacentRanges(originalRanges)
+        // const mergedAfterRanges = mergeAdjacentRanges(afterRanges)
 
         return {
-            removedRanges: mergedOriginalRanges,
-            addedRanges: mergedAfterRanges,
+            removedRanges: originalRanges,
+            addedRanges: afterRanges,
         }
     }
 }