File tree Expand file tree Collapse file tree
extensions/ql-vscode/src/databases Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -34,9 +34,9 @@ export interface RemoteUserDefinedListExpandedDbItem {
3434export function updateExpandedItem (
3535 currentExpandedItems : ExpandedDbItem [ ] ,
3636 dbItem : DbItem ,
37- itemExpanded : boolean ,
37+ addItem : boolean ,
3838) : ExpandedDbItem [ ] {
39- if ( itemExpanded ) {
39+ if ( addItem ) {
4040 const expandedDbItem = mapDbItemToExpandedDbItem ( dbItem ) ;
4141 const expandedItems = [ ...currentExpandedItems ] ;
4242 if ( ! expandedItems . some ( ( i ) => isDbItemEqualToExpandedDbItem ( dbItem , i ) ) ) {
Original file line number Diff line number Diff line change @@ -185,37 +185,42 @@ export class DbManager {
185185 ) ;
186186 }
187187
188- private async updateExpandedItems ( items : ExpandedDbItem [ ] ) : Promise < void > {
188+ private async updateExpandedItems (
189+ newExpandedItems : ExpandedDbItem [ ] ,
190+ ) : Promise < void > {
189191 let itemsToStore ;
190192
191- const dbItemsResult = this . getDbItems ( ) ;
193+ const dbItems = this . getDbItems ( ) ;
192194
193- if ( dbItemsResult . isFailure ) {
195+ if ( dbItems . isFailure ) {
194196 // Log an error but don't throw an exception since if the db items are failing
195197 // to be read, then there is a bigger problem than the expanded state.
196198 void this . app . logger . log (
197199 `Could not read db items when calculating expanded state: ${ JSON . stringify (
198- dbItemsResult . errors ,
200+ dbItems . errors ,
199201 ) } `,
200202 ) ;
201- itemsToStore = items ;
203+ itemsToStore = newExpandedItems ;
202204 } else {
203- itemsToStore = cleanNonExistentExpandedItems ( items , dbItemsResult . value ) ;
205+ itemsToStore = cleanNonExistentExpandedItems (
206+ newExpandedItems ,
207+ dbItems . value ,
208+ ) ;
204209 }
205210
206211 await this . setExpandedItems ( itemsToStore ) ;
207212 }
208213
209214 private async updateDbItemExpandedState (
210215 dbItem : DbItem ,
211- itemExpanded : boolean ,
216+ addItem : boolean ,
212217 ) : Promise < void > {
213218 const currentExpandedItems = this . getExpandedItems ( ) ;
214219
215220 const newExpandedItems = updateExpandedItem (
216221 currentExpandedItems ,
217222 dbItem ,
218- itemExpanded ,
223+ addItem ,
219224 ) ;
220225
221226 await this . updateExpandedItems ( newExpandedItems ) ;
You can’t perform that action at this time.
0 commit comments