fix errors in code-editor-web-embedded

Author: Feiyang Liu

patches/web-embedded.series

@@ -30,6 +30,7 @@ web-embedded/add-a-much-simpler-workbench.diff
 web-embedded/remove-terminal-in-code-oss.diff
 web-embedded/remove-ssh-remote-host-in-code-oss.diff
 web-embedded/remove-source-control.diff
+web-embedded/fix-scm-progress-location.diff
 web-embedded/only-have-debug-view-container.diff
 web-embedded/disable-user-tasks-and-fix-build-warnings.diff
 web-embedded/disable-file-actions-calls-accounts-merge-conflit.diff

patches/web-embedded/disable-file-actions-calls-accounts-merge-conflit.diff

@@ -789,3 +789,100 @@ Index: third-party-src/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.
  registerAction2(AcceptAllCombination);
 
  registerAction2(ToggleBetweenInputs);
+Index: third-party-src/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+===================================================================
+--- third-party-src.orig/src/vs/workbench/browser/parts/editor/editor.contribution.ts
++++ third-party-src/src/vs/workbench/browser/parts/editor/editor.contribution.ts
+@@ -42,8 +42,7 @@ import {
+ 	ReOpenInTextEditorAction, DuplicateGroupDownAction, DuplicateGroupLeftAction, DuplicateGroupRightAction, DuplicateGroupUpAction, ToggleEditorTypeAction, SplitEditorToAboveGroupAction, SplitEditorToBelowGroupAction,
+ 	SplitEditorToFirstGroupAction, SplitEditorToLastGroupAction, SplitEditorToLeftGroupAction, SplitEditorToNextGroupAction, SplitEditorToPreviousGroupAction, SplitEditorToRightGroupAction, NavigateForwardInEditsAction,
+ 	NavigateBackwardsInEditsAction, NavigateForwardInNavigationsAction, NavigateBackwardsInNavigationsAction, NavigatePreviousInNavigationsAction, NavigatePreviousInEditsAction, NavigateToLastNavigationLocationAction,
+-	MaximizeGroupHideSidebarAction, MoveEditorToNewWindowAction, CopyEditorToNewindowAction, RestoreEditorsToMainWindowAction, ToggleMaximizeEditorGroupAction, MinimizeOtherGroupsHideSidebarAction, CopyEditorGroupToNewWindowAction,
+-	MoveEditorGroupToNewWindowAction, NewEmptyEditorWindowAction,
++	MaximizeGroupHideSidebarAction, RestoreEditorsToMainWindowAction, ToggleMaximizeEditorGroupAction, MinimizeOtherGroupsHideSidebarAction,
+ 	ClearEditorHistoryWithoutConfirmAction
+ } from './editorActions.js';
+ import {
+@@ -51,8 +50,8 @@ import {
+ 	CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, KEEP_EDITOR_COMMAND_ID, PIN_EDITOR_COMMAND_ID, SHOW_EDITORS_IN_GROUP, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_LEFT,
+ 	SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, TOGGLE_KEEP_EDITORS_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, setup as registerEditorCommands, REOPEN_WITH_COMMAND_ID,
+ 	TOGGLE_LOCK_GROUP_COMMAND_ID, UNLOCK_GROUP_COMMAND_ID, SPLIT_EDITOR_IN_GROUP, JOIN_EDITOR_IN_GROUP, FOCUS_FIRST_SIDE_EDITOR, FOCUS_SECOND_SIDE_EDITOR, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, LOCK_GROUP_COMMAND_ID,
+-	SPLIT_EDITOR, TOGGLE_MAXIMIZE_EDITOR_GROUP, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID,
+-	NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, MOVE_EDITOR_INTO_RIGHT_GROUP, MOVE_EDITOR_INTO_LEFT_GROUP, MOVE_EDITOR_INTO_ABOVE_GROUP, MOVE_EDITOR_INTO_BELOW_GROUP
++	SPLIT_EDITOR, TOGGLE_MAXIMIZE_EDITOR_GROUP,
++	MOVE_EDITOR_INTO_RIGHT_GROUP, MOVE_EDITOR_INTO_LEFT_GROUP, MOVE_EDITOR_INTO_ABOVE_GROUP, MOVE_EDITOR_INTO_BELOW_GROUP
+ } from './editorCommands.js';
+ import { GOTO_NEXT_CHANGE, GOTO_PREVIOUS_CHANGE, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, TOGGLE_DIFF_SIDE_BY_SIDE, DIFF_SWAP_SIDES } from './diffEditorCommands.js';
+ import { inQuickPickContext, getQuickNavigateHandler } from '../../quickaccess.js';
+@@ -301,12 +300,7 @@ registerAction2(QuickAccessPreviousRecen
+ registerAction2(QuickAccessLeastRecentlyUsedEditorInGroupAction);
+ registerAction2(QuickAccessPreviousEditorFromHistoryAction);
+ 
+-registerAction2(MoveEditorToNewWindowAction);
+-registerAction2(CopyEditorToNewindowAction);
+-registerAction2(MoveEditorGroupToNewWindowAction);
+-registerAction2(CopyEditorGroupToNewWindowAction);
+ registerAction2(RestoreEditorsToMainWindowAction);
+-registerAction2(NewEmptyEditorWindowAction);
+ 
+ const quickAccessNavigateNextInEditorPickerId = 'workbench.action.quickOpenNavigateNextInEditorPicker';
+ KeybindingsRegistry.registerCommandAndKeybindingRule({
+@@ -359,7 +353,7 @@ MenuRegistry.appendMenuItem(MenuId.Empty
+ MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: SPLIT_EDITOR_DOWN, title: localize('splitDown', "Split Down") }, group: '2_split', order: 20 });
+ MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: SPLIT_EDITOR_LEFT, title: localize('splitLeft', "Split Left") }, group: '2_split', order: 30 });
+ MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: SPLIT_EDITOR_RIGHT, title: localize('splitRight', "Split Right") }, group: '2_split', order: 40 });
+-MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, title: localize('newWindow', "New Window") }, group: '3_window', order: 10 });
++
+ MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: TOGGLE_LOCK_GROUP_COMMAND_ID, title: localize('toggleLockGroup', "Lock Group"), toggled: ActiveEditorGroupLockedContext }, group: '4_lock', order: 10, when: IsAuxiliaryWindowContext.toNegated() /* already a primary action for aux windows */ });
+ MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: CLOSE_EDITOR_GROUP_COMMAND_ID, title: localize('close', "Close") }, group: '5_close', order: 10, when: MultipleEditorGroupsContext });
+ 
+@@ -369,8 +363,7 @@ MenuRegistry.appendMenuItem(MenuId.Edito
+ MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: SPLIT_EDITOR_LEFT, title: localize('splitLeft', "Split Left") }, group: '2_split', order: 30 });
+ MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: SPLIT_EDITOR_RIGHT, title: localize('splitRight', "Split Right") }, group: '2_split', order: 40 });
+ 
+-MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, title: localize('moveEditorGroupToNewWindow', "Move into New Window") }, group: '3_window', order: 10 });
+-MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, title: localize('copyEditorGroupToNewWindow', "Copy into New Window") }, group: '3_window', order: 20 });
++
+ 
+ MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { submenu: MenuId.EditorTabsBarShowTabsSubmenu, title: localize('tabBar', "Tab Bar"), group: '4_config', order: 10, when: InEditorZenModeContext.negate() });
+ MenuRegistry.appendMenuItem(MenuId.EditorTabsBarShowTabsSubmenu, { command: { id: ShowMultipleEditorTabsAction.ID, title: localize('multipleTabs', "Multiple Tabs"), toggled: ContextKeyExpr.equals('config.workbench.editor.showTabs', 'multiple') }, group: '1_config', order: 10 });
+@@ -402,8 +395,7 @@ MenuRegistry.appendMenuItem(MenuId.Edito
+ MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: SPLIT_EDITOR, title: localize('splitRight', "Split Right") }, group: '5_split', order: 10, when: SplitEditorsVertically.negate() });
+ MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: SPLIT_EDITOR, title: localize('splitDown', "Split Down") }, group: '5_split', order: 10, when: SplitEditorsVertically });
+ MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { submenu: MenuId.EditorSplitMoveSubmenu, title: localize('splitAndMoveEditor', "Split & Move"), group: '5_split', order: 15 });
+-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, title: localize('moveToNewWindow', "Move into New Window") }, group: '7_new_window', order: 10 });
+-MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, title: localize('copyToNewWindow', "Copy into New Window") }, group: '7_new_window', order: 20 });
++
+ MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { submenu: MenuId.EditorTitleContextShare, title: localize('share', "Share"), group: '11_share', order: -1, when: MultipleEditorsSelectedInGroupContext.negate() });
+ 
+ // Editor Title Context Menu: Split & Move Editor Submenu
+@@ -768,29 +760,7 @@ MenuRegistry.appendMenuItem(MenuId.Menub
+ 	order: 1
+ });
+ 
+-MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+-	group: '3_new_window',
+-	command: {
+-		id: MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID,
+-		title: {
+-			...localize2('moveEditorToNewWindow', "Move Editor into New Window"),
+-			mnemonicTitle: localize({ key: 'miMoveEditorToNewWindow', comment: ['&& denotes a mnemonic'] }, "&&Move Editor into New Window"),
+-		}
+-	},
+-	order: 1
+-});
+ 
+-MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+-	group: '3_new_window',
+-	command: {
+-		id: COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID,
+-		title: {
+-			...localize2('copyEditorToNewWindow', "Copy Editor into New Window"),
+-			mnemonicTitle: localize({ key: 'miCopyEditorToNewWindow', comment: ['&& denotes a mnemonic'] }, "&&Copy Editor into New Window"),
+-		}
+-	},
+-	order: 2
+-});
+ 
+ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
+ 	group: '4_layouts',

