Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions .github/workflows/codacy-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,26 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@master
uses: actions/checkout@v4

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

# Upload the SARIF file generated in the previous step
- name: Upload SARIF results file
uses: github/codeql-action/upload-sarif@main
with:
sarif_file: results.sarif
# SARIF upload is temporarily disabled due to incompatibility
# See: https://github.com/codacy/codacy-analysis-cli-action/issues/142
# TODO: Re-enable when Codacy fixes the multiple runs issue
# - name: Upload SARIF results file
# uses: github/codeql-action/upload-sarif@v4
# with:
# sarif_file: results.sarif
# category: codacy-security-scan
2 changes: 1 addition & 1 deletion .github/workflows/test-wtih-vscode-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os: [macos-14]
node-version: [20.x]
node-version: [22.x]

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

Expand Down
24 changes: 5 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"license": "ISC",
"devDependencies": {
"@cloudflare/workers-types": "^4.20250109.0",
"@github1s/vscode-web": "^0.26.0",
"@github1s/vscode-web": "^0.27.0",
"chokidar": "^4.0.3",
"clean-css": "^5.3.3",
"copy-webpack-plugin": "^12.0.2",
Expand Down
2 changes: 1 addition & 1 deletion vscode-web/.VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.101.2
1.108.2
4 changes: 2 additions & 2 deletions vscode-web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vscode-web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@github1s/vscode-web",
"version": "0.26.0",
"version": "0.27.0",
"description": "VS Code web for GitHub1s",
"author": "github1s",
"license": "MIT",
Expand Down
16 changes: 8 additions & 8 deletions vscode-web/scripts/.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"src/vs/workbench/browser/parts/activitybar/activitybarPart.ts": "49575327f7d302dad48a46beba42a675c75d6bfd2caa6b3e5e3bb3e7f41a71e0",
"src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "6be71e59eeb2e650262bb6d15a05dbd7636928fbbae7f33998f1554b436b4108",
"src/vs/workbench/browser/web.main.ts": "b3276e26f954a434d1b6174eeece432f448fbbd831566d6451aa35208a0d5627",
"src/vs/workbench/browser/parts/activitybar/activitybarPart.ts": "3edda05b7b7cf235bc0d51f066aa8d57c447ea784ccd507316327150a4bb880c",
"src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "26cdde234b2811b42166224f3b0f12eb6d78d519d5262cc2b12ec08653b3df39",
"src/vs/workbench/browser/web.main.ts": "a7c43beaa0f873ce0f9edc1aa03db3e9150fb1ac6dc6479a08e0ea5c8a3b2e76",
"src/vs/workbench/contrib/files/browser/editors/fileEditorInput.ts": "e986095a30dbea54af56c25fa1b184b55f34f8914129b27e2f20d8c4ea9fd16b",
"src/vs/workbench/contrib/webview/browser/pre/index.html": "7ce2885c633813288123a7dde3981448e387471450cf0d861c1c02b9cbdbf0bc",
"src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts": "c220568141adf6ed560bab754ea7769795465c6fa93ecd461e9b59f05ca56377",
"src/vs/workbench/services/label/common/labelService.ts": "72d72581bd521c2edadd60d4458de4d1c6a9a2cc2cf83820034c82815a2eae6a",
"src/vs/workbench/services/textfile/browser/textFileService.ts": "607da093a8562c6a42e9bdb1b2456fa9eb1065a53a5ac6afbb323f6f8505e03f",
"src/vs/base/common/network.ts": "34fc2461d4b6029e71b60a3bf5d7438585e9d2b66ccdcab0893cc69d77fab5b5",
"src/vs/workbench/contrib/webview/browser/pre/index.html": "8b2e27b411b4fa493fe003c5312378ca0c7164fee99ed288c6e4f47c43dbca1f",
"src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts": "16fc1f8830432097a2de87ba04f9f11e930408df8f672bb7a4bbbe3c1a7c509d",
"src/vs/workbench/services/label/common/labelService.ts": "ac42f60193b50a4668384787468758e4b093f9f2da74a7c9604de5c455886e98",
"src/vs/workbench/services/textfile/browser/textFileService.ts": "c384a6ec5991888fb09cdbf482a6747fa15d486e1cd8967560da3ca1df65944e",
"src/vs/base/common/network.ts": "e8679d4499a7bf7474f31e3dcf61db40be3c0c5c81837cf7adf8e7ea2b656fa1",
"src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html": "40d576ad2307d28012b34b86858ba36ba49ae10e5aedb394bd06b14a35b869a5"
}
23 changes: 20 additions & 3 deletions vscode-web/src/vs/base/common/network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,13 @@ export namespace Schemas {
export const vscodeChatCodeCompareBlock = 'vscode-chat-code-compare-block';

/** Scheme used for the chat input editor. */
export const vscodeChatSesssion = 'vscode-chat-editor';
export const vscodeChatEditor = 'vscode-chat-editor';

/** Scheme used for the chat input part */
export const vscodeChatInput = 'chatSessionInput';

/** Scheme used for local chat session content */
export const vscodeLocalChatSession = 'vscode-chat-session';

/**
* Scheme used internally for webviews that aren't linked to a resource (i.e. not custom editors)
Expand Down Expand Up @@ -139,6 +145,17 @@ export namespace Schemas {
* Scheme used for the accessible view
*/
export const accessibleView = 'accessible-view';

/**
* Used for snapshots of chat edits
*/
export const chatEditingSnapshotScheme = 'chat-editing-snapshot-text-model';
export const chatEditingModel = 'chat-editing-text-model';

/**
* Used for rendering multidiffs in copilot agent sessions
*/
export const copilotPr = 'copilot-pr';
}

