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

Register debugger commands globally.

Browse Source
This commit is contained in:
Martín Lucas Golini
2025-12-24 00:39:26 -03:00
parent 396b3d9d07
commit 8f2b9d65ba
7 changed files with 85 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/eepp/ui/widgetcommandexecuter.hpp
View File

@@ -1,9 +1,12 @@
#ifndef EE_UI_WIDGETCOMMANDEXECUTER_HPP
#define EE_UI_WIDGETCOMMANDEXECUTER_HPP
#include <algorithm>
#include <functional>
#include <span>
#include <eepp/scene/keyevent.hpp>
#include <eepp/ui/keyboardshortcut.hpp>
#include <functional>
using namespace EE::Scene;
@@ -25,14 +28,33 @@ class EE_API WidgetCommandExecuter {
}
}
void unsetCommand( const std::string& name ) {
mCommands.erase( name );
auto it = std::find( mCommandList.begin(), mCommandList.end(), name );
if ( it != mCommandList.end() )
mCommandList.erase( it );
}
void unsetCommands( const std::span<std::string>& names ) {
for ( const auto& name : names ) {
mCommands.erase( name );
auto it = std::find( mCommandList.begin(), mCommandList.end(), name );
if ( it != mCommandList.end() )
mCommandList.erase( it );
}
}
bool hasCommand( const std::string& name ) const {
return mCommands.find( name ) != mCommands.end();
}
void execute( const std::string& command ) {
bool execute( const std::string& command ) {
auto cmdIt = mCommands.find( command );
if ( cmdIt != mCommands.end() )
if ( cmdIt != mCommands.end() ) {
cmdIt->second();
return true;
}
return false;
}
size_t commandCount() const { return mCommands.size(); }

2
src/modules/eterm/include/eterm/ui/uiterminal.hpp
View File

@@ -66,7 +66,7 @@ class UITerminal : public UIWidget {
void addKeyBinds( const std::map<KeyBindings::Shortcut, std::string>& binds );
void execute( const std::string& command );
bool execute( const std::string& command );
void setCommands( const std::map<std::string, TerminalCommand>& cmds );

4
src/modules/eterm/src/eterm/ui/uiterminal.cpp
View File

@@ -399,11 +399,13 @@ void UITerminal::addKeyBinds( const std::map<KeyBindings::Shortcut, std::string>
mKeyBindings.addKeybinds( binds );
}
void UITerminal::execute( const std::string& command ) {
bool UITerminal::execute( const std::string& command ) {
auto cmdIt = mCommands.find( command );
if ( cmdIt != mCommands.end() ) {
cmdIt->second();
return true;
}
return false;
}
void UITerminal::setCommands( const std::map<std::string, TerminalCommand>& cmds ) {

3
src/tools/ecode/ecode.cpp
View File

@@ -616,7 +616,8 @@ void App::runCommand( const std::string& command ) {
editor->getDocument().execute( command, editor );
} else if ( mSplitter->getCurWidget() &&
mSplitter->getCurWidget()->isType( UI_TYPE_TERMINAL ) ) {
mSplitter->getCurWidget()->asType<UITerminal>()->execute( command );
if ( !mSplitter->getCurWidget()->asType<UITerminal>()->execute( command ) )
mMainLayout->execute( command );
} else {
mMainLayout->execute( command );
}

74
src/tools/ecode/plugins/debugger/debuggerplugin.cpp
View File

@@ -176,6 +176,8 @@ DebuggerPlugin::~DebuggerPlugin() {
if ( SceneManager::existsSingleton() && !SceneManager::instance()->isShuttingDown() &&
getPluginContext() && getPluginContext()->getMainLayout() ) {
getPluginContext()->getMainLayout()->unsetCommands( mRegisteredCommands );
for ( const auto& kb : mKeyBindings )
getPluginContext()->getMainLayout()->getKeyBindings().removeCommandKeybind( kb.first );
}
@@ -695,6 +697,7 @@ PluginRequestHandle DebuggerPlugin::processMessage( const PluginMessage& msg ) {
break;
}
case ecode::PluginMessageType::UIReady: {
registerCommands( getPluginContext()->getMainLayout() );
for ( const auto& kb : mKeyBindings ) {
getPluginContext()->getMainLayout()->getKeyBindings().addKeybindString( kb.second,
kb.first );
@@ -1394,8 +1397,15 @@ DebuggerPlugin::needsToResolveInputs( nlohmann::json& json,
return inputs;
}
void DebuggerPlugin::onRegisterDocument( TextDocument* doc ) {
doc->setCommand( "debugger-continue-interrupt", [this] {
template <typename TCommandRegister, typename Cmd, typename CmdCb>
void DebuggerPlugin::registerCommand( TCommandRegister* doc, Cmd cmd, CmdCb cb ) {
doc->setCommand( cmd, cb );
mRegisteredCommands.push_back( cmd );
}
template <typename TCommandRegister>
void DebuggerPlugin::registerCommands( TCommandRegister* executer ) {
registerCommand( executer, "debugger-continue-interrupt", [this] {
if ( mDebugger && mListener ) {
if ( mListener->isStopped() ) {
resume( mListener->getCurrentThreadId() );
@@ -1431,15 +1441,15 @@ void DebuggerPlugin::onRegisterDocument( TextDocument* doc ) {
}
} );
doc->setCommand( "debugger-start", [this] {
registerCommand( executer, "debugger-start", [this] {
if ( mDebugger )
exitDebugger( true );
runCurrentConfig();
} );
doc->setCommand( "debugger-stop", [this] { exitDebugger( true ); } );
registerCommand( executer, "debugger-stop", [this] { exitDebugger( true ); } );
doc->setCommand( "debugger-start-stop", [this] {
registerCommand( executer, "debugger-start-stop", [this] {
if ( mDebugger && mDebugger->started() ) {
exitDebugger( true );
} else {
@@ -1447,6 +1457,35 @@ void DebuggerPlugin::onRegisterDocument( TextDocument* doc ) {
}
} );
registerCommand( executer, "debugger-step-over", [this] {
if ( mDebugger && mListener && mListener->isStopped() )
mDebugger->stepOver( mListener->getCurrentThreadId() );
} );
registerCommand( executer, "debugger-step-into", [this] {
if ( mDebugger && mListener && mListener->isStopped() )
mDebugger->stepInto( mListener->getCurrentThreadId() );
} );
registerCommand( executer, "debugger-step-out", [this] {
if ( mDebugger && mListener && mListener->isStopped() )
mDebugger->stepOut( mListener->getCurrentThreadId() );
} );
registerCommand( executer, "toggle-status-app-debugger", [this] {
if ( getStatusDebuggerController() )
getStatusDebuggerController()->toggle();
} );
registerCommand( executer, "show-debugger-tab", [this] {
if ( mTab )
mTab->setTabSelected();
} );
}
void DebuggerPlugin::onRegisterDocument( TextDocument* doc ) {
registerCommands( doc );
doc->setCommand( "debugger-breakpoint-toggle", [doc, this] {
if ( setBreakpoint( doc, doc->getSelection().start().line() + 1 ) )
getUISceneNode()->getRoot()->invalidateDraw();
@@ -1457,31 +1496,6 @@ void DebuggerPlugin::onRegisterDocument( TextDocument* doc ) {
getUISceneNode()->getRoot()->invalidateDraw();
} );
doc->setCommand( "debugger-step-over", [this] {
if ( mDebugger && mListener && mListener->isStopped() )
mDebugger->stepOver( mListener->getCurrentThreadId() );
} );
doc->setCommand( "debugger-step-into", [this] {
if ( mDebugger && mListener && mListener->isStopped() )
mDebugger->stepInto( mListener->getCurrentThreadId() );
} );
doc->setCommand( "debugger-step-out", [this] {
if ( mDebugger && mListener && mListener->isStopped() )
mDebugger->stepOut( mListener->getCurrentThreadId() );
} );
doc->setCommand( "toggle-status-app-debugger", [this] {
if ( getStatusDebuggerController() )
getStatusDebuggerController()->toggle();
} );
doc->setCommand( "show-debugger-tab", [this]() {
if ( mTab )
mTab->setTabSelected();
} );
Lock l( mClientsMutex );
mClients[doc] = std::make_unique<DebuggerPluginClient>( this, doc );
doc->registerClient( mClients[doc].get() );

7
src/tools/ecode/plugins/debugger/debuggerplugin.hpp
View File

@@ -135,6 +135,7 @@ class DebuggerPlugin : public PluginBase {
std::string mLastStateJsonDump;
std::string mCurDebugger;
std::string mCurConfiguration;
std::vector<std::string> mRegisteredCommands;
class DebuggerPluginClient : public TextDocument::Client {
public:
@@ -290,6 +291,12 @@ class DebuggerPlugin : public PluginBase {
bool replaceInVal( std::string& val, const std::optional<ProjectBuildStep>& runConfig,
ProjectBuild* buildConfig, int randomPort );
template<typename TCommandRegister, typename Cmd, typename CmdCb>
void registerCommand( TCommandRegister* doc, Cmd cmd, CmdCb cb );
template<typename TCommandRegister>
void registerCommands( TCommandRegister* doc );
};
} // namespace ecode

3
src/tools/ecode/plugins/lsp/lspclientserver.cpp
View File

@@ -1745,10 +1745,12 @@ void LSPClientServer::processDidChangeQueue() {
}
bool LSPClientServer::hasDocument( TextDocument* doc ) const {
Lock l( mClientsMutex );
return std::find( mDocs.begin(), mDocs.end(), doc ) != mDocs.end();
}
bool LSPClientServer::hasDocument( const URI& uri ) const {
Lock l( mClientsMutex );
for ( const auto& doc : mDocs ) {
if ( doc->getURI() == uri )
return true;
@@ -1766,6 +1768,7 @@ bool LSPClientServer::hasDocumentClient( LSPDocumentClient* cl ) const {
}
bool LSPClientServer::hasDocuments() const {
Lock l( mClientsMutex );
return !mDocs.empty();
}