Skip to content

Commit

Permalink
chore: bump vscode to 1.87.2 (#555)
Browse files Browse the repository at this point in the history
  • Loading branch information
conwnet authored Mar 15, 2024
1 parent 34fb6f4 commit 5a1d3e1
Show file tree
Hide file tree
Showing 14 changed files with 135 additions and 113 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"lib": "lib"
},
"devDependencies": {
"@github1s/vscode-web": "0.17.0",
"@github1s/vscode-web": "0.18.0",
"@typescript-eslint/eslint-plugin": "^5.40.1",
"@typescript-eslint/parser": "^5.40.1",
"chokidar": "^3.5.3",
Expand Down
2 changes: 1 addition & 1 deletion tests/__tests__/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ it('should load successfully', async () => {
it('should open file correctly', async () => {
await page.goto(`${BASE_URL}/conwnet/github1s`);
await page.waitForTimeout(3000);
await page.click('[title="~/tsconfig.json"]');
await page.click('[aria-label="~/tsconfig.json"]');
await page.click('[data-resource-name="tsconfig.json"]');
await page.waitForTimeout(3000);

Expand Down
2 changes: 1 addition & 1 deletion vscode-web/.VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.86.2
1.87.2
16 changes: 8 additions & 8 deletions vscode-web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@github1s/vscode-web",
"version": "0.17.0",
"version": "0.18.0",
"description": "VS Code web for GitHub1s",
"author": "github1s",
"license": "MIT",
Expand Down Expand Up @@ -30,13 +30,13 @@
"dependencies": {
"@vscode/iconv-lite-umd": "0.7.0",
"@vscode/vscode-languagedetection": "1.0.21",
"@xterm/addon-canvas": "0.6.0-beta.20",
"@xterm/addon-image": "0.7.0-beta.18",
"@xterm/addon-search": "0.14.0-beta.20",
"@xterm/addon-serialize": "0.12.0-beta.20",
"@xterm/addon-unicode11": "0.7.0-beta.20",
"@xterm/addon-webgl": "0.17.0-beta.20",
"@xterm/xterm": "5.4.0-beta.20",
"@xterm/addon-canvas": "0.6.0-beta.31",
"@xterm/addon-image": "0.7.0-beta.29",
"@xterm/addon-search": "0.14.0-beta.31",
"@xterm/addon-serialize": "0.12.0-beta.31",
"@xterm/addon-unicode11": "0.7.0-beta.31",
"@xterm/addon-webgl": "0.17.0-beta.31",
"@xterm/xterm": "5.4.0-beta.31",
"jschardet": "3.0.0",
"tas-client-umd": "0.1.8",
"vscode-oniguruma": "1.7.0",
Expand Down
16 changes: 8 additions & 8 deletions vscode-web/scripts/.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"vs/code/browser/workbench/workbench.ts": "66d3d7f717a67bf5b4432e1968fa68c1af8fa5552df7e958afd07c64cde3e247",
"vs/workbench/browser/parts/activitybar/activitybarPart.ts": "f2efeda40ac46abdef871145126e8099009c9b9ab25f0d17f5b03653fa09ecbf",
"vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "7884173bd194d76d1f0392b8fb5a92d7f946348555bb26a564f99dbfd7961dcf",
"vs/workbench/browser/web.main.ts": "ab8d3494022bec32bbdf5f85d083434be2a379018699222246c5aa1d87470f36",
"vs/workbench/contrib/files/browser/editors/fileEditorInput.ts": "cabf40a531266003fe9746756da07d74cd41be20afd505f94fd7937f7f49e6ec",
"vs/workbench/contrib/webview/browser/pre/index.html": "256fae7173fdabfed8963f6d15852609b15630d6e68ddbc281def651a23c76bb",
"vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts": "a301513f75bdecf781c0e8703e0c2f22c164039972dcbc99b12524f2073ccc43",
"vs/code/browser/workbench/workbench.ts": "4d5caa66a9d8d5c862c4ee6a928c4e1cb7cc93fc481dc9c471245229be7323e1",
"vs/workbench/browser/parts/activitybar/activitybarPart.ts": "3b2d7f2be631cb5b2a37bbd5eaceae87833273fd7c3babc41cab180d6330b657",
"vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "253c6b6b1212d0ca80e1969959d3d09d0c1040f3bea3ad076f2708783bd14544",
"vs/workbench/browser/web.main.ts": "a1fb5bb77c9602358f4e25cf3413bf2f89cb31421de1fa64b797d815e30b3e9c",
"vs/workbench/contrib/files/browser/editors/fileEditorInput.ts": "b1c3f939b2f6182bd2bfb231a0fea0d19e7579fb6a37953ad5dada596337cbf2",
"vs/workbench/contrib/webview/browser/pre/index.html": "a1942558e310b15a1d2387f33cd00787d2e507332df16bbb258ad644e4c62dbb",
"vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts": "8cbb23b36f1e35436c0cd53b10f6ba2d3a51c92cee297d1fd956b9dcd6e33b1a",
"vs/workbench/services/label/common/labelService.ts": "73237cce0f9496151ea8ae5079676bbdfa15ce49de9b05621d39fcd04e9c1f0d",
"vs/workbench/services/textfile/browser/textFileService.ts": "193176bfccbbeae7fdf7b546992647554503dc4df8579db7094a4eee3cf50451"
"vs/workbench/services/textfile/browser/textFileService.ts": "9d0831d6f49ad0ac8482a941e1b3b36b58e7a9db2fedc6e66ba94499719617e9"
}
Original file line number Diff line number Diff line change
Expand Up @@ -406,8 +406,7 @@ registerAction2(class extends Action2 {
super({
id: 'workbench.action.activityBarLocation.side',
title: {
value: localize('positionActivityBarSide', 'Move Activity Bar to Side'),
original: 'Move Activity Bar to Side',
...localize2('positionActivityBarSide', 'Move Activity Bar to Side'),
mnemonicTitle: localize({ key: 'miSideActivityBar', comment: ['&& denotes a mnemonic'] }, "&&Side"),
},
shortTitle: localize('side', "Side"),
Expand All @@ -433,8 +432,7 @@ registerAction2(class extends Action2 {
super({
id: 'workbench.action.activityBarLocation.top',
title: {
value: localize('positionActivityBarTop', 'Move Activity Bar to Top'),
original: 'Move Activity Bar to Top',
...localize2('positionActivityBarTop', 'Move Activity Bar to Top'),
mnemonicTitle: localize({ key: 'miTopActivityBar', comment: ['&& denotes a mnemonic'] }, "&&Top"),
},
shortTitle: localize('top', "Top"),
Expand All @@ -460,8 +458,7 @@ registerAction2(class extends Action2 {
super({
id: 'workbench.action.activityBarLocation.hide',
title: {
value: localize('hideActivityBar', 'Hide Activity Bar'),
original: 'Hide Activity Bar',
...localize2('hideActivityBar', 'Hide Activity Bar'),
mnemonicTitle: localize({ key: 'miHideActivityBar', comment: ['&& denotes a mnemonic'] }, "&&Hidden"),
},
shortTitle: localize('hide', "Hidden"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@

.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center .action-item.command-center-quick-pick {
display: flex;
justify-content: start;
overflow: hidden;
margin: auto;
max-width: 600px;
}

.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center .action-item.command-center-quick-pick .search-icon {
Expand Down
4 changes: 2 additions & 2 deletions vscode-web/src/vs/workbench/browser/web.main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import { IUserDataSyncStoreManagementService } from 'vs/platform/userDataSync/co
import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions';
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { localize } from 'vs/nls';
import { localize, localize2 } from 'vs/nls';
import { Categories } from 'vs/platform/action/common/actionCommonCategories';
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
import { IHostService } from 'vs/workbench/services/host/browser/host';
Expand Down Expand Up @@ -480,7 +480,7 @@ export class BrowserMain extends Disposable {
constructor() {
super({
id: 'workbench.action.resetUserData',
title: { original: 'Reset User Data', value: localize('reset', "Reset User Data") },
title: localize2('reset', "Reset User Data"),
category: Categories.Developer,
menu: {
id: MenuId.CommandPalette
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import { URI } from 'vs/base/common/uri';
import { IFileEditorInput, Verbosity, GroupIdentifier, IMoveResult, EditorInputCapabilities, IEditorDescriptor, IEditorPane, IUntypedEditorInput, DEFAULT_EDITOR_ASSOCIATION, IUntypedFileEditorInput, findViewStateForEditor, isResourceEditorInput, IFileEditorInputOptions } from 'vs/workbench/common/editor';
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
import { EditorInput, IUntypedEditorOptions } from 'vs/workbench/common/editor/editorInput';
import { AbstractTextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
import { ITextResourceEditorInput } from 'vs/platform/editor/common/editor';
import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
Expand Down Expand Up @@ -421,7 +421,7 @@ export class FileEditorInput extends AbstractTextResourceEditorInput implements
};
}

override toUntyped(options?: { preserveViewState: GroupIdentifier }): ITextResourceEditorInput {
override toUntyped(options?: IUntypedEditorOptions): ITextResourceEditorInput {
const untypedInput: IUntypedFileEditorInput = {
resource: this.preferredResource,
forceFile: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@
} else {
return; // let the browser handle this
}
} else if (!onElectron && (isCloseTab(e) || isNewWindow(e))) {
} else if (!onElectron && (isCloseTab(e) || isNewWindow(e) || isHelp(e) || isRefresh(e))) {
// Prevent Ctrl+W closing window / Ctrl+N opening new window in PWA.
// (No effect in a regular browser tab.)
e.preventDefault();
Expand Down Expand Up @@ -673,6 +673,24 @@
return hasMeta && e.keyCode === 78;
}

/**
* @param {KeyboardEvent} e
* @return {boolean}
*/
function isHelp(e) {
// 112: keyCode of "F1"
return e.keyCode === 112;
}

/**
* @param {KeyboardEvent} e
* @return {boolean}
*/
function isRefresh(e) {
// 116: keyCode of "F5"
return e.keyCode === 116;
}

let isHandlingScroll = false;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ export class BuiltinExtensionsScannerService implements IBuiltinExtensionsScanne
const id = getGalleryExtensionId(e.packageJSON.publisher, e.packageJSON.name);
return {
identifier: { id },
location: uriIdentityService.extUri.joinPath(builtinExtensionsServiceUrl!, e.extensionPath),
location: uriIdentityService.extUri.joinPath(builtinExtensionsServiceUrl, e.extensionPath),
type: ExtensionType.System,
isBuiltin: true,
manifest: e.packageNLS ? await this.localizeManifest(id, e.packageJSON, e.packageNLS) : e.packageJSON,
readmeUrl: e.readmePath ? uriIdentityService.extUri.joinPath(builtinExtensionsServiceUrl!, e.readmePath) : undefined,
changelogUrl: e.changelogPath ? uriIdentityService.extUri.joinPath(builtinExtensionsServiceUrl!, e.changelogPath) : undefined,
readmeUrl: e.readmePath ? uriIdentityService.extUri.joinPath(builtinExtensionsServiceUrl, e.readmePath) : undefined,
changelogUrl: e.changelogPath ? uriIdentityService.extUri.joinPath(builtinExtensionsServiceUrl, e.changelogPath) : undefined,
targetPlatform: TargetPlatform.WEB,
validations: [],
isValid: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,10 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
}

// save model
return targetModel.save(options);
return targetModel.save({
...options,
from: source
});
}

private async confirmOverwrite(resource: URI): Promise<boolean> {
Expand Down
68 changes: 34 additions & 34 deletions vscode-web/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,40 +17,40 @@
resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3"
integrity sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==

"@xterm/[email protected].20":
version "0.6.0-beta.20"
resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.20.tgz#078dddef70caf880b2cb121fdda37d301fc13156"
integrity sha512-tHhsuqElE7LNiDJPbZzgVpmbcG2Dk6i2vh1EI+DzSByUWScDqLoeJbVPE5Xd2UW2garo24lxErpnIAlsytcA3A==

"@xterm/[email protected].18":
version "0.7.0-beta.18"
resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.18.tgz#588ea2d0841cff48c63bde1bfcdf56e9494dc6af"
integrity sha512-+HQ+IBmHPelzjRJ5zO3XkjbeQNr2Zrf5wAlbPhy4EGSD0mDCqHJSfzZ8wKrhx7t8qpfiA8eTpWu/M76WsEnlnA==

"@xterm/[email protected].20":
version "0.14.0-beta.20"
resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.20.tgz#cac366b1be1eb02cf9fe9537933f26f227d030c8"
integrity sha512-1LOL/OzWSrCBpndiBeeE2S1rxtKKgU1ucYFSG3P68W0J4VQz/Ksci1BgDKsgspj9jzpsGhdql3zwa5WEM7n4Pg==

"@xterm/[email protected].20":
version "0.12.0-beta.20"
resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.20.tgz#5fe126194ff4dc466b92a0946e081e039a14ad21"
integrity sha512-GdRCQDjLyVNBxCFnhfCWsMmuqv2PryUkOaNl4z5MqB5lBUkiEnRNY0u/s5f34+2zrijp3h0O/f9JDLW4gSUQgw==

"@xterm/[email protected].20":
version "0.7.0-beta.20"
resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.20.tgz#5d3c97320898dd6766f2dc127deb4f071c8698c2"
integrity sha512-4/uwJ6lV/xJplT7hJc7sO4Im4XNvEXHnUEFIs03FFp8ZUfu3U6wcBk6/GoKMwJKJtGVNxotiD6ZzJ5v8IBH6nA==

"@xterm/[email protected].20":
version "0.17.0-beta.20"
resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.20.tgz#443845ac5ac755cf762b105ed237b30426b07137"
integrity sha512-iqvXNSTfKIcO9FBraNwdO/ixPrTHok8CBN/wjlnGLv0ZMc4zLAiKE8+PHyg9ZY38QJfS+4Ouo8KsuZwoOYfnNA==

"@xterm/[email protected].20":
version "5.4.0-beta.20"
resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.20.tgz#28bbbbc73eceb6ef3e1e095de195cf849d0cbfb6"
integrity sha512-nkY91qBy5pe1HlW9LOoLcyG6v4teEsliEtUVshAO42NrJDaPniSn28O5m5832UjZOdjLCY58QlcBkZUquODGrQ==
"@xterm/[email protected].31":
version "0.6.0-beta.31"
resolved "https://registry.yarnpkg.com/@xterm/addon-canvas/-/addon-canvas-0.6.0-beta.31.tgz#17cc7d9968ede411fb23db11813b495435c068a0"
integrity sha512-jm/7FWZOgnAGG7MXjr0W4SnuIzsag+oVpyf6wAD9UlCgq5HBuk/3kJ5mYGiGR7CpdTxqXmzyBk3OhQe8npZ1aQ==

"@xterm/[email protected].29":
version "0.7.0-beta.29"
resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.7.0-beta.29.tgz#276b56007c9009e7a59605dc3809c280e7d637ed"
integrity sha512-Z5JCuhl0AcwQA+DE/kQMeSSHZbfwJVLUUBodDeujVItQrcpc9vA8mxf/qIwS3XTA/tPbFihfc/CE9zL7OFdbaw==

"@xterm/[email protected].31":
version "0.14.0-beta.31"
resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.14.0-beta.31.tgz#e6edcd257f5a66bca7e92e62684132b604fb817d"
integrity sha512-SS4CdgciLT98Uc4Dq0IjJegHcGIjGaASTcMtVkNBx9dOat9xt6lCXmtgUUj5w0KlB8nUfKrcy5T6fHgzrOzvrw==

"@xterm/[email protected].31":
version "0.12.0-beta.31"
resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.12.0-beta.31.tgz#daec32b94d45afcd662351d7689cb1b19eb24db7"
integrity sha512-MZ24pw33qOJrHdA6tlvwE4dSSpmIp/H9ZKtbiWZvuxVsY/hfYYPOluBQiCsOiYT7bZ8gQub2OOBX3jyMoZVxnQ==

"@xterm/[email protected].31":
version "0.7.0-beta.31"
resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.7.0-beta.31.tgz#e1a6e965638ee6cb59b8b0777387037c42582d4b"
integrity sha512-wrZLt2s6Yjmpe4nh0Sp6DKji0EoHod7V6ABfWBf8krjmEGSleE+GSb+ZwDOMsNzLJLmxoq1e6glHcVixG1z7WQ==

"@xterm/[email protected].31":
version "0.17.0-beta.31"
resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.17.0-beta.31.tgz#15dfea4583ff9b65f1a442e5cdba1d1638adb05f"
integrity sha512-wqbBDDppwQ4R8o0YgnyFL8Pai2mVZqHb3E097vkFLB5Fw2hNx2dys3MgiXriSGXaUABKM3usVdZyouL6QgWdxQ==

"@xterm/[email protected].31":
version "5.4.0-beta.31"
resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.4.0-beta.31.tgz#ff0bb3af9b00b0dfc73e84075f4218440c9886be"
integrity sha512-EpCtaYqMhJSyZrGY2sJVZeRCIRrANKtv1GGTj+IQPvk6hTiJHGrFHLM0tZ0dj0l3z65tLoOdj6EzJnjzX3Pqjw==

ansi-styles@^3.2.1:
version "3.2.1"
Expand Down
Loading

0 comments on commit 5a1d3e1

Please sign in to comment.