Fixes lint issues

eamodio · eamodio · commit 0c02627ff627 · 2026-06-06T02:40:22.000-04:00
diff --git a/package.json b/package.json
@@ -26519,6 +26519,11 @@
 					"when": "listMultiSelection && webview == gitlens.views.commitDetails && webviewItemsUnion =~ /gitlens:file\\b(?=.*?\\b\\+unstaged\\b)(?!.*?\\b\\+(committed|stashed)\\b)/",
 					"group": "1_gitlens_actions@1"
 				},
+				{
+					"command": "gitlens.views.stageFile.multi:graphDetails",
+					"when": "webviewItemsUnion =~ /gitlens:file\\b(?=.*?\\b\\+unstaged\\b)(?!.*?\\b\\+(committed|stashed)\\b)/ && listMultiSelection && (webview == gitlens.graph || webview == gitlens.views.graph)",
+					"group": "1_gitlens_actions@1"
+				},
 				{
 					"command": "gitlens.graph.pull",
 					"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+(behind|tracking)\\b)(?!.*?\\b\\+closed\\b)/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:repos:withRemotes",
@@ -26899,11 +26904,6 @@
 					"when": "webviewItem =~ /gitlens:file\\b(?=.*?\\b\\+unstaged\\b)/ && (webview == gitlens.graph || webview == gitlens.views.graph)",
 					"group": "1_gitlens_actions@1"
 				},
-				{
-					"command": "gitlens.views.stageFile.multi:graphDetails",
-					"when": "webviewItemsUnion =~ /gitlens:file\\b(?=.*?\\b\\+unstaged\\b)(?!.*?\\b\\+(committed|stashed)\\b)/ && listMultiSelection && (webview == gitlens.graph || webview == gitlens.views.graph)",
-					"group": "1_gitlens_actions@1"
-				},
 				{
 					"command": "gitlens.views.mergeChangesWithWorking:commitDetails",
 					"when": "webviewItem =~ /gitlens:file\\b(?=.*?\\b\\+stashed\\b)(?!.*?\\+submodule)/ && webview == gitlens.views.commitDetails",
diff --git a/packages/git-cli/src/providers/__tests__/integration/config.measure.test.ts b/packages/git-cli/src/providers/__tests__/integration/config.measure.test.ts
@@ -78,7 +78,6 @@ suite('ConfigSubProvider (bulk gk read)', () => {
 		}
 		const configSpawns = countSince(mark, 'config');
 
-		// eslint-disable-next-line no-console
 		console.error(`[measure] cold gk overview read → ${configSpawns} \`git config\` spawn(s) (was 4)`);
 		assert.strictEqual(configSpawns, 1, 'expected one bulk gk read, not one per namespace');
 	});
diff --git a/src/quickpicks/worktreePicker.ts b/src/quickpicks/worktreePicker.ts
@@ -1,8 +1,8 @@
 import type { Disposable } from 'vscode';
 import { window } from 'vscode';
 import type { GitWorktree } from '@gitlens/git/models/worktree.js';
-import { createWorktreeQuickPickItem } from '../git/utils/-webview/worktree.quickpick.js';
 import type { WorktreeQuickPickItem } from '../git/utils/-webview/worktree.quickpick.js';
