Fix compilation

Author: jeanp413

extensions/gitpod-remote/src/extension.ts

@@ -2,7 +2,7 @@
  *  Copyright (c) Gitpod. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
 
-/// <reference path='../../../src/vs/vscode.d.ts'/>
+/// <reference path='../../../src/vscode-dts/vscode.d.ts'/>
 
 import * as cp from 'child_process';
 import { GitpodExtensionContext, registerTasks, setupGitpodContext, registerIpcHookCli } from 'gitpod-shared';

extensions/gitpod-shared/src/features.ts

@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Gitpod. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
-/// <reference path='../../../src/vs/vscode.d.ts'/>
+/// <reference path='../../../src/vscode-dts/vscode.d.ts'/>
 
 // TODO get rid of loading inversify and reflect-metadata
 require('reflect-metadata');

extensions/gitpod-web/src/extension.ts

@@ -2,8 +2,9 @@
  *  Copyright (c) Gitpod. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
 
-/// <reference path='../../../src/vs/vscode.d.ts'/>
-/// <reference path='../../../src/vs/vscode.proposed.d.ts'/>
+/// <reference path='../../../src/vscode-dts/vscode.d.ts'/>
+/// <reference path='../../../src/vscode-dts/vscode.proposed.resolvers.d.ts'/>
+/// <reference path='../../../src/vscode-dts/vscode.proposed.terminalLocation.d.ts'/>
 
 import * as workspaceInstance from '@gitpod/gitpod-protocol/lib/workspace-instance';
 import * as grpc from '@grpc/grpc-js';

extensions/gitpod/src/extension.ts

@@ -2,7 +2,7 @@
  *  Copyright (c) Gitpod. All rights reserved.
  *--------------------------------------------------------------------------------------------*/
 
-/// <reference path='../../../src/vs/vscode.d.ts'/>
+/// <reference path='../../../src/vscode-dts/vscode.d.ts'/>
 
 import { AutoTunnelRequest, ResolveSSHConnectionRequest, ResolveSSHConnectionResponse } from '@gitpod/local-app-api-grpcweb/lib/localapp_pb';
 import { LocalAppClient } from '@gitpod/local-app-api-grpcweb/lib/localapp_pb_service';

src/vs/workbench/api/common/menusExtensionPoint.ts

@@ -97,30 +97,6 @@ const apiMenus: IAPIMenu[] = [
 		id: MenuId.MenubarCopy,
 		description: localize('menus.opy', "'Copy as' submenu in the top level Edit menu")
 	},
-	{
-		key: 'menuBar/help',
-		id: MenuId.MenubarHelpMenu,
-		description: localize('menus.help', "The top level help menu"),
-		proposed: true
-	},
-	{
-		key: 'menuBar/preferences',
-		id: MenuId.MenubarPreferencesMenu,
-		description: localize('menus.preferences', "The preferences menu"),
-		proposed: true
-	},
-	{
-		key: 'preferences/context',
-		id: MenuId.MenubarPreferencesMenu,
-		description: localize('menus.preferencesContext', "The preferences context menu"),
-		proposed: true
-	},
-	{
-		key: 'accounts/context',
-		id: MenuId.AccountsContext,
-		description: localize('menus.accountsContext', "The accounts context menu"),
-		proposed: true
-	},
 	{
 		key: 'scm/title',
 		id: MenuId.SCMTitle,
@@ -275,6 +251,35 @@ const apiMenus: IAPIMenu[] = [
 		supportsSubmenus: false,
 		proposed: 'inlineCompletions'
 	},
+
+	// Gitpod specific
+	// Hack:
+	// For now just use 'contribMenuBarHome' to avoid creating a file per extension point.
+	// Seems safe for now as the file will be empty either way
+	{
+		key: 'menuBar/help',
+		id: MenuId.MenubarHelpMenu,
+		description: localize('menus.help', "The top level help menu"),
+		proposed: 'contribMenuBarHome'
+	},
+	{
+		key: 'menuBar/preferences',
+		id: MenuId.MenubarPreferencesMenu,
+		description: localize('menus.preferences', "The preferences menu"),
+		proposed: 'contribMenuBarHome'
+	},
+	{
+		key: 'preferences/context',
+		id: MenuId.MenubarPreferencesMenu,
+		description: localize('menus.preferencesContext', "The preferences context menu"),
+		proposed: 'contribMenuBarHome'
+	},
+	{
+		key: 'accounts/context',
+		id: MenuId.AccountsContext,
+		description: localize('menus.accountsContext', "The accounts context menu"),
+		proposed: 'contribMenuBarHome'
+	},
 ];
 
 namespace schema {