Skip to content

Commit 39a724d

Browse files
author
Loïc Mangeonjean
committed
fix: fix product config override
so that the quality is not undefined, so that it doesn't try to use the `experimentalEditContextEnabled` option
1 parent 3a82afc commit 39a724d

File tree

1 file changed

+15
-18
lines changed

1 file changed

+15
-18
lines changed

src/services.ts

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
type IEditorOverrideServices,
1010
StandaloneServices
1111
} from 'vs/editor/standalone/browser/standaloneServices'
12-
import { mixin } from 'vs/base/common/objects'
1312
import {
1413
type GetLeadingNonServiceArgs,
1514
IInstantiationService,
@@ -78,23 +77,21 @@ export async function initialize(
7877
initializeWorkbench(container, configuration, env)
7978

8079
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+
},
9895
...getLayoutServiceOverride(), // Always override layout service to break cyclic dependency with ICodeEditorService
9996
...getEnvironmentServiceOverride(),
10097
...getExtensionsServiceOverride(),

0 commit comments

Comments
 (0)