Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit49025a5

Browse files
committed
win
1 parent126416f commit49025a5

File tree

2 files changed

+57
-4
lines changed

2 files changed

+57
-4
lines changed

‎cli/open.go‎

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"net/url"
77
"path"
88
"path/filepath"
9+
"runtime"
910
"strings"
1011

1112
"github.com/skratchdot/open-golang/open"
@@ -119,8 +120,11 @@ func (r *RootCmd) openVSCode() *clibase.Cmd {
119120
returnxerrors.Errorf("path %q requires expansion and is not supported, use an absolute path instead",d)
120121

121122
caseworkspaceAgent.OperatingSystem=="windows":
122-
// TODO(mafredri): For now we keep this simple instead of discerning out relative paths on Windows.
123-
directory=d
123+
if!isWindowsAbsPath(d) {
124+
directory=windowsJoinPath(workspaceAgent.ExpandedDirectory,d)
125+
}else {
126+
directory=d
127+
}
124128

125129
// Note that we use `path` instead of `filepath` since we want Unix behavior.
126130
casedirectory!=""&&!path.IsAbs(d):
@@ -218,3 +222,44 @@ func (r *RootCmd) openVSCode() *clibase.Cmd {
218222

219223
returncmd
220224
}
225+
226+
// isWindowsAbsPath checks if the path is an absolute path on Windows. On Unix
227+
// systems the check is very simplistic and does not cover edge cases.
228+
//
229+
//nolint:revive // Shadow path variable for readability.
230+
funcisWindowsAbsPath(pathstring)bool {
231+
ifruntime.GOOS=="windows" {
232+
returnfilepath.IsAbs(path)
233+
}
234+
235+
switch {
236+
caselen(path)>=2&&path[1]==':':
237+
// Path starts with a drive letter.
238+
returnlen(path)==2|| (len(path)>=4&&path[2]=='\\'&&path[3]=='\\')
239+
default:
240+
returnfalse
241+
}
242+
}
243+
244+
// windowsJoinPath joins the elements into a path, using Windows path separator
245+
// and converting forward slashes to backslashes. On Unix systems a very
246+
// simplistic join operator is used.
247+
funcwindowsJoinPath(elem...string)string {
248+
ifruntime.GOOS=="windows" {
249+
returnfilepath.Join(elem...)
250+
}
251+
252+
varsstring
253+
for_,e:=rangeelem {
254+
e=strings.ReplaceAll(e,"/","\\")
255+
ife=="" {
256+
continue
257+
}
258+
ifs=="" {
259+
s=e
260+
continue
261+
}
262+
s+="\\"+strings.TrimSuffix(s,"\\")
263+
}
264+
returns
265+
}

‎cli/open_test.go‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"net/url"
55
"os"
66
"path/filepath"
7+
"runtime"
78
"testing"
89

910
"github.com/stretchr/testify/assert"
@@ -27,6 +28,7 @@ func TestOpenVSCode(t *testing.T) {
2728
client,workspace,agentToken:=setupWorkspaceForAgent(t,func(agents []*proto.Agent) []*proto.Agent {
2829
agents[0].Directory=agentDir
2930
agents[0].Name=agentName
31+
agents[0].OperatingSystem=runtime.GOOS
3032
returnagents
3133
})
3234

@@ -161,6 +163,7 @@ func TestOpenVSCode_NoAgentDirectory(t *testing.T) {
161163
agentName:="agent1"
162164
client,workspace,agentToken:=setupWorkspaceForAgent(t,func(agents []*proto.Agent) []*proto.Agent {
163165
agents[0].Name=agentName
166+
agents[0].OperatingSystem=runtime.GOOS
164167
returnagents
165168
})
166169

@@ -176,6 +179,11 @@ func TestOpenVSCode_NoAgentDirectory(t *testing.T) {
176179
wd,err:=os.Getwd()
177180
require.NoError(t,err)
178181

182+
absPath:="/home/coder"
183+
ifruntime.GOOS=="windows" {
184+
absPath="C:\\home\\coder"
185+
}
186+
179187
tests:= []struct {
180188
namestring
181189
args []string
@@ -196,8 +204,8 @@ func TestOpenVSCode_NoAgentDirectory(t *testing.T) {
196204
},
197205
{
198206
name:"ok with absolute path",
199-
args: []string{"--test.open-error",workspace.Name,"/home/coder"},
200-
wantDir:"/home/coder",
207+
args: []string{"--test.open-error",workspace.Name,absPath},
208+
wantDir:absPath,
201209
},
202210
{
203211
name:"ok with token",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp