Changes from code review

(#1328, #4754)

Author: eamodio

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+### Added
+
+- Adds an experimental 'gitlens.advanced.resolveSymlinks' setting to resolve symbolic links when determining file paths for Git operations ([#1328](https://github.com/gitkraken/vscode-gitlens/issues/1328))
+
 ### Changed
 
 - Changes _rebase_, _merge_, _revert_, and _branch delete_ commands no longer use/open a terminal ([#3527](https://github.com/gitkraken/vscode-gitlens/issues/3527), [#3530](https://github.com/gitkraken/vscode-gitlens/issues/3530), [#3532](https://github.com/gitkraken/vscode-gitlens/issues/3532), [#3534](https://github.com/gitkraken/vscode-gitlens/issues/3534))

package.json

@@ -5445,12 +5445,15 @@
 						"scope": "window",
 						"order": 110
 					},
-					"gitlens.advanced.realpath": {
+					"gitlens.advanced.resolveSymlinks": {
 						"type": "boolean",
 						"default": false,
-						"markdownDescription": "[Experimental] Specifies whether to resolve symbolic links when determining file paths for Git operations",
+						"markdownDescription": "Specifies whether to resolve symbolic links when determining file paths for Git operations",
 						"scope": "window",
-						"order": 115
+						"order": 115,
+						"tags": [
+							"experimental"
+						]
 					},
 					"gitlens.advanced.commits.delayLoadingFileDetails": {
 						"type": "boolean",

src/config.ts

@@ -208,7 +208,7 @@ export interface AdvancedConfig {
 	readonly quickPick: {
 		readonly closeOnFocusOut: boolean;
 	};
-	readonly realpath: boolean;
+	readonly resolveSymlinks: boolean;
 	readonly repositorySearchDepth: number | null;
 	readonly similarityThreshold: number | null;
 }

src/env/browser/fs.ts

@@ -0,0 +1,3 @@
+export function realpath(path: string): Promise<string> {
+	return Promise.resolve(path);
+}

src/env/browser/realpath.ts

@@ -0,0 +1,5 @@
+import { realpath as _realpath } from 'fs/promises';
+
+export function realpath(path: string): Promise<string> {
+	return _realpath(path);
+}

src/env/node/fs.ts

@@ -1,6 +1,5 @@
 import { Uri } from 'vscode';
-import { isWeb } from '@env/platform';
-import { realpath } from '@env/realpath';
+import { realpath } from '@env/fs';
 import { getQueryDataFromScmGitUri } from '../@types/vscode.git.uri';
 import { Schemes } from '../constants';
 import { Container } from '../container';
@@ -252,13 +251,12 @@ export class GitUri extends (Uri as any as UriEx) {
 	static async fromUri(uri: Uri): Promise<GitUri> {
 		if (isGitUri(uri)) return uri;
 
-		// Check for symbolic links (Node.js only)
-		if (configuration.get('advanced.realpath') && !isWeb && uri.scheme === 'file') {
+		// Check for symbolic links
+		if (uri.scheme === Schemes.File && configuration.get('advanced.resolveSymlinks')) {
 			try {
 				const realPath = await realpath(uri.fsPath);
 				if (uri.fsPath !== realPath) {
-					const newUri = Uri.file(realPath);
-					return await this.fromUri(newUri);
+					uri = Uri.file(realPath);
 				}
 			} catch {
 				// Ignore errors (e.g., if path doesn't exist)