Skip to content

Commit cf232fc

Browse files
authored
chore: bump vscode to 1.108.2 (#656)
* chore: bump vscode to 1.108.2 * chore: fix workflow
1 parent 8df3e38 commit cf232fc

File tree

16 files changed

+168
-84
lines changed

16 files changed

+168
-84
lines changed

.github/workflows/codacy-analysis.yaml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,26 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@master
15+
uses: actions/checkout@v4
1616

1717
- name: Run Codacy Analysis CLI
1818
uses: codacy/codacy-analysis-cli-action@master
1919
with:
20-
output: results.sarif
21-
format: sarif
22-
# Adjust severity of non-security issues
23-
gh-code-scanning-compat: true
24-
# Force 0 exit code to allow SARIF file generation
25-
# This will handover control about PR rejection to the GitHub side
20+
# Run analysis without SARIF output to avoid GitHub Code Scanning integration issues
21+
# See: https://github.com/codacy/codacy-analysis-cli-action/issues/142
22+
# The Codacy tool generates multiple SARIF runs which is incompatible with
23+
# GitHub's new policy as of July 2025
24+
verbose: true
25+
# Force 0 exit code to prevent workflow failures
2626
max-allowed-issues: 2147483647
2727
# only scan the github1s directory
2828
directory: $GITHUB_WORKSPACE/extensions/github1s
2929

30-
# Upload the SARIF file generated in the previous step
31-
- name: Upload SARIF results file
32-
uses: github/codeql-action/upload-sarif@main
33-
with:
34-
sarif_file: results.sarif
30+
# SARIF upload is temporarily disabled due to incompatibility
31+
# See: https://github.com/codacy/codacy-analysis-cli-action/issues/142
32+
# TODO: Re-enable when Codacy fixes the multiple runs issue
33+
# - name: Upload SARIF results file
34+
# uses: github/codeql-action/upload-sarif@v4
35+
# with:
36+
# sarif_file: results.sarif
37+
# category: codacy-security-scan

.github/workflows/test-wtih-vscode-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: [macos-14]
16-
node-version: [20.x]
16+
node-version: [22.x]
1717

1818
runs-on: ${{ matrix.os }}
1919

package-lock.json

Lines changed: 5 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"license": "ISC",
3131
"devDependencies": {
3232
"@cloudflare/workers-types": "^4.20250109.0",
33-
"@github1s/vscode-web": "^0.26.0",
33+
"@github1s/vscode-web": "^0.27.0",
3434
"chokidar": "^4.0.3",
3535
"clean-css": "^5.3.3",
3636
"copy-webpack-plugin": "^12.0.2",

vscode-web/.VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.101.2
1+
1.108.2

vscode-web/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vscode-web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@github1s/vscode-web",
3-
"version": "0.26.0",
3+
"version": "0.27.0",
44
"description": "VS Code web for GitHub1s",
55
"author": "github1s",
66
"license": "MIT",

vscode-web/scripts/.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"src/vs/workbench/browser/parts/activitybar/activitybarPart.ts": "49575327f7d302dad48a46beba42a675c75d6bfd2caa6b3e5e3bb3e7f41a71e0",
3-
"src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "6be71e59eeb2e650262bb6d15a05dbd7636928fbbae7f33998f1554b436b4108",
4-
"src/vs/workbench/browser/web.main.ts": "b3276e26f954a434d1b6174eeece432f448fbbd831566d6451aa35208a0d5627",
2+
"src/vs/workbench/browser/parts/activitybar/activitybarPart.ts": "3edda05b7b7cf235bc0d51f066aa8d57c447ea784ccd507316327150a4bb880c",
3+
"src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "26cdde234b2811b42166224f3b0f12eb6d78d519d5262cc2b12ec08653b3df39",
4+
"src/vs/workbench/browser/web.main.ts": "a7c43beaa0f873ce0f9edc1aa03db3e9150fb1ac6dc6479a08e0ea5c8a3b2e76",
55
"src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts": "e986095a30dbea54af56c25fa1b184b55f34f8914129b27e2f20d8c4ea9fd16b",
6-
"src/vs/workbench/contrib/webview/browser/pre/index.html": "7ce2885c633813288123a7dde3981448e387471450cf0d861c1c02b9cbdbf0bc",
7-
"src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts": "c220568141adf6ed560bab754ea7769795465c6fa93ecd461e9b59f05ca56377",
8-
"src/vs/workbench/services/label/common/labelService.ts": "72d72581bd521c2edadd60d4458de4d1c6a9a2cc2cf83820034c82815a2eae6a",
9-
"src/vs/workbench/services/textfile/browser/textFileService.ts": "607da093a8562c6a42e9bdb1b2456fa9eb1065a53a5ac6afbb323f6f8505e03f",
10-
"src/vs/base/common/network.ts": "34fc2461d4b6029e71b60a3bf5d7438585e9d2b66ccdcab0893cc69d77fab5b5",
6+
"src/vs/workbench/contrib/webview/browser/pre/index.html": "8b2e27b411b4fa493fe003c5312378ca0c7164fee99ed288c6e4f47c43dbca1f",
7+
"src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts": "16fc1f8830432097a2de87ba04f9f11e930408df8f672bb7a4bbbe3c1a7c509d",
8+
"src/vs/workbench/services/label/common/labelService.ts": "ac42f60193b50a4668384787468758e4b093f9f2da74a7c9604de5c455886e98",
9+
"src/vs/workbench/services/textfile/browser/textFileService.ts": "c384a6ec5991888fb09cdbf482a6747fa15d486e1cd8967560da3ca1df65944e",
10+
"src/vs/base/common/network.ts": "e8679d4499a7bf7474f31e3dcf61db40be3c0c5c81837cf7adf8e7ea2b656fa1",
1111
"src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html": "40d576ad2307d28012b34b86858ba36ba49ae10e5aedb394bd06b14a35b869a5"
1212
}

vscode-web/src/vs/base/common/network.ts

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,13 @@ export namespace Schemas {
8282
export const vscodeChatCodeCompareBlock = 'vscode-chat-code-compare-block';
8383

8484
/** Scheme used for the chat input editor. */
85-
export const vscodeChatSesssion = 'vscode-chat-editor';
85+
export const vscodeChatEditor = 'vscode-chat-editor';
86+
87+
/** Scheme used for the chat input part */
88+
export const vscodeChatInput = 'chatSessionInput';
89+
90+
/** Scheme used for local chat session content */
91+
export const vscodeLocalChatSession = 'vscode-chat-session';
8692

8793
/**
8894
* Scheme used internally for webviews that aren't linked to a resource (i.e. not custom editors)
@@ -139,6 +145,17 @@ export namespace Schemas {
139145
* Scheme used for the accessible view
140146
*/
141147
export const accessibleView = 'accessible-view';
148+
149+
/**
150+
* Used for snapshots of chat edits
151+
*/
152+
export const chatEditingSnapshotScheme = 'chat-editing-snapshot-text-model';
153+
export const chatEditingModel = 'chat-editing-text-model';
154+
155+
/**
156+
* Used for rendering multidiffs in copilot agent sessions
157+
*/
158+
export const copilotPr = 'copilot-pr';
142159
}
143160

144161
export function matchesScheme(target: URI | string, scheme: string): boolean {
@@ -404,15 +421,15 @@ export namespace COI {
404421
* isn't enabled the current context
405422
*/
406423
export function addSearchParam(urlOrSearch: URLSearchParams | Record<string, string>, coop: boolean, coep: boolean): void {
407-
if (!(<any>globalThis).crossOriginIsolated) {
424+
if (!(globalThis as typeof globalThis & { crossOriginIsolated?: boolean }).crossOriginIsolated) {
408425
// depends on the current context being COI
409426
return;
410427
}
411428
const value = coop && coep ? '3' : coep ? '2' : '1';
412429
if (urlOrSearch instanceof URLSearchParams) {
413430
urlOrSearch.set(coiSearchParamName, value);
414431
} else {
415-
(<Record<string, string>>urlOrSearch)[coiSearchParamName] = value;
432+
urlOrSearch[coiSearchParamName] = value;
416433
}
417434
}
418435
}

vscode-web/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { IThemeService, IColorTheme, registerThemingParticipant } from '../../..
1616
import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_ACTIVE_BORDER, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_INACTIVE_FOREGROUND, ACTIVITY_BAR_ACTIVE_BACKGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_ACTIVE_FOCUS_BORDER } from '../../../common/theme.js';
1717
import { activeContrastBorder, contrastBorder, focusBorder } from '../../../../platform/theme/common/colorRegistry.js';
1818
import { addDisposableListener, append, EventType, isAncestor, $, clearNode } from '../../../../base/browser/dom.js';
19-
import { assertIsDefined } from '../../../../base/common/types.js';
19+
import { assertReturnsDefined } from '../../../../base/common/types.js';
2020
import { CustomMenubarControl } from '../titlebar/menubarControl.js';
2121
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
2222
import { getMenuBarVisibility, MenuSettings } from '../../../../platform/window/common/window.js';
@@ -129,7 +129,7 @@ export class ActivitybarPart extends Part {
129129
override updateStyles(): void {
130130
super.updateStyles();
131131

132-
const container = assertIsDefined(this.getContainer());
132+
const container = assertReturnsDefined(this.getContainer());
133133
const background = this.getColor(ACTIVITY_BAR_BACKGROUND) || '';
134134
container.style.backgroundColor = background;
135135

@@ -281,7 +281,7 @@ export class ActivityBarCompositeBar extends PaneCompositeBar {
281281

282282
this.menuBarContainer = $('.menubar');
283283

284-
const content = assertIsDefined(this.element);
284+
const content = assertReturnsDefined(this.element);
285285
/* below codes are changed by github1s */
286286
const homeBarContainer = this.element?.querySelector('.home-bar');
287287
if (homeBarContainer) {

0 commit comments

Comments
 (0)