From f155d6358f8fdaf07f547f9e069336da100557da Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 6 Mar 2022 18:41:10 -0500 Subject: [PATCH] Fixes spelling mistake --- CHANGELOG.md | 2 +- src/env/node/git/localGitProvider.ts | 12 ++++++------ src/git/formatters/commitFormatter.ts | 4 ++-- src/git/gitProvider.ts | 12 ++++++------ src/git/gitProviderService.ts | 16 ++++++++-------- src/git/models/commit.ts | 4 ++-- src/plus/github/githubGitProvider.ts | 12 ++++++------ src/repositories.ts | 6 +++--- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67b0fb7..a369ebe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -432,7 +432,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Adds a `gitlens.defaultTimeFormat` setting to specify how times will be formatted by default - Adds a `gitlens.showWelcomeOnInstall` setting to specify whether to show the Welcome (Quick Setup) experience on first install — closes [#1049](https://github.com/gitkraken/vscode-gitlens/issues/1049) thanks to [PR #1258](https://github.com/gitkraken/vscode-gitlens/pull/1258) by Rickard ([@rickardp](https://github.com/rickardp)) - Adds a ⭐ star as a favorite indicator on branches in the quick pick menus -- Adds ability to toggle the _Toggle Compare with: Working Tree / Branch_ command before a comparision is chosen +- Adds ability to toggle the _Toggle Compare with: Working Tree / Branch_ command before a comparison is chosen - Adds GitLens extensibility APIs - Adds an _action runner_ extensibility point to provide a runner (handler) for the new _createPullRequest_ and _openPullRequest_ actions — see [`gitlens.d.ts`](https://github.com/gitkraken/vscode-gitlens/blob/main/src/api/gitlens.d.ts) for API definitions diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts index c60d7fd..eb6ab57 100644 --- a/src/env/node/git/localGitProvider.ts +++ b/src/env/node/git/localGitProvider.ts @@ -39,10 +39,10 @@ import { GitProvider, GitProviderDescriptor, GitProviderId, - NextComparisionUrisResult, + NextComparisonUrisResult, PagedResult, - PreviousComparisionUrisResult, - PreviousLineComparisionUrisResult, + PreviousComparisonUrisResult, + PreviousLineComparisonUrisResult, RepositoryCloseEvent, RepositoryInitWatcher, RepositoryOpenEvent, @@ -2786,7 +2786,7 @@ export class LocalGitProvider implements GitProvider, Disposable { uri: Uri, ref: string | undefined, skip: number = 0, - ): Promise { + ): Promise { // If we have no ref (or staged ref) there is no next commit if (!ref) return undefined; @@ -2890,7 +2890,7 @@ export class LocalGitProvider implements GitProvider, Disposable { ref: string | undefined, skip: number = 0, firstParent: boolean = false, - ): Promise { + ): Promise { if (ref === GitRevision.deletedOrMissing) return undefined; const relativePath = this.getRelativePath(uri, repoPath); @@ -2967,7 +2967,7 @@ export class LocalGitProvider implements GitProvider, Disposable { editorLine: number, // 0-based, Git is 1-based ref: string | undefined, skip: number = 0, - ): Promise { + ): Promise { if (ref === GitRevision.deletedOrMissing) return undefined; let relativePath = this.getRelativePath(uri, repoPath); diff --git a/src/git/formatters/commitFormatter.ts b/src/git/formatters/commitFormatter.ts index f53ff90..684d9c0 100644 --- a/src/git/formatters/commitFormatter.ts +++ b/src/git/formatters/commitFormatter.ts @@ -23,7 +23,7 @@ import { join, map } from '../../system/iterable'; import { PromiseCancelledError } from '../../system/promise'; import { escapeMarkdown, getSuperscript, TokenOptions } from '../../system/string'; import { ContactPresence } from '../../vsls/vsls'; -import { PreviousLineComparisionUrisResult } from '../gitProvider'; +import { PreviousLineComparisonUrisResult } from '../gitProvider'; import { GitCommit, GitRemote, GitRevision, IssueOrPullRequest, PullRequest } from '../models'; import { RemoteProvider } from '../remotes/provider'; import { FormatOptions, Formatter } from './formatter'; @@ -42,7 +42,7 @@ export interface CommitFormatOptions extends FormatOptions { pullRequestOrRemote?: PullRequest | PromiseCancelledError | GitRemote; pullRequestPendingMessage?: string; presence?: ContactPresence; - previousLineComparisonUris?: PreviousLineComparisionUrisResult; + previousLineComparisonUris?: PreviousLineComparisonUrisResult; remotes?: GitRemote[]; unpublished?: boolean; diff --git a/src/git/gitProvider.ts b/src/git/gitProvider.ts index 1a1f900..068a263 100644 --- a/src/git/gitProvider.ts +++ b/src/git/gitProvider.ts @@ -68,18 +68,18 @@ export interface PagedResult { readonly values: NonNullable[]; } -export interface NextComparisionUrisResult { +export interface NextComparisonUrisResult { current: GitUri; next: GitUri | undefined; deleted?: boolean | undefined; } -export interface PreviousComparisionUrisResult { +export interface PreviousComparisonUrisResult { current: GitUri; previous: GitUri | undefined; } -export interface PreviousLineComparisionUrisResult extends PreviousComparisionUrisResult { +export interface PreviousLineComparisonUrisResult extends PreviousComparisonUrisResult { line: number; } @@ -332,21 +332,21 @@ export interface GitProvider extends Disposable { uri: Uri, ref: string | undefined, skip?: number, - ): Promise; + ): Promise; getPreviousComparisonUris( repoPath: string, uri: Uri, ref: string | undefined, skip?: number, firstParent?: boolean, - ): Promise; + ): Promise; getPreviousComparisonUrisForLine( repoPath: string, uri: Uri, editorLine: number, ref: string | undefined, skip?: number, - ): Promise; + ): Promise; getIncomingActivity( repoPath: string, options?: { diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts index 3017a29..84ca2c2 100644 --- a/src/git/gitProviderService.ts +++ b/src/git/gitProviderService.ts @@ -24,7 +24,7 @@ import { AccessDeniedError, ProviderNotFoundError } from '../errors'; import type { FeatureAccess, Features, PlusFeatures } from '../features'; import { Logger } from '../logger'; import type { SubscriptionChangeEvent } from '../plus/subscription/subscriptionService'; -import { asRepoComparisonKey, RepoComparisionKey, Repositories } from '../repositories'; +import { asRepoComparisonKey, RepoComparisonKey, Repositories } from '../repositories'; import { WorkspaceStorageKeys } from '../storage'; import { FreeSubscriptionPlans, @@ -45,10 +45,10 @@ import { GitProvider, GitProviderDescriptor, GitProviderId, - NextComparisionUrisResult, + NextComparisonUrisResult, PagedResult, - PreviousComparisionUrisResult, - PreviousLineComparisionUrisResult, + PreviousComparisonUrisResult, + PreviousLineComparisonUrisResult, RepositoryVisibility, ScmRepository, } from './gitProvider'; @@ -161,7 +161,7 @@ export class GitProviderService implements Disposable { readonly supportedSchemes = new Set(); private readonly _disposable: Disposable; - private readonly _pendingRepositories = new Map>(); + private readonly _pendingRepositories = new Map>(); private readonly _providers = new Map(); private readonly _repositories = new Repositories(); private readonly _richRemotesCache = new Map | null>(); @@ -1504,7 +1504,7 @@ export class GitProviderService implements Disposable { uri: Uri, ref: string | undefined, skip: number = 0, - ): Promise { + ): Promise { if (!ref) return Promise.resolve(undefined); const { provider, path } = this.getProvider(repoPath); @@ -1518,7 +1518,7 @@ export class GitProviderService implements Disposable { ref: string | undefined, skip: number = 0, firstParent: boolean = false, - ): Promise { + ): Promise { if (ref === GitRevision.deletedOrMissing) return Promise.resolve(undefined); const { provider, path } = this.getProvider(repoPath); @@ -1532,7 +1532,7 @@ export class GitProviderService implements Disposable { editorLine: number, ref: string | undefined, skip: number = 0, - ): Promise { + ): Promise { if (ref === GitRevision.deletedOrMissing) return Promise.resolve(undefined); const { provider, path } = this.getProvider(repoPath); diff --git a/src/git/models/commit.ts b/src/git/models/commit.ts index b53239c..8d93318 100644 --- a/src/git/models/commit.ts +++ b/src/git/models/commit.ts @@ -8,7 +8,7 @@ import { gate } from '../../system/decorators/gate'; import { memoize } from '../../system/decorators/memoize'; import { cancellable } from '../../system/promise'; import { pad, pluralize } from '../../system/string'; -import { PreviousLineComparisionUrisResult } from '../gitProvider'; +import { PreviousLineComparisonUrisResult } from '../gitProvider'; import { GitUri } from '../gitUri'; import { GitFile, GitFileChange, GitFileWorkingTreeStatus } from './file'; import { PullRequest } from './pullRequest'; @@ -430,7 +430,7 @@ export class GitCommit implements GitRevisionReference { getPreviousComparisonUrisForLine( editorLine: number, ref?: string, - ): Promise { + ): Promise { return this.file != null ? this.container.git.getPreviousComparisonUrisForLine( this.repoPath, diff --git a/src/plus/github/githubGitProvider.ts b/src/plus/github/githubGitProvider.ts index dc00175..1847135 100644 --- a/src/plus/github/githubGitProvider.ts +++ b/src/plus/github/githubGitProvider.ts @@ -29,10 +29,10 @@ import { Features, PlusFeatures } from '../../features'; import { GitProvider, GitProviderId, - NextComparisionUrisResult, + NextComparisonUrisResult, PagedResult, - PreviousComparisionUrisResult, - PreviousLineComparisionUrisResult, + PreviousComparisonUrisResult, + PreviousLineComparisonUrisResult, RepositoryCloseEvent, RepositoryOpenEvent, RepositoryVisibility, @@ -1987,7 +1987,7 @@ export class GitHubGitProvider implements GitProvider, Disposable { uri: Uri, ref: string | undefined, skip: number = 0, - ): Promise { + ): Promise { // If we have no ref there is no next commit if (!ref) return undefined; @@ -2036,7 +2036,7 @@ export class GitHubGitProvider implements GitProvider, Disposable { ref: string | undefined, skip: number = 0, _firstParent: boolean = false, - ): Promise { + ): Promise { if (ref === GitRevision.deletedOrMissing) return undefined; const cc = Logger.getCorrelationContext(); @@ -2104,7 +2104,7 @@ export class GitHubGitProvider implements GitProvider, Disposable { editorLine: number, // 0-based, Git is 1-based ref: string | undefined, skip: number = 0, - ): Promise { + ): Promise { if (ref === GitRevision.deletedOrMissing) return undefined; const cc = Logger.getCorrelationContext(); diff --git a/src/repositories.ts b/src/repositories.ts index dfa10a0..caf66e8 100644 --- a/src/repositories.ts +++ b/src/repositories.ts @@ -9,11 +9,11 @@ import { UriTrie } from './system/trie'; const slash = 47; //CharCode.Slash; -export type RepoComparisionKey = string & { __type__: 'RepoComparisionKey' }; +export type RepoComparisonKey = string & { __type__: 'RepoComparisonKey' }; -export function asRepoComparisonKey(uri: Uri): RepoComparisionKey { +export function asRepoComparisonKey(uri: Uri): RepoComparisonKey { const { path } = normalizeRepoUri(uri); - return path as RepoComparisionKey; + return path as RepoComparisonKey; } export function normalizeRepoUri(uri: Uri): { path: string; ignoreCase: boolean } {