💄prettiers and lints

src/commands/openDirectoryCompare.ts

@@ -1,5 +1,4 @@
 import type { TextEditor, Uri } from 'vscode';
-import { GitActions } from '../commands/gitCommands.actions';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { Logger } from '../logger';
@@ -10,6 +9,7 @@ import { command } from '../system/command';
 import { CompareResultsNode } from '../views/nodes/compareResultsNode';
 import type { CommandContext } from './base';
 import { ActiveEditorCommand, getCommandUri, isCommandContextViewNodeHasRef } from './base';
+import { GitActions } from './gitCommands.actions';
 
 export interface OpenDirectoryCompareCommandArgs {
 	ref1?: string;

src/commands/repositories.ts

@@ -1,8 +1,8 @@
-import { executeGitCommand } from '../commands/gitCommands.actions';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { command } from '../system/command';
 import { Command } from './base';
+import { executeGitCommand } from './gitCommands.actions';
 
 @command()
 export class FetchRepositoriesCommand extends Command {

src/commands/searchCommits.ts

@@ -1,4 +1,3 @@
-import { executeGitCommand } from '../commands/gitCommands.actions';
 import { configuration } from '../configuration';
 import { Commands } from '../constants';
 import type { Container } from '../container';
@@ -7,6 +6,7 @@ import { command } from '../system/command';
 import { SearchResultsNode } from '../views/nodes/searchResultsNode';
 import type { CommandContext } from './base';
 import { Command, isCommandContextViewNodeHasRepository } from './base';
+import { executeGitCommand } from './gitCommands.actions';
 
 export interface SearchCommitsCommandArgs {
 	search?: Partial<SearchQuery>;

src/commands/showCommitsInView.ts

@@ -1,5 +1,4 @@
 import type { TextEditor, Uri } from 'vscode';
-import { executeGitCommand, GitActions } from '../commands/gitCommands.actions';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
@@ -11,6 +10,7 @@ import { command } from '../system/command';
 import { filterMap } from '../system/iterable';
 import type { CommandContext } from './base';
 import { ActiveEditorCommand, getCommandUri, isCommandContextViewNodeHasCommit } from './base';
+import { executeGitCommand, GitActions } from './gitCommands.actions';
 
 export interface ShowCommitsInViewCommandArgs {
 	refs?: string[];

src/commands/showQuickRepoStatus.ts

@@ -1,8 +1,8 @@
-import { executeGitCommand } from '../commands/gitCommands.actions';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { command } from '../system/command';
 import { Command } from './base';
+import { executeGitCommand } from './gitCommands.actions';
 
 export interface ShowQuickRepoStatusCommandArgs {
 	repoPath?: string;

src/commands/showQuickStashList.ts

@@ -1,8 +1,8 @@
-import { executeGitCommand } from '../commands/gitCommands.actions';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { command } from '../system/command';
 import { Command } from './base';
+import { executeGitCommand } from './gitCommands.actions';
 
 export interface ShowQuickStashListCommandArgs {
 	repoPath?: string;

src/commands/stashApply.ts

@@ -1,4 +1,3 @@
-import { GitActions } from '../commands/gitCommands.actions';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import type { GitStashCommit } from '../git/models/commit';
@@ -7,6 +6,7 @@ import type { CommandQuickPickItem } from '../quickpicks/items/common';
 import { command } from '../system/command';
 import type { CommandContext } from './base';
 import { Command, isCommandContextViewNodeHasCommit, isCommandContextViewNodeHasRepository } from './base';
+import { GitActions } from './gitCommands.actions';
 
 export interface StashApplyCommandArgs {
 	deleteAfter?: boolean;

src/commands/stashSave.ts

@@ -1,7 +1,6 @@
 import type { Uri } from 'vscode';
 import type { ScmResource } from '../@types/vscode.git.resources';
 import { ScmResourceGroupType } from '../@types/vscode.git.resources.enums';
-import { GitActions } from '../commands/gitCommands.actions';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { GitUri } from '../git/gitUri';
@@ -13,6 +12,7 @@ import {
 	isCommandContextViewNodeHasRepoPath,
 	isCommandContextViewNodeHasRepository,
 } from './base';
+import { GitActions } from './gitCommands.actions';
 
 export interface StashSaveCommandArgs {
 	message?: string;

src/env/node/git/localGitProvider.ts

@@ -82,8 +82,8 @@ import { Repository, RepositoryChange, RepositoryChangeComparisonMode } from '..
 import type { GitStash } from '../../../git/models/stash';
 import type { GitStatusFile } from '../../../git/models/status';
 import { GitStatus } from '../../../git/models/status';
-import type { GitTag } from '../../../git/models/tag';
-import { getTagId, sortTags, type TagSortOptions } from '../../../git/models/tag';
+import type { GitTag, TagSortOptions } from '../../../git/models/tag';
+import { getTagId, sortTags } from '../../../git/models/tag';
 import type { GitTreeEntry } from '../../../git/models/tree';
 import type { GitUser } from '../../../git/models/user';
 import { isUserMatch } from '../../../git/models/user';
@@ -113,8 +113,8 @@ import { getRemoteProviderMatcher, loadRemoteProviders } from '../../../git/remo
 import type { RichRemoteProvider } from '../../../git/remotes/richRemoteProvider';
 import type { GitSearch, GitSearchResultData, GitSearchResults, SearchQuery } from '../../../git/search';
 import { getGitArgsFromSearchQuery, getSearchQueryComparisonKey } from '../../../git/search';
-import { Logger } from '../../../logger';
 import type { LogScope } from '../../../logger';
+import { Logger } from '../../../logger';
 import {
 	showGenericErrorMessage,
 	showGitDisabledErrorMessage,

src/git/fsProvider.ts

@@ -3,11 +3,11 @@ import { Disposable, EventEmitter, FileSystemError, FileType, workspace } from '
 import { isLinux } from '@env/platform';
 import { Schemes } from '../constants';
 import type { Container } from '../container';
-import { GitUri, isGitUri } from '../git/gitUri';
 import { debug } from '../system/decorators/log';
 import { map } from '../system/iterable';
 import { normalizePath, relative } from '../system/path';
 import { TernarySearchTree } from '../system/searchTree';
+import { GitUri, isGitUri } from './gitUri';
 import { GitRevision } from './models/reference';
 import type { GitTreeEntry } from './models/tree';
 

src/git/gitProviderService.ts

@@ -18,7 +18,6 @@ import type { Container } from '../container';
 import { setContext } from '../context';
 import { AccessDeniedError, ProviderNotFoundError } from '../errors';
 import type { FeatureAccess, Features, PlusFeatures, RepoFeatureAccess } from '../features';
-import type { RemoteProvider } from '../git/remotes/remoteProvider';
 import { Logger } from '../logger';
 import type { SubscriptionChangeEvent } from '../plus/subscription/subscriptionService';
 import type { RepoComparisonKey } from '../repositories';
@@ -67,6 +66,7 @@ import type { GitTag, TagSortOptions } from './models/tag';
 import type { GitTreeEntry } from './models/tree';
 import type { GitUser } from './models/user';
 import type { GitWorktree } from './models/worktree';
+import type { RemoteProvider } from './remotes/remoteProvider';
 import { RichRemoteProviders } from './remotes/remoteProviderConnections';
 import type { RemoteProviders } from './remotes/remoteProviders';
 import type { RichRemoteProvider } from './remotes/richRemoteProvider';

src/git/models/repository.ts

@@ -21,8 +21,8 @@ import { basename, normalizePath } from '../../system/path';
 import { md5 } from '../../system/string';
 import { runGitCommandInTerminal } from '../../terminal';
 import type { GitProviderDescriptor } from '../gitProvider';
-import { loadRemoteProviders } from '../remotes/remoteProviders';
 import type { RemoteProviders } from '../remotes/remoteProviders';
+import { loadRemoteProviders } from '../remotes/remoteProviders';
 import type { RichRemoteProvider } from '../remotes/richRemoteProvider';
 import type { GitSearch, SearchQuery } from '../search';
 import type { BranchSortOptions, GitBranch } from './branch';

src/git/remotes/remoteProvider.ts

@@ -1,5 +1,5 @@
-import { env, Uri } from 'vscode';
 import type { Range } from 'vscode';
+import { env, Uri } from 'vscode';
 import type { DynamicAutolinkReference } from '../../annotations/autolinks';
 import type { AutolinkReference } from '../../config';
 import { encodeUrl } from '../../system/encoding';

src/git/remotes/remoteProviderConnections.ts

@@ -1,5 +1,5 @@
-import { EventEmitter } from 'vscode';
 import type { Event } from 'vscode';
+import { EventEmitter } from 'vscode';
 import { Container } from '../../container';
 
 export interface ConnectionStateChangeEvent {

src/git/remotes/richRemoteProvider.ts

@@ -1,5 +1,5 @@
-import { authentication, EventEmitter, window } from 'vscode';
 import type { AuthenticationSession, AuthenticationSessionsChangeEvent, Event, MessageItem } from 'vscode';
+import { authentication, EventEmitter, window } from 'vscode';
 import { wrapForForcedInsecureSSL } from '@env/fetch';
 import { isWeb } from '@env/platform';
 import { configuration } from '../../configuration';

src/keyboard.ts

@@ -23,7 +23,7 @@ export const keys = [
 	'alt+.',
 	'escape',
 ] as const;
-export type Keys = typeof keys[number];
+export type Keys = (typeof keys)[number];
 
 export type KeyMapping = { [K in Keys]?: KeyCommand | (() => Promise<KeyCommand>) };
 type IndexableKeyMapping = KeyMapping & {

src/plus/gitlab/gitlab.ts

@@ -1,7 +1,7 @@
 import type { HttpsProxyAgent } from 'https-proxy-agent';
 import { Disposable, Uri, window } from 'vscode';
-import { fetch, getProxyAgent, wrapForForcedInsecureSSL } from '@env/fetch';
 import type { RequestInit, Response } from '@env/fetch';
+import { fetch, getProxyAgent, wrapForForcedInsecureSSL } from '@env/fetch';
 import { isWeb } from '@env/platform';
 import { configuration } from '../../configuration';
 import type { Container } from '../../container';

src/plus/webviews/graph/graphWebview.ts

@@ -37,8 +37,8 @@ import { PlusFeatures } from '../../../features';
 import { GitSearchError } from '../../../git/errors';
 import { getBranchId, getBranchNameWithoutRemote, getRemoteNameFromBranchName } from '../../../git/models/branch';
 import { GitContributor } from '../../../git/models/contributor';
-import { GitGraphRowType } from '../../../git/models/graph';
 import type { GitGraph } from '../../../git/models/graph';
+import { GitGraphRowType } from '../../../git/models/graph';
 import type {
 	GitBranchReference,
 	GitRevisionReference,
@@ -70,8 +70,8 @@ import type { CommitNode } from '../../../views/nodes/commitNode';
 import type { StashNode } from '../../../views/nodes/stashNode';
 import type { TagNode } from '../../../views/nodes/tagNode';
 import { RepositoryFolderNode } from '../../../views/nodes/viewNode';
-import { onIpc } from '../../../webviews/protocol';
 import type { IpcMessage, IpcMessageParams, IpcNotificationType } from '../../../webviews/protocol';
+import { onIpc } from '../../../webviews/protocol';
 import { WebviewBase } from '../../../webviews/webviewBase';
 import type { SubscriptionChangeEvent } from '../../subscription/subscriptionService';
 import { arePlusFeaturesEnabled, ensurePlusFeaturesEnabled } from '../../subscription/utils';

src/quickpicks/commitPicker.ts

@@ -6,10 +6,10 @@ import type { GitCommit, GitStashCommit } from '../git/models/commit';
 import type { GitLog } from '../git/models/log';
 import type { GitStash } from '../git/models/stash';
 import type { KeyboardScope, Keys } from '../keyboard';
-import { CommandQuickPickItem } from '../quickpicks/items/common';
 import { filter, map } from '../system/iterable';
 import { isPromise } from '../system/promise';
 import { getQuickPickIgnoreFocusOut } from '../system/utils';
+import { CommandQuickPickItem } from './items/common';
 import { Directive, DirectiveQuickPickItem } from './items/directive';
 import { CommitQuickPickItem } from './items/gitCommands';
 

src/quickpicks/remoteProviderPicker.ts

@@ -9,9 +9,9 @@ import type { RemoteResource } from '../git/models/remoteResource';
 import { getNameFromRemoteResource, RemoteResourceType } from '../git/models/remoteResource';
 import type { RemoteProvider } from '../git/remotes/remoteProvider';
 import type { Keys } from '../keyboard';
-import { CommandQuickPickItem } from '../quickpicks/items/common';
 import { getSettledValue } from '../system/promise';
 import { getQuickPickIgnoreFocusOut } from '../system/utils';
+import { CommandQuickPickItem } from './items/common';
 
 export class ConfigureCustomRemoteProviderCommandQuickPickItem extends CommandQuickPickItem {
 	constructor() {

src/system/stopwatch.ts

@@ -2,7 +2,7 @@ import { hrtime } from '@env/hrtime';
 import { GlyphChars } from '../constants';
 import type { LogScope } from '../logger';
 import { Logger, LogLevel } from '../logger';
-import { getNextLogScopeId } from '../system/decorators/log';
+import { getNextLogScopeId } from './decorators/log';
 
 type StopwatchLogOptions = { message?: string; suffix?: string };
 type StopwatchOptions = {

src/webviews/apps/commitDetails/commitDetails.ts

@@ -3,8 +3,6 @@ import { ViewFilesLayout } from '../../../config';
 import type { HierarchicalItem } from '../../../system/array';
 import { makeHierarchical } from '../../../system/array';
 import type { Serialized } from '../../../system/serialize';
-import type { IpcMessage } from '../../../webviews/protocol';
-import { onIpc } from '../../../webviews/protocol';
 import type { CommitActionsParams, State } from '../../commitDetails/protocol';
 import {
 	AutolinkSettingsCommandType,
@@ -21,11 +19,15 @@ import {
 	PreferencesCommandType,
 	SearchCommitCommandType,
 } from '../../commitDetails/protocol';
+import type { IpcMessage } from '../../protocol';
+import { onIpc } from '../../protocol';
 import { App } from '../shared/appBase';
 import type { FileChangeListItem, FileChangeListItemDetail } from '../shared/components/list/file-change-list-item';
 import type { WebviewPane, WebviewPaneExpandedChangeEventDetail } from '../shared/components/webview-pane';
 import { DOM } from '../shared/dom';
 import './commitDetails.scss';
+import '../shared/components/actions/action-item';
+import '../shared/components/actions/action-nav';
 import '../shared/components/code-icon';
 import '../shared/components/commit/commit-identity';
 import '../shared/components/formatted-date';
@@ -37,8 +39,6 @@ import '../shared/components/progress';
 import '../shared/components/list/list-container';
 import '../shared/components/list/list-item';
 import '../shared/components/list/file-change-list-item';
-import '../shared/components/actions/action-item';
-import '../shared/components/actions/action-nav';
 
 const uncommittedSha = '0000000000000000000000000000000000000000';
 

src/webviews/apps/home/home.ts

@@ -25,10 +25,10 @@ import type { SteppedSection } from './components/stepped-section';
 import '../shared/components/code-icon';
 import '../shared/components/overlays/pop-over';
 import './components/card-section';
-import './components/stepped-section';
+import './components/header-card';
 import './components/plus-banner';
 import './components/plus-content';
-import './components/header-card';
+import './components/stepped-section';
 
 export class HomeApp extends App<State> {
 	private $steps!: SteppedSection[];

src/webviews/apps/plus/graph/GraphWrapper.tsx

@@ -1,4 +1,3 @@
-import GraphContainer, { GRAPH_ZONE_TYPE, REF_ZONE_TYPE } from '@gitkraken/gitkraken-components';
 import type {
 	GraphColumnSetting,
 	GraphColumnsSettings,
@@ -11,6 +10,7 @@ import type {
 	GraphZoneType,
 	OnFormatCommitDateTime,
 } from '@gitkraken/gitkraken-components';
+import GraphContainer, { GRAPH_ZONE_TYPE, REF_ZONE_TYPE } from '@gitkraken/gitkraken-components';
 import { VSCodeCheckbox, VSCodeRadio, VSCodeRadioGroup } from '@vscode/webview-ui-toolkit/react';
 import type { FormEvent, ReactElement } from 'react';
 import React, { createElement, useEffect, useMemo, useRef, useState } from 'react';
@@ -53,7 +53,7 @@ import {
 import type { Subscription } from '../../../../subscription';
 import { getSubscriptionTimeRemaining, SubscriptionState } from '../../../../subscription';
 import { pluralize } from '../../../../system/string';
-import type { IpcNotificationType } from '../../../../webviews/protocol';
+import type { IpcNotificationType } from '../../../protocol';
 import { MenuDivider, MenuItem, MenuLabel, MenuList } from '../../shared/components/menu/react';
 import { PopMenu } from '../../shared/components/overlays/pop-menu/react';
 import { PopOver } from '../../shared/components/overlays/react';
@@ -111,10 +111,7 @@ const createIconElements = (): { [key: string]: ReactElement } => {
 		'hide',
 	];
 
-	const miniIconList = [
-		'upstream-ahead',
-		'upstream-behind',
-	];
+	const miniIconList = ['upstream-ahead', 'upstream-behind'];
 
 	const elementLibrary: { [key: string]: ReactElement<any> } = {};
 	iconList.forEach(iconKey => {

src/webviews/apps/plus/graph/graph.tsx

@@ -47,8 +47,8 @@ import {
 	UpdateSelectionCommandType,
 } from '../../../../plus/webviews/graph/protocol';
 import { debounce } from '../../../../system/function';
-import type { IpcMessage, IpcNotificationType } from '../../../../webviews/protocol';
-import { onIpc } from '../../../../webviews/protocol';
+import type { IpcMessage, IpcNotificationType } from '../../../protocol';
+import { onIpc } from '../../../protocol';
 import { App } from '../../shared/appBase';
 import { mix, opacity } from '../../shared/colors';
 import { GraphWrapper } from './GraphWrapper';

src/webviews/apps/settings/partials/commit-graph.html

@@ -140,9 +140,7 @@
 								type="checkbox"
 								data-setting
 							/>
-							<label for="graph.dimMergeCommits"
-								>Dim merge commit rows</label
-							>
+							<label for="graph.dimMergeCommits">Dim merge commit rows</label>
 						</div>
 					</div>
 

src/webviews/apps/settings/partials/hovers.html

@@ -51,7 +51,9 @@
 												data-setting
 												disabled
 											/>
-											<label for="hovers.autolinks.enhanced">Enhance autolinks with remote details</label>
+											<label for="hovers.autolinks.enhanced"
+												>Enhance autolinks with remote details</label
+											>
 										</div>
 										<p class="setting__hint">
 											Requires a connection to a supported remote service (e.g. GitHub)

src/webviews/apps/shared/appWithConfigBase.ts

@@ -9,8 +9,8 @@ import {
 	onIpc,
 	UpdateConfigurationCommandType,
 } from '../../protocol';
-import { formatDate, setDefaultDateLocales } from '../shared/date';
 import { App } from './appBase';
+import { formatDate, setDefaultDateLocales } from './date';
 import { DOM } from './dom';
 
 const offset = (new Date().getTimezoneOffset() / 60) * 100;

src/webviews/apps/shared/components/avatars/avatar-item.ts

@@ -1,6 +1,6 @@
 import { attr, css, customElement, FASTElement, html } from '@microsoft/fast-element';
-import { focusOutline } from '../../../shared/components/styles/a11y';
-import { elementBase } from '../../../shared/components/styles/base';
+import { focusOutline } from '../styles/a11y';
+import { elementBase } from '../styles/base';
 
 const template = html<AvatarItem>`<template role="img" tabindex="${x => x.tabIndex ?? '0'}">
 	<slot></slot>

src/webviews/apps/shared/components/avatars/avatar-stack.ts

@@ -1,6 +1,6 @@
 import { css, customElement, FASTElement, html, observable, slotted } from '@microsoft/fast-element';
-import { elementBase } from '../../../shared/components/styles/base';
 import { nodeTypeFilter } from '../helpers/slots';
+import { elementBase } from '../styles/base';
 
 const template = html<AvatarStack>`<template>
 	<slot ${slotted({ property: 'avatarNodes', filter: nodeTypeFilter(Node.ELEMENT_NODE) })}></slot>

src/webviews/apps/shared/components/search/search-box.ts

@@ -5,10 +5,10 @@ import { pluralize } from '../../../../../system/string';
 import type { Disposable } from '../../dom';
 import { DOM } from '../../dom';
 import { numberConverter } from '../converters/number-converter';
-import '../code-icon';
 import type { SearchInput } from './search-input';
+import '../code-icon';
+import '../progress';
 import './search-input';
-import './../progress';
 
 export type SearchNavigationDirection = 'first' | 'previous' | 'next' | 'last';
 export interface SearchNavigationEventDetail {