Skip to content

Commit 32e71a8

Browse files
bpaserobpasero
authored
Merge branch 'main' into osortega/fix-cancel-search
2 parents ab60c1e + 55cf9aa commit 32e71a8

File tree

208 files changed

+3619
-1635
lines changed

Some content is hidden

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

208 files changed

+3619
-1635
lines changed

‎.config/guardian/.gdnbaselines

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -296,21 +296,6 @@
296296
"expirationDate": "2025-11-19 21:48:17Z",
297297
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
298298
},
299-
"216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8": {
300-
"signature": "216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8",
301-
"alternativeSignatures": [
302-
"07746898f43afab7cc50931b33154c2d9e1a35f82a649dbe8aecf785b3d5a813"
303-
],
304-
"target": "file:///D:/a/_work/1/vscode-server-win32-x64/node_modules/@vscode/vsce-sign/bin/vsce-sign.exe",
305-
"memberOf": [
306-
"default"
307-
],
308-
"tool": "binskim",
309-
"ruleId": "BA2008",
310-
"createdDate": "2025-06-02 21:46:49Z",
311-
"expirationDate": "2025-11-19 21:48:17Z",
312-
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
313-
},
314299
"1d4a48ebc63e3b652146bc16309b2d960a7168d299c7ac94cf794347c06265ef": {
315300
"signature": "1d4a48ebc63e3b652146bc16309b2d960a7168d299c7ac94cf794347c06265ef",
316301
"alternativeSignatures": [
@@ -326,21 +311,6 @@
326311
"expirationDate": "2025-11-19 21:48:17Z",
327312
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
328313
},
329-
"77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624": {
330-
"signature": "77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624",
331-
"alternativeSignatures": [
332-
"4a6cb67bd4b401e9669c13a2162660aaefc0a94a4122e5b50c198414db545672"
333-
],
334-
"target": "file:///D:/a/_work/1/vscode-server-win32-x64-web/node_modules/@vscode/vsce-sign/bin/vsce-sign.exe",
335-
"memberOf": [
336-
"default"
337-
],
338-
"tool": "binskim",
339-
"ruleId": "BA2008",
340-
"createdDate": "2025-06-02 21:46:49Z",
341-
"expirationDate": "2025-11-19 21:48:17Z",
342-
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
343-
},
344314
"21b8091cf937b1be55c7a300483182fec206bc0cd8e2666727b29c8c200aa101": {
345315
"signature": "21b8091cf937b1be55c7a300483182fec206bc0cd8e2666727b29c8c200aa101",
346316
"alternativeSignatures": [
@@ -416,21 +386,6 @@
416386
"expirationDate": "2025-11-19 21:48:17Z",
417387
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
418388
},
419-
"30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad": {
420-
"signature": "30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad",
421-
"alternativeSignatures": [
422-
"b7b9eb974d7d3a4ae14df8695ca5a62592c8c9d20b7eda70a6535d50cbda3e7f"
423-
],
424-
"target": "file:///D:/a/_work/1/VSCode-win32-x64/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign.exe",
425-
"memberOf": [
426-
"default"
427-
],
428-
"tool": "binskim",
429-
"ruleId": "BA2008",
430-
"createdDate": "2025-06-02 21:46:49Z",
431-
"expirationDate": "2025-11-19 21:48:17Z",
432-
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
433-
},
434389
"d23a7cc83e649f9a9c5831255cb7569d363799adb5490ff7e299685ea7cf5000": {
435390
"signature": "d23a7cc83e649f9a9c5831255cb7569d363799adb5490ff7e299685ea7cf5000",
436391
"alternativeSignatures": [
@@ -462,4 +417,4 @@
462417
"justification": "This error is baselined with an expiration date of 180 days from 2025-06-02 21:48:17Z"
463418
}
464419
}
465-
}
420+
}

‎.eslint-plugin-local/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
* Copyright (c) Microsoft Corporation. All rights reserved.
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
5+
// @ts-check
56
const glob = require('glob');
67
const path = require('path');
78

89
require('ts-node').register({ experimentalResolver: true, transpileOnly: true });
910

