File tree 2 files changed +4
-7
lines changed
arduino-ide-extension/src/node
2 files changed +4
-7
lines changed Original file line number Diff line number Diff line change 1
1
import { inject , injectable } from '@theia/core/shared/inversify' ;
2
- import { Disposable } from '@theia/core/lib/common/disposable' ;
3
2
import {
4
3
MonitorManagerProxy ,
5
4
MonitorManagerProxyClient ,
@@ -12,7 +11,7 @@ import {
12
11
} from './monitor-settings/monitor-settings-provider' ;
13
12
14
13
export interface ConnectToClient {
15
- ( ) : Promise < Disposable > ;
14
+ ( ) : Promise < void > ;
16
15
}
17
16
18
17
@injectable ( )
@@ -55,7 +54,6 @@ export class MonitorManagerProxyImpl implements MonitorManagerProxy {
55
54
) ;
56
55
}
57
56
await this . client . connect ( address ) ;
58
- return Disposable . create ( ( ) => this . client ?. disconnect ( ) ) ;
59
57
} ;
60
58
return this . manager . startMonitor ( board , port , connectToClient ) ;
61
59
}
Original file line number Diff line number Diff line change @@ -42,7 +42,7 @@ export class MonitorManager extends CoreClientAware {
42
42
private monitorServiceStartQueue : {
43
43
monitorID : string ;
44
44
serviceStartParams : [ Board , Port ] ;
45
- connectToClient : ( ) => void ;
45
+ connectToClient : ConnectToClient ;
46
46
} [ ] = [ ] ;
47
47
48
48
@inject ( MonitorServiceFactory )
@@ -133,12 +133,11 @@ export class MonitorManager extends CoreClientAware {
133
133
return ;
134
134
}
135
135
136
- const disposable = await connectToClient ( ) ;
137
136
try {
137
+ await connectToClient ( ) ;
138
138
await monitor . start ( ) ;
139
139
} catch ( err ) {
140
140
if ( ! AlreadyConnectedError . is ( err ) ) {
141
- disposable . dispose ( ) ;
142
141
throw err ;
143
142
}
144
143
}
@@ -272,8 +271,8 @@ export class MonitorManager extends CoreClientAware {
272
271
const monitorService = this . monitorServices . get ( monitorID ) ;
273
272
274
273
if ( monitorService ) {
274
+ await connectToClient ( ) ;
275
275
await monitorService . start ( ) ;
276
- connectToClient ( ) ;
277
276
}
278
277
}
279
278
}
You can’t perform that action at this time.
0 commit comments