Removes more enums

eamodio · eamodio · commit c33d4dfc5dc2 · 2025-03-24T17:23:11.000-04:00
diff --git a/docs/telemetry-events.md b/docs/telemetry-events.md
@@ -2042,7 +2042,7 @@ or
 
 ```typescript
 {
-  'context.key': 'gettingStarted' | 'visualizeCodeHistory' | 'prReviews' | 'streamlineCollaboration' | 'integrations'
+  'context.key': 'integrations' | 'gettingStarted' | 'visualizeCodeHistory' | 'prReviews' | 'streamlineCollaboration'
 }
 ```
 
diff --git a/src/commands/git/push.ts b/src/commands/git/push.ts
@@ -1,6 +1,5 @@
 import { GlyphChars } from '../../constants';
 import type { Container } from '../../container';
-import { Features } from '../../features';
 import type { GitBranchReference, GitReference } from '../../git/models/reference';
 import type { Repository } from '../../git/models/repository';
 import { getRemoteNameFromBranchName } from '../../git/utils/branch.utils';
@@ -158,7 +157,7 @@ export class PushGitCommand extends QuickCommand<State> {
 		const useForceIfIncludes =
 			useForceWithLease &&
 			(configuration.getCore('git.useForcePushIfIncludes') ?? true) &&
-			(await this.container.git.supports(state.repos[0].uri, Features.ForceIfIncludes));
+			(await this.container.git.supports(state.repos[0].uri, 'forceIfIncludes'));
 
 		let step: QuickPickStep<FlagsQuickPickItem<Flags>>;
 
diff --git a/src/commands/git/worktree.ts b/src/commands/git/worktree.ts
@@ -4,7 +4,6 @@ import type { Config } from '../../config';
 import { proBadge, proBadgeSuperscript } from '../../constants';
 import type { Container } from '../../container';
 import { CancellationError } from '../../errors';
-import { PlusFeatures } from '../../features';
 import { executeGitCommand } from '../../git/actions';
 import { convertLocationToOpenFlags, convertOpenFlagsToLocation, reveal } from '../../git/actions/worktree';
 import {
@@ -309,7 +308,7 @@ export class WorktreeGitCommand extends QuickCommand<State> {
 			}
 			assertStateStepRepository(state);
 
-			const result = yield* ensureAccessStep(this.container, state, context, PlusFeatures.Worktrees);
+			const result = yield* ensureAccessStep(this.container, state, context, 'worktrees');
 			if (result === StepResultBreak) continue;
 
 			switch (state.subcommand) {
diff --git a/src/commands/quickCommand.steps.ts b/src/commands/quickCommand.steps.ts
@@ -2,8 +2,7 @@ import type { QuickInputButton, QuickPick, QuickPickItem } from 'vscode';
 import { ThemeIcon } from 'vscode';
 import { GlyphChars, quickPickTitleMaxChars } from '../constants';
 import { Container } from '../container';
-import type { FeatureAccess, RepoFeatureAccess } from '../features';
-import { PlusFeatures } from '../features';
+import type { FeatureAccess, PlusFeatures, RepoFeatureAccess } from '../features';
 import * as BranchActions from '../git/actions/branch';
 import * as CommitActions from '../git/actions/commit';
 import * as ContributorActions from '../git/actions/contributor';
@@ -2688,7 +2687,7 @@ export async function* ensureAccessStep<
 	}
 
 	switch (feature) {
-		case PlusFeatures.Launchpad:
+		case 'launchpad' satisfies PlusFeatures:
 			directives.splice(
 				0,
 				0,
@@ -2705,7 +2704,7 @@ export async function* ensureAccessStep<
 				createQuickPickSeparator(),
 			);
 			break;
-		case PlusFeatures.StartWork:
+		case 'startWork' satisfies PlusFeatures:
 			directives.splice(
 				0,
 				0,
@@ -2716,7 +2715,7 @@ export async function* ensureAccessStep<
 				createQuickPickSeparator(),
 			);
 			break;
-		case PlusFeatures.AssociateIssueWithBranch:
+		case 'associateIssueWithBranch' satisfies PlusFeatures:
 			directives.splice(
 				0,
 				0,
@@ -2727,7 +2726,7 @@ export async function* ensureAccessStep<
 				createQuickPickSeparator(),
 			);
 			break;
-		case PlusFeatures.Worktrees:
+		case 'worktrees' satisfies PlusFeatures:
 			directives.splice(
 				0,
 				0,
diff --git a/src/commands/stashSave.ts b/src/commands/stashSave.ts
@@ -2,7 +2,6 @@ import type { Uri } from 'vscode';
 import type { ScmResource } from '../@types/vscode.git.resources';
 import { ScmResourceGroupType, ScmStatus } from '../@types/vscode.git.resources.enums';
 import type { Container } from '../container';
-import { Features } from '../features';
 import { push } from '../git/actions/stash';
 import { GitUri } from '../git/gitUri';
 import { command } from '../system/-webview/command';
@@ -77,7 +76,7 @@ export class StashSaveCommand extends GlCommandBase {
 			const repo = await this.container.git.getOrOpenRepository(uris[0]);
 
 			args.repoPath = repo?.path;
-			args.onlyStaged = repo != null && hasOnlyStaged ? await repo.git.supports(Features.StashOnlyStaged) : false;
+			args.onlyStaged = repo != null && hasOnlyStaged ? await repo.git.supports('stashOnlyStaged') : false;
 			if (args.keepStaged == null && !hasStaged) {
 				args.keepStaged = true;
 			}
@@ -116,7 +115,7 @@ export class StashSaveCommand extends GlCommandBase {
 			const repo = await this.container.git.getOrOpenRepository(uris[0]);
 
 			args.repoPath = repo?.path;
-			args.onlyStaged = repo != null && hasOnlyStaged ? await repo.git.supports(Features.StashOnlyStaged) : false;
+			args.onlyStaged = repo != null && hasOnlyStaged ? await repo.git.supports('stashOnlyStaged') : false;
 			if (args.keepStaged == null && !hasStaged) {
 				args.keepStaged = true;
 			}
diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts
@@ -9,7 +9,7 @@ import { isLinux, isWindows } from '@env/platform';
 import type { GitExtension, API as ScmGitApi } from '../../../@types/vscode.git';
 import { GlyphChars, Schemes } from '../../../constants';
 import type { Container } from '../../../container';
-import { Features } from '../../../features';
+import type { Features } from '../../../features';
 import { GitCache } from '../../../git/cache';
 import { GitErrorHandling } from '../../../git/commandOptions';
 import {
@@ -463,15 +463,15 @@ export class LocalGitProvider implements GitProvider, Disposable {
 		if (supported != null) return supported;
 
 		switch (feature) {
-			case Features.Worktrees:
+			case 'worktrees' satisfies Features:
 				supported = await this.git.isAtLeastVersion('2.17.0');
 				this._supportedFeatures.set(feature, supported);
 				return supported;
-			case Features.StashOnlyStaged:
+			case 'stashOnlyStaged' satisfies Features:
 				supported = await this.git.isAtLeastVersion('2.35.0');
 				this._supportedFeatures.set(feature, supported);
 				return supported;
-			case Features.ForceIfIncludes:
+			case 'forceIfIncludes' satisfies Features:
 				supported = await this.git.isAtLeastVersion('2.30.0');
 				this._supportedFeatures.set(feature, supported);
 				return supported;
diff --git a/src/features.ts b/src/features.ts
@@ -4,13 +4,7 @@ import type { RepositoryVisibility } from './git/gitProvider';
 import type { RequiredSubscriptionPlans, Subscription } from './plus/gk/models/subscription';
 import { capitalize } from './system/string';
 
-export const enum Features {
-	Stashes = 'stashes',
-	Timeline = 'timeline',
-	Worktrees = 'worktrees',
-	StashOnlyStaged = 'stashOnlyStaged',
-	ForceIfIncludes = 'forceIfIncludes',
-}
+export type Features = 'stashes' | 'timeline' | 'worktrees' | 'stashOnlyStaged' | 'forceIfIncludes';
 
 export type FeatureAccess =
 	| {
@@ -36,14 +30,7 @@ export type RepoFeatureAccess =
 			visibility?: RepositoryVisibility;
 	  };
 
-export const enum PlusFeatures {
-	Timeline = 'timeline',
-	Worktrees = 'worktrees',
-	Graph = 'graph',
-	Launchpad = 'launchpad',
-	StartWork = 'startWork',
-	AssociateIssueWithBranch = 'associateIssueWithBranch',
-}
+export type PlusFeatures = 'timeline' | 'worktrees' | 'graph' | 'launchpad' | 'startWork' | 'associateIssueWithBranch';
 
 export type FeaturePreviews = 'graph';
 export const featurePreviews: FeaturePreviews[] = ['graph'];
diff --git a/src/git/models/issue.ts b/src/git/models/issue.ts
@@ -40,7 +40,7 @@ export class Issue implements IssueShape {
 	) {}
 }
 
-export enum RepositoryAccessLevel {
+export const enum RepositoryAccessLevel {
 	Admin = 100,
 	Maintain = 40,
 	Write = 30,
diff --git a/src/plus/integrations/providers/github/githubGitProvider.ts b/src/plus/integrations/providers/github/githubGitProvider.ts
@@ -21,7 +21,7 @@ import {
 	OpenVirtualRepositoryError,
 	OpenVirtualRepositoryErrorReason,
 } from '../../../../errors';
-import { Features } from '../../../../features';
+import type { Features } from '../../../../features';
 import { GitCache } from '../../../../git/cache';
 import type {
 	GitProvider,
@@ -248,9 +248,9 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 		// if (supported != null) return supported;
 
 		switch (feature) {
-			case Features.Stashes:
-			case Features.Worktrees:
-			case Features.StashOnlyStaged:
+			case 'stashes' satisfies Features:
+			case 'worktrees' satisfies Features:
+			case 'stashOnlyStaged' satisfies Features:
 				return false;
 			default:
 				return true;
diff --git a/src/plus/integrations/providers/models.ts b/src/plus/integrations/providers/models.ts
@@ -112,20 +112,20 @@ export function isCloudSelfHostedIntegrationId(id: IntegrationId): id is CloudSe
 	return id === SelfHostedIntegrationId.CloudGitHubEnterprise || id === SelfHostedIntegrationId.CloudGitLabSelfHosted;
 }
 
-export enum PullRequestFilter {
+export const enum PullRequestFilter {
 	Author = 'author',
 	Assignee = 'assignee',
 	ReviewRequested = 'review-requested',
 	Mention = 'mention',
 }
 
-export enum IssueFilter {
+export const enum IssueFilter {
 	Author = 'author',
 	Assignee = 'assignee',
 	Mention = 'mention',
 }
 
-export enum PagingMode {
+export const enum PagingMode {
 	Project = 'project',
 	Repo = 'repo',
 	Repos = 'repos',
diff --git a/src/plus/launchpad/launchpad.ts b/src/plus/launchpad/launchpad.ts
@@ -41,7 +41,6 @@ import type { IntegrationId } from '../../constants.integrations';
 import { HostingIntegrationId, SelfHostedIntegrationId } from '../../constants.integrations';
 import type { LaunchpadTelemetryContext, Source, Sources, TelemetryEvents } from '../../constants.telemetry';
 import type { Container } from '../../container';
-import { PlusFeatures } from '../../features';
 import type { QuickPickItemOfT } from '../../quickpicks/items/common';
 import { createQuickPickItemOfT, createQuickPickSeparator } from '../../quickpicks/items/common';
 import type { DirectiveQuickPickItem } from '../../quickpicks/items/directive';
@@ -290,7 +289,7 @@ export class LaunchpadCommand extends QuickCommand<State> {
 				newlyConnected = Boolean(connected);
 			}
 
-			const result = yield* ensureAccessStep(this.container, state, context, PlusFeatures.Launchpad);
+			const result = yield* ensureAccessStep(this.container, state, context, 'launchpad');
 			if (result === StepResultBreak) continue;
 
 			await updateContextItems(this.container, context, { force: newlyConnected });
diff --git a/src/plus/remotehub.ts b/src/plus/remotehub.ts
@@ -35,7 +35,7 @@ export interface Provider {
 	readonly name: string;
 }
 
-export enum HeadType {
+export const enum HeadType {
 	Branch = 0,
 	RemoteBranch = 1,
 	Tag = 2,
diff --git a/src/plus/startWork/startWork.ts b/src/plus/startWork/startWork.ts
@@ -33,7 +33,7 @@ import type { IntegrationId } from '../../constants.integrations';
 import { HostingIntegrationId, IssueIntegrationId, SelfHostedIntegrationId } from '../../constants.integrations';
 import type { Source, Sources, StartWorkTelemetryContext, TelemetryEvents } from '../../constants.telemetry';
 import type { Container } from '../../container';
-import { PlusFeatures } from '../../features';
+import type { PlusFeatures } from '../../features';
 import type { Issue, IssueShape } from '../../git/models/issue';
 import type { GitBranchReference } from '../../git/models/reference';
 import type { Repository } from '../../git/models/repository';
@@ -218,9 +218,9 @@ export abstract class StartWorkBaseCommand extends QuickCommand<State> {
 
 			let plusFeature: PlusFeatures | undefined;
 			if (this.key === 'startWork') {
-				plusFeature = PlusFeatures.StartWork;
+				plusFeature = 'startWork';
 			} else if (this.key === 'associateIssueWithBranch') {
-				plusFeature = PlusFeatures.AssociateIssueWithBranch;
+				plusFeature = 'associateIssueWithBranch';
 			}
 
 			if (plusFeature != null) {
diff --git a/src/plus/workspaces/models/cloudWorkspace.ts b/src/plus/workspaces/models/cloudWorkspace.ts
@@ -172,7 +172,7 @@ export interface CloudWorkspaceFileData {
 	workspaces: CloudWorkspacesPathMap;
 }
 
-export enum CloudWorkspaceProviderType {
+export const enum CloudWorkspaceProviderType {
 	GitHub = 'github',
 	GitHubEnterprise = 'github_enterprise',
 	GitLab = 'gitlab',
@@ -190,7 +190,7 @@ export const cloudWorkspaceProviderTypeToRemoteProviderId = {
 	[CloudWorkspaceProviderType.GitLabSelfHosted]: 'gitlab',
 };
 
-export enum CloudWorkspaceProviderInputType {
+export const enum CloudWorkspaceProviderInputType {
 	GitHub = 'GITHUB',
 	GitHubEnterprise = 'GITHUB_ENTERPRISE',
 	GitLab = 'GITLAB',
diff --git a/src/plus/workspaces/models/workspaces.ts b/src/plus/workspaces/models/workspaces.ts
@@ -11,10 +11,7 @@ import type { LocalWorkspace, LocalWorkspaceRepositoryDescriptor } from './local
 export type WorkspaceType = 'cloud' | 'local';
 export type WorkspaceAutoAddSetting = 'disabled' | 'enabled' | 'prompt';
 
-export enum WorkspaceRepositoryRelation {
-	Direct = 'DIRECT',
-	ProviderProject = 'PROVIDER_PROJECT',
-}
+export type WorkspaceRepositoryRelation = 'DIRECT' | 'PROVIDER_PROJECT';
 
 export type CodeWorkspaceFileContents = {
 	folders: { path: string }[];
@@ -57,11 +54,6 @@ export interface GetCloudWorkspaceRepositoriesResponse {
 	repositoriesInfo: string | undefined;
 }
 
-export enum WorkspaceAddRepositoriesChoice {
-	CurrentWindow = 'Current Window',
-	ParentFolder = 'Parent Folder',
-}
-
 export const defaultWorkspaceCount = 100;
 export const defaultWorkspaceRepoCount = 100;
 
diff --git a/src/plus/workspaces/workspacesService.ts b/src/plus/workspaces/workspacesService.ts
@@ -33,7 +33,6 @@ import type {
 	WorkspaceRepositoryRelation,
 	WorkspacesResponse,
 } from './models/workspaces';
-import { WorkspaceAddRepositoriesChoice } from './models/workspaces';
 import type { WorkspacesApi } from './workspacesApi';
 import type { GkWorkspacesSharedStorageProvider } from './workspacesSharedStorageProvider';
 
@@ -813,21 +812,21 @@ export class WorkspacesService implements Disposable {
 			const choices: {
 				label: string;
 				description?: string;
-				choice: WorkspaceAddRepositoriesChoice;
+				choice: 'currentWindow' | 'parentFolder';
 				picked?: boolean;
 			}[] = [
 				{
 					label: 'Choose repositories from a folder',
 					description: undefined,
-					choice: WorkspaceAddRepositoriesChoice.ParentFolder,
+					choice: 'parentFolder',
 				},
 			];
 
 			if (validRepos.length > 0) {
 				choices.unshift({
 					label: 'Choose repositories from the current window',
 					description: undefined,
-					choice: WorkspaceAddRepositoriesChoice.CurrentWindow,
+					choice: 'currentWindow',
 				});
 			}
 
@@ -840,7 +839,7 @@ export class WorkspacesService implements Disposable {
 
 			if (repoChoice == null) return;
 
-			if (repoChoice.choice === WorkspaceAddRepositoriesChoice.ParentFolder) {
+			if (repoChoice.choice === 'parentFolder') {
 				await window.withProgress(
 					{
 						location: ProgressLocation.Notification,
diff --git a/src/telemetry/walkthroughStateProvider.ts b/src/telemetry/walkthroughStateProvider.ts
diff --git a/src/views/launchpadView.ts b/src/views/launchpadView.ts
diff --git a/src/views/nodes/repositoryNode.ts b/src/views/nodes/repositoryNode.ts
diff --git a/src/views/nodes/resultsFilesNode.ts b/src/views/nodes/resultsFilesNode.ts
diff --git a/src/views/nodes/worktreesNode.ts b/src/views/nodes/worktreesNode.ts
diff --git a/src/views/worktreesView.ts b/src/views/worktreesView.ts
diff --git a/src/webviews/plus/graph/graphWebview.ts b/src/webviews/plus/graph/graphWebview.ts
diff --git a/src/webviews/plus/timeline/timelineWebview.ts b/src/webviews/plus/timeline/timelineWebview.ts

Original file line number	Diff line number	Diff line change
`@@ -2042,7 +2042,7 @@ or`
`2042`	`2042`
`2043`	`2043`	```typescript
`2044`	`2044`	`{`
`2045`		`- 'context.key': 'gettingStarted' \| 'visualizeCodeHistory' \| 'prReviews' \| 'streamlineCollaboration' \| 'integrations'`
	`2045`	`+ 'context.key': 'integrations' \| 'gettingStarted' \| 'visualizeCodeHistory' \| 'prReviews' \| 'streamlineCollaboration'`
`2046`	`2046`	`}`
`2047`	`2047`	```
`2048`	`2048`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export class Issue implements IssueShape {`
`40`	`40`	`) {}`
`41`	`41`	`}`
`42`	`42`
`43`		`-export enum RepositoryAccessLevel {`
	`43`	`+export const enum RepositoryAccessLevel {`
`44`	`44`	`Admin = 100,`
`45`	`45`	`Maintain = 40,`
`46`	`46`	`Write = 30,`