Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 03ac5ef

Browse files
ghostwriternrghostwriternr
committed
Merge remote-tracking branch 'upstream/main' into fetch-upstream-250524
2 parents cac3e6a + 91b99e1 commit 03ac5ef

File tree

336 files changed

+9168
-4325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

336 files changed

+9168
-4325
lines changed

‎.vscode/extensions/vscode-selfhost-test-provider/src/extension.ts

+13-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const TEST_FILE_PATTERN = 'src/vs/**/*.{test,integrationTest}.ts';
2525

2626
const getWorkspaceFolderForTestFile = (uri: vscode.Uri) =>
2727
(uri.path.endsWith('.test.ts') || uri.path.endsWith('.integrationTest.ts')) &&
28-
uri.path.includes('/src/vs/')
28+
uri.path.includes('/src/vs/')
2929
? vscode.workspace.getWorkspaceFolder(uri)
3030
: undefined;
3131

@@ -41,6 +41,17 @@ export async function activate(context: vscode.ExtensionContext) {
4141
const ctrl = vscode.tests.createTestController('selfhost-test-controller', 'VS Code Tests');
4242
const fileChangedEmitter = new vscode.EventEmitter<FileChangeEvent>();
4343

44+
context.subscriptions.push(vscode.tests.registerTestFollowupProvider({
45+
async provideFollowup(_result, test, taskIndex, messageIndex, _token) {
46+
return [{
47+
title: '$(sparkle) Ask copilot for help',
48+
command: 'github.copilot.tests.fixTestFailure',
49+
arguments: [{ source: 'peekFollowup', test, message: test.taskStates[taskIndex].messages[messageIndex] }]
50+
}];
51+
},
52+
}));
53+
54+
4455
ctrl.resolveHandler = async test => {
4556
if (!test) {
4657
context.subscriptions.push(await startWatchingWorkspace(ctrl, fileChangedEmitter));
@@ -62,7 +73,7 @@ export async function activate(context: vscode.ExtensionContext) {
6273
});
6374

6475
const createRunHandler = (
65-
runnerCtor: { new (folder: vscode.WorkspaceFolder): VSCodeTestRunner },
76+
runnerCtor: { new(folder: vscode.WorkspaceFolder): VSCodeTestRunner },
6677
kind: vscode.TestRunProfileKind,
6778
args: string[] = []
6879
) => {

‎.vscode/extensions/vscode-selfhost-test-provider/src/failingDeepStrictEqualAssertFixer.ts

+8-10
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ export class FailingDeepStrictEqualAssertFixer {
7171
},
7272
})
7373
);
74-
75-
tests.testResults;
7674
}
7775

