Handle \\wsl.localhost as well as \\wsl$

Author: stuartleeks

internal/pkg/devcontainers/dockerutils.go

@@ -70,7 +70,7 @@ func ListDevcontainers() ([]DevcontainerInfo, error) {
 			}
 		}
 		localPath := parts[listPartLocalFolder]
-		if strings.HasPrefix(localPath, "\\\\wsl$") && wsl.IsWsl() {
+		if wsl.HasWslPathPrefix(localPath) && wsl.IsWsl() {
 			localPath, err = wsl.ConvertWindowsPathToWslPath(localPath)
 			if err != nil {
 				return []DevcontainerInfo{}, fmt.Errorf("error converting path: %s", err)
@@ -143,7 +143,7 @@ func GetSourceInfoFromDevContainer(containerIDOrName string) (SourceInfo, error)
 		return SourceInfo{}, err
 	}
 
-	if strings.HasPrefix(localPath, "\\\\wsl$") && wsl.IsWsl() {
+	if wsl.HasWslPathPrefix(localPath) && wsl.IsWsl() {
 		localPath, err = wsl.ConvertWindowsPathToWslPath(localPath)
 		if err != nil {
 			return SourceInfo{}, fmt.Errorf("error converting path: %s", err)
@@ -165,7 +165,7 @@ func GetSourceInfoFromDevContainer(containerIDOrName string) (SourceInfo, error)
 	var mount DockerMount
 	err = json.Unmarshal(output, &mount)
 	if err != nil {
-		return SourceInfo{}, fmt.Errorf("failed to get parse JSON getting mount folder for container %q (path=%q): %s", containerIDOrName, mountFolder, err)
+		return SourceInfo{}, fmt.Errorf("failed to parse JSON getting mount folder for container %q (path=%q): %s", containerIDOrName, mountFolder, err)
 	}
 
 	return SourceInfo{
@@ -199,13 +199,22 @@ func GetClosestPathMatchForPath(devContainers []DevcontainerInfo, devcontainerPa
 	matchingPaths := byLocalPathLength{}
 	for _, devcontainer := range devContainers {
 		// Treat as match if the specified path is within the devcontainer path
-		if strings.HasPrefix(absPath, devcontainer.LocalFolderPath) {
+		testPath := devcontainer.LocalFolderPath
+		if wsl.IsWsl() && wsl.HasWslPathPrefix(testPath) {
+			testPath, err = wsl.ConvertWindowsPathToWslPath(testPath)
+			fmt.Println("Converted to..")
+			if err != nil {
+				return DevcontainerInfo{}, fmt.Errorf("Error converting path from dev container list (%q): %s", testPath, err)
+			}
+		}
+		if strings.HasPrefix(absPath, testPath) {
 			matchingPaths = append(matchingPaths, devcontainer)
 		}
 	}
 	if len(matchingPaths) == 0 {
 		return DevcontainerInfo{}, fmt.Errorf("Could not find running container for path %q", devcontainerPath)
 	}
+
 	// return longest prefix match
 	sort.Sort(matchingPaths)
 	return matchingPaths[len(matchingPaths)-1], nil

internal/pkg/devcontainers/remoteuri.go

@@ -6,7 +6,6 @@ import (
 	"io/ioutil"
 	"path/filepath"
 	"regexp"
-	"strings"
 
 	"github.com/stuartleeks/devcontainer-cli/internal/pkg/git"
 	"github.com/stuartleeks/devcontainer-cli/internal/pkg/wsl"
@@ -49,7 +48,7 @@ func GetWorkspaceMountPath(folderPath string) (string, error) {
 
 	// If we're called from WSL we want a WSL Path but will also handle a Windows Path
 	if wsl.IsWsl() {
-		if strings.HasPrefix(folderPath, "\\\\wsl$\\") {
+		if wsl.HasWslPathPrefix(folderPath) {
 			convertedPath, err := wsl.ConvertWindowsPathToWslPath(folderPath)
 			if err != nil {
 				return "", err

internal/pkg/wsl/wsl.go

@@ -34,3 +34,7 @@ func ConvertWindowsPathToWslPath(path string) (string, error) {
 	}
 	return strings.TrimSpace(string(buf)), nil
 }
+
+func HasWslPathPrefix(path string) bool {
+	return strings.HasPrefix(path, "\\\\wsl$\\") || strings.HasPrefix(path, "\\\\wsl.localhost\\")
+}