Updates (minor) from code review

Author: eamodio

docs/telemetry-events.md

@@ -319,7 +319,7 @@ or
 ```typescript
 {
   'hostingProvider.key': string,
-  'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'gitlab-self-hosted'
+  'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted'
 }
 ```
 
@@ -330,7 +330,7 @@ or
 ```typescript
 {
   'hostingProvider.key': string,
-  'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'gitlab-self-hosted'
+  'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted'
 }
 ```
 
@@ -341,7 +341,7 @@ or
 ```typescript
 {
   'issueProvider.key': string,
-  'issueProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'gitlab-self-hosted'
+  'issueProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted'
 }
 ```
 
@@ -352,7 +352,7 @@ or
 ```typescript
 {
   'issueProvider.key': string,
-  'issueProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'gitlab-self-hosted'
+  'issueProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted'
 }
 ```
 
@@ -373,7 +373,7 @@ or
 
 ```typescript
 {
-  'integration.id': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello'
+  'integration.id': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted'
 }
 ```
 
@@ -1465,7 +1465,7 @@ void
 ```typescript
 {
   'hostingProvider.key': string,
-  'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'gitlab-self-hosted',
+  'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted',
   // @deprecated: true
   'remoteProviders.key': string
 }
@@ -1478,7 +1478,7 @@ void
 ```typescript
 {
   'hostingProvider.key': string,
-  'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'gitlab-self-hosted',
+  'hostingProvider.provider': 'github' | 'gitlab' | 'bitbucket' | 'azureDevOps' | 'jira' | 'trello' | 'github-enterprise' | 'cloud-github-enterprise' | 'gitlab-self-hosted',
   // @deprecated: true
   'remoteProviders.key': string
 }

src/constants.integrations.ts

@@ -20,8 +20,8 @@ export type IntegrationId = HostingIntegrationId | IssueIntegrationId | SelfHost
 
 export const supportedOrderedCloudIssueIntegrationIds = [IssueIntegrationId.Jira];
 export const supportedOrderedCloudIntegrationIds = [
-	SelfHostedIntegrationId.CloudGitHubEnterprise,
 	HostingIntegrationId.GitHub,
+	SelfHostedIntegrationId.CloudGitHubEnterprise,
 	HostingIntegrationId.GitLab,
 	IssueIntegrationId.Jira,
 ];

src/git/parsers/remoteParser.ts

@@ -6,13 +6,11 @@ import type { getRemoteProviderMatcher } from '../remotes/remoteProviders';
 
 const remoteRegex = /^(.*)\t(.*)\s\((.*)\)$/gm;
 
-type PromiseType<T> = T extends Promise<infer U> ? U : T;
-
 export function parseGitRemotes(
 	container: Container,
 	data: string,
 	repoPath: string,
-	remoteProviderMatcher: PromiseType<ReturnType<typeof getRemoteProviderMatcher>>,
+	remoteProviderMatcher: Awaited<ReturnType<typeof getRemoteProviderMatcher>>,
 ): GitRemote[] {
 	using sw = maybeStopWatch(`Git.parseRemotes(${repoPath})`, { log: false, logLevel: 'debug' });
 	if (!data) return [];

src/plus/integrations/integrationService.ts

@@ -91,8 +91,9 @@ export class IntegrationService implements Disposable {
 	private async syncCloudIntegrations(forceConnect: boolean) {
 		const scope = getLogScope();
 		const connectedIntegrations = new Set<IntegrationId>();
+		const domainsById = new Map<IntegrationId, string>();
+
 		const loggedIn = await this.container.subscription.getAuthenticationSession();
-		const domains = new Map<string, string>();
 		if (loggedIn) {
 			const cloudIntegrations = await this.container.cloudIntegrations;
 			const connections = await cloudIntegrations?.getConnections();
@@ -106,15 +107,15 @@ export class IntegrationService implements Disposable {
 				if (p.domain?.length > 0) {
 					try {
 						const host = new URL(p.domain).host;
-						domains.set(integrationId, host);
+						domainsById.set(integrationId, host);
 					} catch {
 						Logger.warn(`Invalid domain for ${integrationId} integration: ${p.domain}. Ignoring.`, scope);
 					}
 				}
 			});
 		}
 
-		for await (const integration of this.getSupportedCloudIntegrations(domains)) {
+		for await (const integration of this.getSupportedCloudIntegrations(domainsById)) {
 			await integration.syncCloudConnection(
 				connectedIntegrations.has(integration.id) ? 'connected' : 'disconnected',
 				forceConnect,
@@ -132,9 +133,9 @@ export class IntegrationService implements Disposable {
 		return connectedIntegrations;
 	}
 
-	private async *getSupportedCloudIntegrations(domains: Map<string, string>): AsyncIterable<Integration> {
+	private async *getSupportedCloudIntegrations(domainsById: Map<IntegrationId, string>): AsyncIterable<Integration> {
 		for (const id of getSupportedCloudIntegrationIds()) {
-			if (id === SelfHostedIntegrationId.CloudGitHubEnterprise && !domains.has(id)) {
+			if (id === SelfHostedIntegrationId.CloudGitHubEnterprise && !domainsById.has(id)) {
 				try {
 					// Try getting whatever we have now because we will need to disconnect
 					yield this.get(id);
@@ -143,7 +144,7 @@ export class IntegrationService implements Disposable {
 					// because we probably haven't ever had an instance of this integration
 				}
 			} else {
-				yield this.get(id, domains?.get(id));
+				yield this.get(id, domainsById.get(id));
 			}
 		}
 	}
@@ -594,11 +595,13 @@ export class IntegrationService implements Disposable {
 			// case 'bitbucket':
 			// 	return get(HostingIntegrationId.Bitbucket) as RT;
 			case 'github':
-				if (remote.provider.custom && remote.provider.domain != null) {
-					return get(SelfHostedIntegrationId.GitHubEnterprise, remote.provider.domain) as RT;
-				}
 				if (remote.provider.domain != null && !isGitHubDotCom(remote.provider.domain)) {
-					return get(SelfHostedIntegrationId.CloudGitHubEnterprise, remote.provider.domain) as RT;
+					return get(
+						remote.provider.custom
+							? SelfHostedIntegrationId.GitHubEnterprise
+							: SelfHostedIntegrationId.CloudGitHubEnterprise,
+						remote.provider.domain,
+					) as RT;
 				}
 				return get(HostingIntegrationId.GitHub) as RT;
 			case 'gitlab':

src/plus/integrations/providers/github/sub-providers/remotes.ts

@@ -7,7 +7,6 @@ import { configuration } from '../../../../../system/vscode/configuration';
 
 export class RemotesGitSubProvider extends RemotesGitProviderBase {
 	@log({ args: { 1: false } })
-	// eslint-disable-next-line @typescript-eslint/require-await
 	async getRemotes(
 		repoPath: string | undefined,
 		_options?: { filter?: (remote: GitRemote) => boolean; sort?: boolean },