Replaces comparers with simple function

Author: eamodio

src/commands/closeUnchangedFiles.ts

@@ -4,8 +4,8 @@ import type { Container } from '../container';
 import { showGenericErrorMessage } from '../messages';
 import { getRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command } from '../system/-webview/command';
-import { UriComparer } from '../system/comparers';
 import { Logger } from '../system/logger';
+import { uriEquals } 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 => UriComparer.equals(uri, inputUri))) {
+						if (hasNoChangedFiles || !args.uris.some(uri => uriEquals(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 => UriComparer.equals(uri, inputUri))) {
+						if (hasNoChangedFiles || !args.uris.some(uri => uriEquals(uri, inputUri))) {
 							void window.tabGroups.close(tab, true);
 						}
 					}

src/commands/openFileOnRemote.ts

@@ -10,9 +10,9 @@ import { isSha } from '../git/utils/revision.utils';
 import { showGenericErrorMessage } from '../messages';
 import { showReferencePicker } from '../quickpicks/referencePicker';
 import { command, executeCommand } from '../system/-webview/command';
-import { UriComparer } from '../system/comparers';
 import { Logger } from '../system/logger';
 import { pad, splitSingle } from '../system/string';
+import { uriEquals } from '../system/uri';
 import { StatusFileNode } from '../views/nodes/statusFileNode';
 import { ActiveEditorCommand } from './commandBase';
 import { getCommandUri } from './commandBase.utils';
@@ -121,7 +121,7 @@ export class OpenFileOnRemoteCommand extends ActiveEditorCommand {
 
 			let range: Range | undefined;
 			if (args.range) {
-				if (editor != null && UriComparer.equals(editor.document.uri, uri)) {
+				if (editor != null && uriEquals(editor.document.uri, uri)) {
 					range = new Range(
 						editor.selection.start.with({ line: editor.selection.start.line + 1 }),
 						editor.selection.end.with({

src/commands/openOnlyChangedFiles.ts

@@ -7,8 +7,8 @@ import { getRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command } from '../system/-webview/command';
 import { findOrOpenEditors } from '../system/-webview/vscode';
 import { filterMap } from '../system/array';
-import { UriComparer } from '../system/comparers';
 import { Logger } from '../system/logger';
+import { uriEquals } from '../system/uri';
 import { GlCommandBase } from './commandBase';
 
 export interface OpenOnlyChangedFilesCommandArgs {
@@ -65,7 +65,7 @@ export class OpenOnlyChangedFilesCommand extends GlCommandBase {
 
 					if (inputUri == null) continue;
 					// eslint-disable-next-line no-loop-func
-					matchingUri = args.uris.find(uri => UriComparer.equals(uri, inputUri));
+					matchingUri = args.uris.find(uri => uriEquals(uri, inputUri));
 					if (matchingUri != null) {
 						openUris.delete(matchingUri);
 					} else {

src/git/gitUri.ts

@@ -6,10 +6,10 @@ import type { GitHubAuthorityMetadata } from '../plus/remotehub';
 import { formatPath } from '../system/-webview/formatPath';
 import { getBestPath, relativeDir, splitPath } from '../system/-webview/path';
 import { isVirtualUri } from '../system/-webview/vscode';
-import { UriComparer } from '../system/comparers';
 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 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 (!UriComparer.equals(this, uri)) return false;
+		if (!uriEquals(this, uri)) return false;
 
 		return this.sha === (isGitUri(uri) ? uri.sha : undefined);
 	}

src/hovers/lineHoverController.ts

@@ -2,10 +2,10 @@ import type { CancellationToken, ConfigurationChangeEvent, Position, TextDocumen
 import { Disposable, Hover, languages, Range, window } from 'vscode';
 import type { Container } from '../container';
 import { configuration } from '../system/-webview/configuration';
-import { UriComparer } from '../system/comparers';
 import { debug } from '../system/decorators/log';
 import { once } from '../system/event';
 import { Logger } from '../system/logger';
+import { uriEquals } 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 && UriComparer.equals(this._uri, uri);
+		return this._hoverProviderDisposable != null && uriEquals(this._uri, uri);
 	}
 
 	private register(editor: TextEditor | undefined) {

src/system/comparers.ts

@@ -0,0 +1,8 @@
+import type { Uri } from 'vscode';
+
+export function uriEquals(lhs: Uri | undefined, rhs: Uri | undefined): boolean {
+	if (lhs === rhs) return true;
+	if (lhs == null || rhs == null) return false;
+
+	return lhs.toString() === rhs.toString();
+}

src/system/uri.ts

@@ -8,14 +8,14 @@ import { showReferencePicker } from '../../quickpicks/referencePicker';
 import { setContext } from '../../system/-webview/context';
 import { isFolderUri } from '../../system/-webview/path';
 import { isVirtualUri } from '../../system/-webview/vscode';
-import { UriComparer } from '../../system/comparers';
 import { gate } from '../../system/decorators/-webview/gate';
 import { debug, log } from '../../system/decorators/log';
 import { weakEvent } from '../../system/event';
 import type { Deferrable } from '../../system/function';
 import { debounce } from '../../system/function';
 import { Logger } from '../../system/logger';
 import { getLogScope, setLogScopeExit } from '../../system/logger.scope';
+import { uriEquals } from '../../system/uri';
 import type { FileHistoryView } from '../fileHistoryView';
 import { SubscribeableViewNode } from './abstract/subscribeableViewNode';
 import type { ViewNode } from './abstract/viewNode';
@@ -170,7 +170,7 @@ export class FileHistoryTrackerNode extends SubscribeableViewNode<'file-history-
 			}
 		}
 
-		if (this.hasUri && UriComparer.equals(uri ?? gitUri, this.uri)) {
+		if (this.hasUri && uriEquals(uri ?? gitUri, this.uri)) {
 			return true;
 		}
 

src/views/nodes/fileHistoryTrackerNode.ts

@@ -7,13 +7,13 @@ import { isBranchReference } from '../../git/utils/reference.utils';
 import { isSha } from '../../git/utils/revision.utils';
 import { showReferencePicker } from '../../quickpicks/referencePicker';
 import { setContext } from '../../system/-webview/context';
-import { UriComparer } from '../../system/comparers';
 import { gate } from '../../system/decorators/-webview/gate';
 import { debug, log } from '../../system/decorators/log';
 import { weakEvent } from '../../system/event';
 import { debounce } from '../../system/function';
 import { Logger } from '../../system/logger';
 import { getLogScope, setLogScopeExit } from '../../system/logger.scope';
+import { uriEquals } from '../../system/uri';
 import type { LinesChangeEvent } from '../../trackers/lineTracker';
 import type { FileHistoryView } from '../fileHistoryView';
 import type { LineHistoryView } from '../lineHistoryView';
@@ -186,7 +186,7 @@ export class LineHistoryTrackerNode extends SubscribeableViewNode<
 
 		if (
 			this.hasUri &&
-			UriComparer.equals(gitUri, this.uri) &&
+			uriEquals(gitUri, this.uri) &&
 			this._selection != null &&
 			editor.selection.isEqual(this._selection)
 		) {