@@ -959,6 +959,88 @@ describe("DiffViewProvider", () => {
959959 expect ( mockTask . say ) . not . toHaveBeenCalled ( )
960960 } )
961961
962+ it ( "keeps each overlapping save's own diagnostics baseline" , async ( ) => {
963+ const mockDelay = vi . mocked ( delay )
964+ mockDelay . mockClear ( )
965+ vi . mocked ( vscode . languages . getDiagnostics ) . mockClear ( )
966+
967+ // Both saves are started before either tail runs. The first save's pre-save
968+ // snapshot is empty, the second save's snapshot already has the problem (it
969+ // landed between the two writes); the post snapshot has it too. Each tail must
970+ // compare against its OWN captured baseline: the first emits once and the
971+ // second emits nothing. Using the shared this.preDiagnostics would emit zero.
972+ const diag : vscode . Diagnostic = {
973+ severity : vscode . DiagnosticSeverity . Error ,
974+ range : new vscode . Range ( 0 , 0 , 0 , 1 ) ,
975+ message : "overlap-problem" ,
976+ }
977+ const diagnostics : [ vscode . Uri , vscode . Diagnostic [ ] ] [ ] = [ [ makeUri ( mockCwd + "/test.ts" ) , [ diag ] ] ]
978+ vi . mocked ( vscode . languages . getDiagnostics )
979+ . mockReturnValueOnce ( [ ] )
980+ . mockReturnValueOnce ( diagnostics )
981+ . mockReturnValue ( diagnostics )
982+
983+ // Gate both tail delays so the two saves overlap before either tail runs.
984+ const releases : Array < ( ) => void > = [ ]
985+ mockDelay . mockImplementation (
986+ ( ) =>
987+ new Promise < void > ( ( resolve ) => {
988+ releases . push ( resolve )
989+ } ) ,
990+ )
991+
992+ await diffViewProvider . saveDirectly ( "test.ts" , "first" , true , true , 100 )
993+ await diffViewProvider . saveDirectly ( "test.ts" , "second" , true , true , 100 )
994+ expect ( releases ) . toHaveLength ( 2 )
995+
996+ releases . forEach ( ( release ) => release ( ) )
997+ await new Promise ( ( resolve ) => setTimeout ( resolve , 0 ) )
998+
999+ expect ( mockTask . say ) . toHaveBeenCalledTimes ( 1 )
1000+ expect ( mockTask . say . mock . calls [ 0 ] ?. [ 1 ] ) . toContain ( "overlap-problem" )
1001+
1002+ mockDelay . mockImplementation ( ( ) => Promise . resolve ( ) )
1003+ } )
1004+
1005+ it ( "stops a tail whose delay is aborted before any diagnostics work" , async ( ) => {
1006+ const mockDelay = vi . mocked ( delay )
1007+ mockDelay . mockClear ( )
1008+ vi . mocked ( vscode . languages . getDiagnostics ) . mockClear ( )
1009+ vi . mocked ( vscode . languages . getDiagnostics ) . mockReturnValue ( [ ] )
1010+ const warnSpy = vi . spyOn ( console , "warn" ) . mockImplementation ( ( ) => { } )
1011+
1012+ // The mocked delay rejects with an AbortError when the tail's signal aborts;
1013+ // cancellation lands during the wait, before the post-save snapshot.
1014+ mockDelay . mockImplementation (
1015+ ( _ms : number , options ?: { signal ?: AbortSignal } ) =>
1016+ new Promise < void > ( ( _resolve , reject ) => {
1017+ options ?. signal ?. addEventListener (
1018+ "abort" ,
1019+ ( ) => reject ( Object . assign ( new Error ( "aborted" ) , { name : "AbortError" } ) ) ,
1020+ { once : true } ,
1021+ )
1022+ } ) ,
1023+ )
1024+
1025+ try {
1026+ await diffViewProvider . saveDirectly ( "test.ts" , "content" , true , true , 100 )
1027+ await new Promise ( ( resolve ) => setTimeout ( resolve , 0 ) )
1028+ // Only saveDirectly's pre-save snapshot ran so far.
1029+ expect ( vscode . languages . getDiagnostics ) . toHaveBeenCalledTimes ( 1 )
1030+
1031+ diffViewProvider . cancelPostSaveDiagnosticsTails ( )
1032+ await new Promise ( ( resolve ) => setTimeout ( resolve , 0 ) )
1033+
1034+ // The aborted tail returns before querying diagnostics or emitting anything.
1035+ expect ( vscode . languages . getDiagnostics ) . toHaveBeenCalledTimes ( 1 )
1036+ expect ( mockTask . say ) . not . toHaveBeenCalled ( )
1037+ expect ( warnSpy ) . not . toHaveBeenCalled ( )
1038+ } finally {
1039+ warnSpy . mockRestore ( )
1040+ mockDelay . mockImplementation ( ( ) => Promise . resolve ( ) )
1041+ }
1042+ } )
1043+
9621044 it ( "attributes only the saved file's new problems to the saved file" , async ( ) => {
9631045 vi . mocked ( vscode . languages . getDiagnostics ) . mockClear ( )
9641046
0 commit comments