|
9 | 9 | type IEditorOverrideServices,
|
10 | 10 | StandaloneServices
|
11 | 11 | } from 'vs/editor/standalone/browser/standaloneServices'
|
12 |
| -import { mixin } from 'vs/base/common/objects' |
13 | 12 | import {
|
14 | 13 | type GetLeadingNonServiceArgs,
|
15 | 14 | IInstantiationService,
|
@@ -78,23 +77,21 @@ export async function initialize(
|
78 | 77 | initializeWorkbench(container, configuration, env)
|
79 | 78 |
|
80 | 79 | const instantiationService = StandaloneServices.initialize({
|
81 |
| - [IProductService.toString()]: mixin( |
82 |
| - <Partial<IProductConfiguration>>{ |
83 |
| - version: VSCODE_VERSION, |
84 |
| - quality: 'stable', |
85 |
| - commit: VSCODE_COMMIT, |
86 |
| - nameShort: 'Code - OSS', |
87 |
| - nameLong: 'Code - OSS', |
88 |
| - applicationName: 'code-oss', |
89 |
| - dataFolderName: '.vscode-oss', |
90 |
| - urlProtocol: 'code-oss', |
91 |
| - reportIssueUrl: 'https://github.com/microsoft/vscode/issues/new', |
92 |
| - licenseName: 'MIT', |
93 |
| - licenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt', |
94 |
| - serverApplicationName: 'code-server-oss' |
95 |
| - }, |
96 |
| - configuration.productConfiguration ?? {} |
97 |
| - ), |
| 80 | + [IProductService.toString()]: <Partial<IProductConfiguration>>{ |
| 81 | + version: VSCODE_VERSION, |
| 82 | + quality: 'stable', |
| 83 | + commit: VSCODE_COMMIT, |
| 84 | + nameShort: 'Code - OSS', |
| 85 | + nameLong: 'Code - OSS', |
| 86 | + applicationName: 'code-oss', |
| 87 | + dataFolderName: '.vscode-oss', |
| 88 | + urlProtocol: 'code-oss', |
| 89 | + reportIssueUrl: 'https://github.com/microsoft/vscode/issues/new', |
| 90 | + licenseName: 'MIT', |
| 91 | + licenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt', |
| 92 | + serverApplicationName: 'code-server-oss', |
| 93 | + ...(configuration.productConfiguration ?? {}) |
| 94 | + }, |
98 | 95 | ...getLayoutServiceOverride(), // Always override layout service to break cyclic dependency with ICodeEditorService
|
99 | 96 | ...getEnvironmentServiceOverride(),
|
100 | 97 | ...getExtensionsServiceOverride(),
|
|
0 commit comments