Skip to content

Commit 01ad4dd

Browse files
authored
Dont show welcome widget when notifications are visible (microsoft#186592)
1 parent c1bca6d commit 01ad4dd

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

src/vs/workbench/contrib/welcomeDialog/browser/welcomeDialog.contribution.ts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,13 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
1010
import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
1111
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
1212
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';
1414
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
1515
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1616
import { ICommandService } from 'vs/platform/commands/common/commands';
1717
import { WelcomeWidget } from 'vs/workbench/contrib/welcomeDialog/browser/welcomeWidget';
1818
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
1919
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';
2620
import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
2721
import { localize } from 'vs/nls';
2822
import { applicationConfigurationNodeBase } from 'vs/workbench/common/configuration';
@@ -45,11 +39,6 @@ class WelcomeDialogContribution extends Disposable implements IWorkbenchContribu
4539
@ICommandService readonly commandService: ICommandService,
4640
@ITelemetryService readonly telemetryService: ITelemetryService,
4741
@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,
5342
@IEditorService readonly editorService: IEditorService
5443
) {
5544
super();
@@ -74,7 +63,9 @@ class WelcomeDialogContribution extends Disposable implements IWorkbenchContribu
7463
const codeEditor = codeEditorService.getActiveCodeEditor();
7564
if (codeEditor?.hasModel()) {
7665
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) {
7869
this.isRendered = true;
7970

8071
const welcomeWidget = new WelcomeWidget(

0 commit comments

Comments
 (0)