fix: event registration for ProgressProvider

lokalise · Jul 31, 2021 · 0c5828d · 0c5828d
1 parent d8fba28
commit 0c5828d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/core/CurrentFile.ts b/src/core/CurrentFile.ts
@@ -10,10 +10,12 @@ export class CurrentFile {
   static _vue_sfc_loader: VueSfcLoader | null = null
   static _composed_loader = new ComposedLoader()
   static _onInvalidate = new EventEmitter<boolean>()
+  static _onInitialized = new EventEmitter<void>()
   static _onHardStringDetected = new EventEmitter<DetectionResult[] | undefined>()
 
   static onInvalidate = CurrentFile._onInvalidate.event
   static onHardStringDetected = CurrentFile._onHardStringDetected.event
+  static onInitialized = CurrentFile._onInitialized.event
 
   static get VueSfc() {
     return Global.hasFeatureEnabled('VueSfc')
@@ -54,6 +56,7 @@ export class CurrentFile {
     }
 
     this.updateLoaders()
+    this._onInitialized.fire()
   }
 
   static updateLoaders() {

diff --git a/src/core/loaders/ComposedLoader.ts b/src/core/loaders/ComposedLoader.ts
@@ -2,11 +2,11 @@ import { Disposable } from 'vscode'
 import _ from 'lodash'
 import { PendingWrite } from '../types'
 import { Translator } from '../Translator'
-import { Log } from '~/utils'
 import { Config } from '../Config'
 import { FulfillAllMissingKeys } from '../../commands/manipulations'
 import { LocaleTree, LocaleNode, FlattenLocaleTree } from '../Nodes'
 import { Loader } from './Loader'
+import { Log } from '~/utils'
 
 export class ComposedLoader extends Loader {
   constructor() {

diff --git a/src/views/providers/ProgressProvider.ts b/src/views/providers/ProgressProvider.ts
@@ -14,9 +14,9 @@ export class ProgressProvider implements TreeDataProvider<BaseTreeItem> {
 
   constructor(private ctx: ExtensionContext) {
     const throttledRefresh = throttle(() => this.refresh(), THROTTLE_DELAY)
-    CurrentFile.loader.onDidChange(throttledRefresh)
     EditorPanel.onDidChange(throttledRefresh)
-    Global.loader.onDidChange(throttledRefresh)
+    CurrentFile.onInitialized(() => CurrentFile.loader.onDidChange(throttledRefresh))
+    Global.onDidChangeLoader(() => Global.loader.onDidChange(throttledRefresh))
   }
 
   refresh(): void {