Merge pull request #3456 from opral/sherl-171-fix-sherlock-v2-ot-working-on-windows

fix: sherlock v2 on win

Author: felixhaeberle

.changeset/wise-pillows-applaud.md

@@ -0,0 +1,6 @@
+---
+"vs-code-extension": patch
+"@inlang/sdk": patch
+---
+
+fix sdk&sherlock on win

inlang/packages/sdk/src/project/loadProjectFromDirectory.ts

@@ -705,21 +705,33 @@ export function withAbsolutePaths(
  * Joins a path from a project path.
  *
  * @example
- *   joinPathFromProject("/project.inlang", "./local-plugins/mock-plugin.js") -> "/local-plugins/mock-plugin.js"
+ *   absolutePathFromProject("/project.inlang", "./local-plugins/mock-plugin.js") -> "/local-plugins/mock-plugin.js"
  *
- *   joinPathFromProject("/website/project.inlang", "./mock-plugin.js") -> "/website/mock-plugin.js"
+ *   absolutePathFromProject("/website/project.inlang", "./mock-plugin.js") -> "/website/mock-plugin.js"
  */
-export function absolutePathFromProject(projectPath: string, path: string) {
-	// need to remove the project path from the module path for legacy reasons
-	// "/project.inlang/local-plugins/mock-plugin.js" -> "/local-plugins/mock-plugin.js"
-	const pathWithoutProject = projectPath
-		.split(nodePath.sep)
-		.slice(0, -1)
-		.join(nodePath.sep);
+export function absolutePathFromProject(
+	projectPath: string,
+	filePath: string
+): string {
+	// Normalize paths for consistency across platforms
+	const normalizedProjectPath = nodePath
+		.normalize(projectPath)
+		.replace(/\\/g, "/");
+	const normalizedFilePath = nodePath.normalize(filePath).replace(/\\/g, "/");
+
+	// Remove the last part of the project path (file name) to get the project root
+	const projectRoot = nodePath.dirname(normalizedProjectPath);
+
+	// If filePath is already absolute, return it directly
+	if (nodePath.isAbsolute(normalizedFilePath)) {
+		return normalizedFilePath;
+	}
 
-	const resolvedPath = nodePath.resolve(pathWithoutProject, path);
+	// Compute absolute resolved path
+	const resolvedPath = nodePath.resolve(projectRoot, normalizedFilePath);
 
-	return resolvedPath;
+	// Ensure final path always uses forward slashes
+	return resolvedPath.replace(/\\/g, "/");
 }
 
 export class ResourceFileImportError extends Error {

inlang/packages/sherlock/src/utilities/project/project.ts

@@ -44,14 +44,25 @@ export function createProjectViewNodes(args: {
 		}
 
 		const projectPath = typeof project.projectPath === "string" ? project.projectPath : ""
-		const projectName = projectPath.split("/").slice(-1).join("/").replace(".inlang", "")
-		const relativePath =
-			"./" + path.normalize(projectPath.replace(args.workspaceFolder.uri.fsPath, "./"))
+
+		// Ensure forward slashes are used across platforms
+		const normalizedProjectPath = projectPath.split(path.sep).join("/")
+
+		// Extract project name safely
+		const projectName = normalizedProjectPath.split("/").slice(-1).join("/").replace(".inlang", "")
+
+		// Compute relative path
+		const relativePath = path
+			.relative(args.workspaceFolder.uri.fsPath, projectPath) // Get relative path
+			.split(path.sep) // Normalize separators
+			.join("/") // Ensure forward slashes for cross-platform compatibility
+
+		const finalRelativePath = `./${relativePath}`
 
 		return {
 			label: projectName,
 			path: project.projectPath,
-			relativePath: relativePath,
+			relativePath: finalRelativePath,
 			isSelected: project.projectPath === state().selectedProjectPath,
 			collapsibleState: vscode.TreeItemCollapsibleState.Collapsed,
 			context: args.context,
@@ -95,6 +106,7 @@ export async function handleTreeSelection(args: {
 	}))
 
 	const newSelectedProject = projectViewNodes.find((node) => node.isSelected)?.path as string
+	console.log(newSelectedProject)
 
 	try {
 		const localAccount = getLocalAccount({ fs })