@@ -168,7 +168,7 @@ export class DataSourceEditorProvider implements CustomTextEditorProvider {
168168 /* c8 ignore start */
169169 const selectedServer = getServerForUri ( document . uri ) || "" ;
170170 const connected = connMngService . isConnected ( selectedServer ) ;
171-
171+ let runner : any ;
172172 switch ( msg . command ) {
173173 case DataSourceCommand . Server : {
174174 await setServerForUri ( document . uri , msg . selectedServer ) ;
@@ -196,47 +196,41 @@ export class DataSourceEditorProvider implements CustomTextEditorProvider {
196196 break ;
197197 }
198198 case DataSourceCommand . Refresh : {
199- if ( connected ) {
200- const runner = Runner . create ( async ( ) => {
201- await connMngService . refreshGetMeta ( selectedServer ) ;
202- this . cache . delete ( selectedServer ) ;
203- updateWebview ( ) ;
204- } ) ;
205- runner . location = ProgressLocation . Notification ;
206- runner . title = `Refreshing meta data for ${ selectedServer } .` ;
199+ runner = Runner . create ( async ( ) => {
200+ await connMngService . refreshGetMeta ( selectedServer ) ;
201+ this . cache . delete ( selectedServer ) ;
202+ updateWebview ( ) ;
203+ } ) ;
204+ runner . location = ProgressLocation . Notification ;
205+ runner . title = `Refreshing meta data for ${ selectedServer } .` ;
206+ if ( connected ) await runner . execute ( ) ;
207+ else if ( await offerConnectAction ( selectedServer ) )
207208 await runner . execute ( ) ;
208- } else {
209- offerConnectAction ( selectedServer ) ;
210- }
211209 break ;
212210 }
213211 case DataSourceCommand . Run : {
214- if ( connected ) {
215- const runner = Runner . create ( ( ) =>
216- runDataSource (
217- msg . dataSourceFile ,
218- msg . selectedServer ,
219- this . filenname ,
220- ) ,
221- ) ;
222- runner . location = ProgressLocation . Notification ;
223- runner . title = `Running ${ getBasename ( document . uri ) } on ${ msg . selectedServer } .` ;
212+ runner = Runner . create ( ( ) =>
213+ runDataSource (
214+ msg . dataSourceFile ,
215+ msg . selectedServer ,
216+ this . filenname ,
217+ ) ,
218+ ) ;
219+ runner . location = ProgressLocation . Notification ;
220+ runner . title = `Running ${ getBasename ( document . uri ) } on ${ msg . selectedServer } .` ;
221+ if ( connected ) await runner . execute ( ) ;
222+ else if ( await offerConnectAction ( selectedServer ) )
224223 await runner . execute ( ) ;
225- } else {
226- offerConnectAction ( selectedServer ) ;
227- }
228224 break ;
229225 }
230226 case DataSourceCommand . Populate : {
231- if ( connected ) {
232- const runner = Runner . create ( ( ) =>
233- populateScratchpad ( msg . dataSourceFile , msg . selectedServer ) ,
234- ) ;
235- runner . title = "Populating scratchpad." ;
227+ runner = Runner . create ( ( ) =>
228+ populateScratchpad ( msg . dataSourceFile , msg . selectedServer ) ,
229+ ) ;
230+ runner . title = "Populating scratchpad." ;
231+ if ( connected ) await runner . execute ( ) ;
232+ else if ( await offerConnectAction ( selectedServer ) )
236233 await runner . execute ( ) ;
237- } else {
238- offerConnectAction ( selectedServer ) ;
239- }
240234 break ;
241235 }
242236 }
0 commit comments