Merge branch 'main' into mi/e2e-nb-infra

Author: midleman

extensions/positron-r/src/interpreter-settings.ts

@@ -6,7 +6,7 @@
 import * as path from 'path';
 import * as vscode from 'vscode';
 import { LOGGER } from './extension';
-import { arePathsSame, isParentPath, untildify } from './path-utils';
+import { arePathsSame, isParentPath, normalizeUserPath } from './path-utils';
 
 /**
  * Directory(ies) where this user keeps R installations.
@@ -21,7 +21,7 @@ export function userRHeadquarters(): string[] {
 		return [];
 	}
 	const userHqDirs = customRootFolders
-		.map((item) => untildify(item))
+		.map((item) => normalizeUserPath(item))
 		.filter((item) => {
 			if (path.isAbsolute(item)) {
 				return true;
@@ -46,7 +46,7 @@ export function userRBinaries(): string[] {
 		return [];
 	}
 	const userBinaries = customBinaries
-		.map((item) => untildify(item))
+		.map((item) => normalizeUserPath(item))
 		.filter((item) => {
 			if (path.isAbsolute(item)) {
 				return true;
@@ -72,7 +72,7 @@ function getExcludedInstallations(): string[] {
 		return [];
 	}
 	const excludedPaths = interpretersExclude
-		.map((item) => untildify(item))
+		.map((item) => normalizeUserPath(item))
 		.filter((item) => {
 			if (path.isAbsolute(item)) {
 				return true;
@@ -100,7 +100,7 @@ export function getInterpreterOverridePaths(): string[] {
 		return [];
 	}
 	const overridePaths = interpretersOverride
-		.map((item) => untildify(item))
+		.map((item) => normalizeUserPath(item))
 		.filter((item) => {
 			if (path.isAbsolute(item)) {
 				return true;
@@ -149,7 +149,7 @@ export function getDefaultInterpreterPath(): string | undefined {
 	const config = vscode.workspace.getConfiguration('positron.r');
 	let defaultInterpreterPath = config.get<string>('interpreters.default');
 	if (defaultInterpreterPath) {
-		defaultInterpreterPath = untildify(defaultInterpreterPath);
+		defaultInterpreterPath = normalizeUserPath(defaultInterpreterPath);
 		if (path.isAbsolute(defaultInterpreterPath)) {
 			LOGGER.info(`Default R interpreter path specified in 'positron.r.interpreters.default': ${defaultInterpreterPath}`);
 			return defaultInterpreterPath;

extensions/positron-r/src/path-utils.ts

@@ -39,11 +39,24 @@ export function arePathsSame(path1: string, path2: string): boolean {
 
 /**
  * Copied from the function of the same name in extensions/positron-python/src/client/common/helpers.ts.
+ * NOTE: We do not export this since in all known cases, normalizeUserPath()
+ * is the better choice.
  */
-export function untildify(path: string): string {
+function untildify(path: string): string {
 	return path.replace(/^~($|\/|\\)/, `${os.homedir()}$1`);
 }
 
+/**
+ * Normalizes a user-provided path (e.g., from settings) by expanding tilde (~) to the home
+ * directory, normalizing path separators, and resolving `.` and `..`. This leaves us with
+ * more robust and predictable paths in, e.g., the R installation metadata.
+ * @param filepath The user-provided path to normalize
+ * @returns The normalized, tilde-expanded, absolute path
+ */
+export function normalizeUserPath(filepath: string): string {
+	return path.normalize(untildify(filepath));
+}
+
 /**
  * Check if a path is a file.
  * A combination of isFile and resolveSymbolicLink in extensions/positron-python/src/client/pythonEnvironments/common/externalDependencies.ts.

extensions/positron-r/src/r-installation.ts

@@ -146,6 +146,8 @@ export class RInstallation {
 		current: boolean = false,
 		reasonDiscovered: ReasonDiscovered[] | null = null
 	) {
+		pth = path.normalize(pth);
+
 		LOGGER.info(`Candidate R binary at ${pth}`);
 
 		this.binpath = pth;

extensions/positron-r/src/tasks.ts

@@ -88,10 +88,12 @@ export async function getRPackageTasks(editorFilePath?: string): Promise<vscode.
 				{ env: taskEnv }
 			);
 		} else {
-			// The explicit quoting treatment here is also motivated by PowerShell, so make sure to
-			// test any changes on Windows.
+			// The explicit quoting treatment here is motivated by problems on
+			// both bash and PowerShell, on Windows, so make sure to test any
+			// changes on Windows.
+			// https://github.com/posit-dev/positron/issues/9216
 			exec = new vscode.ShellExecution(
-				binpath,
+				{ value: binpath, quoting: vscode.ShellQuoting.Strong },
 				['--quiet', '--no-restore', '--no-save', '-e', { value: data.rcode, quoting: vscode.ShellQuoting.Strong }],
 				{ env: taskEnv }
 			);

src/vs/workbench/contrib/positronConsole/browser/components/currentWorkingDirectory.tsx

@@ -11,6 +11,8 @@ import React, { MouseEvent, useEffect, useRef, useState } from 'react';
 
 // Other dependencies.
 import { localize } from '../../../../../nls.js';
+import { toSlashes } from '../../../../../base/common/extpath.js';
+import { isWindows } from '../../../../../base/common/platform.js';
 import { usePositronReactServicesContext } from '../../../../../base/browser/positronReactRendererContext.js';
 import { CustomContextMenuItem } from '../../../../browser/positronComponents/customContextMenu/customContextMenuItem.js';
 import { usePositronActionBarContext } from '../../../../../platform/positronActionBar/browser/positronActionBarContext.js';
@@ -113,7 +115,7 @@ export const CurrentWorkingDirectory = (props: CurrentWorkingDirectoryProps) =>
 		>
 			<span className='codicon codicon-folder' role='presentation' />
 			<span className='label'>
-				{props.directoryLabel}
+				{isWindows ? toSlashes(props.directoryLabel) : props.directoryLabel}
 			</span>
 		</div>
 	);