Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-30 01:56:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

eepp: Improved String::unescape. Improved JavaScript+TypeScript regex tokenization. Minor fix for unescaped search in text highlights in UICodeEditor.

Browse Source 
ecode: Avoid reloading plugins when a new instance of ecode is opened. Improved plugins logs.
This commit is contained in:
Martín Lucas Golini
2023-05-25 02:10:41 -03:00
parent 6fa7f5c63b
commit 893943cc85
16 changed files with 100 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/tools/ecode/plugins/pluginmanager.cpp
View File

@@ -15,8 +15,10 @@ PluginManager::PluginManager( const std::string& resourcesPath, const std::strin
PluginManager::~PluginManager() {
mClosing = true;
for ( auto& plugin : mPlugins )
for ( auto& plugin : mPlugins ) {
Log::debug( "PluginManager: unloading plugin %s", plugin.second->getTitle().c_str() );
eeDelete( plugin.second );
}
}
void PluginManager::registerPlugin( const PluginDefinition& def ) {
@@ -34,6 +36,7 @@ bool PluginManager::setEnabled( const std::string& id, bool enable, bool sync )
mPluginsEnabled[id] = enable;
UICodeEditorPlugin* plugin = get( id );
if ( enable && plugin == nullptr && hasDefinition( id ) ) {
Log::debug( "PluginManager: loading plugin %s", mDefinitions[id].name.c_str() );
UICodeEditorPlugin* newPlugin = sync && mDefinitions[id].creatorSyncFn
? mDefinitions[id].creatorSyncFn( this )
: mDefinitions[id].creatorFn( this );
@@ -43,6 +46,7 @@ bool PluginManager::setEnabled( const std::string& id, bool enable, bool sync )
return true;
}
if ( !enable && plugin != nullptr ) {
Log::debug( "PluginManager: unloading plugin %s", mDefinitions[id].name.c_str() );
mThreadPool->run( [plugin]() { eeDelete( plugin ); } );
{
Lock l( mSubscribedPluginsMutex );
@@ -59,7 +63,7 @@ bool PluginManager::isEnabled( const std::string& id ) const {
bool PluginManager::reload( const std::string& id ) {
if ( isEnabled( id ) ) {
Log::warning( "PluginManager reloading plugin: %s", id.c_str() );
Log::warning( "PluginManager: reloading plugin %s", id.c_str() );
setEnabled( id, false );
setEnabled( id, true );
return true;
@@ -446,10 +450,18 @@ void Plugin::subscribeFileSystemListener() {
return;
if ( !mShuttingDown && file.getFilepath() == mConfigPath &&
file.getModificationTime() != mConfigFileInfo.getModificationTime() ) {
mConfigFileInfo = file;
mManager->getFileSystemListener()->removeListener( mFileSystemListenerCb );
mFileSystemListenerCb = 0;
mManager->reload( getId() );
std::string fileContents;
FileSystem::fileGet( file.getFilepath(), fileContents );
if ( getConfigFileHash() != String::hash( fileContents ) ) {
mConfigFileInfo = file;
mManager->getFileSystemListener()->removeListener( mFileSystemListenerCb );
mFileSystemListenerCb = 0;
mManager->reload( getId() );
} else {
Log::debug( "Plugin %s: Configuration file has been modified: %s. But contents "
"are the same.",
getTitle().c_str(), mConfigPath.c_str() );
}
}
} );
}