@@ -55,7 +55,8 @@ async function deleteFiles(dir: vscode.Uri, pred?: (fileType: [string, vscode.Fi
55
55
if ( ! pred || pred ( [ name , type ] ) ) {
56
56
console . log ( `Deleting ${ uri } ` ) ;
57
57
await vscode . workspace . fs . delete ( getWorkspaceFile ( name ) , {
58
- recursive : true , useTrash : false
58
+ recursive : true ,
59
+ useTrash : false ,
59
60
} ) ;
60
61
}
61
62
} ) ;
@@ -86,13 +87,15 @@ suite('Extension Test Suite', () => {
86
87
await getHaskellConfig ( ) . update ( 'logFile' , 'hls.log' ) ;
87
88
await getHaskellConfig ( ) . update ( 'trace.server' , 'messages' ) ;
88
89
await getHaskellConfig ( ) . update ( 'releasesDownloadStoragePath' , path . normalize ( getWorkspaceFile ( 'bin' ) . fsPath ) ) ;
89
- await getHaskellConfig ( ) . update ( 'serverEnvironment' ,
90
- { XDG_CACHE_HOME : path . normalize ( getWorkspaceFile ( 'cache-test' ) . fsPath ) } ) ;
90
+ await getHaskellConfig ( ) . update ( 'serverEnvironment' , {
91
+ XDG_CACHE_HOME : path . normalize ( getWorkspaceFile ( 'cache-test' ) . fsPath ) ,
92
+ } ) ;
91
93
const contents = new TextEncoder ( ) . encode ( 'main = putStrLn "hi vscode tests"' ) ;
92
94
await vscode . workspace . fs . writeFile ( getWorkspaceFile ( 'Main.hs' ) , contents ) ;
93
95
94
96
const pred = ( uri : vscode . Uri ) => ! [ 'download' , 'gz' , 'zip' ] . includes ( path . extname ( uri . fsPath ) ) ;
95
97
const exeExt = os . platform . toString ( ) === 'win32' ? '.exe' : '' ;
98
+ // Setting up watchers before actual tests start, to ensure we will got the created event
96
99
filesCreated . set ( 'wrapper' , existsWorkspaceFile ( `bin/haskell-language-server-wrapper*${ exeExt } ` , pred ) ) ;
97
100
filesCreated . set ( 'server' , existsWorkspaceFile ( `bin/haskell-language-server-[1-9]*${ exeExt } ` , pred ) ) ;
98
101
filesCreated . set ( 'log' , existsWorkspaceFile ( 'hls.log' ) ) ;
@@ -132,8 +135,7 @@ suite('Extension Test Suite', () => {
132
135
await delay ( 10 ) ;
133
136
const logContents = getExtensionLogContent ( ) ;
134
137
assert . ok ( logContents , 'Extension log file does not exist' ) ;
135
- assert . match ( logContents , / I N F O h l s : R e g i s t e r i n g i d e c o n f i g u r a t i o n / ,
136
- 'Extension log file has no hls output' ) ;
138
+ assert . match ( logContents , / I N F O h l s : \s + R e g i s t e r i n g i d e c o n f i g u r a t i o n / , 'Extension log file has no hls output' ) ;
137
139
} ) ;
138
140
139
141
test ( 'Server should inherit environment variables defined in the settings' , async ( ) => {
0 commit comments