@@ -10,19 +10,13 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
10
10
import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService' ;
11
11
import { IConfigurationService } from 'vs/platform/configuration/common/configuration' ;
12
12
import { Disposable } from 'vs/base/common/lifecycle' ;
13
- import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey' ;
13
+ import { ContextKeyExpr , IContextKeyService } from 'vs/platform/contextkey/common/contextkey' ;
14
14
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService' ;
15
15
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation' ;
16
16
import { ICommandService } from 'vs/platform/commands/common/commands' ;
17
17
import { WelcomeWidget } from 'vs/workbench/contrib/welcomeDialog/browser/welcomeWidget' ;
18
18
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry' ;
19
19
import { IOpenerService } from 'vs/platform/opener/common/opener' ;
20
- import { IWebviewService } from 'vs/workbench/contrib/webview/browser/webview' ;
21
- import { IFileService } from 'vs/platform/files/common/files' ;
22
- import { INotificationService } from 'vs/platform/notification/common/notification' ;
23
- import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions' ;
24
- import { LanguageService } from 'vs/editor/common/services/languageService' ;
25
- import { ILanguageService } from 'vs/editor/common/languages/language' ;
26
20
import { IConfigurationRegistry , Extensions as ConfigurationExtensions , ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry' ;
27
21
import { localize } from 'vs/nls' ;
28
22
import { applicationConfigurationNodeBase } from 'vs/workbench/common/configuration' ;
@@ -45,11 +39,6 @@ class WelcomeDialogContribution extends Disposable implements IWorkbenchContribu
45
39
@ICommandService readonly commandService : ICommandService ,
46
40
@ITelemetryService readonly telemetryService : ITelemetryService ,
47
41
@IOpenerService readonly openerService : IOpenerService ,
48
- @IWebviewService readonly webviewService : IWebviewService ,
49
- @IFileService readonly fileService : IFileService ,
50
- @INotificationService readonly notificationService : INotificationService ,
51
- @IExtensionService readonly extensionService : IExtensionService ,
52
- @ILanguageService readonly languageService : LanguageService ,
53
42
@IEditorService readonly editorService : IEditorService
54
43
) {
55
44
super ( ) ;
@@ -74,7 +63,9 @@ class WelcomeDialogContribution extends Disposable implements IWorkbenchContribu
74
63
const codeEditor = codeEditorService . getActiveCodeEditor ( ) ;
75
64
if ( codeEditor ?. hasModel ( ) ) {
76
65
const scheduler = new RunOnceScheduler ( ( ) => {
77
- if ( codeEditor === codeEditorService . getActiveCodeEditor ( ) ) {
66
+ const notificationsVisible = contextService . contextMatchesRules ( ContextKeyExpr . deserialize ( 'notificationCenterVisible' ) ) ||
67
+ contextService . contextMatchesRules ( ContextKeyExpr . deserialize ( 'notificationToastsVisible' ) ) ;
68
+ if ( codeEditor === codeEditorService . getActiveCodeEditor ( ) && ! notificationsVisible ) {
78
69
this . isRendered = true ;
79
70
80
71
const welcomeWidget = new WelcomeWidget (
0 commit comments