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- addItem : boolean ,
37+ itemExpanded : boolean ,
3838) : ExpandedDbItem [ ] {
39- if ( addItem ) {
39+ if ( itemExpanded ) {
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 @@ -191,42 +191,37 @@ export class DbManager {
191191 ) ;
192192 }
193193
194- private async updateExpandedItems (
195- newExpandedItems : ExpandedDbItem [ ] ,
196- ) : Promise < void > {
194+ private async updateExpandedItems ( items : ExpandedDbItem [ ] ) : Promise < void > {
197195 let itemsToStore ;
198196
199- const dbItems = this . getDbItems ( ) ;
197+ const dbItemsResult = this . getDbItems ( ) ;
200198
201- if ( dbItems . isFailure ) {
199+ if ( dbItemsResult . isFailure ) {
202200 // Log an error but don't throw an exception since if the db items are failing
203201 // to be read, then there is a bigger problem than the expanded state.
204202 void this . app . logger . log (
205203 `Could not read db items when calculating expanded state: ${ JSON . stringify (
206- dbItems . errors ,
204+ dbItemsResult . errors ,
207205 ) } `,
208206 ) ;
209- itemsToStore = newExpandedItems ;
207+ itemsToStore = items ;
210208 } else {
211- itemsToStore = cleanNonExistentExpandedItems (
212- newExpandedItems ,
213- dbItems . value ,
214- ) ;
209+ itemsToStore = cleanNonExistentExpandedItems ( items , dbItemsResult . value ) ;
215210 }
216211
217212 await this . setExpandedItems ( itemsToStore ) ;
218213 }
219214
220215 private async updateDbItemExpandedState (
221216 dbItem : DbItem ,
222- addItem : boolean ,
217+ itemExpanded : boolean ,
223218 ) : Promise < void > {
224219 const currentExpandedItems = this . getExpandedItems ( ) ;
225220
226221 const newExpandedItems = updateExpandedItem (
227222 currentExpandedItems ,
228223 dbItem ,
229- addItem ,
224+ itemExpanded ,
230225 ) ;
231226
232227 await this . updateExpandedItems ( newExpandedItems ) ;
You can’t perform that action at this time.
0 commit comments