Skip to content

Commit

Permalink
Fixes spelling mistake
Browse files Browse the repository at this point in the history
  • Loading branch information
eamodio committed Mar 25, 2022
1 parent e365c54 commit 9bc6a3a
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Expand Up @@ -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

Expand Down
12 changes: 6 additions & 6 deletions src/env/node/git/localGitProvider.ts
Expand Up @@ -39,10 +39,10 @@ import {
GitProvider,
GitProviderDescriptor,
GitProviderId,
NextComparisionUrisResult,
NextComparisonUrisResult,
PagedResult,
PreviousComparisionUrisResult,
PreviousLineComparisionUrisResult,
PreviousComparisonUrisResult,
PreviousLineComparisonUrisResult,
RepositoryCloseEvent,
RepositoryInitWatcher,
RepositoryOpenEvent,
Expand Down Expand Up @@ -2786,7 +2786,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
uri: Uri,
ref: string | undefined,
skip: number = 0,
): Promise<NextComparisionUrisResult | undefined> {
): Promise<NextComparisonUrisResult | undefined> {
// If we have no ref (or staged ref) there is no next commit
if (!ref) return undefined;

Expand Down Expand Up @@ -2890,7 +2890,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
ref: string | undefined,
skip: number = 0,
firstParent: boolean = false,
): Promise<PreviousComparisionUrisResult | undefined> {
): Promise<PreviousComparisonUrisResult | undefined> {
if (ref === GitRevision.deletedOrMissing) return undefined;

const relativePath = this.getRelativePath(uri, repoPath);
Expand Down Expand Up @@ -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<PreviousLineComparisionUrisResult | undefined> {
): Promise<PreviousLineComparisonUrisResult | undefined> {
if (ref === GitRevision.deletedOrMissing) return undefined;

let relativePath = this.getRelativePath(uri, repoPath);
Expand Down
4 changes: 2 additions & 2 deletions src/git/formatters/commitFormatter.ts
Expand Up @@ -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';
Expand All @@ -42,7 +42,7 @@ export interface CommitFormatOptions extends FormatOptions {
pullRequestOrRemote?: PullRequest | PromiseCancelledError | GitRemote;
pullRequestPendingMessage?: string;
presence?: ContactPresence;
previousLineComparisonUris?: PreviousLineComparisionUrisResult;
previousLineComparisonUris?: PreviousLineComparisonUrisResult;
remotes?: GitRemote<RemoteProvider>[];
unpublished?: boolean;

Expand Down
12 changes: 6 additions & 6 deletions src/git/gitProvider.ts
Expand Up @@ -68,18 +68,18 @@ export interface PagedResult<T> {
readonly values: NonNullable<T>[];
}

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;
}

Expand Down Expand Up @@ -332,21 +332,21 @@ export interface GitProvider extends Disposable {
uri: Uri,
ref: string | undefined,
skip?: number,
): Promise<NextComparisionUrisResult | undefined>;
): Promise<NextComparisonUrisResult | undefined>;
getPreviousComparisonUris(
repoPath: string,
uri: Uri,
ref: string | undefined,
skip?: number,
firstParent?: boolean,
): Promise<PreviousComparisionUrisResult | undefined>;
): Promise<PreviousComparisonUrisResult | undefined>;
getPreviousComparisonUrisForLine(
repoPath: string,
uri: Uri,
editorLine: number,
ref: string | undefined,
skip?: number,
): Promise<PreviousLineComparisionUrisResult | undefined>;
): Promise<PreviousLineComparisonUrisResult | undefined>;
getIncomingActivity(
repoPath: string,
options?: {
Expand Down
16 changes: 8 additions & 8 deletions src/git/gitProviderService.ts
Expand Up @@ -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,
Expand All @@ -45,10 +45,10 @@ import {
GitProvider,
GitProviderDescriptor,
GitProviderId,
NextComparisionUrisResult,
NextComparisonUrisResult,
PagedResult,
PreviousComparisionUrisResult,
PreviousLineComparisionUrisResult,
PreviousComparisonUrisResult,
PreviousLineComparisonUrisResult,
RepositoryVisibility,
ScmRepository,
} from './gitProvider';
Expand Down Expand Up @@ -161,7 +161,7 @@ export class GitProviderService implements Disposable {
readonly supportedSchemes = new Set<string>();

private readonly _disposable: Disposable;
private readonly _pendingRepositories = new Map<RepoComparisionKey, Promise<Repository | undefined>>();
private readonly _pendingRepositories = new Map<RepoComparisonKey, Promise<Repository | undefined>>();
private readonly _providers = new Map<GitProviderId, GitProvider>();
private readonly _repositories = new Repositories();
private readonly _richRemotesCache = new Map<string, GitRemote<RichRemoteProvider> | null>();
Expand Down Expand Up @@ -1504,7 +1504,7 @@ export class GitProviderService implements Disposable {
uri: Uri,
ref: string | undefined,
skip: number = 0,
): Promise<NextComparisionUrisResult | undefined> {
): Promise<NextComparisonUrisResult | undefined> {
if (!ref) return Promise.resolve(undefined);

const { provider, path } = this.getProvider(repoPath);
Expand All @@ -1518,7 +1518,7 @@ export class GitProviderService implements Disposable {
ref: string | undefined,
skip: number = 0,
firstParent: boolean = false,
): Promise<PreviousComparisionUrisResult | undefined> {
): Promise<PreviousComparisonUrisResult | undefined> {
if (ref === GitRevision.deletedOrMissing) return Promise.resolve(undefined);

const { provider, path } = this.getProvider(repoPath);
Expand All @@ -1532,7 +1532,7 @@ export class GitProviderService implements Disposable {
editorLine: number,
ref: string | undefined,
skip: number = 0,
): Promise<PreviousLineComparisionUrisResult | undefined> {
): Promise<PreviousLineComparisonUrisResult | undefined> {
if (ref === GitRevision.deletedOrMissing) return Promise.resolve(undefined);

const { provider, path } = this.getProvider(repoPath);
Expand Down
4 changes: 2 additions & 2 deletions src/git/models/commit.ts
Expand Up @@ -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';
Expand Down Expand Up @@ -430,7 +430,7 @@ export class GitCommit implements GitRevisionReference {
getPreviousComparisonUrisForLine(
editorLine: number,
ref?: string,
): Promise<PreviousLineComparisionUrisResult | undefined> {
): Promise<PreviousLineComparisonUrisResult | undefined> {
return this.file != null
? this.container.git.getPreviousComparisonUrisForLine(
this.repoPath,
Expand Down
12 changes: 6 additions & 6 deletions src/plus/github/githubGitProvider.ts
Expand Up @@ -29,10 +29,10 @@ import { Features, PlusFeatures } from '../../features';
import {
GitProvider,
GitProviderId,
NextComparisionUrisResult,
NextComparisonUrisResult,
PagedResult,
PreviousComparisionUrisResult,
PreviousLineComparisionUrisResult,
PreviousComparisonUrisResult,
PreviousLineComparisonUrisResult,
RepositoryCloseEvent,
RepositoryOpenEvent,
RepositoryVisibility,
Expand Down Expand Up @@ -1987,7 +1987,7 @@ export class GitHubGitProvider implements GitProvider, Disposable {
uri: Uri,
ref: string | undefined,
skip: number = 0,
): Promise<NextComparisionUrisResult | undefined> {
): Promise<NextComparisonUrisResult | undefined> {
// If we have no ref there is no next commit
if (!ref) return undefined;

Expand Down Expand Up @@ -2036,7 +2036,7 @@ export class GitHubGitProvider implements GitProvider, Disposable {
ref: string | undefined,
skip: number = 0,
_firstParent: boolean = false,
): Promise<PreviousComparisionUrisResult | undefined> {
): Promise<PreviousComparisonUrisResult | undefined> {
if (ref === GitRevision.deletedOrMissing) return undefined;

const cc = Logger.getCorrelationContext();
Expand Down Expand Up @@ -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<PreviousLineComparisionUrisResult | undefined> {
): Promise<PreviousLineComparisonUrisResult | undefined> {
if (ref === GitRevision.deletedOrMissing) return undefined;

const cc = Logger.getCorrelationContext();
Expand Down
6 changes: 3 additions & 3 deletions src/repositories.ts
Expand Up @@ -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 } {
Expand Down

0 comments on commit 9bc6a3a

Please sign in to comment.