Merge pull request #520 from conwnet/master

release 0.17.0

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

@@ -35,6 +35,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ matrix.node-version }}
 
+      - run: sudo apt -y install libkrb5-dev
       - run: yarn --frozen-lockfile
       - run: yarn build:vscode
       - run: yarn yalc && yarn build

package.json

@@ -7,7 +7,7 @@
     "lib": "lib"
   },
   "devDependencies": {
-    "@github1s/vscode-web": "0.11.0",
+    "@github1s/vscode-web": "0.12.0",
     "@typescript-eslint/eslint-plugin": "^5.40.1",
     "@typescript-eslint/parser": "^5.40.1",
     "chokidar": "^3.5.3",

vscode-web/.VERSION

@@ -1 +1 @@
-1.80.1
+1.81.1

vscode-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@github1s/vscode-web",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "VS Code web for GitHub1s",
   "author": "github1s",
   "license": "MIT",

vscode-web/scripts/.patch

@@ -1,12 +1,12 @@
 {
-  "vs/code/browser/workbench/workbench.ts": "f24fefa3aafa0e02360cd31aa5c65ac06f61fcba8a3c074c4ff451ae809ed362",
-  "vs/editor/common/config/editorOptions.ts": "1c775bdf817b916ca151bf3364a59e7b8f559f022672d6cb46666ed829297f5c",
-  "vs/workbench/browser/parts/activitybar/activitybarActions.ts": "aafb4182f380f52395d3ef43bdd6b9318f396f66e9ae22a5082ef6da0a33c2a8",
+  "vs/code/browser/workbench/workbench.ts": "be140606a59a329584a67af7a8ec3d624ab71028ed3717a3d41bf368412beb4a",
+  "vs/editor/common/config/editorOptions.ts": "648903f0306c733cb2df5c0b7c241a8b1423a46ea7f2b746ef879cd43992117a",
+  "vs/workbench/browser/parts/activitybar/activitybarActions.ts": "a4813477aac947fc94d84f563143ef67370a9cf9c34a054741e051ec88f2eca2",
   "vs/workbench/browser/parts/activitybar/activitybarPart.ts": "0a9ff35eaa2bf4ffaa22ecf362b070cf47d8a63fc9e7055a280b456150677a06",
   "vs/workbench/browser/parts/titlebar/media/titlebarpart.css": "715607e6f7330e1137a4ddf7892c4846b40fe0d6c04a164d2b684eefa608846f",
-  "vs/workbench/browser/web.main.ts": "9b904a551718648f2a78bd711e121fb08ed397ea9be0e4873654a100d782388a",
+  "vs/workbench/browser/web.main.ts": "707d64b8fc7436e704fb1e6e06cddc6b48224c75c2617cc2175d7763906f1895",
   "vs/workbench/contrib/files/browser/editors/fileEditorInput.ts": "d52aa1f962f1a0bdfc6d186762f6fa51c9aa35bb98667aead8d8e9ad75e45215",
-  "vs/workbench/contrib/webview/browser/pre/index.html": "39b76b7cd7d79ca401e0aa7b0c9a1fa18ec620f1c6f868aaf17ff5351237e48b",
+  "vs/workbench/contrib/webview/browser/pre/index.html": "110da74034afd7843b0939ed0e2aa8a8ce8f4288d0382f9b651913659d3eceaf",
   "vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts": "b2c52e36c3d4122aa21b8f9a14fc9b14d45550f5a2251617e6d0e60685dde83c",
   "vs/workbench/services/label/common/labelService.ts": "73237cce0f9496151ea8ae5079676bbdfa15ce49de9b05621d39fcd04e9c1f0d",
   "vs/workbench/services/textfile/browser/textFileService.ts": "c9e7439cf0356c327c791e1c3ea911cf13399212e84d27f49e6c2bc8a983b861"

vscode-web/src/vs/editor/common/config/editorOptions.ts

@@ -58,6 +58,11 @@ export interface IEditorOptions {
 	 * The aria label for the editor's textarea (when it is focused).
 	 */
 	ariaLabel?: string;
+
+	/**
+	 * Whether the aria-required attribute should be set on the editors textarea.
+	 */
+	ariaRequired?: boolean;
 	/**
 	 * Control whether a screen reader announces inline suggestion content immediately.
 	 */
@@ -822,6 +827,11 @@ export interface IDiffEditorBaseOptions {
 	 * Defaults to false
 	 */
 	isInEmbeddedEditor?: boolean;
+
+	/**
+	 * If the diff editor should only show the difference review mode.
+	 */
+	onlyShowAccessibleDiffViewer?: boolean;
 }
 
 /**
@@ -4972,6 +4982,7 @@ export const enum EditorOption {
 	accessibilitySupport,
 	accessibilityPageSize,
 	ariaLabel,
+	ariaRequired,
 	autoClosingBrackets,
 	screenReaderAnnounceInlineSuggestion,
 	autoClosingDelete,
@@ -5142,6 +5153,9 @@ export const EditorOptions = {
 	ariaLabel: register(new EditorStringOption(
 		EditorOption.ariaLabel, 'ariaLabel', nls.localize('editorViewAccessibleLabel', "Editor content")
 	)),
+	ariaRequired: register(new EditorBooleanOption(
+		EditorOption.ariaRequired, 'ariaRequired', false, undefined
+	)),
 	screenReaderAnnounceInlineSuggestion: register(new EditorBooleanOption(
 		EditorOption.screenReaderAnnounceInlineSuggestion, 'screenReaderAnnounceInlineSuggestion', true,
 		{

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

@@ -9,7 +9,6 @@ import { EventType, addDisposableListener, EventHelper, append, $, clearNode, hi
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { EventType as TouchEventType, GestureEvent } from 'vs/base/browser/touch';
 import { Action, IAction, Separator, SubmenuAction, toAction } from 'vs/base/common/actions';
-import { Event } from 'vs/base/common/event';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { IMenuService, MenuId, IMenu, registerAction2, Action2, IAction2Options } from 'vs/platform/actions/common/actions';
@@ -41,6 +40,7 @@ import { ICredentialsService } from 'vs/platform/credentials/common/credentials'
 import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfile';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
 import { ILogService } from 'vs/platform/log/common/log';
+import { ISecretStorageService } from 'vs/platform/secrets/common/secrets';
 
 export class ViewContainerActivityAction extends ActivityAction {
 
@@ -149,13 +149,9 @@ abstract class AbstractGlobalActivityActionViewItem extends ActivityActionViewIt
 			const actions = await this.resolveContextMenuActions(disposables);
 
 			const event = new StandardMouseEvent(e);
-			const anchor = {
-				x: event.posx,
-				y: event.posy
-			};
 
 			this.contextMenuService.showContextMenu({
-				getAnchor: () => anchor,
+				getAnchor: () => event,
 				getActions: () => actions,
 				onHide: () => disposables.dispose()
 			});
@@ -277,7 +273,7 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
 	private readonly problematicProviders: Set<string> = new Set();
 
 	private initialized = false;
-	private sessionFromEmbedder = getCurrentAuthenticationSessionInfo(this.credentialsService, this.productService);
+	private sessionFromEmbedder = getCurrentAuthenticationSessionInfo(this.credentialsService, this.secretStorageService, this.productService);
 
 	constructor(
 		action: ActivityAction,
@@ -295,6 +291,7 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
 		@IConfigurationService configurationService: IConfigurationService,
 		@IStorageService private readonly storageService: IStorageService,
 		@IKeybindingService keybindingService: IKeybindingService,
+		@ISecretStorageService private readonly secretStorageService: ISecretStorageService,
 		@ICredentialsService private readonly credentialsService: ICredentialsService,
 		@ILogService private readonly logService: ILogService
 	) {
@@ -525,7 +522,7 @@ export class GlobalActivityActionViewItem extends MenuActivityActionViewItem {
 		@IKeybindingService keybindingService: IKeybindingService,
 	) {
 		super(MenuId.GlobalActivity, action, contextMenuActionsProvider, true, colors, activityHoverOptions, themeService, hoverService, menuService, contextMenuService, contextKeyService, configurationService, environmentService, keybindingService);
-		this._register(Event.any(this.userDataProfileService.onDidUpdateCurrentProfile, this.userDataProfileService.onDidChangeCurrentProfile)(() => this.updateProfileBadge()));
+		this._register(this.userDataProfileService.onDidChangeCurrentProfile(() => this.updateProfileBadge()));
 	}
 
 	override render(container: HTMLElement): void {

vscode-web/src/vs/workbench/browser/web.main.ts

@@ -92,6 +92,10 @@ import { BrowserRemoteResourceLoader } from 'vs/workbench/services/remote/browse
 import { BufferLogger } from 'vs/platform/log/common/bufferLog';
 import { FileLoggerService } from 'vs/platform/log/common/fileLog';
 import { IEmbedderTerminalService } from 'vs/workbench/services/terminal/common/embedderTerminalService';
+import { BrowserSecretStorageService } from 'vs/workbench/services/secrets/browser/secretStorageService';
+import { EncryptionService } from 'vs/workbench/services/encryption/browser/encryptionService';
+import { IEncryptionService } from 'vs/platform/encryption/common/encryptionService';
+import { ISecretStorageService } from 'vs/platform/secrets/common/secrets';
 
 export class BrowserMain extends Disposable {
 
@@ -384,9 +388,14 @@ export class BrowserMain extends Disposable {
 		const credentialsService = new BrowserCredentialsService(environmentService, remoteAgentService, productService);
 		serviceCollection.set(ICredentialsService, credentialsService);
 
+		const encryptionService = new EncryptionService();
+		serviceCollection.set(IEncryptionService, encryptionService);
+		const secretStorageService = new BrowserSecretStorageService(storageService, encryptionService, environmentService, logService);
+		serviceCollection.set(ISecretStorageService, secretStorageService);
+
 		// Userdata Initialize Service
 		const userDataInitializers: IUserDataInitializer[] = [];
-		userDataInitializers.push(new UserDataSyncInitializer(environmentService, credentialsService, userDataSyncStoreManagementService, fileService, userDataProfilesService, storageService, productService, requestService, logService, uriIdentityService));
+		userDataInitializers.push(new UserDataSyncInitializer(environmentService, secretStorageService, credentialsService, userDataSyncStoreManagementService, fileService, userDataProfilesService, storageService, productService, requestService, logService, uriIdentityService));
 		if (environmentService.options.profile) {
 			userDataInitializers.push(new UserDataProfileInitializer(environmentService, fileService, userDataProfileService, storageService, logService, uriIdentityService, requestService));
 		}

vscode-web/src/vs/workbench/contrib/webview/browser/pre/index.html

@@ -12,7 +12,7 @@
 		content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
 </head>
 
-<body style="margin: 0; overflow: hidden; width: 100%; height: 100%" role="document">
+<body style="margin: 0; overflow: hidden; width: 100%; height: 100%; overscroll-behavior-x: none;" role="document">
 	<script async type="module">
 		// @ts-check
 		/// <reference lib="dom" />
@@ -86,6 +86,7 @@
 		defaultStyles.id = '_defaultStyles';
 		defaultStyles.textContent = `
 			html {
+				overscroll-behavior-x: none;
 				scrollbar-color: var(--vscode-scrollbarSlider-background) var(--vscode-editor-background);
 			}
 
@@ -1112,6 +1113,14 @@
 				}
 			});
 
+			// propagate vscode-context-menu-visible class
+			hostMessaging.onMessage('set-context-menu-visible', (_event, data) => {
+				const target = getActiveFrame();
+				if (target && target.contentDocument) {
+					target.contentDocument.body.classList.toggle('vscode-context-menu-visible', data.visible);
+				}
+			});
+
 			hostMessaging.onMessage('set-title', async (_event, data) => {
 				const target = getActiveFrame();
 				if (target) {

yarn.lock

@@ -31,10 +31,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@github1s/vscode-web@0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@github1s/vscode-web/-/vscode-web-0.11.0.tgz#aa8ff5389c7f615ceecc5a851035e3c8ca677282"
-  integrity sha512-8n5BaCrF+C6sykfswGobZkYcYw2Qw7znX5a9rgxh9NcRbYxAV9AY+jlxpDjnr21e7qUWWdTn0RTWsxF7x91LqA==
+"@github1s/vscode-web@0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@github1s/vscode-web/-/vscode-web-0.12.0.tgz#5de3d9c47c8ab4eb6120189dbb786177eadf1e1d"
+  integrity sha512-pi28LdqI043zk3+IcAUgZKghXu9qGFCbcaACrDV61wE7y0vQuZTgCa7bEV9I5xUPeg7RqvS33Xpn4QGfc4kF7Q==
   dependencies:
     "@vscode/iconv-lite-umd" "0.7.0"
     "@vscode/vscode-languagedetection" "1.0.21"