Removes GlCommand enum (finally)

Author: eamodio

src/codelens/codeLensProvider.ts

@@ -21,7 +21,6 @@ import type { CodeLensConfig, CodeLensLanguageScope } from '../config';
 import { CodeLensCommand } from '../config';
 import { trackableSchemes } from '../constants';
 import type { GlCommands } from '../constants.commands';
-import { GlCommand } from '../constants.commands';
 import type { Container } from '../container';
 import type { GitUri } from '../git/gitUri';
 import type { GitBlame } from '../git/models/blame';
@@ -617,7 +616,7 @@ function applyDiffWithPreviousCommand<T extends GitRecentChangeCodeLens | GitAut
 	commit: GitCommit | undefined,
 ): T {
 	lens.command = createCommand<[undefined, DiffWithPreviousCommandArgs]>(
-		GlCommand.DiffWithPrevious,
+		'gitlens.diffWithPrevious',
 		title,
 		undefined,
 		{
@@ -634,7 +633,7 @@ function applyCopyOrOpenCommitOnRemoteCommand<T extends GitRecentChangeCodeLens
 	commit: GitCommit,
 	clipboard: boolean = false,
 ): T {
-	lens.command = createCommand<[OpenOnRemoteCommandArgs]>(GlCommand.OpenOnRemote, title, {
+	lens.command = createCommand<[OpenOnRemoteCommandArgs]>('gitlens.openOnRemote', title, {
 		resource: {
 			type: RemoteResourceType.Commit,
 			sha: commit.sha,
@@ -651,7 +650,7 @@ function applyCopyOrOpenFileOnRemoteCommand<T extends GitRecentChangeCodeLens |
 	commit: GitCommit,
 	clipboard: boolean = false,
 ): T {
-	lens.command = createCommand<[OpenOnRemoteCommandArgs]>(GlCommand.OpenOnRemote, title, {
+	lens.command = createCommand<[OpenOnRemoteCommandArgs]>('gitlens.openOnRemote', title, {
 		resource: {
 			type: RemoteResourceType.Revision,
 			fileName: commit.file?.path ?? '',
@@ -694,7 +693,7 @@ function applyShowCommitsInViewCommand<T extends GitRecentChangeCodeLens | GitAu
 	}
 
 	lens.command = createCommand<[ShowCommitsInViewCommandArgs]>(
-		refs.length === 0 ? ('' as GlCommands) : GlCommand.ShowCommitsInView,
+		refs.length === 0 ? ('' as GlCommands) : 'gitlens.showCommitsInView',
 		title,
 		{
 			repoPath: blame.repoPath,

src/commands/browseRepoAtRevision.ts

@@ -1,5 +1,4 @@
 import type { TextEditor, Uri } from 'vscode';
-import { GlCommand } from '../constants.commands';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import { showGenericErrorMessage } from '../messages';
@@ -22,22 +21,22 @@ export interface BrowseRepoAtRevisionCommandArgs {
 export class BrowseRepoAtRevisionCommand extends ActiveEditorCommand {
 	constructor(private readonly container: Container) {
 		super([
-			GlCommand.BrowseRepoAtRevision,
-			GlCommand.BrowseRepoAtRevisionInNewWindow,
-			GlCommand.BrowseRepoBeforeRevision,
-			GlCommand.BrowseRepoBeforeRevisionInNewWindow,
+			'gitlens.browseRepoAtRevision',
+			'gitlens.browseRepoAtRevisionInNewWindow',
+			'gitlens.browseRepoBeforeRevision',
+			'gitlens.browseRepoBeforeRevisionInNewWindow',
 		]);
 	}
 
 	protected override preExecute(context: CommandContext, args?: BrowseRepoAtRevisionCommandArgs): Promise<void> {
 		switch (context.command) {
-			case GlCommand.BrowseRepoAtRevisionInNewWindow:
+			case 'gitlens.browseRepoAtRevisionInNewWindow':
 				args = { ...args, before: false, openInNewWindow: true };
 				break;
-			case GlCommand.BrowseRepoBeforeRevision:
+			case 'gitlens.browseRepoBeforeRevision':
 				args = { ...args, before: true, openInNewWindow: false };
 				break;
-			case GlCommand.BrowseRepoBeforeRevisionInNewWindow:
+			case 'gitlens.browseRepoBeforeRevisionInNewWindow':
 				args = { ...args, before: true, openInNewWindow: true };
 				break;
 		}

src/commands/compareWith.ts

@@ -1,5 +1,4 @@
 import type { TextEditor, Uri } from 'vscode';
-import { GlCommand } from '../constants.commands';
 import type { Container } from '../container';
 import { showGenericErrorMessage } from '../messages';
 import { getBestRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
@@ -18,24 +17,24 @@ export interface CompareWithCommandArgs {
 export class CompareWithCommand extends ActiveEditorCommand {
 	constructor(private readonly container: Container) {
 		super(
-			[GlCommand.CompareWith, GlCommand.CompareHeadWith, GlCommand.CompareWorkingWith],
+			['gitlens.compareWith', 'gitlens.compareHeadWith', 'gitlens.compareWorkingWith'],
 			['gitlens.diffHeadWith', 'gitlens.diffWorkingWith'],
 		);
 	}
 
 	protected override preExecute(context: CommandContext, args?: CompareWithCommandArgs): Promise<void> {
 		switch (context.command) {
-			case GlCommand.CompareWith:
+			case 'gitlens.compareWith':
 				args = { ...args };
 				break;
 
-			case GlCommand.CompareHeadWith:
+			case 'gitlens.compareHeadWith':
 			case /** @deprecated */ 'gitlens.diffHeadWith':
 				args = { ...args };
 				args.ref1 = 'HEAD';
 				break;
 
-			case GlCommand.CompareWorkingWith:
+			case 'gitlens.compareWorkingWith':
 			case /** @deprecated */ 'gitlens.diffWorkingWith':
 				args = { ...args };
 				args.ref1 = '';

src/commands/copyMessageToClipboard.ts

@@ -1,6 +1,5 @@
 import type { TextEditor, Uri } from 'vscode';
 import { env } from 'vscode';
-import { GlCommand } from '../constants.commands';
 import type { Container } from '../container';
 import { copyMessageToClipboard } from '../git/actions/commit';
 import { GitUri } from '../git/gitUri';
@@ -26,7 +25,7 @@ export interface CopyMessageToClipboardCommandArgs {
 @command()
 export class CopyMessageToClipboardCommand extends ActiveEditorCommand {
 	constructor(private readonly container: Container) {
-		super(GlCommand.CopyMessageToClipboard);
+		super('gitlens.copyMessageToClipboard');
 	}
 
 	protected override async preExecute(

src/commands/copyShaToClipboard.ts

@@ -1,6 +1,5 @@
 import type { TextEditor, Uri } from 'vscode';
 import { env } from 'vscode';
-import { GlCommand } from '../constants.commands';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import { shortenRevision } from '../git/utils/revision.utils';
@@ -25,7 +24,7 @@ export interface CopyShaToClipboardCommandArgs {
 @command()
 export class CopyShaToClipboardCommand extends ActiveEditorCommand {
 	constructor(private readonly container: Container) {
-		super(GlCommand.CopyShaToClipboard);
+		super('gitlens.copyShaToClipboard');
 	}
 
 	protected override preExecute(context: CommandContext, args?: CopyShaToClipboardCommandArgs): Promise<void> {

src/commands/createPullRequestOnRemote.ts

@@ -1,5 +1,4 @@
 import { window } from 'vscode';
-import { GlCommand } from '../constants.commands';
 import type { Container } from '../container';
 import type { GitRemote } from '../git/models/remote';
 import type { RemoteResource } from '../git/models/remoteResource';
@@ -23,7 +22,7 @@ export interface CreatePullRequestOnRemoteCommandArgs {
 @command()
 export class CreatePullRequestOnRemoteCommand extends GlCommandBase {
 	constructor(private readonly container: Container) {
-		super(GlCommand.CreatePullRequestOnRemote);
+		super('gitlens.createPullRequestOnRemote');
 	}
 
 	async execute(args?: CreatePullRequestOnRemoteCommandArgs): Promise<void> {
@@ -77,7 +76,7 @@ export class CreatePullRequestOnRemoteCommand extends GlCommandBase {
 			},
 		};
 
-		void (await executeCommand<OpenOnRemoteCommandArgs>(GlCommand.OpenOnRemote, {
+		void (await executeCommand<OpenOnRemoteCommandArgs>('gitlens.openOnRemote', {
 			resource: resource,
 			remotes: remotes,
 		}));

src/commands/diffFolderWithRevision.ts

@@ -1,7 +1,6 @@
 import type { TextDocumentShowOptions, TextEditor } from 'vscode';
 import { FileType, Uri, workspace } from 'vscode';
 import { GlyphChars } from '../constants';
-import { GlCommand } from '../constants.commands';
 import type { Container } from '../container';
 import { openFolderCompare } from '../git/actions/commit';
 import { GitUri } from '../git/gitUri';
@@ -15,6 +14,7 @@ import { Logger } from '../system/logger';
 import { pad } from '../system/string';
 import { ActiveEditorCommand } from './commandBase';
 import { getCommandUri } from './commandBase.utils';
+import type { DiffFolderWithRevisionFromCommandArgs } from './diffFolderWithRevisionFrom';
 
 export interface DiffFolderWithRevisionCommandArgs {
 	uri?: Uri;
@@ -62,7 +62,10 @@ export class DiffFolderWithRevisionCommand extends ActiveEditorCommand {
 			const pick = await showCommitPicker(log, title, 'Choose a commit to compare with', {
 				picked: gitUri.sha,
 				showOtherReferences: [
-					CommandQuickPickItem.fromCommand('Choose a Branch or Tag...', GlCommand.DiffFolderWithRevisionFrom),
+					CommandQuickPickItem.fromCommand<DiffFolderWithRevisionFromCommandArgs>(
+						'Choose a Branch or Tag...',
+						'gitlens.diffFolderWithRevisionFrom',
+					),
 				],
 			});
 			if (pick == null) return;

src/commands/diffFolderWithRevisionFrom.ts

@@ -1,7 +1,6 @@
 import type { TextEditor } from 'vscode';
 import { FileType, Uri, workspace } from 'vscode';
 import { GlyphChars } from '../constants';
-import { GlCommand } from '../constants.commands';
 import type { Container } from '../container';
 import { openFolderCompare } from '../git/actions/commit';
 import { GitUri } from '../git/gitUri';
@@ -24,7 +23,7 @@ export interface DiffFolderWithRevisionFromCommandArgs {
 @command()
 export class DiffFolderWithRevisionFromCommand extends ActiveEditorCommand {
 	constructor(private readonly container: Container) {
-		super(GlCommand.DiffFolderWithRevisionFrom);
+		super('gitlens.diffFolderWithRevisionFrom');
 	}
 
 	async execute(editor?: TextEditor, uri?: Uri, args?: DiffFolderWithRevisionFromCommandArgs): Promise<any> {

src/commands/diffLineWithPrevious.ts

@@ -1,5 +1,4 @@
 import type { TextDocumentShowOptions, TextEditor, Uri } from 'vscode';
-import { GlCommand } from '../constants.commands';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import type { GitCommit } from '../git/models/commit';
@@ -21,7 +20,7 @@ export interface DiffLineWithPreviousCommandArgs {
 @command()
 export class DiffLineWithPreviousCommand extends ActiveEditorCommand {
 	constructor(private readonly container: Container) {
-		super(GlCommand.DiffLineWithPrevious);
+		super('gitlens.diffLineWithPrevious');
 	}
 
 	protected override preExecute(context: CommandContext, args?: DiffLineWithPreviousCommandArgs): Promise<any> {
@@ -54,7 +53,7 @@ export class DiffLineWithPreviousCommand extends ActiveEditorCommand {
 				return;
 			}
 
-			void (await executeCommand<DiffWithCommandArgs>(GlCommand.DiffWith, {
+			void (await executeCommand<DiffWithCommandArgs>('gitlens.diffWith', {
 				repoPath: diffUris.current.repoPath,
 				lhs: {
 					sha: diffUris.previous.sha ?? '',

src/commands/diffLineWithWorking.ts

@@ -1,6 +1,5 @@
 import type { TextDocumentShowOptions, TextEditor, Uri } from 'vscode';
 import { window } from 'vscode';
-import { GlCommand } from '../constants.commands';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
 import type { GitCommit } from '../git/models/commit';
@@ -23,7 +22,7 @@ export interface DiffLineWithWorkingCommandArgs {
 @command()
 export class DiffLineWithWorkingCommand extends ActiveEditorCommand {
 	constructor(private readonly container: Container) {
-		super(GlCommand.DiffLineWithWorking);
+		super('gitlens.diffLineWithWorking');
 	}
 
 	protected override preExecute(context: CommandContext, args?: DiffLineWithWorkingCommandArgs): Promise<any> {
@@ -100,7 +99,7 @@ export class DiffLineWithWorkingCommand extends ActiveEditorCommand {
 			return;
 		}
 
-		void (await executeCommand<DiffWithCommandArgs>(GlCommand.DiffWith, {
+		void (await executeCommand<DiffWithCommandArgs>('gitlens.diffWith', {
 			repoPath: args.commit.repoPath,
 			lhs: {
 				sha: lhsSha,