patches/web-embedded/fix-scm-progress-location.diff

@@ -0,0 +1,23 @@
+Fix SCM progress location error
+
+Since the SCM view container is removed by remove-source-control.diff,
+the ProgressLocation.Scm location no longer exists. This causes the error
+"Bad progress location: workbench.scm" when quickDiffModel tries to show
+progress. Change to ProgressLocation.Window which doesn't require a view.
+---
+ .../workbench/contrib/scm/browser/quickDiffModel.ts     | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: third-party-src/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
+===================================================================
+--- third-party-src.orig/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
++++ third-party-src/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
+@@ -241,7 +241,7 @@ export class QuickDiffModel extends Disp
+ 	}
+ 
+ 	private diff(): Promise<{ allChanges: QuickDiffChange[]; changes: QuickDiffChange[]; mapChanges: Map<string, number[]> } | null> {
+-		return this.progressService.withProgress({ location: ProgressLocation.Scm, delay: 250 }, async () => {
++		return this.progressService.withProgress({ location: ProgressLocation.Window, delay: 250 }, async () => {
+ 			const originalURIs = await this.getQuickDiffsPromise();
+ 			if (this._disposed || this._model.isDisposed() || (originalURIs.length === 0)) {
+ 				// Disposed

patches/web-embedded/remove-import-export-profiles-and-revert-file-menu-i.diff

@@ -93,7 +93,7 @@ Index: third-party-src/src/vs/workbench/contrib/userDataProfile/browser/userData
 ===================================================================
 --- third-party-src.orig/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
 +++ third-party-src/src/vs/workbench/contrib/userDataProfile/browser/userDataProfile.ts
-@@ -130,8 +130,6 @@ export class UserDataProfilesWorkbenchCo
+@@ -152,8 +152,6 @@ export class UserDataProfilesWorkbenchCo
  		this.registerProfilesActions();
  		this._register(this.userDataProfilesService.onDidChangeProfiles(() => this.registerProfilesActions()));
 
@@ -102,7 +102,7 @@ Index: third-party-src/src/vs/workbench/contrib/userDataProfile/browser/userData
  		this.registerCreateFromCurrentProfileAction();
  		this.registerNewProfileAction();
  		this.registerDeleteProfileAction();
-@@ -364,34 +362,6 @@ export class UserDataProfilesWorkbenchCo
+@@ -386,34 +384,6 @@ export class UserDataProfilesWorkbenchCo
  		return disposables;
  	}
 
@@ -137,3 +137,72 @@ Index: third-party-src/src/vs/workbench/contrib/userDataProfile/browser/userData
 
  	private registerCreateFromCurrentProfileAction(): void {
  		const that = this;
+Index: third-party-src/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
+===================================================================
+--- third-party-src.orig/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
++++ third-party-src/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.ts
+@@ -223,13 +223,7 @@ export class UserDataProfilesEditor exte
+ 					const actions: IAction[] = [];
+ 					if (this.templates.length) {
+ 						actions.push(new SubmenuAction('from.template', localize('from template', "From Template"), this.getCreateFromTemplateActions()));
+-						actions.push(new Separator());
+ 					}
+-					actions.push(toAction({
+-						id: 'importProfile',
+-						label: localize('importProfile', "Import Profile..."),
+-						run: () => this.importProfile()
+-					}));
+ 					return actions;
+ 				}
+ 			},
+@@ -294,50 +288,9 @@ export class UserDataProfilesEditor exte
+ 		if (templateActions.length) {
+ 			actions.push(new SubmenuAction('from.template', localize('new from template', "New Profile From Template"), templateActions));
+ 		}
+-		actions.push(new Separator());
+-		actions.push(toAction({
+-			id: 'importProfile',
+-			label: localize('importProfile', "Import Profile..."),
+-			run: () => this.importProfile()
+-		}));
+ 		return actions;
+ 	}
+ 
+-	private async importProfile(): Promise<void> {
+-		const disposables = new DisposableStore();
+-		const quickPick = disposables.add(this.quickInputService.createQuickPick());
+-
+-		const updateQuickPickItems = (value?: string) => {
+-			const quickPickItems: IQuickPickItem[] = [];
+-			if (value) {
+-				quickPickItems.push({ label: quickPick.value, description: localize('import from url', "Import from URL") });
+-			}
+-			quickPickItems.push({ label: localize('import from file', "Select File...") });
+-			quickPick.items = quickPickItems;
+-		};
+-
+-		quickPick.title = localize('import profile quick pick title', "Import from Profile Template...");
+-		quickPick.placeholder = localize('import profile placeholder', "Provide Profile Template URL");
+-		quickPick.ignoreFocusOut = true;
+-		disposables.add(quickPick.onDidChangeValue(updateQuickPickItems));
+-		updateQuickPickItems();
+-		quickPick.matchOnLabel = false;
+-		quickPick.matchOnDescription = false;
+-		disposables.add(quickPick.onDidAccept(async () => {
+-			quickPick.hide();
+-			const selectedItem = quickPick.selectedItems[0];
+-			if (!selectedItem) {
+-				return;
+-			}
+-			const url = selectedItem.label === quickPick.value ? URI.parse(quickPick.value) : await this.getProfileUriFromFileSystem();
+-			if (url) {
+-				this.createNewProfile(url);
+-			}
+-		}));
+-		disposables.add(quickPick.onDidHide(() => disposables.dispose()));
+-		quickPick.show();
+-	}
+-
+ 	async createNewProfile(copyFrom?: URI | IUserDataProfile): Promise<void> {
+ 		await this.model?.createNewProfile(copyFrom);
+ 	}