#5977: Add reloadDecarations() to IDeclarationManager interface

codereader · Jun 19, 2022 · 38ed7f2 · 38ed7f2
1 parent c4f2bbb
commit 38ed7f2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/include/ideclmanager.h b/include/ideclmanager.h
@@ -103,6 +103,9 @@ class IDeclarationManager :
     // Iterate over all known declarations, using the given visitor
     virtual void foreachDeclaration(Type type, const std::function<void(const IDeclaration&)>& functor) = 0;
 
+    // Re-load all declarations from any changed files
+    virtual void reloadDecarations() = 0;
+
     // Signal emitted when the decls of the given type have been (re-)loaded
     virtual sigc::signal<void>& signal_DeclsReloaded(Type type) = 0;
 };

diff --git a/plugins/sound/SoundManager.cpp b/plugins/sound/SoundManager.cpp
@@ -194,8 +194,7 @@ float SoundManager::getSoundFileDuration(const std::string& vfsPath)
 
 void SoundManager::reloadSounds()
 {
-    // TODO _defLoader.reset();
-    // TODO _defLoader.start();
+    GlobalDeclarationManager().reloadDecarations();
 }
 
 void SoundManager::reloadSoundsCmd(const cmd::ArgumentList& args)

diff --git a/radiantcore/decl/DeclarationManager.cpp b/radiantcore/decl/DeclarationManager.cpp
@@ -103,6 +103,11 @@ void DeclarationManager::doWithDeclarations(Type type, const std::function<void(
     action(decls->second.decls);
 }
 
+void DeclarationManager::reloadDecarations()
+{
+    // TODO
+}
+
 sigc::signal<void>& DeclarationManager::signal_DeclsReloaded(Type type)
 {
     return _declsReloadedSignals.try_emplace(type).first->second;
@@ -217,7 +222,11 @@ void DeclarationManager::shutdownModule()
     parsersToFinish.clear(); // might block if parsers are running
 
     // All parsers have finished, clear the structure, no need to lock anything
+    _registeredFolders.clear();
+    _unrecognisedBlocks.clear();
     _declarationsByType.clear();
+    _parsersByTypename.clear();
+    _declsReloadedSignals.clear();
 }
 
 module::StaticModuleRegistration<DeclarationManager> _declManagerModule;

diff --git a/radiantcore/decl/DeclarationManager.h b/radiantcore/decl/DeclarationManager.h
@@ -50,6 +50,7 @@ class DeclarationManager :
     IDeclaration::Ptr findDeclaration(Type type, const std::string& name) override;
     void foreachDeclaration(Type type, const std::function<void(const IDeclaration&)>& functor) override;
     sigc::signal<void>& signal_DeclsReloaded(Type type) override;
+    void reloadDecarations() override;
 
     const std::string& getName() const override;
     const StringSet& getDependencies() const override;