Repository navigation
Commit d030e04
s3-1395
fix(diff-view): reopen the preview tabs a discarded stream evicted
restorePreviewTabs() is defined at DiffViewProvider.ts:1141 and reached from saveChanges()
(:403) and revertChanges() (:917), but not from discardUnapprovedStream(), so a denied stream
left every preview tab VS Code evicted to open the diff closed out: reset() clears
snapshotPreviewTabs right after the method returns and nothing reopened what the snapshot
held. Call it from the discard path once the artifact sweep succeeds and before the outcome
is reported, including on the path where the diff editor is already gone, and skip it when
cleanupFailure is set - the placeholder is then still on disk and still owned, and the
snapshot is the only record the retry path has of what is left to remove.
restorePreviewTabs() reports its own per-tab failures (fs.access miss -> continue, showText
Document rejection -> console.error), so awaiting it here cannot mask editorFailure.
Coverage: the reopened-tab test fails before this commit with "Number of calls: 0" and
passes after it; the sweep-failure test pins the skip and passed before it as well. 135
passed (135 tests) after, 134 passed / 1 failed before.1 parent d65ab55 commit d030e04
2 files changed
Lines changed: 80 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
786 | 786 | | |
787 | 787 | | |
788 | 788 | | |
| 789 | + | |
| 790 | + | |
| 791 | + | |
| 792 | + | |
| 793 | + | |
| 794 | + | |
| 795 | + | |
| 796 | + | |
| 797 | + | |
| 798 | + | |
| 799 | + | |
789 | 800 | | |
790 | 801 | | |
791 | 802 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2899 | 2899 | | |
2900 | 2900 | | |
2901 | 2901 | | |
| 2902 | + | |
| 2903 | + | |
| 2904 | + | |
| 2905 | + | |
| 2906 | + | |
| 2907 | + | |
| 2908 | + | |
| 2909 | + | |
| 2910 | + | |
| 2911 | + | |
| 2912 | + | |
| 2913 | + | |
| 2914 | + | |
| 2915 | + | |
| 2916 | + | |
| 2917 | + | |
| 2918 | + | |
| 2919 | + | |
| 2920 | + | |
| 2921 | + | |
| 2922 | + | |
| 2923 | + | |
| 2924 | + | |
| 2925 | + | |
| 2926 | + | |
| 2927 | + | |
| 2928 | + | |
| 2929 | + | |
| 2930 | + | |
| 2931 | + | |
| 2932 | + | |
| 2933 | + | |
| 2934 | + | |
| 2935 | + | |
| 2936 | + | |
| 2937 | + | |
| 2938 | + | |
| 2939 | + | |
| 2940 | + | |
| 2941 | + | |
| 2942 | + | |
| 2943 | + | |
| 2944 | + | |
| 2945 | + | |
| 2946 | + | |
| 2947 | + | |
| 2948 | + | |
| 2949 | + | |
| 2950 | + | |
| 2951 | + | |
| 2952 | + | |
| 2953 | + | |
| 2954 | + | |
| 2955 | + | |
| 2956 | + | |
| 2957 | + | |
| 2958 | + | |
| 2959 | + | |
| 2960 | + | |
| 2961 | + | |
| 2962 | + | |
| 2963 | + | |
| 2964 | + | |
| 2965 | + | |
| 2966 | + | |
| 2967 | + | |
| 2968 | + | |
| 2969 | + | |
| 2970 | + | |
2902 | 2971 | | |
2903 | 2972 | | |
2904 | 2973 | | |
| |||
0 commit comments