Repository navigation
Commit da2b913
committed
Merge upstream/main (a0d03a0) into fws/u8-diffview-guarded-save
The only conflicted path was src/core/tools/ApplyDiffTool.ts and it conflicted in its import
block: this branch added versionTokenOfStat for the read/observe authorization, upstream
1b9cb7d added isPathOutsideWorkspace for the outside-workspace auto-approve guard. Both
imports are kept, so both semantics survive - upstream's isOutsideWorkspace flag on the
appliedDiff payload (:168/:174 and :377) and this branch's stat-around-read authorization
(:82-:101). Task.ts, applyDiffTool.failureReporting.spec.ts and src/eslint-suppressions.json
auto-merged. This merge answers and resolves nothing on the review side.
Two test files needed integration work, in setup only, no assertion removed:
- applyDiffTool.outsideWorkspace.spec.ts arrived from upstream with a Task double that
predates this branch's tool, so it now also carries the stat result and an
observationRegistry, because the merged tool stats around its own read and consults the
registry before saving.
- guardedWrite.spec.ts wrote task.abort = true at two rows. Task.ts:3587 (main) exposes abort
as an accessor over the run state, so writing it is a TS2540 on a Task-typed double. The
double now carries the accessor plus the state holder it reads and the two rows flip that
holder instead of writing the accessor: same mid-flight abort, same assertions.
After both: tsc --noEmit -p tsconfig.json is exit 0 on the merged tree, and the 70 test files
under core/tools/__tests__, core/task/__tests__ and DiffViewProvider.spec.ts pass (1602
passed, 5 skipped). eslint --max-warnings=0 and prettier --check are exit 0 on every file both
sides changed, plus the two test files touched above.
Controls against the merged tree, both reverted: forcing the payload flag to false takes
outsideWorkspace.spec.ts to 6 failed, and skipping the stat-around-read block takes
failureReporting/guardedWrite to 1 failed, so neither semantic is carried by accident. The
suppression records did not rise: 265 file records with a summed count of 2866 on this merge,
against 2868 on main and 2868 on the branch head it replaced. The narrow --prune-suppressions
runs were checks only and were reverted.34 files changed
Lines changed: 900 additions & 193 deletions
File tree
- .github/workflows
- apps/vscode-e2e
- src/suite
- src
- core
- task
- __tests__
- run-state
- __tests__
- tools
- __tests__
- webview/__tests__
- scripts
- test-utils
- __tests__
- webview-ui
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
247 | 247 | | |
248 | 248 | | |
249 | 249 | | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
250 | 255 | | |
251 | 256 | | |
252 | 257 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
148 | 150 | | |
149 | 151 | | |
150 | 152 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
100 | 101 | | |
101 | 102 | | |
102 | 103 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
145 | 145 | | |
146 | 146 | | |
147 | 147 | | |
148 | | - | |
| 148 | + | |
149 | 149 | | |
150 | 150 | | |
151 | 151 | | |
| |||
397 | 397 | | |
398 | 398 | | |
399 | 399 | | |
400 | | - | |
401 | 400 | | |
402 | 401 | | |
403 | 402 | | |
| |||
415 | 414 | | |
416 | 415 | | |
417 | 416 | | |
418 | | - | |
419 | 417 | | |
420 | 418 | | |
421 | 419 | | |
| |||
3586 | 3584 | | |
3587 | 3585 | | |
3588 | 3586 | | |
| 3587 | + | |
| 3588 | + | |
| 3589 | + | |
| 3590 | + | |
| 3591 | + | |
| 3592 | + | |
| 3593 | + | |
| 3594 | + | |
3589 | 3595 | | |
3590 | | - | |
3591 | 3596 | | |
3592 | 3597 | | |
3593 | 3598 | | |
3594 | 3599 | | |
3595 | 3600 | | |
3596 | 3601 | | |
3597 | 3602 | | |
3598 | | - | |
3599 | 3603 | | |
3600 | 3604 | | |
3601 | 3605 | | |
| |||
3605 | 3609 | | |
3606 | 3610 | | |
3607 | 3611 | | |
3608 | | - | |
3609 | 3612 | | |
3610 | 3613 | | |
3611 | 3614 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| |||
909 | 910 | | |
910 | 911 | | |
911 | 912 | | |
912 | | - | |
| 913 | + | |
913 | 914 | | |
914 | 915 | | |
915 | 916 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
104 | | - | |
| 104 | + | |
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
110 | 110 | | |
111 | | - | |
| 111 | + | |
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
| |||
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
127 | | - | |
| 127 | + | |
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
| |||
149 | 149 | | |
150 | 150 | | |
151 | 151 | | |
152 | | - | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
153 | 157 | | |
154 | 158 | | |
155 | 159 | | |
156 | 160 | | |
157 | | - | |
158 | 161 | | |
159 | 162 | | |
160 | 163 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| 102 | + | |
102 | 103 | | |
103 | 104 | | |
104 | 105 | | |
| |||
1071 | 1072 | | |
1072 | 1073 | | |
1073 | 1074 | | |
1074 | | - | |
| 1075 | + | |
1075 | 1076 | | |
1076 | 1077 | | |
1077 | 1078 | | |
| |||
4922 | 4923 | | |
4923 | 4924 | | |
4924 | 4925 | | |
4925 | | - | |
| 4926 | + | |
4926 | 4927 | | |
4927 | 4928 | | |
4928 | 4929 | | |
| |||
4943 | 4944 | | |
4944 | 4945 | | |
4945 | 4946 | | |
4946 | | - | |
| 4947 | + | |
4947 | 4948 | | |
4948 | 4949 | | |
4949 | 4950 | | |
| |||
7344 | 7345 | | |
7345 | 7346 | | |
7346 | 7347 | | |
7347 | | - | |
| 7348 | + | |
7348 | 7349 | | |
7349 | 7350 | | |
7350 | 7351 | | |
| |||
7398 | 7399 | | |
7399 | 7400 | | |
7400 | 7401 | | |
7401 | | - | |
| 7402 | + | |
7402 | 7403 | | |
7403 | 7404 | | |
7404 | 7405 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
| |||
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
14 | | - | |
| 15 | + | |
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
| |||
44 | 45 | | |
45 | 46 | | |
46 | 47 | | |
47 | | - | |
| 48 | + | |
48 | 49 | | |
49 | 50 | | |
50 | 51 | | |
| |||
62 | 63 | | |
63 | 64 | | |
64 | 65 | | |
65 | | - | |
| 66 | + | |
66 | 67 | | |
67 | 68 | | |
68 | 69 | | |
| |||
83 | 84 | | |
84 | 85 | | |
85 | 86 | | |
86 | | - | |
| 87 | + | |
87 | 88 | | |
88 | 89 | | |
89 | 90 | | |
| |||
102 | 103 | | |
103 | 104 | | |
104 | 105 | | |
105 | | - | |
| 106 | + | |
106 | 107 | | |
107 | 108 | | |
108 | 109 | | |
| |||
0 commit comments