Skip to content

Commit 120aba1

Browse files
committed
simplify the code base
1 parent 88bde6f commit 120aba1

File tree

2 files changed

+16
-49
lines changed

2 files changed

+16
-49
lines changed

packages/amazonq/src/lsp/chat/diffAnimation/streamingDiffController.ts

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ export class StreamingDiffController implements vscode.Disposable {
4646
vscode.workspace.registerTextDocumentContentProvider(diffViewUriScheme, this.contentProvider)
4747
}
4848

49+
private disposeSession(session: StreamingSession): void {
50+
session.disposed = true
51+
session.fadedOverlayController.clear()
52+
session.activeLineController.clear()
53+
}
54+
55+
private logError(context: string, toolUseId: string, error: any): void {
56+
getLogger().error(`[StreamingDiffController] ❌ ${context} for ${toolUseId}: ${error}`)
57+
}
58+
4959
updateFsWriteParams(toolUseId: string, fsWriteParams: FsWriteParams): void {
5060
const session = this.activeStreamingSessions.get(toolUseId)
5161
if (session) {
@@ -246,7 +256,7 @@ export class StreamingDiffController implements vscode.Disposable {
246256
setTimeout(async () => {
247257
try {
248258
await this.cleanupTempFile(session.tempFilePath)
249-
session.disposed = true
259+
this.disposeSession(session)
250260
this.activeStreamingSessions.delete(toolUseId)
251261
} catch (error) {
252262
getLogger().warn(`Failed to auto-cleanup temp file ${session.tempFilePath}: ${error}`)
@@ -279,7 +289,7 @@ export class StreamingDiffController implements vscode.Disposable {
279289
return
280290
}
281291
const currentContent = document.getText()
282-
if (document.uri.fsPath === session.tempFilePath) {
292+
if (document.uri.fsPath !== session.tempFilePath) {
283293
return
284294
}
285295
try {
@@ -417,9 +427,7 @@ export class StreamingDiffController implements vscode.Disposable {
417427
}
418428

419429
try {
420-
session.disposed = true
421-
session.fadedOverlayController.clear()
422-
session.activeLineController.clear()
430+
this.disposeSession(session)
423431

424432
// Clean up temp file immediately when session is closed
425433
if (session.tempFilePath) {
@@ -428,9 +436,7 @@ export class StreamingDiffController implements vscode.Disposable {
428436

429437
this.activeStreamingSessions.delete(toolUseId)
430438
} catch (error) {
431-
getLogger().error(
432-
`[StreamingDiffController] ❌ Failed to close streaming session for ${toolUseId}: ${error}`
433-
)
439+
this.logError('Failed to close streaming session', toolUseId, error)
434440
}
435441
}
436442

@@ -569,11 +575,9 @@ export class StreamingDiffController implements vscode.Disposable {
569575

570576
for (const [toolUseId, session] of this.activeStreamingSessions.entries()) {
571577
try {
572-
session.disposed = true
573-
session.fadedOverlayController.clear()
574-
session.activeLineController.clear()
578+
this.disposeSession(session)
575579
} catch (error) {
576-
getLogger().error(`[StreamingDiffController] ❌ Error disposing session ${toolUseId}: ${error}`)
580+
this.logError('Error disposing session', toolUseId, error)
577581
}
578582
}
579583

packages/amazonq/src/lsp/chat/diffAnimation/types.ts

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,43 +14,6 @@ export interface DiffAnimation {
1414
isFromChatClick?: boolean
1515
}
1616

17-
export interface PartialUpdateOptions {
18-
changeLocation?: {
19-
startLine: number
20-
endLine: number
21-
startChar?: number
22-
endChar?: number
23-
}
24-
searchContent?: string
25-
isPartialUpdate?: boolean
26-
}
27-
28-
export interface DiffLine {
29-
type: 'unchanged' | 'added' | 'removed'
30-
content: string
31-
lineNumber: number
32-
oldLineNumber?: number
33-
newLineNumber?: number
34-
}
35-
36-
export interface ChangedRegion {
37-
startLine: number
38-
endLine: number
39-
totalLines: number
40-
}
41-
42-
export interface ScanPlan {
43-
leftLines: Array<DiffLine & { index: number }>
44-
rightLines: Array<DiffLine & { index: number }>
45-
scanPlan: Array<{
46-
leftIndex: number | undefined
47-
rightIndex: number | undefined
48-
leftLine?: DiffLine & { index: number }
49-
rightLine?: DiffLine & { index: number }
50-
preAdded?: boolean
51-
}>
52-
}
53-
5417
export interface FsWriteParams {
5518
command?: string
5619
insertLine?: number

0 commit comments

Comments
 (0)