Renames helpers for consistency

eamodio · eamodio · commit de6d963f359f · 2025-05-10T02:09:02.000-04:00
diff --git a/src/commands/closeUnchangedFiles.ts b/src/commands/closeUnchangedFiles.ts
@@ -5,7 +5,7 @@ import { showGenericErrorMessage } from '../messages';
 import { getRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command } from '../system/-webview/command';
 import { Logger } from '../system/logger';
-import { uriEquals } from '../system/uri';
+import { areUrisEqual } from '../system/uri';
 import { GlCommandBase } from './commandBase';
 
 export interface CloseUnchangedFilesCommandArgs {
@@ -46,12 +46,12 @@ export class CloseUnchangedFilesCommand extends GlCommandBase {
 						tab.input instanceof TabInputNotebook
 					) {
 						const inputUri = tab.input.uri;
-						if (hasNoChangedFiles || !args.uris.some(uri => uriEquals(uri, inputUri))) {
+						if (hasNoChangedFiles || !args.uris.some(uri => areUrisEqual(uri, inputUri))) {
 							void window.tabGroups.close(tab, true);
 						}
 					} else if (tab.input instanceof TabInputTextDiff || tab.input instanceof TabInputNotebookDiff) {
 						const inputUri = tab.input.modified;
-						if (hasNoChangedFiles || !args.uris.some(uri => uriEquals(uri, inputUri))) {
+						if (hasNoChangedFiles || !args.uris.some(uri => areUrisEqual(uri, inputUri))) {
 							void window.tabGroups.close(tab, true);
 						}
 					}
diff --git a/src/commands/diffLineWithPrevious.ts b/src/commands/diffLineWithPrevious.ts
@@ -8,7 +8,7 @@ import { command, executeCommand } from '../system/-webview/command';
 import { selectionToDiffRange } from '../system/-webview/vscode/editors';
 import { getTabUris, getVisibleTabs } from '../system/-webview/vscode/tabs';
 import { Logger } from '../system/logger';
-import { uriEquals } from '../system/uri';
+import { areUrisEqual } from '../system/uri';
 import { ActiveEditorCommand } from './commandBase';
 import { getCommandUri } from './commandBase.utils';
 import type { CommandContext } from './commandContext';
@@ -52,7 +52,7 @@ export class DiffLineWithPreviousCommand extends ActiveEditorCommand {
 			const uris = getTabUris(tab);
 			// If there is an original, then we are in a diff editor -- modified is right, original is left
 			if (uris.original != null) {
-				skipFirstRev = uriEquals(uri, uris.modified);
+				skipFirstRev = areUrisEqual(uri, uris.modified);
 			}
 		}
 
diff --git a/src/commands/diffWithNext.ts b/src/commands/diffWithNext.ts
@@ -8,7 +8,7 @@ import { command, executeCommand } from '../system/-webview/command';
 import { selectionToDiffRange } from '../system/-webview/vscode/editors';
 import { getTabUris, getVisibleTabs } from '../system/-webview/vscode/tabs';
 import { Logger } from '../system/logger';
-import { uriEquals } from '../system/uri';
+import { areUrisEqual } from '../system/uri';
 import { ActiveEditorCommand } from './commandBase';
 import { getCommandUri } from './commandBase.utils';
 import type { DiffWithCommandArgs } from './diffWith';
@@ -41,7 +41,7 @@ export class DiffWithNextCommand extends ActiveEditorCommand {
 			if (tab != null) {
 				const uris = getTabUris(tab);
 				// If there is an original, then we are in a diff editor -- modified is right, original is left
-				if (uris.original != null && uriEquals(uri, uris.original)) {
+				if (uris.original != null && areUrisEqual(uri, uris.original)) {
 					isInLeftSideOfDiffEditor = true;
 				}
 			}
diff --git a/src/commands/diffWithPrevious.ts b/src/commands/diffWithPrevious.ts
@@ -9,7 +9,7 @@ import { command, executeCommand } from '../system/-webview/command';
 import { getOrOpenTextEditor, selectionToDiffRange } from '../system/-webview/vscode/editors';
 import { getTabUris, getVisibleTabs } from '../system/-webview/vscode/tabs';
 import { Logger } from '../system/logger';
-import { uriEquals } from '../system/uri';
+import { areUrisEqual } from '../system/uri';
 import { ActiveEditorCommand } from './commandBase';
 import { getCommandUri } from './commandBase.utils';
 import type { DiffWithCommandArgs } from './diffWith';
@@ -80,7 +80,7 @@ export class DiffWithPreviousCommand extends ActiveEditorCommand {
 
 				const uris = getTabUris(tab);
 				// If there is an original, then we are in a diff editor -- modified is right, original is left
-				if (uris.original != null && uriEquals(uri, uris.modified)) {
+				if (uris.original != null && areUrisEqual(uri, uris.modified)) {
 					isInRightSideOfDiffEditor = true;
 				}
 			}
diff --git a/src/commands/diffWithWorking.ts b/src/commands/diffWithWorking.ts
@@ -11,7 +11,7 @@ import { command, executeCommand } from '../system/-webview/command';
 import { getOrOpenTextEditor, selectionToDiffRange } from '../system/-webview/vscode/editors';
 import { getTabUris, getVisibleTabs } from '../system/-webview/vscode/tabs';
 import { Logger } from '../system/logger';
-import { uriEquals } from '../system/uri';
+import { areUrisEqual } from '../system/uri';
 import { ActiveEditorCommand } from './commandBase';
 import { getCommandUri } from './commandBase.utils';
 import type { DiffWithCommandArgs } from './diffWith';
@@ -48,7 +48,7 @@ export class DiffWithWorkingCommand extends ActiveEditorCommand {
 		if (tab != null) {
 			const uris = getTabUris(tab);
 			// If there is an original, then we are in a diff editor -- modified is right, original is left
-			if (uris.original != null && uriEquals(uri, uris.modified)) {
+			if (uris.original != null && areUrisEqual(uri, uris.modified)) {
 				isInRightSideOfDiffEditor = true;
 			}
 		}
diff --git a/src/commands/openFileOnRemote.ts b/src/commands/openFileOnRemote.ts
@@ -11,7 +11,7 @@ import { showReferencePicker } from '../quickpicks/referencePicker';
 import { command, executeCommand } from '../system/-webview/command';
 import { Logger } from '../system/logger';
 import { pad, splitSingle } from '../system/string';
-import { uriEquals } from '../system/uri';
+import { areUrisEqual } from '../system/uri';
 import { StatusFileNode } from '../views/nodes/statusFileNode';
 import { ActiveEditorCommand } from './commandBase';
 import { getCommandUri } from './commandBase.utils';
@@ -122,7 +122,7 @@ export class OpenFileOnRemoteCommand extends ActiveEditorCommand {
 
 			let range: Range | undefined;
 			if (args.range) {
-				if (editor != null && uriEquals(editor.document.uri, uri)) {
+				if (editor != null && areUrisEqual(editor.document.uri, uri)) {
 					range = new Range(
 						editor.selection.start.with({ line: editor.selection.start.line + 1 }),
 						editor.selection.end.with({
diff --git a/src/commands/openOnlyChangedFiles.ts b/src/commands/openOnlyChangedFiles.ts
@@ -7,7 +7,7 @@ import { command } from '../system/-webview/command';
 import { openTextEditors } from '../system/-webview/vscode/editors';
 import { filterMap } from '../system/array';
 import { Logger } from '../system/logger';
-import { uriEquals } from '../system/uri';
+import { areUrisEqual } from '../system/uri';
 import { GlCommandBase } from './commandBase';
 
 export interface OpenOnlyChangedFilesCommandArgs {
@@ -64,7 +64,7 @@ export class OpenOnlyChangedFilesCommand extends GlCommandBase {
 
 					if (inputUri == null) continue;
 					// eslint-disable-next-line no-loop-func
-					matchingUri = args.uris.find(uri => uriEquals(uri, inputUri));
+					matchingUri = args.uris.find(uri => areUrisEqual(uri, inputUri));
 					if (matchingUri != null) {
 						openUris.delete(matchingUri);
 					} else {
diff --git a/src/env/node/git/localGitProvider.ts b/src/env/node/git/localGitProvider.ts
@@ -68,7 +68,7 @@ import { first, join } from '../../../system/iterable';
 import { Logger } from '../../../system/logger';
 import type { LogScope } from '../../../system/logger.scope';
 import { getLogScope, setLogScopeExit } from '../../../system/logger.scope';
-import { commonBaseIndex, dirname, isAbsolute, maybeUri, normalizePath, pathEquals } from '../../../system/path';
+import { arePathsEqual, commonBaseIndex, dirname, isAbsolute, maybeUri, normalizePath } from '../../../system/path';
 import { any, asSettled, getSettledValue } from '../../../system/promise';
 import { equalsIgnoreCase, getDurationMilliseconds } from '../../../system/string';
 import { compare, fromString } from '../../../system/version';
@@ -1221,7 +1221,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 						if (networkPath != null) {
 							// If the repository is at the root of the mapped drive then we
 							// have to append `\` (ex: D:\) otherwise the path is not valid.
-							const isDriveRoot = pathEquals(repoUri.fsPath, networkPath);
+							const isDriveRoot = arePathsEqual(repoUri.fsPath, networkPath);
 
 							repoPath = normalizePath(
 								repoUri.fsPath.replace(
@@ -1250,7 +1250,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 							return;
 						}
 
-						if (pathEquals(uri.fsPath, resolvedPath)) {
+						if (arePathsEqual(uri.fsPath, resolvedPath)) {
 							Logger.debug(scope, `No symlink detected; repoPath=${repoPath}`);
 							resolve([repoPath!, undefined]);
 							return;
diff --git a/src/git/gitProviderService.ts b/src/git/gitProviderService.ts
@@ -39,7 +39,7 @@ import { getScheme, isAbsolute, maybeUri, normalizePath } from '../system/path';
 import type { Deferred } from '../system/promise';
 import { asSettled, defer, getDeferredPromiseIfPending, getSettledValue } from '../system/promise';
 import { VisitedPathsTrie } from '../system/trie';
-import { uriEquals } from '../system/uri';
+import { areUrisEqual } from '../system/uri';
 import type {
 	CachedGitTypes,
 	GitBranchesSubProvider,
@@ -1970,7 +1970,7 @@ export class GitProviderService implements Disposable {
 		if (typeof pathOrUri === 'string') {
 			return this.getRepository(pathOrUri)?.path === pathOrUri;
 		}
-		return uriEquals(pathOrUri, this.getRepository(pathOrUri)?.uri);
+		return areUrisEqual(pathOrUri, this.getRepository(pathOrUri)?.uri);
 	}
 
 	@log({ exit: true })
diff --git a/src/git/gitUri.ts b/src/git/gitUri.ts
@@ -9,7 +9,7 @@ import { isVirtualUri } from '../system/-webview/vscode/uris';
 import { memoize } from '../system/decorators/-webview/memoize';
 import { debug } from '../system/decorators/log';
 import { basename, normalizePath } from '../system/path';
-import { uriEquals } from '../system/uri';
+import { areUrisEqual } from '../system/uri';
 import type { RevisionUriData } from './gitProvider';
 import { decodeGitLensRevisionUriAuthority, decodeRemoteHubAuthority } from './gitUri.authority';
 import type { GitFile } from './models/file';
@@ -213,7 +213,7 @@ export class GitUri extends (Uri as any as UriEx) {
 	}
 
 	equals(uri: Uri | undefined): boolean {
-		if (!uriEquals(this, uri)) return false;
+		if (!areUrisEqual(this, uri)) return false;
 
 		return this.sha === (isGitUri(uri) ? uri.sha : undefined);
 	}
diff --git a/src/hovers/lineHoverController.ts b/src/hovers/lineHoverController.ts
@@ -5,7 +5,7 @@ import { configuration } from '../system/-webview/configuration';
 import { debug } from '../system/decorators/log';
 import { once } from '../system/event';
 import { Logger } from '../system/logger';
-import { uriEquals } from '../system/uri';
+import { areUrisEqual } from '../system/uri';
 import type { LinesChangeEvent } from '../trackers/lineTracker';
 import { changesMessage, detailsMessage } from './hovers';
 
@@ -191,7 +191,7 @@ export class LineHoverController implements Disposable {
 	}
 
 	private isRegistered(uri: Uri | undefined) {
-		return this._hoverProviderDisposable != null && uriEquals(this._uri, uri);
+		return this._hoverProviderDisposable != null && areUrisEqual(this._uri, uri);
 	}
 
 	private register(editor: TextEditor | undefined) {
diff --git a/src/system/-webview/vscode/tabs.ts b/src/system/-webview/vscode/tabs.ts
@@ -1,6 +1,6 @@
 import type { Tab } from 'vscode';
 import { Uri, window } from 'vscode';
-import { uriEquals } from '../../uri';
+import { areUrisEqual } from '../../uri';
 
 export function getTabUri(tab: Tab | undefined): Uri | undefined {
 	const input = tab?.input;
@@ -51,7 +51,7 @@ export function tabContainsUri(tab: Tab | undefined, uri: Uri | undefined): bool
 	if (input == null || typeof input !== 'object') return false;
 
 	function equals(uri: Uri, inputUri: unknown): boolean {
-		return inputUri instanceof Uri && uriEquals(uri, inputUri);
+		return inputUri instanceof Uri && areUrisEqual(uri, inputUri);
 	}
 
 	return (
diff --git a/src/system/path.ts b/src/system/path.ts
@@ -8,6 +8,14 @@ const hasSchemeRegex = /^([a-zA-Z][\w+.-]+):/;
 const pathNormalizeRegex = /\\/g;
 const slash = 47;
 
+export function arePathsEqual(a: string, b: string, ignoreCase?: boolean): boolean {
+	if (ignoreCase || (ignoreCase == null && !isLinux)) {
+		a = a.toLowerCase();
+		b = b.toLowerCase();
+	}
+	return normalizePath(a) === normalizePath(b);
+}
+
 export function commonBase(s: string[], delimiter: string, ignoreCase?: boolean): string | undefined {
 	if (s.length === 0) return undefined;
 
@@ -78,14 +86,6 @@ export function normalizePath(path: string): string {
 	return path;
 }
 
-export function pathEquals(a: string, b: string, ignoreCase?: boolean): boolean {
-	if (ignoreCase || (ignoreCase == null && !isLinux)) {
-		a = a.toLowerCase();
-		b = b.toLowerCase();
-	}
-	return normalizePath(a) === normalizePath(b);
-}
-
 export function stripFolderGlob(path: string): string {
 	return isFolderGlob(path) ? path.slice(0, -2) : path;
 }
diff --git a/src/system/uri.ts b/src/system/uri.ts
@@ -1,6 +1,6 @@
 import type { Uri } from 'vscode';
 
-export function uriEquals(a: Uri | undefined, b: Uri | undefined): boolean {
+export function areUrisEqual(a: Uri | undefined, b: Uri | undefined): boolean {
 	if (a === b) return true;
 	if (a == null || b == null) return false;
 
diff --git a/src/views/nodes/fileHistoryTrackerNode.ts b/src/views/nodes/fileHistoryTrackerNode.ts
@@ -16,7 +16,7 @@ import type { Deferrable } from '../../system/function/debounce';
 import { debounce } from '../../system/function/debounce';
 import { Logger } from '../../system/logger';
 import { getLogScope, setLogScopeExit } from '../../system/logger.scope';
-import { uriEquals } from '../../system/uri';
+import { areUrisEqual } from '../../system/uri';
 import type { FileHistoryView } from '../fileHistoryView';
 import { SubscribeableViewNode } from './abstract/subscribeableViewNode';
 import type { ViewNode } from './abstract/viewNode';
@@ -235,7 +235,7 @@ export class FileHistoryTrackerNode extends SubscribeableViewNode<'file-history-
 		// If we have a sha, normalize the history to the working file (so we get a full history all the time)
 		const uri = await ensureWorkingUri(this.view.container, gitUri);
 
-		if (this.hasUri && uriEquals(uri ?? gitUri, this.uri)) {
+		if (this.hasUri && areUrisEqual(uri ?? gitUri, this.uri)) {
 			return false;
 		}
 
diff --git a/src/views/nodes/lineHistoryTrackerNode.ts b/src/views/nodes/lineHistoryTrackerNode.ts
@@ -13,7 +13,7 @@ import { weakEvent } from '../../system/event';
 import { debounce } from '../../system/function/debounce';
 import { Logger } from '../../system/logger';
 import { getLogScope, setLogScopeExit } from '../../system/logger.scope';
-import { uriEquals } from '../../system/uri';
+import { areUrisEqual } from '../../system/uri';
 import type { LinesChangeEvent } from '../../trackers/lineTracker';
 import type { FileHistoryView } from '../fileHistoryView';
 import type { LineHistoryView } from '../lineHistoryView';
@@ -245,7 +245,7 @@ export class LineHistoryTrackerNode extends SubscribeableViewNode<
 
 		if (
 			this.hasUri &&
-			uriEquals(gitUri, this.uri) &&
+			areUrisEqual(gitUri, this.uri) &&
 			this._selection != null &&
 			editor.selection.isEqual(this._selection)
 		) {
diff --git a/src/webviews/plus/timeline/timelineWebview.ts b/src/webviews/plus/timeline/timelineWebview.ts
@@ -43,7 +43,7 @@ import { flatten } from '../../../system/object';
 import { batch, getSettledValue } from '../../../system/promise';
 import { SubscriptionManager } from '../../../system/subscriptionManager';
 import { createDisposable } from '../../../system/unifiedDisposable';
-import { uriEquals } from '../../../system/uri';
+import { areUrisEqual } from '../../../system/uri';
 import { isViewFileOrFolderNode } from '../../../views/nodes/utils/-webview/node.utils';
 import type { IpcMessage } from '../../protocol';
 import type { WebviewHost, WebviewProvider, WebviewShowingArgs } from '../../webviewProvider';
@@ -724,7 +724,7 @@ export class TimelineWebviewProvider implements WebviewProvider<State, State, Ti
 			this._tabCloseDebounceTimer = undefined;
 		}
 
-		if (uriEquals(uri, this._context.uri)) return;
+		if (areUrisEqual(uri, this._context.uri)) return;
 
 		this._repositorySubscription?.dispose();
 		this._repositorySubscription = undefined;
