Skip to content

Commit 8746da1

Browse files
gabrielcsapogabrielcsapo
authored
Merge branch 'main' into gcsapo/adds-log-level-for-tsserver
2 parents b2152a7 + dc0c979 commit 8746da1

File tree

1,544 files changed

+46927
-25623
lines changed

Some content is hidden

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

1,544 files changed

+46927
-25623
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+
}

‎.devcontainer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Next, let's try debugging.
9999

100100
2. Go to your local VS Code client, and use the **Run / Debug** view to launch the **VS Code** configuration. (Typically the default, so you can likely just press <kbd>F5</kbd>).
101101

102-
> **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../../.vscode/launch.json). However, running `./scripts/code.sh` first will set up Electron which will usually solve timeout issues.
102+
> **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../.vscode/launch.json). However, running `./scripts/code.sh` first will set up Electron which will usually solve timeout issues.
103103
104104
3. After a bit, Code - OSS will appear with the debugger attached!
105105

‎.eslint-plugin-local/code-import-patterns.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ interface ConditionalPattern {
1818

1919
interface RawImportPatternsConfig {
2020
target: string;
21-
layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main';
21+
layer?: 'common' | 'worker' | 'browser' | 'electron-browser' | 'node' | 'electron-utility' | 'electron-main';
2222
test?: boolean;
2323
restrictions: string | (string | ConditionalPattern)[];
2424
}
@@ -80,7 +80,7 @@ export = new class implements eslint.Rule.RuleModule {
8080
return this._optionsCache.get(options)!;
8181
}
8282

83-
type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main';
83+
type Layer = 'common' | 'worker' | 'browser' | 'electron-browser' | 'node' | 'electron-utility' | 'electron-main';
8484

8585
interface ILayerRule {
8686
layer: Layer;
@@ -98,7 +98,7 @@ export = new class implements eslint.Rule.RuleModule {
9898
{ layer: 'common', deps: orSegment(['common']) },
9999
{ layer: 'worker', deps: orSegment(['common', 'worker']) },
100100
{ layer: 'browser', deps: orSegment(['common', 'browser']), isBrowser: true },
101-
{ layer: 'electron-sandbox', deps: orSegment(['common', 'browser', 'electron-sandbox']), isBrowser: true },
101+
{ layer: 'electron-browser', deps: orSegment(['common', 'browser', 'electron-browser']), isBrowser: true },
102102
{ layer: 'node', deps: orSegment(['common', 'node']), isNode: true },
103103
{ layer: 'electron-utility', deps: orSegment(['common', 'node', 'electron-utility']), isNode: true, isElectron: true },
104104
{ layer: 'electron-main', deps: orSegment(['common', 'node', 'electron-utility', 'electron-main']), isNode: true, isElectron: true },

‎.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/CODEOWNERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# Ensure that Lad and Joao review changes to the Code OSS actions
2+
.github/workflows/pr-darwin-test.yml @lszomoru @joaomoreno
3+
.github/workflows/pr-linux-cli-test.yml @lszomoru @joaomoreno
4+
.github/workflows/pr-linux-test.yml @lszomoru @joaomoreno
5+
.github/workflows/pr-node-modules.yml @lszomoru @joaomoreno
6+
.github/workflows/pr-win32-test.yml @lszomoru @joaomoreno
7+
.github/workflows/pr.yml @lszomoru @joaomoreno
8+
19
# ensure the API police is aware of changes to the vscode-dts file
210
# this is only about the final API, not about proposed API changes
311
src/vscode-dts/vscode.d.ts @jrieken @mjbvz

‎.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/chatmodes/learn.chatmode.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
description: 'Save learnings from conversation'
3+
tools: ['codebase', 'editFiles', 'githubRepo', 'runCommands', 'search', 'searchResults', 'usages']
4+
---
5+
Please take a moment and deeply reflect on all the steps you took and think if there would have been a piece of information which would have allowed you to work faster (take less steps).
6+
7+
The file .vscode/project.instructions.md has been already provided to you. Edit the file such that it would contain information which would have made you work faster. Please don't make this too specific to this task, but rather something that is generic but useful enought to ensure speed-ups in the future for other tasks.

‎.github/chatmodes/plan.chatmode.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
description: 'Plan the solution for a problem.'
3+
tools: ['codebase', 'findTestFiles', 'githubRepo', 'search', 'searchResults', 'usages']
4+
---
5+
I need your help with the following problem. Please take a look, understand the request in depth, and if the request makes sense, research it, understand the existing code, then suggest a clear plan with steps to take to address the request.

0 commit comments

Comments
 (0)