Skip to content

Commit 6591e7e

Browse files
cdrciwdoxshzt
authored andcommitted
This is a combination of 9 commits.
Update Helm chart and changelog with 4.128.0 (#7891) feat: hide debug view from activity bar feat: hide sidebar. diff修改提交 feat: merge quilt. 11
1 parent cb22f74 commit 6591e7e

9 files changed

Lines changed: 767 additions & 4 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Code v99.99.999
2222

2323
## Unreleased
2424

25+
## [4.128.0](https://github.com/coder/code-server/releases/tag/v4.128.0) - 2026-07-11
26+
2527
Code v1.128.0
2628

2729
### Changed

ci/helm-chart/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 3.42.0
18+
version: 3.43.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
23-
appVersion: 4.127.0
23+
appVersion: 4.128.0

ci/helm-chart/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replicaCount: 1
66

77
image:
88
repository: codercom/code-server
9-
tag: '4.127.0'
9+
tag: '4.128.0'
1010
pullPolicy: Always
1111

1212
# Specifies one or more secrets to be used when pulling images from a
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
diff --git code-server/lib/vscode/src/vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution.ts code-server/lib/vscode/src/vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution.ts
2+
index da0388a5435..fb91e3665c5 100644
3+
--- code-server/lib/vscode/src/vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution.ts
4+
+++ code-server/lib/vscode/src/vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution.ts
5+
@@ -132,9 +132,9 @@ export class ExternalTerminalContribution extends Disposable implements IWorkben
6+
when: shouldShowExternalKindOnLocal
7+
};
8+
9+
-
10+
- MenuRegistry.appendMenuItem(MenuId.ExplorerContext, this._openInTerminalMenuItem);
11+
- MenuRegistry.appendMenuItem(MenuId.ExplorerContext, this._openInIntegratedTerminalMenuItem);
12+
+ // 屏蔽右键打开的终端
13+
+ //MenuRegistry.appendMenuItem(MenuId.ExplorerContext, this._openInTerminalMenuItem);
14+
+ //MenuRegistry.appendMenuItem(MenuId.ExplorerContext, this._openInIntegratedTerminalMenuItem);
15+
16+
this._register(this._configurationService.onDidChangeConfiguration(e => {
17+
if (e.affectsConfiguration('terminal.explorerKind') || e.affectsConfiguration('terminal.external')) {
18+
diff --git code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/terminalService.ts code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/terminalService.ts
19+
index 152d14d7a9b..589cb6e0366 100644
20+
--- code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/terminalService.ts
21+
+++ code-server/lib/vscode/src/vs/workbench/contrib/terminal/browser/terminalService.ts
22+
@@ -449,6 +449,11 @@ export class TerminalService extends Disposable implements ITerminalService {
23+
this._logService.trace('Pty host ready');
24+
}
25+
26+
+ private _isTerminalDisabled(): boolean {
27+
+ return true
28+
+ }
29+
+
30+
+
31+
private async _reconnectToRemoteTerminals(): Promise<void> {
32+
const remoteAuthority = this._environmentService.remoteAuthority;
33+
if (!remoteAuthority) {
34+
@@ -973,6 +978,11 @@ export class TerminalService extends Disposable implements ITerminalService {
35+
}
36+
37+
async createTerminal(options?: ICreateTerminalOptions): Promise<ITerminalInstance> {
38+
+
39+
+ if (this._isTerminalDisabled()) {
40+
+ this._notificationService.info('集成终端已被管理员禁用,无法创建');
41+
+ return;
42+
+ }
43+
// Await the initialization of available profiles as long as this is not a pty terminal or a
44+
// local terminal in a remote workspace as profile won't be used in those cases and these
45+
// terminals need to be launched before remote connections are established.

patches/qian-changes.diff

Whitespace-only changes.

patches/series

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ trusted-domains.diff
2424
signature-verification.diff
2525
copilot.diff
2626
app-name.diff
27+
disable_terminal_keybind.diff
28+
whitelist-keybingding.diff
29+
ui-hidden.diff

patches/ui-hidden.diff

Lines changed: 672 additions & 0 deletions
Large diffs are not rendered by default.

patches/whitelist-keybingding.diff

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
diff --git code-server/lib/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.ts b/src/vs/workbench/services/keybinding/browser/keybindingService.ts
2+
index 5db49b2be12..b6c6670231a 100644
3+
--- code-server/lib/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.ts
4+
+++ code-server/lib/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.ts
5+
@@ -184,6 +184,36 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
6+
readonly contribution: KeybindingsSchemaContribution;
7+
}> = [];
8+
private readonly kbsJsonSchema: KeybindingsJsonSchema;
9+
+ protected override _dispatch(e: IKeyboardEvent,target: never): boolean {
10+
+ // 白名单允许的快捷键组合
11+
+ const allowSet = new Set<string>([
12+
+ 'ctrl+keyc',
13+
+ 'ctrl+keyv',
14+
+ 'ctrl+keyx',
15+
+ 'ctrl+keyz',
16+
+ 'ctrl+keys',
17+
+ 'ctrl+keyf',
18+
+ ]);
19+
+
20+
+ // 组装当前按键标识(仅处理Ctrl组合,Mac meta单独区分)
21+
+ let keyLabel = '';
22+
+ if (e.ctrlKey && !e.metaKey) {
23+
+ keyLabel = `ctrl+${e.code.toLowerCase()}`;
24+
+ }
25+
+ // Mac系统兼容 meta(cmd) 版本
26+
+ if (e.metaKey && !e.ctrlKey) {
27+
+ keyLabel = `ctrl+${e.code.toLowerCase()}`;
28+
+ }
29+
+ // 不在白名单,直接返回false,不执行任何快捷键逻辑
30+
+ if (!allowSet.has(keyLabel)) {
31+
+ return false;
32+
+ }
33+
+
34+
+ // 白名单按键放行,走原生分发逻辑
35+
+ return super._dispatch(e, target);
36+
+}
37+
+
38+
+
39+
40+
constructor(
41+
@IContextKeyService contextKeyService: IContextKeyService,

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"experimentalDecorators": true,
1414
"esModuleInterop": true,
1515
"allowSyntheticDefaultImports": true,
16-
"sourceMap": true,
16+
"sourceMap": false,
1717
"tsBuildInfoFile": "./.cache/tsbuildinfo",
1818
"incremental": true,
1919
"typeRoots": [

0 commit comments

Comments
 (0)