Git - 💄 fix history item details provider name (#238045)

This commit is contained in:
Ladislau Szomoru
2025-01-16 12:25:19 +01:00
committed by GitHub
parent 118e6f5373
commit 7610cc1d19
11 changed files with 34 additions and 34 deletions

View File

@@ -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 {

View File

@@ -326,7 +326,7 @@ export interface BranchProtectionProvider {
provideBranchProtection(): BranchProtection[];
}
export interface SourceControlHistoryItemDetailProvider {
export interface SourceControlHistoryItemDetailsProvider {
provideHoverCommands(repository: Repository): ProviderResult<Command[]>;
provideMessageLinks(repository: Repository, message: string): ProviderResult<string>;
}
@@ -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 {

View File

@@ -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);

View File

@@ -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<Command[] | undefined> {
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<string | undefined> {
for (const provider of registry.getSourceControlHistoryItemDetailProviders()) {
for (const provider of registry.getSourceControlHistoryItemDetailsProviders()) {
const result = await provider.provideMessageLinks(
new ApiRepository(repository), message);

View File

@@ -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
) {

View File

@@ -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<Repository>();
readonly onDidOpenRepository: Event<Repository> = this._onDidOpenRepository.event;
@@ -237,7 +237,7 @@ export class Model implements IRepositoryResolver, IBranchProtectionProviderRegi
readonly onDidChangeBranchProtectionProviders = this._onDidChangeBranchProtectionProviders.event;
private pushErrorHandlers = new Set<PushErrorHandler>();
private historyItemDetailProviders = new Set<SourceControlHistoryItemDetailProvider>();
private historyItemDetailsProviders = new Set<SourceControlHistoryItemDetailsProvider>();
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 {

View File

@@ -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

View File

@@ -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 {