Skip to content

Commit 59cd15f

Browse files
author
Loïc Mangeonjean
committed
fix: fix NPE
doResolveStartupKind being called directly in the constructor of the parent
1 parent f8a84f1 commit 59cd15f

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

src/service-override/lifecycle.ts

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,26 @@ export interface LifecycleServiceParams {
2020

2121
const DEFAULT_RESOLVE_STARTUP_KIND: StartupKindResolver = (resolveDefault) => resolveDefault()
2222

23-
class BrowserLifecycleServiceOverride extends BrowserLifecycleService {
24-
constructor(
25-
private params: LifecycleServiceParams,
26-
@ILogService logService: ILogService,
27-
@IStorageService storageService: IStorageService
28-
) {
29-
super(logService, storageService)
30-
}
23+
export default function getServiceOverride(
24+
params: LifecycleServiceParams = {}
25+
): IEditorOverrideServices {
26+
class BrowserLifecycleServiceOverride extends BrowserLifecycleService {
27+
constructor(
28+
@ILogService logService: ILogService,
29+
@IStorageService storageService: IStorageService
30+
) {
31+
super(logService, storageService)
32+
}
3133

32-
protected override doResolveStartupKind(): StartupKind | undefined {
33-
return (this.params.resolveStartupKind ?? DEFAULT_RESOLVE_STARTUP_KIND)(() =>
34-
super.doResolveStartupKind()
35-
)
34+
protected override doResolveStartupKind(): StartupKind | undefined {
35+
return (params.resolveStartupKind ?? DEFAULT_RESOLVE_STARTUP_KIND)(() =>
36+
super.doResolveStartupKind()
37+
)
38+
}
3639
}
37-
}
3840

39-
export default function getServiceOverride(
40-
options: LifecycleServiceParams = {}
41-
): IEditorOverrideServices {
4241
return {
43-
[ILifecycleService.toString()]: new SyncDescriptor(BrowserLifecycleServiceOverride, [options]),
42+
[ILifecycleService.toString()]: new SyncDescriptor(BrowserLifecycleServiceOverride),
4443
[ITimerService.toString()]: new SyncDescriptor(TimerService)
4544
}
4645
}

0 commit comments

Comments
 (0)