Expands GL view on upgrade

Author: eamodio

package.json

@@ -18913,12 +18913,12 @@
 			{
 				"view": "gitlens.views.scm.grouped",
 				"contents": "GitLens groups many related views—Commits, Branches, Stashes, etc—here for easier view management.\n\n[Continue](command:gitlens.views.scm.grouped.welcome.dismiss)\n\nUse the tabs above to navigate, or detach the views you want to keep separated. You can regroup them anytime using the 'x' in the view header.",
-				"when": "gitlens:views:scm:grouped:welcome && gitlens:newInstall"
+				"when": "gitlens:views:scm:grouped:welcome && gitlens:install:new"
 			},
 			{
 				"view": "gitlens.views.scm.grouped",
 				"contents": "In GitLens 16, we've grouped many related views—Commits, Branches, Stashes, etc—here for easier view management.\n\n[Continue](command:gitlens.views.scm.grouped.welcome.dismiss)\n\nPrefer them separate? [Restore views to previous locations](command:gitlens.views.scm.grouped.welcome.restore)\n\nUse the tabs above to navigate, or detach the views you want to keep separated. You can regroup them anytime using the 'x' in the view header.",
-				"when": "gitlens:views:scm:grouped:welcome && !gitlens:newInstall"
+				"when": "gitlens:views:scm:grouped:welcome && !gitlens:install:new"
 			},
 			{
 				"view": "gitlens.views.searchAndCompare",

src/constants.context.ts

@@ -15,10 +15,10 @@ export type ContextKeys = {
 	'gitlens:gk:organization:drafts:enabled': boolean;
 	'gitlens:hasVirtualFolders': boolean;
 	'gitlens:launchpad:connect': boolean;
-	/** Indicates that this is a new install of GitLens (on this machine) */
-	'gitlens:newInstall': boolean;
-	/** Indicates that this is a new install of GitLens (anywhere for this user -- if synced settings is on) */
-	'gitlens:newUserInstall': boolean;
+	/** Indicates that this is the first run of a new install of GitLens */
+	'gitlens:install:new': boolean;
+	/** Indicates that this is the first run after an upgrade of GitLens */
+	'gitlens:install:upgradedFrom': string;
 	'gitlens:plus': Exclude<SubscriptionPlanId, SubscriptionPlanId.Community>;
 	'gitlens:plus:disallowedRepos': string[];
 	'gitlens:plus:enabled': boolean;

src/extension.ts

@@ -147,13 +147,11 @@ export async function activate(context: ExtensionContext): Promise<GitLensApi |
 		previousVersion = localVersion;
 	}
 
-	// If there is no local previous version, this is a new install on this machine
-	if (localVersion == null) {
-		void setContext('gitlens:newInstall', true);
-	}
-	// If there is no local or synced previous version, this is a new install for this user
-	if (previousVersion == null) {
-		void setContext('gitlens:newUserInstall', true);
+	// If there is no local or synced previous version, this is a new install
+	if (localVersion == null || previousVersion == null) {
+		void setContext('gitlens:install:new', true);
+	} else if (gitlensVersion !== previousVersion && compare(gitlensVersion, previousVersion) === 1) {
+		void setContext('gitlens:install:upgradedFrom', previousVersion);
 	}
 
 	let exitMessage;

src/messages.ts

@@ -230,16 +230,16 @@ export function showIntegrationRequestTimedOutWarningMessage(providerName: strin
 	);
 }
 
-export async function showWhatsNewMessage(version: string) {
+export async function showWhatsNewMessage(majorVersion: string) {
 	const confirm = { title: 'OK', isCloseAffordance: true };
 	const releaseNotes = { title: 'View Release Notes' };
 	const result = await showMessage(
 		'info',
-		`Upgraded to GitLens ${version}${
-			version === '16'
+		`Upgraded to GitLens ${majorVersion}${
+			majorVersion === '16'
 				? ` with an all new [Home view](${createMarkdownCommandLink(Commands.ShowHomeView, {
 						source: 'whatsnew',
-				  })} "Show Home view") reimagined as a hub for your current, future, and recent work, consolidated Source Control views, and much more.`
+				  })} "Show Home view") reimagined as a hub for your current, future, and recent work, [consolidated Source Control views](command:gitlens.views.scm.grouped.focus "Show GitLens view"), and much more.`
 				: " — see what's new."
 		}`,
 		undefined,

src/views/views.ts

@@ -18,7 +18,9 @@ import type { PatchDetailsWebviewShowingArgs } from '../plus/webviews/patchDetai
 import { registerPatchDetailsWebviewView } from '../plus/webviews/patchDetails/registration';
 import type { TimelineWebviewShowingArgs } from '../plus/webviews/timeline/registration';
 import { registerTimelineWebviewView } from '../plus/webviews/timeline/registration';
+import { once } from '../system/function';
 import { first } from '../system/iterable';
+import { compare } from '../system/version';
 import { executeCommand, executeCoreCommand, registerCommand } from '../system/vscode/command';
 import { configuration } from '../system/vscode/configuration';
 import { getContext, setContext } from '../system/vscode/context';
@@ -108,12 +110,27 @@ export class Views implements Disposable {
 			configuration.get('views.scm.grouped.default'),
 		);
 		this.updateScmGroupedViewsRegistration();
+
 		// If this is a new install, expand the GitLens view and show the home view by default
-		if (getContext('gitlens:newInstall', false)) {
-			setTimeout(() => {
-				executeCoreCommand(`gitlens.views.scm.grouped.focus`, { preserveFocus: true });
-				executeCoreCommand(`gitlens.views.home.focus`, { preserveFocus: true });
-			}, 250);
+		const newInstall = getContext('gitlens:install:new', false);
+		let showGitLensView = newInstall;
+		if (!showGitLensView) {
+			const upgradedFrom = getContext('gitlens:install:upgradedFrom');
+			if (upgradedFrom && compare(upgradedFrom, '16.0.2') === -1) {
+				showGitLensView = !container.storage.get('views:scm:grouped:welcome:dismissed', false);
+			}
+		}
+
+		if (showGitLensView) {
+			const disposable = once(container.onReady)(() => {
+				disposable?.dispose();
+				setTimeout(() => {
+					executeCoreCommand(`gitlens.views.scm.grouped.focus`, { preserveFocus: true });
+					if (newInstall) {
+						executeCoreCommand(`gitlens.views.home.focus`, { preserveFocus: true });
+					}
+				}, 0);
+			});
 		}
 	}
 
@@ -410,7 +427,7 @@ export class Views implements Disposable {
 	private async showWelcomeNotification() {
 		this._welcomeDismissed = true;
 
-		const newInstall = getContext('gitlens:newInstall', false);
+		const newInstall = getContext('gitlens:install:new', false);
 
 		const confirm: MessageItem = { title: 'OK', isCloseAffordance: true };
 		const Restore: MessageItem = { title: 'Restore Previous Locations' };

src/webviews/home/homeWebview.ts

@@ -437,7 +437,7 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 			},
 			showWalkthroughProgress: !this.getWalkthroughDismissed(),
 			previewEnabled: this.getPreviewEnabled(),
-			newInstall: getContext('gitlens:newInstall', false),
+			newInstall: getContext('gitlens:install:new', false),
 		};
 	}