File tree Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -562,6 +562,10 @@ export async function checkConnection(
562
562
}
563
563
if ( success ) return ;
564
564
}
565
+ if ( [ "ECONNABORTED" , "ERR_CANCELED" ] . includes ( error ?. code ) ) {
566
+ error = `Request timed out; server took longer than ${ serverInfoTimeout } ms to respond.` ;
567
+ message = `Request timed out after ${ serverInfoTimeout } ms` ;
568
+ }
565
569
handleError (
566
570
errorMessage ?? error ,
567
571
`Failed to connect to server '${ api . serverId } '. Check your server configuration.`
@@ -843,9 +847,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
843
847
continue ;
844
848
}
845
849
}
846
- for await ( const workspaceFolder of vscode . workspace . workspaceFolders ?? [ ] ) {
847
- await addWsServerRootFolderData ( workspaceFolder . uri ) ;
848
- }
850
+ await Promise . allSettled (
851
+ vscode . workspace . workspaceFolders ?. map ( ( wsFolder ) => addWsServerRootFolderData ( wsFolder . uri ) ) || [ ]
852
+ ) ;
849
853
850
854
xmlContentProvider = new XmlContentProvider ( ) ;
851
855
@@ -1383,9 +1387,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
1383
1387
const serverName = notIsfs ( uri ) ? config ( "conn" , configName ) . server : configName ;
1384
1388
await resolveConnectionSpec ( serverName ) ;
1385
1389
}
1386
- for await ( const workspaceFolder of added ) {
1387
- await addWsServerRootFolderData ( workspaceFolder . uri ) ;
1388
- }
1390
+ await Promise . allSettled ( added . map ( ( wsFolder ) => addWsServerRootFolderData ( wsFolder . uri ) ) ) ;
1389
1391
} ) ,
1390
1392
vscode . workspace . onDidChangeConfiguration ( async ( { affectsConfiguration } ) => {
1391
1393
if ( affectsConfiguration ( "objectscript.conn" ) || affectsConfiguration ( "intersystems.servers" ) ) {
You can’t perform that action at this time.
0 commit comments