From 84e12bd5873c4adabc1293d50bd958ffb0dccbdc Mon Sep 17 00:00:00 2001 From: Akash Satheesan Date: Mon, 3 May 2021 20:34:11 +0530 Subject: [PATCH] fix(lib/vscode): add home to workbench.ts --- .../src/vs/code/browser/workbench/workbench.ts | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/vscode/src/vs/code/browser/workbench/workbench.ts b/lib/vscode/src/vs/code/browser/workbench/workbench.ts index 0c7bc8124..ccd80c4c4 100644 --- a/lib/vscode/src/vs/code/browser/workbench/workbench.ts +++ b/lib/vscode/src/vs/code/browser/workbench/workbench.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IWorkbenchConstructionOptions, create, ICredentialsProvider, IURLCallbackProvider, IWorkspaceProvider, IWorkspace, IWindowIndicator, IProductQualityChangeHandler, ISettingsSyncOptions } from 'vs/workbench/workbench.web.api'; +import { IWorkbenchConstructionOptions, create, ICredentialsProvider, IURLCallbackProvider, IWorkspaceProvider, IWorkspace, IWindowIndicator, IProductQualityChangeHandler, ISettingsSyncOptions, IHomeIndicator } from 'vs/workbench/workbench.web.api'; import { URI, UriComponents } from 'vs/base/common/uri'; import { Event, Emitter } from 'vs/base/common/event'; import { generateUuid } from 'vs/base/common/uuid'; @@ -453,6 +453,14 @@ class WindowIndicator implements IWindowIndicator { // Workspace Provider const workspaceProvider = new WorkspaceProvider(workspace, payload); + // NOTE@coder: copied from upstream, modified to use our repo + // Home Indicator + const homeIndicator: IHomeIndicator = { + href: 'https://github.com/cdr/code-server', + icon: 'code', + title: localize('home', "Home") + }; + // Window indicator (unless connected to a remote) let windowIndicator: WindowIndicator | undefined = undefined; if (!workspaceProvider.hasRemote()) { @@ -495,14 +503,8 @@ class WindowIndicator implements IWindowIndicator { // Finally create workbench create(document.body, { ...config, -<<<<<<< HEAD -======= - developmentOptions: { - logLevel: logLevel ? parseLogLevel(logLevel) : undefined, - ...config.developmentOptions - }, ->>>>>>> 58ce849223667f77dc0d6d7658870ca3f815e17f settingsSyncOptions, + homeIndicator, windowIndicator, productQualityChangeHandler, workspaceProvider,