bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(lib/vscode): add home to workbench.ts

This commit is contained in:
Akash Satheesan 2021-05-03 20:34:11 +05:30
parent 96fe3c2734
commit 84e12bd587
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/vscode/src/vs/code/browser/workbench/workbench.ts
View File

@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information. * 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 { URI, UriComponents } from 'vs/base/common/uri';
import { Event, Emitter } from 'vs/base/common/event'; import { Event, Emitter } from 'vs/base/common/event';
import { generateUuid } from 'vs/base/common/uuid'; import { generateUuid } from 'vs/base/common/uuid';
@ -453,6 +453,14 @@ class WindowIndicator implements IWindowIndicator {
// Workspace Provider // Workspace Provider
const workspaceProvider = new WorkspaceProvider(workspace, payload); 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) // Window indicator (unless connected to a remote)
let windowIndicator: WindowIndicator | undefined = undefined; let windowIndicator: WindowIndicator | undefined = undefined;
if (!workspaceProvider.hasRemote()) { if (!workspaceProvider.hasRemote()) {
@ -495,14 +503,8 @@ class WindowIndicator implements IWindowIndicator {
// Finally create workbench // Finally create workbench
create(document.body, { create(document.body, {
...config, ...config,
<<<<<<< HEAD
=======
developmentOptions: {
logLevel: logLevel ? parseLogLevel(logLevel) : undefined,
...config.developmentOptions
},
>>>>>>> 58ce849223667f77dc0d6d7658870ca3f815e17f
settingsSyncOptions, settingsSyncOptions,
homeIndicator,
windowIndicator, windowIndicator,
productQualityChangeHandler, productQualityChangeHandler,
workspaceProvider, workspaceProvider,