Remove "New Window..." contribution point

microsoft · Jun 23, 2021 · a3fc50b · a3fc50b
1 parent 1bbd8db
commit a3fc50b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 54 deletions.
diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
@@ -139,7 +139,7 @@ export interface IStartEntry {
 	readonly description: string;
 	readonly command: string;
 	readonly when?: string;
-	readonly category: 'window' | 'file' | 'folder' | 'notebook';
+	readonly category: 'file' | 'folder' | 'notebook';
 }
 
 export interface IExtensionContributions {

diff --git a/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.contribution.ts
@@ -213,33 +213,6 @@ registerAction2(class extends Action2 {
 	}
 });
 
-registerAction2(class extends Action2 {
-	constructor() {
-		super({
-			id: 'welcome.showNewWindowEntries',
-			title: localize('welcome.newWindow', "New Window..."),
-			category,
-			f1: true,
-			keybinding: {
-				primary: KeyMod.Alt + KeyMod.CtrlCmd + KeyMod.WinCtrl + KeyCode.KEY_W,
-				weight: KeybindingWeight.WorkbenchContrib,
-			},
-			menu: {
-				id: MenuId.MenubarFileMenu,
-				group: '1_new',
-				order: 4
-			}
-		});
-	}
-
-	run(accessor: ServicesAccessor) {
-		const gettingStartedService = accessor.get(IGettingStartedService);
-		gettingStartedService.selectNewEntry([
-			IGettingStartedNewMenuEntryDescriptorCategory.window
-		]);
-	}
-});
-
 registerAction2(class extends Action2 {
 	constructor() {
 		super({
@@ -275,7 +248,7 @@ registerAction2(class extends Action2 {
 		});
 	}
 
-	run(accessor: ServicesAccessor, args?: ('window' | 'file' | 'folder' | 'notebook')[]) {
+	run(accessor: ServicesAccessor, args?: ('file' | 'folder' | 'notebook')[]) {
 		const gettingStartedService = accessor.get(IGettingStartedService);
 		const filters: IGettingStartedNewMenuEntryDescriptorCategory[] = [];
 		(args ?? []).forEach(arg => {

diff --git a/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStartedExtensionPoint.ts b/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStartedExtensionPoint.ts
@@ -219,7 +219,7 @@ export const startEntriesExtensionPoint = ExtensionsRegistry.registerExtensionPo
 				category: {
 					type: 'string',
 					description: localize('startEntries.category', "Category of the new entry."),
-					enum: ['window', 'file', 'folder', 'notebook', 'terminal', 'configuration'],
+					enum: ['file', 'folder', 'notebook'],
 				},
 				description: {
 					type: 'string',

diff --git a/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStartedService.ts b/src/vs/workbench/contrib/welcome/gettingStarted/browser/gettingStartedService.ts
@@ -82,7 +82,6 @@ export interface IGettingStartedWalkthroughDescriptor {
 export enum IGettingStartedNewMenuEntryDescriptorCategory {
 	'file',
 	'notebook',
-	'window',
 	'folder',
 }
 
@@ -236,18 +235,6 @@ export class GettingStartedService extends Disposable implements IGettingStarted
 				category: IGettingStartedNewMenuEntryDescriptorCategory.file,
 				from: CoreNewEntryDisplayName,
 			},
-			{
-				title: localize('newWindowTitle', "Local Window"),
-				action: { runCommand: 'workbench.action.newWindow' },
-				category: IGettingStartedNewMenuEntryDescriptorCategory.window,
-				from: CoreNewEntryDisplayName,
-			},
-			{
-				title: localize('newDuplicateWindowTitle', "Duplicate Current Window"),
-				action: { runCommand: 'workbench.action.duplicateWorkspaceInNewWindow' },
-				category: IGettingStartedNewMenuEntryDescriptorCategory.window,
-				from: CoreNewEntryDisplayName,
-			},
 			{
 				title: localize('newGit', "Folder from Git Repo"),
 				action: { runCommand: 'git.clone' },
@@ -940,7 +927,6 @@ registerAction2(class extends Action2 {
 const displayCategory: Record<IGettingStartedNewMenuEntryDescriptorCategory, string> = {
 	[IGettingStartedNewMenuEntryDescriptorCategory.file]: localize('file', "File"),
 	[IGettingStartedNewMenuEntryDescriptorCategory.folder]: localize('folder', "Folder"),
-	[IGettingStartedNewMenuEntryDescriptorCategory.window]: localize('window', "Window"),
 	[IGettingStartedNewMenuEntryDescriptorCategory.notebook]: localize('notebook', "Notebook"),
 };
 

diff --git a/src/vs/workbench/contrib/welcome/gettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcome/gettingStarted/common/gettingStartedContent.ts
@@ -62,16 +62,6 @@ export const startEntries: GettingStartedStartEntryContent = [
 			command: 'welcome.showNewFileEntries',
 		}
 	},
-	{
-		id: 'welcome.showNewWindowEntries',
-		title: localize('gettingStarted.newWindow.title', "New Window..."),
-		description: localize('gettingStarted.newWindow.description', "Open a new window, either locally or over a remote connection"),
-		icon: Codicon.emptyWindow,
-		content: {
-			type: 'startEntry',
-			command: 'welcome.showNewWindowEntries',
-		}
-	},
 	{
 		id: 'welcome.showNewFolderEntries',
 		title: localize('gettingStarted.newFolder.title', "New Folder..."),