+import { createWorktreeQuickPickItem } from '../git/utils/-webview/worktree.quickpick.js';
 import { getQuickPickIgnoreFocusOut } from '../system/-webview/vscode.js';
 
 export async function showWorktreePicker(
diff --git a/src/webviews/apps/commitDetails/components/gl-details-base.ts b/src/webviews/apps/commitDetails/components/gl-details-base.ts
@@ -6,8 +6,8 @@ import type { GitFileChangeShape } from '@gitlens/git/models/fileChange.js';
 import type { FileShowOptions, Preferences, State } from '../../../commitDetails/protocol.js';
 import type { OpenMultipleChangesArgs } from '../../shared/actions/file.js';
 import { renderCommitStatsIcons } from '../../shared/components/commit/commit-stats.js';
-import { ContextMenuProxyController } from '../../shared/controllers/context-menu-proxy.js';
 import type { TreeItemAction, TreeItemBase } from '../../shared/components/tree/base.js';
+import { ContextMenuProxyController } from '../../shared/controllers/context-menu-proxy.js';
 import { detailsBaseStyles } from './gl-details-base.css.js';
 import '../../shared/components/code-icon.js';
 import '../../shared/components/tree/gl-file-tree-pane.js';
diff --git a/src/webviews/apps/commitDetails/components/gl-details-commit-panel.ts b/src/webviews/apps/commitDetails/components/gl-details-commit-panel.ts
@@ -24,9 +24,9 @@ import type {
 } from '../../../plus/graph/protocol.js';
 import type { RunningOperationExecState } from '../../plus/graph/components/detailsState.js';
 import { renderLearnAboutAutolinks } from '../../shared/components/chips/learn-about-autolinks.js';
-import type { NavigationState } from '../../shared/controllers/navigationStack.js';
 import type { TreeItemAction, TreeItemBase } from '../../shared/components/tree/base.js';
 import { ModifierKeysController } from '../../shared/controllers/modifier-keys.js';
+import type { NavigationState } from '../../shared/controllers/navigationStack.js';
 import { detailsBaseStyles } from './gl-details-base.css.js';
 import type { File } from './gl-details-base.js';
 import { GlDetailsBase } from './gl-details-base.js';
diff --git a/src/webviews/apps/commitDetails/components/gl-details-wip-panel.ts b/src/webviews/apps/commitDetails/components/gl-details-wip-panel.ts
@@ -798,7 +798,7 @@ export class GlDetailsWipPanel extends GlDetailsBase {
 
 		// Start a new batch when none is pending or the action flips (check vs uncheck); the fan-out
 		// applies a single action across the whole selection, so a batch is action-homogeneous.
-		if (this._checkedBatch == null || this._checkedBatch.checked !== e.detail.checked) {
+		if (this._checkedBatch?.checked !== e.detail.checked) {
 			this._checkedBatch = { checked: e.detail.checked, repoPath: repoPath, files: [] };
 			queueMicrotask(() => this.flushCheckedBatch());
 		}
diff --git a/src/webviews/apps/plus/graph/components/gl-details-wip-header.ts b/src/webviews/apps/plus/graph/components/gl-details-wip-header.ts
@@ -8,9 +8,9 @@ import type { Wip } from '../../../../plus/graph/detailsProtocol.js';
 import type { BranchMergeTargetStatus } from '../../../../rpc/services/branches.js';
 import type { OverviewBranchIssue, OverviewBranchPullRequest } from '../../../../shared/overviewBranches.js';
 import { elementBase, metadataBarVarsBase } from '../../../shared/components/styles/lit/base.css.js';
-import type { NavigationState } from '../../../shared/controllers/navigationStack.js';
 import type { WebviewContext } from '../../../shared/contexts/webview.js';
 import { webviewContext } from '../../../shared/contexts/webview.js';
+import type { NavigationState } from '../../../shared/controllers/navigationStack.js';
 import type { RunningOperationExecState } from './detailsState.js';
 import { detailsWipHeaderStyles } from './gl-details-wip-header.css.js';
 import '../../shared/components/merge-rebase-status.js';
diff --git a/src/webviews/apps/plus/graph/graph-wrapper/graph-wrapper.ts b/src/webviews/apps/plus/graph/graph-wrapper/graph-wrapper.ts
@@ -16,12 +16,12 @@ import { customElement, property, query, state } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import type { GitGraphRowType } from '@gitlens/git/models/graph.js';
 import { uncommitted } from '@gitlens/git/models/revision.js';
-import type { GraphBranchesVisibility } from '../../../../../config.js';
 import type { GitCommitReachability } from '@gitlens/git/providers/commits.js';
 import { areEqual as areArraysEqual, filterMap } from '@gitlens/utils/array.js';
 import { getCssMixedColorValue, getCssOpacityColorValue, getCssVariable } from '@gitlens/utils/color.js';
 import { debounce } from '@gitlens/utils/debounce.js';
 import { areEqual, hasKeys } from '@gitlens/utils/object.js';
+import type { GraphBranchesVisibility } from '../../../../../config.js';
 import type { CommitDetails } from '../../../../commitDetails/protocol.js';
 import type {
 	GraphAvatars,
@@ -61,6 +61,7 @@ import { pickWipRowAgentStatus } from '../components/wipRowAgentStatus.js';
 import { graphStateContext } from '../context.js';
 import type { GraphCrossPaneState } from '../graphCrossPaneState.js';
 import { graphCrossPaneContext } from '../graphCrossPaneState.js';
+import { getOverviewBranchSelectionSha } from '../utils/branchSelection.utils.js';
 import { getSelectedRepoPath } from '../utils/repository.utils.js';
 import {
 	isUnpublishedRow,
@@ -69,7 +70,6 @@ import {
 	serializeRowCommitContext,
 	serializeWipContext,
 } from '../utils/rowContext.utils.js';
-import { getOverviewBranchSelectionSha } from '../utils/branchSelection.utils.js';
 import { pickScopePageTarget } from '../utils/scopePaging.utils.js';
 import { filterSecondariesForScopeAndVisibility, shouldShowPrimaryWipRow } from '../utils/wip.utils.js';
 import type { GlGraph } from './gl-graph.js';
diff --git a/src/webviews/apps/shared/components/progress.ts b/src/webviews/apps/shared/components/progress.ts
@@ -1,5 +1,5 @@
-import { css, html, LitElement } from 'lit';
 import type { PropertyValues } from 'lit';
+import { css, html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 
 @customElement('progress-indicator')
diff --git a/src/webviews/apps/shared/controllers/__tests__/collection-index.test.ts b/src/webviews/apps/shared/controllers/__tests__/collection-index.test.ts
@@ -8,7 +8,7 @@ function fakeHost(): ReactiveControllerHost {
 		removeController: () => undefined,
 		requestUpdate: () => undefined,
 		updateComplete: Promise.resolve(true),
-	} as unknown as ReactiveControllerHost;
+	};
 }
 
 interface Row {
diff --git a/src/webviews/apps/shared/controllers/__tests__/keyboard-nav.test.ts b/src/webviews/apps/shared/controllers/__tests__/keyboard-nav.test.ts
@@ -3,16 +3,16 @@ import type { ReactiveControllerHost } from 'lit';
 import { CollectionIndexController } from '../collection-index.js';
 import { FocusController } from '../focus.js';
 import { KeyboardNavController } from '../keyboard-nav.js';
-import { SelectionController } from '../selection.js';
 import type { SelectionMode } from '../selection.js';
+import { SelectionController } from '../selection.js';
 
 function fakeHost(): ReactiveControllerHost {
 	return {
 		addController: () => undefined,
 		removeController: () => undefined,
 		requestUpdate: () => undefined,
 		updateComplete: Promise.resolve(true),
-	} as unknown as ReactiveControllerHost;
+	};
 }
 
 function key(k: string, mods?: { shiftKey?: boolean; ctrlKey?: boolean; metaKey?: boolean }): KeyboardEvent {
diff --git a/src/webviews/apps/shared/controllers/__tests__/selection.test.ts b/src/webviews/apps/shared/controllers/__tests__/selection.test.ts
@@ -1,15 +1,15 @@
 import * as assert from 'assert';
 import type { ReactiveControllerHost } from 'lit';
-import { SelectionController } from '../selection.js';
 import type { SelectionMode } from '../selection.js';
+import { SelectionController } from '../selection.js';
 
 function fakeHost(): ReactiveControllerHost {
 	return {
 		addController: () => undefined,
 		removeController: () => undefined,
 		requestUpdate: () => undefined,
 		updateComplete: Promise.resolve(true),
-	} as unknown as ReactiveControllerHost;
+	};
 }
 
 function setup(options?: { mode?: SelectionMode; ordered?: string[]; isSelectable?: (id: string) => boolean }) {
@@ -111,7 +111,7 @@ suite('SelectionController', () => {
 	test('selectAll selects every selectable id', () => {
 		const { controller, ordered } = setup();
 		controller.selectAll();
-		assert.deepStrictEqual(ids(controller).sort(), [...ordered].sort());
+		assert.deepStrictEqual(ids(controller).sort(), ordered.toSorted());
 	});
 
 	test('isSelectable excludes ids from multi ops but not setSingle', () => {
diff --git a/src/webviews/apps/shared/controllers/__tests__/virtual-collection.test.ts b/src/webviews/apps/shared/controllers/__tests__/virtual-collection.test.ts
@@ -9,7 +9,7 @@ function fakeHost(): ReactiveControllerHost {
 		removeController: () => undefined,
 		requestUpdate: () => undefined,
 		updateComplete: Promise.resolve(true),
-	} as unknown as ReactiveControllerHost;
+	};
 }
 
 function setup(mode: SelectionMode = 'multi') {
diff --git a/src/webviews/apps/shared/controllers/navigationStack.ts b/src/webviews/apps/shared/controllers/navigationStack.ts
@@ -65,8 +65,7 @@ export class NavigationStack<T extends { sha: string }> {
 		const next = this.state;
 		const prev = this._lastEmitted;
 		if (
-			prev != null &&
-			prev.count === next.count &&
+			prev?.count === next.count &&
 			prev.position === next.position &&
 			prev.canBack === next.canBack &&
 			prev.canForward === next.canForward
diff --git a/src/webviews/apps/shared/controllers/virtual-collection.ts b/src/webviews/apps/shared/controllers/virtual-collection.ts
@@ -1,10 +1,10 @@
 import type { ReactiveController, ReactiveControllerHost } from 'lit';
 import { CollectionIndexController } from './collection-index.js';
-import { FocusController } from './focus.js';
 import type { FocusStrategy } from './focus.js';
+import { FocusController } from './focus.js';
 import { KeyboardNavController } from './keyboard-nav.js';
-import { SelectionController } from './selection.js';
 import type { SelectionMode } from './selection.js';
+import { SelectionController } from './selection.js';
 import { VirtualScrollController } from './virtual-scroll.js';
 
 type Virtualizer = HTMLElement & {
diff --git a/src/webviews/plus/graph/graphWebview.ts b/src/webviews/plus/graph/graphWebview.ts
@@ -188,13 +188,13 @@ import {
 	getRemoteProviderUrl,
 	remoteSupportsIntegration,
 } from '../../../git/utils/-webview/remote.utils.js';
-import type { RebaseTodoAction } from '../../../git/utils/rebaseTodo.js';
 import {
 	getOpenedWorktreesByBranch,
 	getReachableWorktrees,
 	getWorktreeHasWorkingChanges,
 	getWorktreesByBranch,
 } from '../../../git/utils/-webview/worktree.utils.js';
+import type { RebaseTodoAction } from '../../../git/utils/rebaseTodo.js';
 import type { OnboardingChangeEvent } from '../../../onboarding/onboardingService.js';
 import type { UsageChangeEvent } from '../../../onboarding/usageTracker.js';
 import { getSupportedAgents } from '../../../plus/agents/agentRegistry.js';
diff --git a/src/webviews/rpc/services/__tests__/discard.test.ts b/src/webviews/rpc/services/__tests__/discard.test.ts
@@ -11,7 +11,7 @@ import { conflictHasHeadVersion, discardOneWith } from '../discard.utils.js';
 
 // Ignore the user's global/system git config (e.g. `merge.ff=only`) so the temp repos behave
 // predictably; identity is supplied per-command (never written).
-const GIT_ENV = {
+const gitEnv = {
 	...process.env,
 	GIT_CONFIG_GLOBAL: '/dev/null',
 	GIT_CONFIG_SYSTEM: '/dev/null',
@@ -22,13 +22,13 @@ function git(repo: string, ...args: string[]): string {
 	return execFileSync('git', ['-c', 'user.name=t', '-c', 'user.email=t@t', '-c', 'commit.gpgsign=false', ...args], {
 		cwd: repo,
 		encoding: 'utf8',
-		env: GIT_ENV,
+		env: gitEnv,
 	});
 }
 
 /** Parse `git status --porcelain` into the GitStatusFile the provider would build for `path`. */
 function statusFileOf(repo: string, path: string): GitStatusFile {
-	const out = execFileSync('git', ['status', '--porcelain'], { cwd: repo, encoding: 'utf8', env: GIT_ENV });
+	const out = execFileSync('git', ['status', '--porcelain'], { cwd: repo, encoding: 'utf8', env: gitEnv });
 	for (const line of out.split('\n')) {
 		if (line.length < 3) continue;
 
@@ -119,7 +119,7 @@ suite('discard.utils — discardOneWith (temp repo)', function () {
 	const read = (p: string): string => readFileSync(join(repo, p), 'utf8');
 	const exists = (p: string): boolean => existsSync(join(repo, p));
 	const porcelain = (): string =>
-		execFileSync('git', ['status', '--porcelain'], { cwd: repo, encoding: 'utf8', env: GIT_ENV }).trim();
+		execFileSync('git', ['status', '--porcelain'], { cwd: repo, encoding: 'utf8', env: gitEnv }).trim();
 	// Whether `git status` still reports `p` with a 2-char unmerged code — proves a conflict discard
 	// actually resolved the index, not just rewrote the file on disk.
 	const conflicted = (p: string): boolean =>

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ suite('ConfigSubProvider (bulk gk read)', () => {`
`78`	`78`	`}`
`79`	`79`	`const configSpawns = countSince(mark, 'config');`
`80`	`80`
`81`		`- // eslint-disable-next-line no-console`
`82`	`81`	console.error(`[measure] cold gk overview read → ${configSpawns} \`git config\` spawn(s) (was 4)`);
`83`	`82`	`assert.strictEqual(configSpawns, 1, 'expected one bulk gk read, not one per namespace');`
`84`	`83`	`});`
Original file line number	Diff line number	Diff line change
`@@ -798,7 +798,7 @@ export class GlDetailsWipPanel extends GlDetailsBase {`
`798`	`798`
`799`	`799`	`// Start a new batch when none is pending or the action flips (check vs uncheck); the fan-out`
`800`	`800`	`// applies a single action across the whole selection, so a batch is action-homogeneous.`
`801`		`- if (this._checkedBatch == null \|\| this._checkedBatch.checked !== e.detail.checked) {`
	`801`	`+ if (this._checkedBatch?.checked !== e.detail.checked) {`
`802`	`802`	`this._checkedBatch = { checked: e.detail.checked, repoPath: repoPath, files: [] };`
`803`	`803`	`queueMicrotask(() => this.flushCheckedBatch());`
`804`	`804`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ function fakeHost(): ReactiveControllerHost {`
`8`	`8`	`removeController: () => undefined,`
`9`	`9`	`requestUpdate: () => undefined,`
`10`	`10`	`updateComplete: Promise.resolve(true),`
`11`		`- } as unknown as ReactiveControllerHost;`
	`11`	`+ };`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`interface Row {`