Skip to content

Commit 83be6ee

Browse files
committed
Fixes #4416 ensure welcome view shows properly
1 parent 9d2789f commit 83be6ee

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
1010

1111
- Improves AI status label in integrations popup to "Select AI model to enable AI features" and fixes text brightness ([#4400](https://github.com/gitkraken/vscode-gitlens/issues/4400))
1212

13+
### Fixed
14+
15+
- Fixes disabled GitLens view tabs on clean install ([#4416](https://github.com/gitkraken/vscode-gitlens/issues/4416))
16+
1317
## [17.2.0] - 2025-06-17
1418

1519
### Added

src/views/views.ts

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -616,10 +616,19 @@ export class Views implements Disposable {
616616
this._scmGroupedViews = getScmGroupedViewsFromConfig();
617617

618618
if (this._scmGroupedViews.size) {
619-
if (this._scmGroupedView == null) {
620-
this._scmGroupedView = new ScmGroupedView(this.container, this);
621-
} else {
622-
void this.setScmGroupedView(this.lastSelectedScmGroupedView ?? first(this._scmGroupedViews.keys())!);
619+
if (this._welcomeDismissed || bypassWelcomeView) {
620+
// If we are bypassing the welcome view, show it as a notification -- since we can't block the view from loading
621+
if (!this._welcomeDismissed && bypassWelcomeView) {
622+
void this.showWelcomeNotification();
623+
}
624+
625+
if (this._scmGroupedView == null) {
626+
this._scmGroupedView = new ScmGroupedView(this.container, this);
627+
} else {
628+
void this.setScmGroupedView(
629+
this.lastSelectedScmGroupedView ?? first(this._scmGroupedViews.keys())!,
630+
);
631+
}
623632
}
624633
} else {
625634
this._scmGroupedView?.dispose();
@@ -702,13 +711,6 @@ export class Views implements Disposable {
702711
this._worktreesView?.dispose();
703712
this._worktreesView = undefined;
704713
}
705-
706-
if (!this._welcomeDismissed) {
707-
if (!bypassWelcomeView) return;
708-
709-
// If we are bypassing the welcome view, show it as a notification -- since we can't block the view from loading
710-
void this.showWelcomeNotification();
711-
}
712714
}
713715

714716
private _branchesView: BranchesView | undefined;

0 commit comments

Comments
 (0)