1011
// Re-export all .ts files as rules
12+
/** @type {Record<string, import('@typescript-eslint/utils/dist/ts-eslint').LooseRuleDefinition>} */
1113
const rules = {};
1214
glob.sync(`${__dirname}/*.ts`).forEach((file) => {
1315
rules[path.basename(file, '.ts')] = require(file);

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
48
---
9+
510
<!-- ⚠️⚠️ Do Not Delete This! bug_report_template ⚠️⚠️ -->
611
<!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ -->
712
<!-- 🕮 Read our guide about submitting issues: https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions -->
@@ -19,4 +24,4 @@ Does this issue occur when all extensions are disabled?: Yes/No
1924
Steps to Reproduce:
2025

2126
1.
22-
2.
27+
2.

‎.github/ISSUE_TEMPLATE/copilot_bug_report.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
name: Copilot Bug report
3+
about: Create a report to help us improve Copilot's chat interface in VS Code
4+
title: ''
5+
labels: chat-ext-issue
6+
assignees: ''
7+
8+
---
9+
10+
<!-- Please search existing issues to avoid creating duplicates -->
11+
<!-- Please attach logs to help us diagnose your issue -->
12+
13+
- Copilot Chat Extension Version:
14+
- VS Code Version:
15+
- OS Version:
16+
- Feature (e.g. agent/edit/ask mode):
17+
- Selected model (e.g. GPT 4.1, Claude 3.7 Sonnet):
18+
- Logs:
19+
20+
Steps to Reproduce:
21+
22+
1.
23+
2.

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
47

58
---
69

‎.github/commands.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,13 +596,22 @@
596596
"reason": "not_planned",
597597
"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode/issues/253126. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
598598
},
599-
{
599+
{
600600
"type": "label",
601601
"name": "~chat-billing",
602602
"removeLabel": "~chat-billing",
603603
"addLabel":"chat-billing",
604604
"action": "close",
605605
"reason": "not_planned",
606606
"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode/issues/252230. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
607+
},
608+
{
609+
"type": "label",
610+
"name": "~chat-infinite-response-loop",
611+
"removeLabel": "~chat-infinite-response-loop",
612+
"addLabel":"chat-infinite-response-loop",
613+
"action": "close",
614+
"reason": "not_planned",
615+
"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode/issues/253134. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
607616
}
608617
]

‎.github/workflows/pr-darwin-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
VSCODE_ARCH: ${{ env.VSCODE_ARCH }}
6969
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
7070
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
71-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
71+
GITHUB_TOKEN: ${{ github.event.pull_request.head.repo.full_name == github.repository && secrets.VSCODE_OSS || secrets.GITHUB_TOKEN }}
7272
# Avoid using dlopen to load Kerberos on macOS which can cause missing libraries
7373
# https://github.com/mongodb-js/kerberos/commit/04044d2814ad1d01e77f1ce87f26b03d86692cf2
7474
# flipped the default to support legacy linux distros which shouldn't happen
@@ -100,7 +100,7 @@ jobs:
100100
if: steps.cache-builtin-extensions.outputs.cache-hit != 'true'
101101
run: node build/lib/builtInExtensions.js
102102
env:
103-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
103+
GITHUB_TOKEN: ${{ github.event.pull_request.head.repo.full_name == github.repository && secrets.VSCODE_OSS || secrets.GITHUB_TOKEN }}
104104

105105
- name: Transpile client and extensions
106106
run: npm run gulp transpile-client-esbuild transpile-extensions
@@ -124,7 +124,7 @@ jobs:
124124
sleep 5 # optional: add a small delay between retries
125125
done
126126
env:
127-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
127+
GITHUB_TOKEN: ${{ github.event.pull_request.head.repo.full_name == github.repository && secrets.VSCODE_OSS || secrets.GITHUB_TOKEN }}
128128

129129
- name: 🧪 Run unit tests (Electron)
130130
if: ${{ inputs.electron_tests }}

‎.github/workflows/pr-linux-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
echo "Npm install failed $i, trying again..."
8080
done
8181
env:
82-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
82+
GITHUB_TOKEN: ${{ github.event.pull_request.head.repo.full_name == github.repository && secrets.VSCODE_OSS || secrets.GITHUB_TOKEN }}
8383

8484
- name: Install dependencies
8585
if: steps.cache-node-modules.outputs.cache-hit != 'true'
@@ -101,7 +101,7 @@ jobs:
101101
VSCODE_ARCH: ${{ env.VSCODE_ARCH }}
102102
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
103103
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
104-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
104+
GITHUB_TOKEN: ${{ github.event.pull_request.head.repo.full_name == github.repository && secrets.VSCODE_OSS || secrets.GITHUB_TOKEN }}
105105

106106
- name: Create node_modules archive
107107
if: steps.cache-node-modules.outputs.cache-hit != 'true'
@@ -128,7 +128,7 @@ jobs:
128128
if: steps.cache-builtin-extensions.outputs.cache-hit != 'true'
129129
run: node build/lib/builtInExtensions.js
130130
env:
131-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
131+
GITHUB_TOKEN: ${{ github.event.pull_request.head.repo.full_name == github.repository && secrets.VSCODE_OSS || secrets.GITHUB_TOKEN }}
132132

133133
- name: Transpile client and extensions
134134
run: npm run gulp transpile-client-esbuild transpile-extensions
@@ -152,7 +152,7 @@ jobs:
152152
sleep 5 # optional: add a small delay between retries
153153
done
154154
env:
155-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
155+
GITHUB_TOKEN: ${{ github.event.pull_request.head.repo.full_name == github.repository && secrets.VSCODE_OSS || secrets.GITHUB_TOKEN }}
156156

157157
- name: 🧪 Run unit tests (Electron)
158158
if: ${{ inputs.electron_tests }}

‎.github/workflows/pr-node-modules.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
env:
5353
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
5454
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
55-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55+
GITHUB_TOKEN: ${{ secrets.VSCODE_OSS }}
5656

5757
- name: Create node_modules archive
5858
if: steps.cache-node-modules.outputs.cache-hit != 'true'
@@ -79,7 +79,7 @@ jobs:
7979
if: steps.cache-builtin-extensions.outputs.cache-hit != 'true'
8080
run: node build/lib/builtInExtensions.js
8181
env:
82-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
82+
GITHUB_TOKEN: ${{ secrets.VSCODE_OSS }}
8383

8484
linux:
8585
name: Linux
@@ -123,7 +123,7 @@ jobs:
123123
echo "Npm install failed $i, trying again..."
124124
done
125125
env:
126-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
126+
GITHUB_TOKEN: ${{ secrets.VSCODE_OSS }}
127127

128128
- name: Install dependencies
129129
if: steps.cache-node-modules.outputs.cache-hit != 'true'
@@ -145,7 +145,7 @@ jobs:
145145
VSCODE_ARCH: ${{ env.VSCODE_ARCH }}
146146
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
147147
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
148-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
148+
GITHUB_TOKEN: ${{ secrets.VSCODE_OSS }}
149149

150150
- name: Create node_modules archive
151151
if: steps.cache-node-modules.outputs.cache-hit != 'true'
@@ -203,7 +203,7 @@ jobs:
203203
VSCODE_ARCH: ${{ env.VSCODE_ARCH }}
204204
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
205205
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
206-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
206+
GITHUB_TOKEN: ${{ secrets.VSCODE_OSS }}
207207
# Avoid using dlopen to load Kerberos on macOS which can cause missing libraries
208208
# https://github.com/mongodb-js/kerberos/commit/04044d2814ad1d01e77f1ce87f26b03d86692cf2
209209
# flipped the default to support legacy linux distros which shouldn't happen
@@ -275,7 +275,7 @@ jobs:
275275
VSCODE_ARCH: ${{ env.VSCODE_ARCH }}
276276
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
277277
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
278-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
278+
GITHUB_TOKEN: ${{ secrets.VSCODE_OSS }}
279279

280280
- name: Create node_modules archive
281281
if: steps.node-modules-cache.outputs.cache-hit != 'true'

‎.github/workflows/pr-win32-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
VSCODE_ARCH: ${{ env.VSCODE_ARCH }}
7979
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
8080
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
81-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
81+
GITHUB_TOKEN: ${{ github.event.pull_request.head.repo.full_name == github.repository && secrets.VSCODE_OSS || secrets.GITHUB_TOKEN }}
8282

8383
- name: Create node_modules archive
8484
if: steps.node-modules-cache.outputs.cache-hit != 'true'
@@ -109,7 +109,7 @@ jobs:
109109
if: steps.cache-builtin-extensions.outputs.cache-hit != 'true'
110110
run: node build/lib/builtInExtensions.js
111111
env:
112-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
112+
GITHUB_TOKEN: ${{ github.event.pull_request.head.repo.full_name == github.repository && secrets.VSCODE_OSS || secrets.GITHUB_TOKEN }}
113113

114114
- name: Transpile client and extensions
115115
shell: pwsh
@@ -133,7 +133,7 @@ jobs:
133133
}
134134
}
135135
env:
136-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
136+
GITHUB_TOKEN: ${{ github.event.pull_request.head.repo.full_name == github.repository && secrets.VSCODE_OSS || secrets.GITHUB_TOKEN }}
137137

138138
- name: 🧪 Run unit tests (Electron)
139139
if: ${{ inputs.electron_tests }}

0 commit comments

Comments
 (0)