Skip to content

Commit b69ac60

Browse files
meganroggemeganrogge
authored
Merge branch 'main' into merogge/shell-int-event
2 parents cbe1da0 + 9362739 commit b69ac60

File tree

112 files changed

+888
-470
lines changed

Some content is hidden

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

112 files changed

+888
-470
lines changed

‎.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
uses: actions/cache/restore@v4
4242
with:
4343
path: .build/node_modules_cache
44-
key: "node_modules-${{ hashFiles('.build/packagelockhash') }}"
44+
key: "node_modules-macos-${{ hashFiles('.build/packagelockhash') }}"
4545

4646
- name: Extract node_modules cache
4747
if: steps.cache-node-modules.outputs.cache-hit == 'true'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
uses: actions/cache/restore@v4
5959
with:
6060
path: .build/node_modules_cache
61-
key: "node_modules-${{ hashFiles('.build/packagelockhash') }}"
61+
key: "node_modules-linux-${{ hashFiles('.build/packagelockhash') }}"
6262

6363
- name: Extract node_modules cache
6464
if: steps.cache-node-modules.outputs.cache-hit == 'true'

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: actions/cache@v4
3131
with:
3232
path: .build/node_modules_cache
33-
key: "node_modules-${{ hashFiles('.build/packagelockhash') }}"
33+
key: "node_modules-compile-${{ hashFiles('.build/packagelockhash') }}"
3434

3535
- name: Install build tools
3636
if: steps.cache-node-modules.outputs.cache-hit != 'true'
@@ -106,7 +106,7 @@ jobs:
106106
uses: actions/cache@v4
107107
with:
108108
path: .build/node_modules_cache
109-
key: "node_modules-${{ hashFiles('.build/packagelockhash') }}"
109+
key: "node_modules-linux-${{ hashFiles('.build/packagelockhash') }}"
110110

111111
- name: Install build dependencies
112112
if: steps.cache-node-modules.outputs.cache-hit != 'true'
@@ -180,7 +180,7 @@ jobs:
180180
uses: actions/cache@v4
181181
with:
182182
path: .build/node_modules_cache
183-
key: "node_modules-${{ hashFiles('.build/packagelockhash') }}"
183+
key: "node_modules-macos-${{ hashFiles('.build/packagelockhash') }}"
184184

185185
- name: Install dependencies
186186
if: steps.cache-node-modules.outputs.cache-hit != 'true'
@@ -246,7 +246,7 @@ jobs:
246246
id: node-modules-cache
247247
with:
248248
path: .build/node_modules_cache
249-
key: "node_modules-${{ hashFiles('.build/packagelockhash') }}"
249+
key: "node_modules-windows-${{ hashFiles('.build/packagelockhash') }}"
250250

251251
- name: Install dependencies
252252
if: steps.node-modules-cache.outputs.cache-hit != 'true'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
id: node-modules-cache
4545
with:
4646
path: .build/node_modules_cache
47-
key: "node_modules-${{ hashFiles('.build/packagelockhash') }}"
47+
key: "node_modules-windows-${{ hashFiles('.build/packagelockhash') }}"
4848

4949
- name: Extract node_modules cache
5050
if: steps.node-modules-cache.outputs.cache-hit == 'true'

‎.github/workflows/pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: actions/cache/restore@v4
3939
with:
4040
path: .build/node_modules_cache
41-
key: "node_modules-${{ hashFiles('.build/packagelockhash') }}"
41+
key: "node_modules-compile-${{ hashFiles('.build/packagelockhash') }}"
4242

4343
- name: Extract node_modules cache
4444
if: steps.cache-node-modules.outputs.cache-hit == 'true'

‎build/gulpfile.vscode.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
213213
const destination = path.join(path.dirname(root), destinationFolderName);
214214
platform = platform || process.platform;
215215

216-
return () => {
216+
const task = () => {
217217
const electron = require('@vscode/gulp-electron');
218218
const json = require('gulp-json-editor');
219219

@@ -422,6 +422,8 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
422422

423423
return result.pipe(vfs.dest(destination));
424424
};
425+
task.taskName = `package-${platform}-${arch}`;
426+
return task;
425427
}
426428

427429
function patchWin32DependenciesTask(destinationFolderName) {

‎extensions/git/src/commands.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2247,8 +2247,8 @@ export class CommandCenter {
22472247

22482248
const messageWarning = !discardUntrackedChangesToTrash
22492249
? resources.length === 1
2250-
? '\n\nThis is IRREVERSIBLE!\nThis file will be FOREVER LOST if you proceed.'
2251-
: '\n\nThis is IRREVERSIBLE!\nThese files will be FOREVER LOST if you proceed.'
2250+
? '\n\n' + l10n.t('This is IRREVERSIBLE!\nThis file will be FOREVER LOST if you proceed.')
2251+
: '\n\n' + l10n.t('This is IRREVERSIBLE!\nThese files will be FOREVER LOST if you proceed.')
22522252
: '';
22532253

22542254
const message = resources.length === 1
@@ -2258,11 +2258,11 @@ export class CommandCenter {
22582258
const messageDetail = discardUntrackedChangesToTrash
22592259
? isWindows
22602260
? resources.length === 1
2261-
? 'You can restore this file from the Recycle Bin.'
2262-
: 'You can restore these files from the Recycle Bin.'
2261+
? l10n.t('You can restore this file from the Recycle Bin.')
2262+
: l10n.t('You can restore these files from the Recycle Bin.')
22632263
: resources.length === 1
2264-
? 'You can restore this file from the Trash.'
2265-
: 'You can restore these files from the Trash.'
2264+
? l10n.t('You can restore this file from the Trash.')
2265+
: l10n.t('You can restore these files from the Trash.')
22662266
: '';
22672267

22682268
const primaryAction = discardUntrackedChangesToTrash

‎extensions/go/cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
"git": {
77
"name": "go-syntax",
88
"repositoryUrl": "https://github.com/worlpaker/go-syntax",
9-
"commitHash": "0ce19cdf1cb5dab6aa99ccc933be9bd21e855ed1"
9+
"commitHash": "8c70c078f56d237f72574ce49cc95839c4f8a741"
1010
}
1111
},
1212
"license": "MIT",
1313
"description": "The file syntaxes/go.tmLanguage.json is from https://github.com/worlpaker/go-syntax, which in turn was derived from https://github.com/jeff-hykin/better-go-syntax.",
14-
"version": "0.8.1"
14+
"version": "0.8.4"
1515
}
1616
],
1717
"version": 1

0 commit comments

Comments
 (0)