Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 5 additions & 47 deletions packages/amazonq/src/app/inline/EditRendering/svgGenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -413,45 +413,6 @@ export class SvgGenerationService {
const originalRanges: Range[] = []
const afterRanges: Range[] = []

/**
* 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
}

// Create reverse mapping for quicker lookups
const reverseMap = new Map<string, string>()
for (const [original, modified] of modifiedLines.entries()) {
Expand All @@ -465,7 +426,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) {
Expand Down Expand Up @@ -497,7 +458,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) {
Expand All @@ -522,12 +483,9 @@ export class SvgGenerationService {
}
}

const mergedOriginalRanges = mergeAdjacentRanges(originalRanges)
const mergedAfterRanges = mergeAdjacentRanges(afterRanges)

return {
removedRanges: mergedOriginalRanges,
addedRanges: mergedAfterRanges,
removedRanges: originalRanges,
addedRanges: afterRanges,
}
}
}
Expand Down
28 changes: 1 addition & 27 deletions packages/amazonq/test/unit/app/inline/EditRendering/svgGenerator.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ describe('SvgGenerationService', function () {
})

describe('highlight ranges', function () {
it('should generate highlight ranges for character-level changes', function () {
it('should generate highlight ranges for word-level changes', function () {
const originalCode = ['function test() {', ' return 42;', '}']
const afterCode = ['function test() {', ' return 100;', '}']
const modifiedLines = new Map([[' return 42;', ' return 100;']])
Expand All @@ -174,32 +174,6 @@ describe('SvgGenerationService', function () {
assert.ok(addedRange.end > addedRange.start)
})

it('should merge adjacent highlight ranges', function () {
const originalCode = ['function test() {', ' return 42;', '}']
const afterCode = ['function test() {', ' return 100;', '}']
const modifiedLines = new Map([[' return 42;', ' return 100;']])

const generateHighlightRanges = (service as any).generateHighlightRanges.bind(service)
const result = generateHighlightRanges(originalCode, afterCode, modifiedLines)

// Adjacent ranges should be merged
const sortedRanges = [...result.addedRanges].sort((a, b) => {
if (a.line !== b.line) {
return a.line - b.line
}
return a.start - b.start
})

// Check that no adjacent ranges exist
for (let i = 0; i < sortedRanges.length - 1; i++) {
const current = sortedRanges[i]
const next = sortedRanges[i + 1]
if (current.line === next.line) {
assert.ok(next.start - current.end > 1, 'Adjacent ranges should be merged')
}
}
})

it('should handle HTML escaping in highlight edits', function () {
const newLines = ['function test() {', ' return "<script>alert(1)</script>";', '}']
const highlightRanges = [{ line: 1, start: 10, end: 35 }]
Expand Down
Loading