win

mafredri · mafredri · commit 49025a565823 · 2023-12-15T17:32:29.000Z
diff --git a/cli/open.go b/cli/open.go
@@ -6,6 +6,7 @@ import (
 	"net/url"
 	"path"
 	"path/filepath"
+	"runtime"
 	"strings"
 
 	"github.com/skratchdot/open-golang/open"
@@ -119,8 +120,11 @@ func (r *RootCmd) openVSCode() *clibase.Cmd {
 					return xerrors.Errorf("path %q requires expansion and is not supported, use an absolute path instead", d)
 
 				case workspaceAgent.OperatingSystem == "windows":
-					// TODO(mafredri): For now we keep this simple instead of discerning out relative paths on Windows.
-					directory = d
+					if !isWindowsAbsPath(d) {
+						directory = windowsJoinPath(workspaceAgent.ExpandedDirectory, d)
+					} else {
+						directory = d
+					}
 
 				// Note that we use `path` instead of `filepath` since we want Unix behavior.
 				case directory != "" && !path.IsAbs(d):
@@ -218,3 +222,44 @@ func (r *RootCmd) openVSCode() *clibase.Cmd {
 
 	return cmd
 }
+
+// isWindowsAbsPath checks if the path is an absolute path on Windows. On Unix
+// systems the check is very simplistic and does not cover edge cases.
+//
+//nolint:revive // Shadow path variable for readability.
+func isWindowsAbsPath(path string) bool {
+	if runtime.GOOS == "windows" {
+		return filepath.IsAbs(path)
+	}
+
+	switch {
+	case len(path) >= 2 && path[1] == ':':
+		// Path starts with a drive letter.
+		return len(path) == 2 || (len(path) >= 4 && path[2] == '\\' && path[3] == '\\')
+	default:
+		return false
+	}
+}
+
+// windowsJoinPath joins the elements into a path, using Windows path separator
+// and converting forward slashes to backslashes. On Unix systems a very
+// simplistic join operator is used.
+func windowsJoinPath(elem ...string) string {
+	if runtime.GOOS == "windows" {
+		return filepath.Join(elem...)
+	}
+
+	var s string
+	for _, e := range elem {
+		e = strings.ReplaceAll(e, "/", "\\")
+		if e == "" {
+			continue
+		}
+		if s == "" {
+			s = e
+			continue
+		}
+		s += "\\" + strings.TrimSuffix(s, "\\")
+	}
+	return s
+}
diff --git a/cli/open_test.go b/cli/open_test.go
@@ -4,6 +4,7 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
+	"runtime"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -27,6 +28,7 @@ func TestOpenVSCode(t *testing.T) {
 	client, workspace, agentToken := setupWorkspaceForAgent(t, func(agents []*proto.Agent) []*proto.Agent {
 		agents[0].Directory = agentDir
 		agents[0].Name = agentName
+		agents[0].OperatingSystem = runtime.GOOS
 		return agents
 	})
 
@@ -161,6 +163,7 @@ func TestOpenVSCode_NoAgentDirectory(t *testing.T) {
 	agentName := "agent1"
 	client, workspace, agentToken := setupWorkspaceForAgent(t, func(agents []*proto.Agent) []*proto.Agent {
 		agents[0].Name = agentName
+		agents[0].OperatingSystem = runtime.GOOS
 		return agents
 	})
 
@@ -176,6 +179,11 @@ func TestOpenVSCode_NoAgentDirectory(t *testing.T) {
 	wd, err := os.Getwd()
 	require.NoError(t, err)
 
+	absPath := "/home/coder"
+	if runtime.GOOS == "windows" {
+		absPath = "C:\\home\\coder"
+	}
+
 	tests := []struct {
 		name      string
 		args      []string
@@ -196,8 +204,8 @@ func TestOpenVSCode_NoAgentDirectory(t *testing.T) {
 		},
 		{
 			name:    "ok with absolute path",
-			args:    []string{"--test.open-error", workspace.Name, "/home/coder"},
-			wantDir: "/home/coder",
+			args:    []string{"--test.open-error", workspace.Name, absPath},
+			wantDir: absPath,
 		},
 		{
 			name:      "ok with token",
