Skip to content

Commit 90ed2e2

Browse files
committed
Make the source directories check non-blocking
1 parent d37f934 commit 90ed2e2

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

integration/vscode/ada/src/extension.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,19 +155,24 @@ async function activateExtension(context: vscode.ExtensionContext) {
155155
vscode.workspace.onDidChangeConfiguration(adaExtState.configChanged)
156156
);
157157

158+
/**
159+
* Register commands first so that commands such as displaying the extension
160+
* Output become available even if the language servers fail to start.
161+
*/
162+
registerCommands(context, adaExtState);
163+
158164
await Promise.all([adaExtState.adaClient.onReady(), adaExtState.gprClient.onReady()]);
159165

160166
await vscode.commands.executeCommand('setContext', ADA_CONTEXT, true);
161167

162-
await checkSrcDirectories(adaExtState.adaClient);
163-
164168
await initializeTestView(context, adaExtState);
165169

166-
await Promise.all([adaExtState.adaClient.onReady(), adaExtState.gprClient.onReady()]);
167-
168170
initializeDebugging(context);
169171

170-
registerCommands(context, adaExtState);
172+
/**
173+
* This can display a dialog to the User so don't wait on the result.
174+
*/
175+
void checkSrcDirectories(adaExtState.adaClient);
171176
}
172177

173178
function setUpLogging(context: vscode.ExtensionContext) {

0 commit comments

Comments
 (0)