diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts index 55cd31a1acf..d715c535a50 100644 --- a/extensions/git/src/api/api1.ts +++ b/extensions/git/src/api/api1.ts @@ -7,7 +7,7 @@ import { Model } from '../model'; import { Repository as BaseRepository, Resource } from '../repository'; -import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, ForcePushMode, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, CredentialsProvider, BranchQuery, PushErrorHandler, PublishEvent, FetchOptions, RemoteSourceProvider, RemoteSourcePublisher, PostCommitCommandsProvider, RefQuery, BranchProtectionProvider, InitOptions, SourceControlHistoryItemDetailProvider } from './git'; +import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, ForcePushMode, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, CredentialsProvider, BranchQuery, PushErrorHandler, PublishEvent, FetchOptions, RemoteSourceProvider, RemoteSourcePublisher, PostCommitCommandsProvider, RefQuery, BranchProtectionProvider, InitOptions, SourceControlHistoryItemDetailsProvider } from './git'; import { Event, SourceControlInputBox, Uri, SourceControl, Disposable, commands, CancellationToken } from 'vscode'; import { combinedDisposable, filterEvent, mapEvent } from '../util'; import { toGitUri } from '../uri'; @@ -414,8 +414,8 @@ export class ApiImpl implements API { return this.#model.registerPushErrorHandler(handler); } - registerSourceControlHistoryItemDetailProvider(provider: SourceControlHistoryItemDetailProvider): Disposable { - return this.#model.registerSourceControlHistoryItemDetailProvider(provider); + registerSourceControlHistoryItemDetailsProvider(provider: SourceControlHistoryItemDetailsProvider): Disposable { + return this.#model.registerSourceControlHistoryItemDetailsProvider(provider); } registerBranchProtectionProvider(root: Uri, provider: BranchProtectionProvider): Disposable { diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts index 622c8a80b16..58299ae6826 100644 --- a/extensions/git/src/api/git.d.ts +++ b/extensions/git/src/api/git.d.ts @@ -326,7 +326,7 @@ export interface BranchProtectionProvider { provideBranchProtection(): BranchProtection[]; } -export interface SourceControlHistoryItemDetailProvider { +export interface SourceControlHistoryItemDetailsProvider { provideHoverCommands(repository: Repository): ProviderResult; provideMessageLinks(repository: Repository, message: string): ProviderResult; } @@ -358,7 +358,7 @@ export interface API { registerPostCommitCommandsProvider(provider: PostCommitCommandsProvider): Disposable; registerPushErrorHandler(handler: PushErrorHandler): Disposable; registerBranchProtectionProvider(root: Uri, provider: BranchProtectionProvider): Disposable; - registerSourceControlHistoryItemDetailProvider(provider: SourceControlHistoryItemDetailProvider): Disposable; + registerSourceControlHistoryItemDetailsProvider(provider: SourceControlHistoryItemDetailsProvider): Disposable; } export interface GitExtension { diff --git a/extensions/git/src/blame.ts b/extensions/git/src/blame.ts index 7265a61d879..f472116e0e4 100644 --- a/extensions/git/src/blame.ts +++ b/extensions/git/src/blame.ts @@ -12,7 +12,7 @@ import { BlameInformation, Commit } from './git'; import { fromGitUri, isGitUri } from './uri'; import { emojify, ensureEmojis } from './emoji'; import { getWorkingTreeAndIndexDiffInformation, getWorkingTreeDiffInformation } from './staging'; -import { provideSourceControlHistoryItemHoverCommands, provideSourceControlHistoryItemMessageLinks } from './historyItemDetailProvider'; +import { provideSourceControlHistoryItemHoverCommands, provideSourceControlHistoryItemMessageLinks } from './historyItemDetailsProvider'; function lineRangesContainLine(changes: readonly TextEditorChange[], lineNumber: number): boolean { return changes.some(c => c.modified.startLineNumber <= lineNumber && lineNumber < c.modified.endLineNumberExclusive); diff --git a/extensions/git/src/historyItemDetailProvider.ts b/extensions/git/src/historyItemDetailsProvider.ts similarity index 70% rename from extensions/git/src/historyItemDetailProvider.ts rename to extensions/git/src/historyItemDetailsProvider.ts index af717a703f1..26d6bac30dd 100644 --- a/extensions/git/src/historyItemDetailProvider.ts +++ b/extensions/git/src/historyItemDetailsProvider.ts @@ -4,20 +4,20 @@ *--------------------------------------------------------------------------------------------*/ import { Command, Disposable } from 'vscode'; -import { SourceControlHistoryItemDetailProvider } from './api/git'; +import { SourceControlHistoryItemDetailsProvider } from './api/git'; import { Repository } from './repository'; import { ApiRepository } from './api/api1'; -export interface ISourceControlHistoryItemDetailProviderRegistry { - registerSourceControlHistoryItemDetailProvider(provider: SourceControlHistoryItemDetailProvider): Disposable; - getSourceControlHistoryItemDetailProviders(): SourceControlHistoryItemDetailProvider[]; +export interface ISourceControlHistoryItemDetailsProviderRegistry { + registerSourceControlHistoryItemDetailsProvider(provider: SourceControlHistoryItemDetailsProvider): Disposable; + getSourceControlHistoryItemDetailsProviders(): SourceControlHistoryItemDetailsProvider[]; } export async function provideSourceControlHistoryItemHoverCommands( - registry: ISourceControlHistoryItemDetailProviderRegistry, + registry: ISourceControlHistoryItemDetailsProviderRegistry, repository: Repository ): Promise { - for (const provider of registry.getSourceControlHistoryItemDetailProviders()) { + for (const provider of registry.getSourceControlHistoryItemDetailsProviders()) { const result = await provider.provideHoverCommands(new ApiRepository(repository)); if (result) { @@ -29,11 +29,11 @@ export async function provideSourceControlHistoryItemHoverCommands( } export async function provideSourceControlHistoryItemMessageLinks( - registry: ISourceControlHistoryItemDetailProviderRegistry, + registry: ISourceControlHistoryItemDetailsProviderRegistry, repository: Repository, message: string ): Promise { - for (const provider of registry.getSourceControlHistoryItemDetailProviders()) { + for (const provider of registry.getSourceControlHistoryItemDetailsProviders()) { const result = await provider.provideMessageLinks( new ApiRepository(repository), message); diff --git a/extensions/git/src/historyProvider.ts b/extensions/git/src/historyProvider.ts index 430819977b5..6322a025a3f 100644 --- a/extensions/git/src/historyProvider.ts +++ b/extensions/git/src/historyProvider.ts @@ -12,7 +12,7 @@ import { Branch, LogOptions, Ref, RefType } from './api/git'; import { emojify, ensureEmojis } from './emoji'; import { Commit } from './git'; import { OperationKind, OperationResult } from './operation'; -import { ISourceControlHistoryItemDetailProviderRegistry, provideSourceControlHistoryItemMessageLinks } from './historyItemDetailProvider'; +import { ISourceControlHistoryItemDetailsProviderRegistry, provideSourceControlHistoryItemMessageLinks } from './historyItemDetailsProvider'; function toSourceControlHistoryItemRef(repository: Repository, ref: Ref): SourceControlHistoryItemRef { const rootUri = Uri.file(repository.root); @@ -98,7 +98,7 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec private disposables: Disposable[] = []; constructor( - private historyItemDetailProviderRegistry: ISourceControlHistoryItemDetailProviderRegistry, + private historyItemDetailProviderRegistry: ISourceControlHistoryItemDetailsProviderRegistry, private readonly repository: Repository, private readonly logger: LogOutputChannel ) { diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts index c94df8d5a50..f64528275d0 100644 --- a/extensions/git/src/model.ts +++ b/extensions/git/src/model.ts @@ -12,14 +12,14 @@ import { Git } from './git'; import * as path from 'path'; import * as fs from 'fs'; import { fromGitUri } from './uri'; -import { APIState as State, CredentialsProvider, PushErrorHandler, PublishEvent, RemoteSourcePublisher, PostCommitCommandsProvider, BranchProtectionProvider, SourceControlHistoryItemDetailProvider } from './api/git'; +import { APIState as State, CredentialsProvider, PushErrorHandler, PublishEvent, RemoteSourcePublisher, PostCommitCommandsProvider, BranchProtectionProvider, SourceControlHistoryItemDetailsProvider } from './api/git'; import { Askpass } from './askpass'; import { IPushErrorHandlerRegistry } from './pushError'; import { ApiRepository } from './api/api1'; import { IRemoteSourcePublisherRegistry } from './remotePublisher'; import { IPostCommitCommandsProviderRegistry } from './postCommitCommands'; import { IBranchProtectionProviderRegistry } from './branchProtection'; -import { ISourceControlHistoryItemDetailProviderRegistry } from './historyItemDetailProvider'; +import { ISourceControlHistoryItemDetailsProviderRegistry } from './historyItemDetailsProvider'; class RepositoryPick implements QuickPickItem { @memoize get label(): string { @@ -171,7 +171,7 @@ class UnsafeRepositoriesManager { } } -export class Model implements IRepositoryResolver, IBranchProtectionProviderRegistry, IRemoteSourcePublisherRegistry, IPostCommitCommandsProviderRegistry, IPushErrorHandlerRegistry, ISourceControlHistoryItemDetailProviderRegistry { +export class Model implements IRepositoryResolver, IBranchProtectionProviderRegistry, IRemoteSourcePublisherRegistry, IPostCommitCommandsProviderRegistry, IPushErrorHandlerRegistry, ISourceControlHistoryItemDetailsProviderRegistry { private _onDidOpenRepository = new EventEmitter(); readonly onDidOpenRepository: Event = this._onDidOpenRepository.event; @@ -237,7 +237,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi readonly onDidChangeBranchProtectionProviders = this._onDidChangeBranchProtectionProviders.event; private pushErrorHandlers = new Set(); - private historyItemDetailProviders = new Set(); + private historyItemDetailsProviders = new Set(); private _unsafeRepositoriesManager: UnsafeRepositoriesManager; get unsafeRepositories(): string[] { @@ -1004,13 +1004,13 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi return [...this.pushErrorHandlers]; } - registerSourceControlHistoryItemDetailProvider(provider: SourceControlHistoryItemDetailProvider): Disposable { - this.historyItemDetailProviders.add(provider); - return toDisposable(() => this.historyItemDetailProviders.delete(provider)); + registerSourceControlHistoryItemDetailsProvider(provider: SourceControlHistoryItemDetailsProvider): Disposable { + this.historyItemDetailsProviders.add(provider); + return toDisposable(() => this.historyItemDetailsProviders.delete(provider)); } - getSourceControlHistoryItemDetailProviders(): SourceControlHistoryItemDetailProvider[] { - return [...this.historyItemDetailProviders]; + getSourceControlHistoryItemDetailsProviders(): SourceControlHistoryItemDetailsProvider[] { + return [...this.historyItemDetailsProviders]; } getUnsafeRepositoryPath(repository: string): string | undefined { diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index d7c37189957..79b8379426e 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -26,7 +26,7 @@ import { toGitUri } from './uri'; import { anyEvent, combinedDisposable, debounceEvent, dispose, EmptyDisposable, eventToPromise, filterEvent, find, getCommitShortHash, IDisposable, isDescendant, onceEvent, pathEquals, relativePath } from './util'; import { IFileWatcher, watch } from './watch'; import { detectEncoding } from './encoding'; -import { ISourceControlHistoryItemDetailProviderRegistry } from './historyItemDetailProvider'; +import { ISourceControlHistoryItemDetailsProviderRegistry } from './historyItemDetailsProvider'; const timeout = (millis: number) => new Promise(c => setTimeout(c, millis)); @@ -856,7 +856,7 @@ export class Repository implements Disposable { remoteSourcePublisherRegistry: IRemoteSourcePublisherRegistry, postCommitCommandsProviderRegistry: IPostCommitCommandsProviderRegistry, private readonly branchProtectionProviderRegistry: IBranchProtectionProviderRegistry, - historyItemDetailProviderRegistry: ISourceControlHistoryItemDetailProviderRegistry, + historyItemDetailProviderRegistry: ISourceControlHistoryItemDetailsProviderRegistry, globalState: Memento, private readonly logger: LogOutputChannel, private telemetryReporter: TelemetryReporter diff --git a/extensions/git/src/timelineProvider.ts b/extensions/git/src/timelineProvider.ts index 6b9085eb821..20daaebe263 100644 --- a/extensions/git/src/timelineProvider.ts +++ b/extensions/git/src/timelineProvider.ts @@ -12,7 +12,7 @@ import { CommandCenter } from './commands'; import { OperationKind, OperationResult } from './operation'; import { getCommitShortHash } from './util'; import { CommitShortStat } from './git'; -import { provideSourceControlHistoryItemHoverCommands, provideSourceControlHistoryItemMessageLinks } from './historyItemDetailProvider'; +import { provideSourceControlHistoryItemHoverCommands, provideSourceControlHistoryItemMessageLinks } from './historyItemDetailsProvider'; export class GitTimelineItem extends TimelineItem { static is(item: TimelineItem): item is GitTimelineItem { diff --git a/extensions/github/src/extension.ts b/extensions/github/src/extension.ts index 968630e1852..5ca0d1cb6d5 100644 --- a/extensions/github/src/extension.ts +++ b/extensions/github/src/extension.ts @@ -16,7 +16,7 @@ import { GithubRemoteSourcePublisher } from './remoteSourcePublisher'; import { GithubBranchProtectionProviderManager } from './branchProtection'; import { GitHubCanonicalUriProvider } from './canonicalUriProvider'; import { VscodeDevShareProvider } from './shareProviders'; -import { GitHubSourceControlHistoryItemDetailProvider } from './historyItemDetailProvider'; +import { GitHubSourceControlHistoryItemDetailsProvider } from './historyItemDetailsProvider'; export function activate(context: ExtensionContext): void { const disposables: Disposable[] = []; @@ -101,7 +101,7 @@ function initializeGitExtension(context: ExtensionContext, telemetryReporter: Te disposables.add(new GithubBranchProtectionProviderManager(gitAPI, context.globalState, logger, telemetryReporter)); disposables.add(gitAPI.registerPushErrorHandler(new GithubPushErrorHandler(telemetryReporter))); disposables.add(gitAPI.registerRemoteSourcePublisher(new GithubRemoteSourcePublisher(gitAPI))); - disposables.add(gitAPI.registerSourceControlHistoryItemDetailProvider(new GitHubSourceControlHistoryItemDetailProvider())); + disposables.add(gitAPI.registerSourceControlHistoryItemDetailsProvider(new GitHubSourceControlHistoryItemDetailsProvider())); disposables.add(new GitHubCanonicalUriProvider(gitAPI)); disposables.add(new VscodeDevShareProvider(gitAPI)); setGitHubContext(gitAPI, disposables); diff --git a/extensions/github/src/historyItemDetailProvider.ts b/extensions/github/src/historyItemDetailsProvider.ts similarity index 89% rename from extensions/github/src/historyItemDetailProvider.ts rename to extensions/github/src/historyItemDetailsProvider.ts index bf1bdded391..4f7d0120ced 100644 --- a/extensions/github/src/historyItemDetailProvider.ts +++ b/extensions/github/src/historyItemDetailsProvider.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import { Command, l10n } from 'vscode'; -import { Repository, SourceControlHistoryItemDetailProvider } from './typings/git'; +import { Repository, SourceControlHistoryItemDetailsProvider } from './typings/git'; import { getRepositoryDefaultRemote, getRepositoryDefaultRemoteUrl } from './util'; const ISSUE_EXPRESSION = /(([A-Za-z0-9_.\-]+)\/([A-Za-z0-9_.\-]+))?(#|GH-)([1-9][0-9]*)($|\b)/g; -export class GitHubSourceControlHistoryItemDetailProvider implements SourceControlHistoryItemDetailProvider { +export class GitHubSourceControlHistoryItemDetailsProvider implements SourceControlHistoryItemDetailsProvider { async provideHoverCommands(repository: Repository): Promise { const url = getRepositoryDefaultRemoteUrl(repository); if (!url) { diff --git a/extensions/github/src/typings/git.d.ts b/extensions/github/src/typings/git.d.ts index 318152e82f6..714474533e0 100644 --- a/extensions/github/src/typings/git.d.ts +++ b/extensions/github/src/typings/git.d.ts @@ -289,7 +289,7 @@ export interface BranchProtectionProvider { provideBranchProtection(): BranchProtection[]; } -export interface SourceControlHistoryItemDetailProvider { +export interface SourceControlHistoryItemDetailsProvider { provideHoverCommands(repository: Repository): Promise; provideMessageLinks(repository: Repository, message: string): Promise; } @@ -321,7 +321,7 @@ export interface API { registerPostCommitCommandsProvider(provider: PostCommitCommandsProvider): Disposable; registerPushErrorHandler(handler: PushErrorHandler): Disposable; registerBranchProtectionProvider(root: Uri, provider: BranchProtectionProvider): Disposable; - registerSourceControlHistoryItemDetailProvider(provider: SourceControlHistoryItemDetailProvider): Disposable; + registerSourceControlHistoryItemDetailsProvider(provider: SourceControlHistoryItemDetailsProvider): Disposable; } export interface GitExtension {