7876
dispose() {
@@ -99,15 +97,15 @@ const formatJsonValue = (value: unknown) => {
9997
context => (node: ts.Node) => {
10098
const visitor = (node: ts.Node): ts.Node =>
10199
ts.isPropertyAssignment(node) &&
102-
ts.isStringLiteralLike(node.name) &&
103-
identifierLikeRe.test(node.name.text)
100+
ts.isStringLiteralLike(node.name) &&
101+
identifierLikeRe.test(node.name.text)
104102
? ts.factory.createPropertyAssignment(
105-
ts.factory.createIdentifier(node.name.text),
106-
ts.visitNode(node.initializer, visitor) as ts.Expression
107-
)
103+
ts.factory.createIdentifier(node.name.text),
104+
ts.visitNode(node.initializer, visitor) as ts.Expression
105+
)
108106
: ts.isStringLiteralLike(node) && node.text === '[undefined]'
109-
? ts.factory.createIdentifier('undefined')
110-
: ts.visitEachChild(node, visitor, context);
107+
? ts.factory.createIdentifier('undefined')
108+
: ts.visitEachChild(node, visitor, context);
111109

112110
return ts.visitNode(node, visitor);
113111
},
@@ -190,7 +188,7 @@ class StrictEqualAssertion {
190188
return undefined;
191189
}
192190

193-
constructor(private readonly expression: ts.CallExpression) {}
191+
constructor(private readonly expression: ts.CallExpression) { }
194192

195193
/** Gets the expected value */
196194
public get expectedValue(): ts.Expression | undefined {

‎.vscode/extensions/vscode-selfhost-test-provider/src/testOutputScanner.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ export async function scanTestOutput(
204204
return;
205205
}
206206

207-
const logLocation = store.getSourceLocation(match[2], Number(match[3]));
207+
const logLocation = store.getSourceLocation(match[2], Number(match[3]) - 1);
208208
const logContents = replaceAllLocations(store, match[1]);
209209
const test = currentTest;
210210

@@ -459,7 +459,8 @@ export class SourceMapStore {
459459
};
460460
}
461461

462-
async getSourceLocation(fileUri: string, line: number, col = 1) {
462+
/** Gets an original location from a base 0 line and column */
463+
async getSourceLocation(fileUri: string, line: number, col = 0) {
463464
return this.getSourceLocationMapper(fileUri).then(m => m(line, col));
464465
}
465466

@@ -599,5 +600,5 @@ async function tryDeriveStackLocation(
599600

600601
async function deriveSourceLocation(store: SourceMapStore, parts: RegExpMatchArray) {
601602
const [, fileUri, line, col] = parts;
602-
return store.getSourceLocation(fileUri, Number(line), Number(col));
603+
return store.getSourceLocation(fileUri, Number(line) - 1, Number(col));
603604
}

‎.vscode/settings.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,5 @@
170170
},
171171
"css.format.spaceAroundSelectorSeparator": true,
172172
"inlineChat.mode": "live",
173-
"typescript.enablePromptUseWorkspaceTsdk": true,
174-
"typescript.tsserver.experimental.useVsCodeWatcher": true
173+
"typescript.enablePromptUseWorkspaceTsdk": true
175174
}

‎.yarnrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
disturl "https://electronjs.org/headers"
2-
target "29.3.1"
3-
ms_build_id "9464424"
2+
target "29.4.0"
3+
ms_build_id "9593362"
44
runtime "electron"
55
build_from_source "true"

‎build/.moduleignore

+9
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ fsevents/test/**
2020
@vscode/spdlog/*.yml
2121
!@vscode/spdlog/build/Release/*.node
2222

23+
@vscode/deviceid/binding.gyp
24+
@vscode/deviceid/build/**
25+
@vscode/deviceid/deps/**
26+
@vscode/deviceid/src/**
27+
@vscode/deviceid/test/**
28+
@vscode/deviceid/*.yml
29+
!@vscode/deviceid/build/Release/*.node
30+
31+
2332
@vscode/sqlite3/binding.gyp
2433
@vscode/sqlite3/benchmark/**
2534
@vscode/sqlite3/cloudformation/**

‎build/azure-pipelines/linux/product-build-linux-test.yml

+6-26
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@ steps:
9292
- script: ./scripts/test-integration.sh --tfs "Integration Tests"
9393
env:
9494
DISPLAY: ":10"
95-
# TODO(deepak1556): Remove this once runtime is updated for
96-
# https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724
97-
UV_USE_IO_URING: 0
9895
displayName: Run integration tests (Electron)
9996
timeoutInMinutes: 20
10097

@@ -104,8 +101,7 @@ steps:
104101

105102
- script: ./scripts/test-remote-integration.sh
106103
env:
107-
# TODO(deepak1556): Remove this once runtime is updated for
108-
# https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724
104+
# TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x
109105
UV_USE_IO_URING: 0
110106
displayName: Run integration tests (Remote)
111107
timeoutInMinutes: 20
@@ -123,9 +119,6 @@ steps:
123119
./scripts/test-integration.sh --build --tfs "Integration Tests"
124120
env:
125121
VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)
126-
# TODO(deepak1556): Remove this once runtime is updated for
127-
# https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724
128-
UV_USE_IO_URING: 0
129122
displayName: Run integration tests (Electron)
130123
timeoutInMinutes: 20
131124
@@ -144,8 +137,7 @@ steps:
144137
./scripts/test-remote-integration.sh
145138
env:
146139
VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)
147-
# TODO(deepak1556): Remove this once runtime is updated for
148-
# https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724
140+
# TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x
149141
UV_USE_IO_URING: 0
150142
displayName: Run integration tests (Remote)
151143
timeoutInMinutes: 20
@@ -173,42 +165,31 @@ steps:
173165

174166
- script: yarn smoketest-no-compile --tracing
175167
timeoutInMinutes: 20
176-
env:
177-
# TODO(deepak1556): Remove this once runtime is updated for
178-
# https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724
179-
UV_USE_IO_URING: 0
180168
displayName: Run smoke tests (Electron)
181169

182170
- script: yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
183171
timeoutInMinutes: 20
184172
env:
185-
# TODO(deepak1556): Remove this once runtime is updated for
186-
# https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724
173+
# TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x
187174
UV_USE_IO_URING: 0
188175
displayName: Run smoke tests (Browser, Chromium)
189176

190177
- script: yarn smoketest-no-compile --remote --tracing
191178
timeoutInMinutes: 20
192179
env:
193-
# TODO(deepak1556): Remove this once runtime is updated for
194-
# https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724
180+
# TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x
195181
UV_USE_IO_URING: 0
196182
displayName: Run smoke tests (Remote)
197183

198184
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
199185
- script: yarn smoketest-no-compile --tracing --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
200186
timeoutInMinutes: 20
201-
env:
202-
# TODO(deepak1556): Remove this once runtime is updated for
203-
# https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724
204-
UV_USE_IO_URING: 0
205187
displayName: Run smoke tests (Electron)
206188

207189
- script: yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage"
208190
env:
209191
VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)-web
210-
# TODO(deepak1556): Remove this once runtime is updated for
211-
# https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724
192+
# TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x
212193
UV_USE_IO_URING: 0
213194
timeoutInMinutes: 20
214195
displayName: Run smoke tests (Browser, Chromium)
@@ -221,8 +202,7 @@ steps:
221202
yarn smoketest-no-compile --tracing --remote --build "$APP_PATH"
222203
timeoutInMinutes: 20
223204
env:
224-
# TODO(deepak1556): Remove this once runtime is updated for
225-
# https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724
205+
# TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x
226206
UV_USE_IO_URING: 0
227207
displayName: Run smoke tests (Remote)
228208

0 commit comments

Comments
 (0)