File tree Expand file tree Collapse file tree 1 file changed +15
-2
lines changed Expand file tree Collapse file tree 1 file changed +15
-2
lines changed Original file line number Diff line number Diff line change @@ -135,14 +135,27 @@ suite('Extension Test Suite', () => {
135
135
await getHaskellConfig ( ) . update ( 'releasesDownloadStoragePath' , path . normalize ( getWorkspaceFile ( 'bin' ) . fsPath ) ) ;
136
136
await getHaskellConfig ( ) . update ( 'serverEnvironment' , {
137
137
XDG_CACHE_HOME : path . normalize ( getWorkspaceFile ( 'cache-test' ) . fsPath ) ,
138
+ GHCUP_INSTALL_BASE_PREFIX : getWorkspaceRoot ( ) . uri
138
139
} ) ;
139
140
const contents = new TextEncoder ( ) . encode ( 'main = putStrLn "hi vscode tests"' ) ;
140
141
await vscode . workspace . fs . writeFile ( getWorkspaceFile ( 'Main.hs' ) , contents ) ;
141
142
142
143
const pred = ( uri : vscode . Uri ) => ! [ 'download' , 'gz' , 'zip' ] . includes ( path . extname ( uri . fsPath ) ) ;
143
144
// Setting up watchers before actual tests start, to ensure we will got the created event
144
- filesCreated . set ( 'wrapper' , existsWorkspaceFile ( `bin/hls-*/haskell-language-server-wrapper*` , pred ) ) ;
145
- filesCreated . set ( 'server' , existsWorkspaceFile ( `bin/hls-*/haskell-language-server-[1-9]*` , pred ) ) ;
145
+ filesCreated . set (
146
+ 'wrapper' ,
147
+ existsWorkspaceFile (
148
+ `${ process . platform === 'win32' ? 'ghcup' : '.ghcup' } /bin/hls-*/haskell-language-server-wrapper*` ,
149
+ pred
150
+ )
151
+ ) ;
152
+ filesCreated . set (
153
+ 'server' ,
154
+ existsWorkspaceFile (
155
+ `${ process . platform === 'win32' ? 'ghcup' : '.ghcup' } /bin/hls-*/haskell-language-server-[1-9]*` ,
156
+ pred
157
+ )
158
+ ) ;
146
159
filesCreated . set ( 'log' , existsWorkspaceFile ( 'hls.log' ) ) ;
147
160
filesCreated . set ( 'cache' , existsWorkspaceFile ( 'cache-test' ) ) ;
148
161
} ) ;
You can’t perform that action at this time.
0 commit comments