diff --git a/src/codelens/codeLensProvider.ts b/src/codelens/codeLensProvider.ts index 4e7ed32..e2c8e41 100644 --- a/src/codelens/codeLensProvider.ts +++ b/src/codelens/codeLensProvider.ts @@ -9,15 +9,13 @@ import type { Uri, } from 'vscode'; import { CodeLens, EventEmitter, Location, Position, Range, SymbolInformation, SymbolKind } from 'vscode'; -import type { - DiffWithPreviousCommandArgs, - OpenOnRemoteCommandArgs, - ShowCommitsInViewCommandArgs, - ShowQuickCommitCommandArgs, - ShowQuickCommitFileCommandArgs, - ShowQuickFileHistoryCommandArgs, - ToggleFileChangesAnnotationCommandArgs, -} from '../commands'; +import type { DiffWithPreviousCommandArgs } from '../commands/diffWithPrevious'; +import type { OpenOnRemoteCommandArgs } from '../commands/openOnRemote'; +import type { ShowCommitsInViewCommandArgs } from '../commands/showCommitsInView'; +import type { ShowQuickCommitCommandArgs } from '../commands/showQuickCommit'; +import type { ShowQuickCommitFileCommandArgs } from '../commands/showQuickCommitFile'; +import type { ShowQuickFileHistoryCommandArgs } from '../commands/showQuickFileHistory'; +import type { ToggleFileChangesAnnotationCommandArgs } from '../commands/toggleFileAnnotations'; import type { CodeLensConfig, CodeLensLanguageScope } from '../config'; import { CodeLensCommand } from '../config'; import { Commands, Schemes } from '../constants'; diff --git a/src/commands.ts b/src/commands.ts index 8384f9c..0f67c26 100644 --- a/src/commands.ts +++ b/src/commands.ts @@ -1,67 +1,67 @@ -export * from './commands/addAuthors'; -export * from './commands/browseRepoAtRevision'; -export * from './commands/closeUnchangedFiles'; -export * from './commands/compareWith'; -export * from './commands/copyCurrentBranch'; -export * from './commands/copyDeepLink'; -export * from './commands/copyMessageToClipboard'; -export * from './commands/copyShaToClipboard'; -export * from './commands/copyRelativePathToClipboard'; -export * from './commands/createPullRequestOnRemote'; -export * from './commands/openDirectoryCompare'; -export * from './commands/diffLineWithPrevious'; -export * from './commands/diffLineWithWorking'; -export * from './commands/diffWith'; -export * from './commands/diffWithNext'; -export * from './commands/diffWithPrevious'; -export * from './commands/diffWithRevision'; -export * from './commands/diffWithRevisionFrom'; -export * from './commands/diffWithWorking'; -export * from './commands/externalDiff'; -export * from './commands/generateCommitMessage'; -export * from './commands/ghpr/openOrCreateWorktree'; -export * from './commands/gitCommands'; -export * from './commands/inviteToLiveShare'; -export * from './commands/logging'; -export * from './commands/openAssociatedPullRequestOnRemote'; -export * from './commands/openBranchesOnRemote'; -export * from './commands/openBranchOnRemote'; -export * from './commands/openCurrentBranchOnRemote'; -export * from './commands/openChangedFiles'; -export * from './commands/openCommitOnRemote'; -export * from './commands/openComparisonOnRemote'; -export * from './commands/openFileFromRemote'; -export * from './commands/openFileOnRemote'; -export * from './commands/openFileAtRevision'; -export * from './commands/openFileAtRevisionFrom'; -export * from './commands/openOnRemote'; -export * from './commands/openIssueOnRemote'; -export * from './commands/openPullRequestOnRemote'; -export * from './commands/openRepoOnRemote'; -export * from './commands/openRevisionFile'; -export * from './commands/openWorkingFile'; -export * from './commands/rebaseEditor'; -export * from './commands/refreshHover'; -export * from './commands/remoteProviders'; -export * from './commands/repositories'; -export * from './commands/resets'; -export * from './commands/resetViewsLayout'; -export * from './commands/searchCommits'; -export * from './commands/showCommitsInView'; -export * from './commands/showLastQuickPick'; -export * from './commands/openOnlyChangedFiles'; -export * from './commands/showQuickBranchHistory'; -export * from './commands/showQuickCommit'; -export * from './commands/showQuickCommitFile'; -export * from './commands/showQuickFileHistory'; -export * from './commands/showQuickRepoStatus'; -export * from './commands/showQuickStashList'; -export * from './commands/showView'; -export * from './commands/stashApply'; -export * from './commands/stashSave'; -export * from './commands/switchAIModel'; -export * from './commands/switchMode'; -export * from './commands/toggleCodeLens'; -export * from './commands/toggleFileAnnotations'; -export * from './commands/toggleLineBlame'; -export * from './commands/walkthroughs'; +import './commands/addAuthors'; +import './commands/browseRepoAtRevision'; +import './commands/closeUnchangedFiles'; +import './commands/compareWith'; +import './commands/copyCurrentBranch'; +import './commands/copyDeepLink'; +import './commands/copyMessageToClipboard'; +import './commands/copyShaToClipboard'; +import './commands/copyRelativePathToClipboard'; +import './commands/createPullRequestOnRemote'; +import './commands/openDirectoryCompare'; +import './commands/diffLineWithPrevious'; +import './commands/diffLineWithWorking'; +import './commands/diffWith'; +import './commands/diffWithNext'; +import './commands/diffWithPrevious'; +import './commands/diffWithRevision'; +import './commands/diffWithRevisionFrom'; +import './commands/diffWithWorking'; +import './commands/externalDiff'; +import './commands/generateCommitMessage'; +import './commands/ghpr/openOrCreateWorktree'; +import './commands/gitCommands'; +import './commands/inviteToLiveShare'; +import './commands/logging'; +import './commands/openAssociatedPullRequestOnRemote'; +import './commands/openBranchesOnRemote'; +import './commands/openBranchOnRemote'; +import './commands/openCurrentBranchOnRemote'; +import './commands/openChangedFiles'; +import './commands/openCommitOnRemote'; +import './commands/openComparisonOnRemote'; +import './commands/openFileFromRemote'; +import './commands/openFileOnRemote'; +import './commands/openFileAtRevision'; +import './commands/openFileAtRevisionFrom'; +import './commands/openOnRemote'; +import './commands/openIssueOnRemote'; +import './commands/openPullRequestOnRemote'; +import './commands/openRepoOnRemote'; +import './commands/openRevisionFile'; +import './commands/openWorkingFile'; +import './commands/rebaseEditor'; +import './commands/refreshHover'; +import './commands/remoteProviders'; +import './commands/repositories'; +import './commands/resets'; +import './commands/resetViewsLayout'; +import './commands/searchCommits'; +import './commands/showCommitsInView'; +import './commands/showLastQuickPick'; +import './commands/openOnlyChangedFiles'; +import './commands/showQuickBranchHistory'; +import './commands/showQuickCommit'; +import './commands/showQuickCommitFile'; +import './commands/showQuickFileHistory'; +import './commands/showQuickRepoStatus'; +import './commands/showQuickStashList'; +import './commands/showView'; +import './commands/stashApply'; +import './commands/stashSave'; +import './commands/switchAIModel'; +import './commands/switchMode'; +import './commands/toggleCodeLens'; +import './commands/toggleFileAnnotations'; +import './commands/toggleLineBlame'; +import './commands/walkthroughs'; diff --git a/src/container.ts b/src/container.ts index ff8014a..e774488 100644 --- a/src/container.ts +++ b/src/container.ts @@ -9,7 +9,7 @@ import { ActionRunners } from './api/actionRunners'; import { setDefaultGravatarsStyle } from './avatars'; import { CacheProvider } from './cache'; import { GitCodeLensController } from './codelens/codeLensController'; -import type { ToggleFileAnnotationCommandArgs } from './commands'; +import type { ToggleFileAnnotationCommandArgs } from './commands/toggleFileAnnotations'; import type { DateStyle, FileAnnotationType, ModeConfig } from './config'; import { fromOutputLevel } from './config'; import { Commands, extensionPrefix } from './constants'; diff --git a/src/extension.ts b/src/extension.ts index 362eeaf..95d026b 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -4,7 +4,8 @@ import { hrtime } from '@env/hrtime'; import { isWeb } from '@env/platform'; import { Api } from './api/api'; import type { CreatePullRequestActionContext, GitLensApi, OpenPullRequestActionContext } from './api/gitlens'; -import type { CreatePullRequestOnRemoteCommandArgs, OpenPullRequestOnRemoteCommandArgs } from './commands'; +import type { CreatePullRequestOnRemoteCommandArgs } from './commands/createPullRequestOnRemote'; +import type { OpenPullRequestOnRemoteCommandArgs } from './commands/openPullRequestOnRemote'; import { fromOutputLevel } from './config'; import { Commands, SyncedStorageKeys } from './constants'; import { Container } from './container'; @@ -26,6 +27,7 @@ import { Stopwatch } from './system/stopwatch'; import { Storage } from './system/storage'; import { compare, fromString, satisfies } from './system/version'; import { isViewNode } from './views/nodes/viewNode'; +import './commands'; export async function activate(context: ExtensionContext): Promise { const gitlensVersion: string = context.extension.packageJSON.version; diff --git a/src/git/actions.ts b/src/git/actions.ts index e3052e1..833500f 100644 --- a/src/git/actions.ts +++ b/src/git/actions.ts @@ -1,9 +1,6 @@ import type { Uri } from 'vscode'; -import type { - BrowseRepoAtRevisionCommandArgs, - GitCommandsCommandArgs, - GitCommandsCommandArgsWithCompletion, -} from '../commands'; +import type { BrowseRepoAtRevisionCommandArgs } from '../commands/browseRepoAtRevision'; +import type { GitCommandsCommandArgs, GitCommandsCommandArgsWithCompletion } from '../commands/gitCommands'; import { Commands } from '../constants'; import { executeCommand, executeEditorCommand } from '../system/command'; import { defer } from '../system/promise'; diff --git a/src/git/actions/commit.ts b/src/git/actions/commit.ts index 3393bf5..f7e124d 100644 --- a/src/git/actions/commit.ts +++ b/src/git/actions/commit.ts @@ -1,15 +1,13 @@ import type { TextDocumentShowOptions } from 'vscode'; import { env, Range, Uri, window } from 'vscode'; -import type { - DiffWithCommandArgs, - DiffWithPreviousCommandArgs, - DiffWithWorkingCommandArgs, - OpenFileOnRemoteCommandArgs, - OpenOnlyChangedFilesCommandArgs, - OpenWorkingFileCommandArgs, - ShowQuickCommitCommandArgs, - ShowQuickCommitFileCommandArgs, -} from '../../commands'; +import type { DiffWithCommandArgs } from '../../commands/diffWith'; +import type { DiffWithPreviousCommandArgs } from '../../commands/diffWithPrevious'; +import type { DiffWithWorkingCommandArgs } from '../../commands/diffWithWorking'; +import type { OpenFileOnRemoteCommandArgs } from '../../commands/openFileOnRemote'; +import type { OpenOnlyChangedFilesCommandArgs } from '../../commands/openOnlyChangedFiles'; +import type { OpenWorkingFileCommandArgs } from '../../commands/openWorkingFile'; +import type { ShowQuickCommitCommandArgs } from '../../commands/showQuickCommit'; +import type { ShowQuickCommitFileCommandArgs } from '../../commands/showQuickCommitFile'; import type { FileAnnotationType } from '../../config'; import { Commands } from '../../constants'; import { Container } from '../../container'; diff --git a/src/git/formatters/commitFormatter.ts b/src/git/formatters/commitFormatter.ts index c85673d..5b0b5b9 100644 --- a/src/git/formatters/commitFormatter.ts +++ b/src/git/formatters/commitFormatter.ts @@ -7,16 +7,14 @@ import type { OpenPullRequestActionContext, } from '../../api/gitlens'; import { getPresenceDataUri } from '../../avatars'; -import type { ShowQuickCommitCommandArgs } from '../../commands'; -import { - ConnectRemoteProviderCommand, - DiffWithCommand, - OpenCommitOnRemoteCommand, - OpenFileAtRevisionCommand, - ShowCommitsInViewCommand, - ShowQuickCommitFileCommand, -} from '../../commands'; import { Command } from '../../commands/base'; +import { DiffWithCommand } from '../../commands/diffWith'; +import { OpenCommitOnRemoteCommand } from '../../commands/openCommitOnRemote'; +import { OpenFileAtRevisionCommand } from '../../commands/openFileAtRevision'; +import { ConnectRemoteProviderCommand } from '../../commands/remoteProviders'; +import { ShowCommitsInViewCommand } from '../../commands/showCommitsInView'; +import type { ShowQuickCommitCommandArgs } from '../../commands/showQuickCommit'; +import { ShowQuickCommitFileCommand } from '../../commands/showQuickCommitFile'; import type { DateStyle } from '../../config'; import { Commands, GlyphChars } from '../../constants'; import { Container } from '../../container'; diff --git a/src/hovers/hovers.ts b/src/hovers/hovers.ts index 6debcc6..8a6071f 100644 --- a/src/hovers/hovers.ts +++ b/src/hovers/hovers.ts @@ -1,7 +1,8 @@ import type { CancellationToken, TextDocument } from 'vscode'; import { MarkdownString } from 'vscode'; import type { EnrichedAutolink } from '../annotations/autolinks'; -import { DiffWithCommand, ShowQuickCommitCommand } from '../commands'; +import { DiffWithCommand } from '../commands/diffWith'; +import { ShowQuickCommitCommand } from '../commands/showQuickCommit'; import { GlyphChars } from '../constants'; import type { Container } from '../container'; import { CommitFormatter } from '../git/formatters/commitFormatter'; diff --git a/src/partners.ts b/src/partners.ts index 4be6fa2..6446217 100644 --- a/src/partners.ts +++ b/src/partners.ts @@ -1,7 +1,7 @@ import type { CancellationTokenSource, Extension, ExtensionContext, Uri } from 'vscode'; import { extensions } from 'vscode'; import type { ActionContext, HoverCommandsActionContext } from './api/gitlens'; -import type { InviteToLiveShareCommandArgs } from './commands'; +import type { InviteToLiveShareCommandArgs } from './commands/inviteToLiveShare'; import { Commands } from './constants'; import { Container } from './container'; import { executeCommand, executeCoreCommand } from './system/command'; diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts index 8d16b37..71c84b1 100644 --- a/src/plus/webviews/focus/focusWebview.ts +++ b/src/plus/webviews/focus/focusWebview.ts @@ -1,5 +1,5 @@ import { Disposable, Uri, window } from 'vscode'; -import type { GHPRPullRequest } from '../../../commands'; +import type { GHPRPullRequest } from '../../../commands/ghpr/openOrCreateWorktree'; import { Commands } from '../../../constants'; import type { Container } from '../../../container'; import { PlusFeatures } from '../../../features'; diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts index e2783ac..84a9993 100644 --- a/src/plus/webviews/graph/graphWebview.ts +++ b/src/plus/webviews/graph/graphWebview.ts @@ -2,15 +2,13 @@ import type { ColorTheme, ConfigurationChangeEvent, Uri, ViewColumn } from 'vsco import { CancellationTokenSource, Disposable, env, window } from 'vscode'; import type { CreatePullRequestActionContext } from '../../../api/gitlens'; import { getAvatarUri } from '../../../avatars'; -import type { - CopyDeepLinkCommandArgs, - CopyMessageToClipboardCommandArgs, - CopyShaToClipboardCommandArgs, - OpenOnRemoteCommandArgs, - OpenPullRequestOnRemoteCommandArgs, - ShowCommitsInViewCommandArgs, -} from '../../../commands'; import { parseCommandContext } from '../../../commands/base'; +import type { CopyDeepLinkCommandArgs } from '../../../commands/copyDeepLink'; +import type { CopyMessageToClipboardCommandArgs } from '../../../commands/copyMessageToClipboard'; +import type { CopyShaToClipboardCommandArgs } from '../../../commands/copyShaToClipboard'; +import type { OpenOnRemoteCommandArgs } from '../../../commands/openOnRemote'; +import type { OpenPullRequestOnRemoteCommandArgs } from '../../../commands/openPullRequestOnRemote'; +import type { ShowCommitsInViewCommandArgs } from '../../../commands/showCommitsInView'; import type { Config, GraphMinimapMarkersAdditionalTypes, GraphScrollMarkersAdditionalTypes } from '../../../config'; import type { StoredGraphFilters, StoredGraphIncludeOnlyRef, StoredGraphRefType } from '../../../constants'; import { Commands, GlyphChars } from '../../../constants'; diff --git a/src/quickpicks/items/commits.ts b/src/quickpicks/items/commits.ts index a2d8086..ad18b94 100644 --- a/src/quickpicks/items/commits.ts +++ b/src/quickpicks/items/commits.ts @@ -1,7 +1,7 @@ import type { QuickPickItem } from 'vscode'; import { window } from 'vscode'; -import type { OpenOnlyChangedFilesCommandArgs } from '../../commands'; import type { OpenChangedFilesCommandArgs } from '../../commands/openChangedFiles'; +import type { OpenOnlyChangedFilesCommandArgs } from '../../commands/openOnlyChangedFiles'; import { RevealInSideBarQuickInputButton, ShowDetailsViewQuickInputButton } from '../../commands/quickCommand.buttons'; import type { Keys } from '../../constants'; import { Commands, GlyphChars } from '../../constants'; diff --git a/src/quickpicks/remoteProviderPicker.ts b/src/quickpicks/remoteProviderPicker.ts index bc1aaf9..f44f51e 100644 --- a/src/quickpicks/remoteProviderPicker.ts +++ b/src/quickpicks/remoteProviderPicker.ts @@ -1,6 +1,6 @@ import type { Disposable, QuickInputButton } from 'vscode'; import { env, Uri, window } from 'vscode'; -import type { OpenOnRemoteCommandArgs } from '../commands'; +import type { OpenOnRemoteCommandArgs } from '../commands/openOnRemote'; import { SetRemoteAsDefaultQuickInputButton } from '../commands/quickCommand.buttons'; import type { Keys } from '../constants'; import { Commands, GlyphChars } from '../constants'; diff --git a/src/terminal/linkProvider.ts b/src/terminal/linkProvider.ts index 1e061fe..44c1f39 100644 --- a/src/terminal/linkProvider.ts +++ b/src/terminal/linkProvider.ts @@ -1,11 +1,9 @@ import type { Disposable, TerminalLink, TerminalLinkContext, TerminalLinkProvider } from 'vscode'; import { commands, window } from 'vscode'; -import type { - GitCommandsCommandArgs, - ShowCommitsInViewCommandArgs, - ShowQuickBranchHistoryCommandArgs, - ShowQuickCommitCommandArgs, -} from '../commands'; +import type { GitCommandsCommandArgs } from '../commands/gitCommands'; +import type { ShowCommitsInViewCommandArgs } from '../commands/showCommitsInView'; +import type { ShowQuickBranchHistoryCommandArgs } from '../commands/showQuickBranchHistory'; +import type { ShowQuickCommitCommandArgs } from '../commands/showQuickCommit'; import { Commands } from '../constants'; import type { Container } from '../container'; import type { PagedResult } from '../git/gitProvider'; diff --git a/src/views/nodes/UncommittedFileNode.ts b/src/views/nodes/UncommittedFileNode.ts index 2cf23d7..8d9b257 100644 --- a/src/views/nodes/UncommittedFileNode.ts +++ b/src/views/nodes/UncommittedFileNode.ts @@ -1,6 +1,6 @@ import type { Command } from 'vscode'; import { TreeItem, TreeItemCollapsibleState } from 'vscode'; -import type { DiffWithPreviousCommandArgs } from '../../commands'; +import type { DiffWithPreviousCommandArgs } from '../../commands/diffWithPrevious'; import { Commands } from '../../constants'; import { StatusFileFormatter } from '../../git/formatters/statusFormatter'; import { GitUri } from '../../git/gitUri'; diff --git a/src/views/nodes/commitFileNode.ts b/src/views/nodes/commitFileNode.ts index 84860c1..299ec58 100644 --- a/src/views/nodes/commitFileNode.ts +++ b/src/views/nodes/commitFileNode.ts @@ -1,6 +1,6 @@ import type { Command, Selection } from 'vscode'; import { MarkdownString, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode'; -import type { DiffWithPreviousCommandArgs } from '../../commands'; +import type { DiffWithPreviousCommandArgs } from '../../commands/diffWithPrevious'; import { Commands, Schemes } from '../../constants'; import { StatusFileFormatter } from '../../git/formatters/statusFormatter'; import { GitUri } from '../../git/gitUri'; diff --git a/src/views/nodes/commitNode.ts b/src/views/nodes/commitNode.ts index 43c2113..c2a3a60 100644 --- a/src/views/nodes/commitNode.ts +++ b/src/views/nodes/commitNode.ts @@ -1,6 +1,6 @@ import type { Command } from 'vscode'; import { MarkdownString, ThemeColor, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; -import type { DiffWithPreviousCommandArgs } from '../../commands'; +import type { DiffWithPreviousCommandArgs } from '../../commands/diffWithPrevious'; import type { Colors } from '../../constants'; import { Commands } from '../../constants'; import { CommitFormatter } from '../../git/formatters/commitFormatter'; diff --git a/src/views/nodes/fileRevisionAsCommitNode.ts b/src/views/nodes/fileRevisionAsCommitNode.ts index e358252..5fd72fb 100644 --- a/src/views/nodes/fileRevisionAsCommitNode.ts +++ b/src/views/nodes/fileRevisionAsCommitNode.ts @@ -1,6 +1,6 @@ import type { Command, Selection } from 'vscode'; import { MarkdownString, ThemeColor, ThemeIcon, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode'; -import type { DiffWithPreviousCommandArgs } from '../../commands'; +import type { DiffWithPreviousCommandArgs } from '../../commands/diffWithPrevious'; import type { Colors } from '../../constants'; import { Commands } from '../../constants'; import type { Container } from '../../container'; diff --git a/src/views/nodes/mergeConflictCurrentChangesNode.ts b/src/views/nodes/mergeConflictCurrentChangesNode.ts index 796ea79..601be5b 100644 --- a/src/views/nodes/mergeConflictCurrentChangesNode.ts +++ b/src/views/nodes/mergeConflictCurrentChangesNode.ts @@ -1,6 +1,6 @@ import type { Command } from 'vscode'; import { MarkdownString, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; -import type { DiffWithCommandArgs } from '../../commands'; +import type { DiffWithCommandArgs } from '../../commands/diffWith'; import { Commands, GlyphChars } from '../../constants'; import { GitUri } from '../../git/gitUri'; import type { GitCommit } from '../../git/models/commit'; diff --git a/src/views/nodes/mergeConflictIncomingChangesNode.ts b/src/views/nodes/mergeConflictIncomingChangesNode.ts index 28406b2..a8f3047 100644 --- a/src/views/nodes/mergeConflictIncomingChangesNode.ts +++ b/src/views/nodes/mergeConflictIncomingChangesNode.ts @@ -1,6 +1,6 @@ import type { Command } from 'vscode'; import { MarkdownString, ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; -import type { DiffWithCommandArgs } from '../../commands'; +import type { DiffWithCommandArgs } from '../../commands/diffWith'; import { Commands, GlyphChars } from '../../constants'; import { GitUri } from '../../git/gitUri'; import type { GitCommit } from '../../git/models/commit'; diff --git a/src/views/nodes/resultsFileNode.ts b/src/views/nodes/resultsFileNode.ts index 74d57c8..da974ff 100644 --- a/src/views/nodes/resultsFileNode.ts +++ b/src/views/nodes/resultsFileNode.ts @@ -1,6 +1,6 @@ import type { Command } from 'vscode'; import { TreeItem, TreeItemCheckboxState, TreeItemCollapsibleState } from 'vscode'; -import type { DiffWithCommandArgs } from '../../commands'; +import type { DiffWithCommandArgs } from '../../commands/diffWith'; import { Commands } from '../../constants'; import { StatusFileFormatter } from '../../git/formatters/statusFormatter'; import { GitUri } from '../../git/gitUri'; diff --git a/src/views/nodes/statusFileNode.ts b/src/views/nodes/statusFileNode.ts index eec927a..834f21e 100644 --- a/src/views/nodes/statusFileNode.ts +++ b/src/views/nodes/statusFileNode.ts @@ -1,6 +1,6 @@ import type { Command } from 'vscode'; import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode'; -import type { DiffWithCommandArgs } from '../../commands'; +import type { DiffWithCommandArgs } from '../../commands/diffWith'; import type { DiffWithPreviousCommandArgs } from '../../commands/diffWithPrevious'; import { Commands } from '../../constants'; import { StatusFileFormatter } from '../../git/formatters/statusFormatter'; diff --git a/src/views/viewCommands.ts b/src/views/viewCommands.ts index 66d9e72..8326aec 100644 --- a/src/views/viewCommands.ts +++ b/src/views/viewCommands.ts @@ -1,12 +1,10 @@ import type { Disposable, TextDocumentShowOptions } from 'vscode'; import { env, Uri, window } from 'vscode'; import type { CreatePullRequestActionContext, OpenPullRequestActionContext } from '../api/gitlens'; -import type { - DiffWithCommandArgs, - DiffWithPreviousCommandArgs, - DiffWithWorkingCommandArgs, - OpenFileAtRevisionCommandArgs, -} from '../commands'; +import type { DiffWithCommandArgs } from '../commands/diffWith'; +import type { DiffWithPreviousCommandArgs } from '../commands/diffWithPrevious'; +import type { DiffWithWorkingCommandArgs } from '../commands/diffWithWorking'; +import type { OpenFileAtRevisionCommandArgs } from '../commands/openFileAtRevision'; import type { ViewShowBranchComparison } from '../config'; import { Commands } from '../constants'; import type { Container } from '../container'; diff --git a/src/webviews/commitDetails/commitDetailsWebview.ts b/src/webviews/commitDetails/commitDetailsWebview.ts index e61216f..e108f3e 100644 --- a/src/webviews/commitDetails/commitDetailsWebview.ts +++ b/src/webviews/commitDetails/commitDetailsWebview.ts @@ -2,7 +2,7 @@ import type { CancellationToken, ConfigurationChangeEvent, TextDocumentShowOptio import { CancellationTokenSource, Disposable, Uri, window } from 'vscode'; import type { MaybeEnrichedAutolink } from '../../annotations/autolinks'; import { serializeAutolink } from '../../annotations/autolinks'; -import type { CopyShaToClipboardCommandArgs } from '../../commands'; +import type { CopyShaToClipboardCommandArgs } from '../../commands/copyShaToClipboard'; import type { CoreConfiguration } from '../../constants'; import { Commands } from '../../constants'; import type { Container } from '../../container'; diff --git a/src/webviews/rebase/rebaseEditor.ts b/src/webviews/rebase/rebaseEditor.ts index 48a3859..1085a86 100644 --- a/src/webviews/rebase/rebaseEditor.ts +++ b/src/webviews/rebase/rebaseEditor.ts @@ -7,7 +7,7 @@ import type { } from 'vscode'; import { ConfigurationTarget, Disposable, Position, Range, Uri, window, workspace, WorkspaceEdit } from 'vscode'; import { getNonce } from '@env/crypto'; -import { ShowCommitsInViewCommand } from '../../commands'; +import { ShowCommitsInViewCommand } from '../../commands/showCommitsInView'; import type { CoreConfiguration } from '../../constants'; import type { Container } from '../../container'; import { emojify } from '../../emojis';