@@ -12,6 +12,7 @@ vi.mock("delay", () => ({
1212vi . mock ( "fs/promises" , ( ) => ( {
1313 readFile : vi . fn ( ) . mockResolvedValue ( "file content" ) ,
1414 writeFile : vi . fn ( ) . mockResolvedValue ( undefined ) ,
15+ unlink : vi . fn ( ) . mockResolvedValue ( undefined ) ,
1516} ) )
1617
1718// Mock utils
@@ -110,7 +111,7 @@ describe("DiffViewProvider", () => {
110111 }
111112 vi . mocked ( vscode . WorkspaceEdit ) . mockImplementation ( ( ) => mockWorkspaceEdit as any )
112113
113- diffViewProvider = new DiffViewProvider ( mockCwd )
114+ diffViewProvider = new DiffViewProvider ( mockCwd , false )
114115 // Mock the necessary properties and methods
115116 ; ( diffViewProvider as any ) . relPath = "test.txt"
116117 ; ( diffViewProvider as any ) . activeDiffEditor = {
@@ -236,6 +237,63 @@ describe("DiffViewProvider", () => {
236237 )
237238 } )
238239
240+ it ( "should respect diffViewAutoFocus setting when opening diff" , async ( ) => {
241+ // Create a new instance with diffViewAutoFocus enabled
242+ const focusEnabledProvider = new DiffViewProvider ( mockCwd , true )
243+
244+ // Setup
245+ const mockEditor = {
246+ document : {
247+ uri : { fsPath : `${ mockCwd } /test.md` } ,
248+ getText : vi . fn ( ) . mockReturnValue ( "" ) ,
249+ lineCount : 0 ,
250+ } ,
251+ selection : {
252+ active : { line : 0 , character : 0 } ,
253+ anchor : { line : 0 , character : 0 } ,
254+ } ,
255+ edit : vi . fn ( ) . mockResolvedValue ( true ) ,
256+ revealRange : vi . fn ( ) ,
257+ }
258+
259+ // Mock showTextDocument
260+ vi . mocked ( vscode . window . showTextDocument ) . mockResolvedValue ( mockEditor as any )
261+
262+ // Mock executeCommand
263+ vi . mocked ( vscode . commands . executeCommand ) . mockResolvedValue ( undefined )
264+
265+ // Mock workspace.onDidOpenTextDocument to trigger immediately
266+ vi . mocked ( vscode . workspace . onDidOpenTextDocument ) . mockImplementation ( ( callback ) => {
267+ setTimeout ( ( ) => {
268+ callback ( { uri : { fsPath : `${ mockCwd } /test.md` } } as any )
269+ } , 0 )
270+ return { dispose : vi . fn ( ) }
271+ } )
272+
273+ // Mock window.visibleTextEditors
274+ vi . mocked ( vscode . window ) . visibleTextEditors = [ mockEditor as any ]
275+
276+ // Set up for file
277+ ; ( focusEnabledProvider as any ) . editType = "modify"
278+
279+ // Execute open
280+ await focusEnabledProvider . open ( "test.md" )
281+
282+ // Verify that preserveFocus is false when diffViewAutoFocus is true
283+ expect ( vscode . window . showTextDocument ) . toHaveBeenCalledWith (
284+ expect . objectContaining ( { fsPath : `${ mockCwd } /test.md` } ) ,
285+ { preview : false , viewColumn : vscode . ViewColumn . Active , preserveFocus : false } ,
286+ )
287+
288+ expect ( vscode . commands . executeCommand ) . toHaveBeenCalledWith (
289+ "vscode.diff" ,
290+ expect . any ( Object ) ,
291+ expect . any ( Object ) ,
292+ `test.md: ${ DIFF_VIEW_LABEL_CHANGES } (Editable)` ,
293+ { preserveFocus : false } ,
294+ )
295+ } )
296+
239297 it ( "should handle showTextDocument failure" , async ( ) => {
240298 // Mock showTextDocument to fail
241299 vi . mocked ( vscode . window . showTextDocument ) . mockRejectedValue ( new Error ( "Cannot open file" ) )
@@ -418,4 +476,91 @@ describe("DiffViewProvider", () => {
418476 expect ( vscode . languages . getDiagnostics ) . toHaveBeenCalled ( )
419477 } )
420478 } )
479+
480+ describe ( "diffViewAutoFocus behavior" , ( ) => {
481+ it ( "should use preserveFocus=true when diffViewAutoFocus is false" , async ( ) => {
482+ // Default provider has diffViewAutoFocus=false
483+ const mockEditor = {
484+ document : {
485+ uri : { fsPath : `${ mockCwd } /test.txt` } ,
486+ getText : vi . fn ( ) . mockReturnValue ( "content" ) ,
487+ save : vi . fn ( ) . mockResolvedValue ( undefined ) ,
488+ isDirty : false ,
489+ } ,
490+ }
491+
492+ vi . mocked ( vscode . window . showTextDocument ) . mockResolvedValue ( mockEditor as any )
493+ ; ( diffViewProvider as any ) . activeDiffEditor = mockEditor
494+ ; ( diffViewProvider as any ) . relPath = "test.txt"
495+ ; ( diffViewProvider as any ) . newContent = "new content"
496+ ; ( diffViewProvider as any ) . preDiagnostics = [ ]
497+ ; ( diffViewProvider as any ) . closeAllDiffViews = vi . fn ( ) . mockResolvedValue ( undefined )
498+
499+ await diffViewProvider . saveChanges ( false )
500+
501+ expect ( vscode . window . showTextDocument ) . toHaveBeenCalledWith ( expect . any ( Object ) , {
502+ preview : false ,
503+ preserveFocus : true ,
504+ } )
505+ } )
506+
507+ it ( "should use preserveFocus=false when diffViewAutoFocus is true" , async ( ) => {
508+ // Create provider with diffViewAutoFocus=true
509+ const focusProvider = new DiffViewProvider ( mockCwd , true )
510+ const mockEditor = {
511+ document : {
512+ uri : { fsPath : `${ mockCwd } /test.txt` } ,
513+ getText : vi . fn ( ) . mockReturnValue ( "content" ) ,
514+ save : vi . fn ( ) . mockResolvedValue ( undefined ) ,
515+ isDirty : false ,
516+ } ,
517+ }
518+
519+ vi . mocked ( vscode . window . showTextDocument ) . mockResolvedValue ( mockEditor as any )
520+ ; ( focusProvider as any ) . activeDiffEditor = mockEditor
521+ ; ( focusProvider as any ) . relPath = "test.txt"
522+ ; ( focusProvider as any ) . newContent = "new content"
523+ ; ( focusProvider as any ) . preDiagnostics = [ ]
524+ ; ( focusProvider as any ) . closeAllDiffViews = vi . fn ( ) . mockResolvedValue ( undefined )
525+
526+ await focusProvider . saveChanges ( false )
527+
528+ expect ( vscode . window . showTextDocument ) . toHaveBeenCalledWith ( expect . any ( Object ) , {
529+ preview : false ,
530+ preserveFocus : false ,
531+ } )
532+ } )
533+
534+ it ( "should use preserveFocus=false for revertChanges when diffViewAutoFocus is true" , async ( ) => {
535+ // Create provider with diffViewAutoFocus=true
536+ const focusProvider = new DiffViewProvider ( mockCwd , true )
537+ const mockEditor = {
538+ document : {
539+ uri : { fsPath : `${ mockCwd } /test.txt` } ,
540+ getText : vi . fn ( ) . mockReturnValue ( "content" ) ,
541+ save : vi . fn ( ) . mockResolvedValue ( undefined ) ,
542+ isDirty : false ,
543+ positionAt : vi . fn ( ) . mockReturnValue ( { line : 0 , character : 0 } ) ,
544+ } ,
545+ edit : vi . fn ( ) . mockResolvedValue ( true ) ,
546+ }
547+
548+ vi . mocked ( vscode . window . showTextDocument ) . mockResolvedValue ( mockEditor as any )
549+ vi . mocked ( vscode . workspace . applyEdit ) . mockResolvedValue ( true )
550+ ; ( focusProvider as any ) . activeDiffEditor = mockEditor
551+ ; ( focusProvider as any ) . relPath = "test.txt"
552+ ; ( focusProvider as any ) . originalContent = "original content"
553+ ; ( focusProvider as any ) . preDiagnostics = [ ]
554+ ; ( focusProvider as any ) . editType = "modify" // Set to modify so it goes through the revert path
555+ ; ( focusProvider as any ) . documentWasOpen = true // This needs to be true for showTextDocument to be called
556+ ; ( focusProvider as any ) . closeAllDiffViews = vi . fn ( ) . mockResolvedValue ( undefined )
557+
558+ await focusProvider . revertChanges ( )
559+
560+ expect ( vscode . window . showTextDocument ) . toHaveBeenCalledWith ( expect . any ( Object ) , {
561+ preview : false ,
562+ preserveFocus : false ,
563+ } )
564+ } )
565+ } )
421566} )
0 commit comments