File tree Expand file tree Collapse file tree 1 file changed +16
-2
lines changed Expand file tree Collapse file tree 1 file changed +16
-2
lines changed Original file line number Diff line number Diff line change @@ -173,8 +173,19 @@ export class DelveDAPOutputAdapter extends ProxyDebugAdapter {
173
173
if ( ! this . connected ) {
174
174
this . connected = this . startAndConnectToServer ( ) ;
175
175
}
176
- await this . connected ;
177
- super . sendMessageToServer ( message ) ;
176
+ try {
177
+ await this . connected ;
178
+ super . sendMessageToServer ( message ) ;
179
+ } catch ( err ) {
180
+ // If there was an error connecting, show an error message
181
+ // and send a terminated event, since we cannot start.
182
+ if ( err ) {
183
+ const errMsg = `connect to server error: ${ err } ` ;
184
+ this . sendMessageToClient ( new OutputEvent ( errMsg ) ) ;
185
+ vscode . window . showErrorMessage ( errMsg ) ;
186
+ }
187
+ this . sendMessageToClient ( new TerminatedEvent ( ) ) ;
188
+ }
178
189
}
179
190
180
191
async dispose ( ) {
@@ -185,6 +196,9 @@ export class DelveDAPOutputAdapter extends ProxyDebugAdapter {
185
196
}
186
197
this . connected = undefined ;
187
198
const dlvDapServer = this . dlvDapServer ;
199
+ if ( ! dlvDapServer ) {
200
+ return ;
201
+ }
188
202
if ( dlvDapServer . exitCode !== null ) {
189
203
console . log ( `dlv dap process(${ dlvDapServer . pid } ) exited ${ dlvDapServer . exitCode } ` ) ;
190
204
return ;
You can’t perform that action at this time.
0 commit comments