export function matchesScheme(target: URI | string, scheme: string): boolean {
Expand Down Expand Up @@ -404,15 +421,15 @@ export namespace COI {
* isn't enabled the current context
*/
export function addSearchParam(urlOrSearch: URLSearchParams | Record<string, string>, coop: boolean, coep: boolean): void {
if (!(<any>globalThis).crossOriginIsolated) {
if (!(globalThis as typeof globalThis & { crossOriginIsolated?: boolean }).crossOriginIsolated) {
// depends on the current context being COI
return;
}
const value = coop && coep ? '3' : coep ? '2' : '1';
if (urlOrSearch instanceof URLSearchParams) {
urlOrSearch.set(coiSearchParamName, value);
} else {
(<Record<string, string>>urlOrSearch)[coiSearchParamName] = value;
urlOrSearch[coiSearchParamName] = value;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { IThemeService, IColorTheme, registerThemingParticipant } from '../../..
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';
import { activeContrastBorder, contrastBorder, focusBorder } from '../../../../platform/theme/common/colorRegistry.js';
import { addDisposableListener, append, EventType, isAncestor, $, clearNode } from '../../../../base/browser/dom.js';
import { assertIsDefined } from '../../../../base/common/types.js';
import { assertReturnsDefined } from '../../../../base/common/types.js';
import { CustomMenubarControl } from '../titlebar/menubarControl.js';
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
import { getMenuBarVisibility, MenuSettings } from '../../../../platform/window/common/window.js';
Expand Down Expand Up @@ -129,7 +129,7 @@ export class ActivitybarPart extends Part {
override updateStyles(): void {
super.updateStyles();

const container = assertIsDefined(this.getContainer());
const container = assertReturnsDefined(this.getContainer());
const background = this.getColor(ACTIVITY_BAR_BACKGROUND) || '';
container.style.backgroundColor = background;

Expand Down Expand Up @@ -281,7 +281,7 @@ export class ActivityBarCompositeBar extends PaneCompositeBar {

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

const content = assertIsDefined(this.element);
const content = assertReturnsDefined(this.element);
/* below codes are changed by github1s */
const homeBarContainer = this.element?.querySelector('.home-bar');
if (homeBarContainer) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@
align-items: center;
}

.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-left {
.monaco-workbench .part.titlebar > .titlebar-container.has-center > .titlebar-left {
order: 0;
width: 20%;
flex-grow: 2;
justify-content: flex-start;
}

.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center {
.monaco-workbench .part.titlebar > .titlebar-container.has-center > .titlebar-center {
order: 1;
width: 60%;
max-width: fit-content;
Expand All @@ -88,15 +88,27 @@
justify-content: center;
}

.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-right {
.monaco-workbench .part.titlebar > .titlebar-container.has-center > .titlebar-right {
order: 2;
width: 20%;
min-width: min-content;
flex-grow: 2;
justify-content: flex-end;
}

.monaco-workbench .part.titlebar > .titlebar-container:not(.has-center) > .titlebar-left {
flex: 1 1 0%;
min-width: 0;
}

.monaco-workbench .part.titlebar > .titlebar-container:not(.has-center) > .titlebar-center {
display: none;
}

.monaco-workbench .part.titlebar > .titlebar-container:not(.has-center) > .titlebar-right {
flex: 0 0 auto;
padding-left: 16px; /* ensure there is some space between title and controls */
}

/* Window title text */
.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title {
Expand Down
Loading
Loading