File tree Expand file tree Collapse file tree 3 files changed +24
-6
lines changed Expand file tree Collapse file tree 3 files changed +24
-6
lines changed Original file line number Diff line number Diff line change @@ -112,7 +112,10 @@ class ListDb2iTables implements IContextProvider {
112
112
}
113
113
}
114
114
115
- export async function registerDb2iTablesProvider ( schema : string ) {
115
+ export async function registerDb2iTablesProvider ( schema ?: string ) {
116
+ if ( ! schema ) {
117
+ return ;
118
+ }
116
119
const continueID = `Continue.continue` ;
117
120
const continueEx = vscode . extensions . getExtension ( continueID ) ;
118
121
if ( continueEx ) {
Original file line number Diff line number Diff line change @@ -102,7 +102,9 @@ export function activate(context: vscode.ExtensionContext): Db2i {
102
102
exampleBrowser . refresh ( ) ;
103
103
selfCodesView . setRefreshEnabled ( Configuration . get ( `jobSelfViewAutoRefresh` ) || false ) ;
104
104
// register list tables
105
- registerDb2iTablesProvider ( JobManager . getSelection ( ) . job . options . libraries [ 0 ] ) ;
105
+ const currentJob = JobManager . getSelection ( ) ;
106
+ const currentSchema = currentJob ?. job . options . libraries [ 0 ] ;
107
+ registerDb2iTablesProvider ( currentSchema ) ;
106
108
if ( devMode && runTests ) {
107
109
runTests ( ) ;
108
110
}
Original file line number Diff line number Diff line change @@ -305,15 +305,28 @@ export class JobManagerView implements TreeDataProvider<any> {
305
305
306
306
const selectedJob = JobManager . getSelection ( ) ;
307
307
const selectedSchema = selectedJob . job . options . libraries [ 0 ] ;
308
-
308
+
309
309
// re-register db2i tables context provider with current schema
310
- if ( provider && provider . getCurrentSchema ( ) . toLowerCase ( ) !== selectedSchema . toLowerCase ( ) ) {
310
+ if (
311
+ provider &&
312
+ selectedJob !== undefined &&
313
+ provider . getCurrentSchema ( ) &&
314
+ selectedSchema &&
315
+ provider . getCurrentSchema ( ) . trim ( ) . toLowerCase ( ) !==
316
+ selectedSchema . trim ( ) . toLowerCase ( )
317
+ ) {
311
318
registerDb2iTablesProvider ( selectedSchema ) ;
312
319
}
313
320
314
- setCancelButtonVisibility ( selectedJob && selectedJob . job . getStatus ( ) === "busy" ) ;
321
+ setCancelButtonVisibility (
322
+ selectedJob && selectedJob . job . getStatus ( ) === "busy"
323
+ ) ;
315
324
sqlLanguageStatus . setState ( selectedJob !== undefined ) ;
316
- commands . executeCommand ( `setContext` , `vscode-db2i:jobManager.hasJob` , selectedJob !== undefined ) ;
325
+ commands . executeCommand (
326
+ `setContext` ,
327
+ `vscode-db2i:jobManager.hasJob` ,
328
+ selectedJob !== undefined
329
+ ) ;
317
330
}
318
331
319
332
getTreeItem ( element : vscode . TreeItem ) {
You can’t perform that action at this time.
0 commit comments