More WIP.

projects/linux/ee.files

@@ -1574,11 +1574,30 @@
 ../../src/tools/ecode/pathhelper.hpp
 ../../src/tools/ecode/plugins/autocomplete/autocompleteplugin.cpp
 ../../src/tools/ecode/plugins/autocomplete/autocompleteplugin.hpp
+../../src/tools/ecode/plugins/debugger/bus.cpp
+../../src/tools/ecode/plugins/debugger/bus.hpp
+../../src/tools/ecode/plugins/debugger/busprocess.cpp
+../../src/tools/ecode/plugins/debugger/busprocess.hpp
+../../src/tools/ecode/plugins/debugger/bussocket.cpp
+../../src/tools/ecode/plugins/debugger/bussocket.hpp
+../../src/tools/ecode/plugins/debugger/config.cpp
+../../src/tools/ecode/plugins/debugger/config.hpp
+../../src/tools/ecode/plugins/debugger/debuggerclient.cpp
+../../src/tools/ecode/plugins/debugger/debuggerclient.hpp
+../../src/tools/ecode/plugins/debugger/debuggerclientlistener.hpp
+../../src/tools/ecode/plugins/debugger/debuggerplugin.cpp
+../../src/tools/ecode/plugins/debugger/debuggerplugin.hpp
 ../../src/tools/ecode/plugins/formatter/formatterplugin.cpp
 ../../src/tools/ecode/plugins/formatter/formatterplugin.hpp
 ../../src/tools/ecode/notificationcenter.cpp
 ../../src/tools/ecode/notificationcenter.hpp
 ../../src/tools/ecode/pathhelper.hpp
+../../src/tools/ecode/plugins/debugger/dap/debuggerclientdap.cpp
+../../src/tools/ecode/plugins/debugger/dap/debuggerclientdap.hpp
+../../src/tools/ecode/plugins/debugger/dap/messages.hpp
+../../src/tools/ecode/plugins/debugger/dap/protocol.cpp
+../../src/tools/ecode/plugins/debugger/dap/protocol.hpp
+../../src/tools/ecode/plugins/debugger/debuggerclientlistener.cpp
 ../../src/tools/ecode/plugins/git/git.cpp
 ../../src/tools/ecode/plugins/git/git.hpp
 ../../src/tools/ecode/plugins/git/gitbranchmodel.cpp

src/tools/ecode/appconfig.cpp

@@ -214,7 +214,7 @@ void AppConfig::load( const std::string& confPath, std::string& keybindingsPath,
 			ini.getValueB( "plugins", creator.first,
 						   "autocomplete" == creator.first || "linter" == creator.first ||
 							   "autoformatter" == creator.first || "lspclient" == creator.first ||
-							   "git" == creator.first );
+							   "git" == creator.first || "debugger" == creator.first );
 	}
 	pluginManager->setPluginsEnabled( pluginsEnabled, sync );
 

src/tools/ecode/ecode.cpp

@@ -19,8 +19,8 @@
 
 //! Plugins
 #include "plugins/autocomplete/autocompleteplugin.hpp"
-#include "plugins/formatter/formatterplugin.hpp"
 #include "plugins/debugger/debuggerplugin.hpp"
+#include "plugins/formatter/formatterplugin.hpp"
 #include "plugins/git/gitplugin.hpp"
 #include "plugins/linter/linterplugin.hpp"
 #include "plugins/lsp/lspclientplugin.hpp"
@@ -554,15 +554,17 @@ void App::onPluginEnabled( Plugin* plugin ) {
 
 void App::initPluginManager() {
 	mPluginManager = std::make_unique<PluginManager>(
-		mResPath, mPluginsPath, mThreadPool, [this]( const std::string& path, const auto& cb ) {
+		mResPath, mPluginsPath, mThreadPool,
+		[this]( const std::string& path, const auto& cb ) {
 			UITab* tab = mSplitter->isDocumentOpen( path );
 			if ( !tab ) {
 				loadFileFromPath( path, true, nullptr, cb );
 			} else {
 				tab->getTabWidget()->setTabSelected( tab );
 				cb( tab->getOwnedWidget()->asType<UICodeEditor>(), path );
 			}
-		} );
+		},
+		[this] { return getProjectBuildManager(); } );
 	mPluginManager->onPluginEnabled = [this]( Plugin* plugin ) {
 		if ( nullptr == mUISceneNode || plugin->isReady() ) {
 			onPluginEnabled( plugin );

src/tools/ecode/iconmanager.cpp

@@ -249,6 +249,9 @@ void IconManager::init( UISceneNode* sceneNode, FontTrueType* iconFont, FontTrue
 			{ "play", 0xeb2c },
 			{ "output", 0xeb9d },
 			{ "fold", 0xeaf5 },
+			{ "bug", 0xeaaf },
+			{ "debug", 0xead8 },
+			{ "debug-alt", 0xeb91 },
 		};
 
 		for ( const auto& icon : codIcons )

src/tools/ecode/plugins/debugger/busprocess.cpp

@@ -4,11 +4,20 @@ namespace ecode {
 
 BusProcess::BusProcess( const Command& command ) : mCommand( command ), mProcess() {}
 
+BusProcess::~BusProcess() {
+	close();
+}
+
 bool BusProcess::start() {
-	bool res = mProcess.create( mCommand.command, mCommand.arguments,
-								Process::getDefaultOptions() | Process::Options::EnableAsync |
-									Process::Options::CombinedStdoutStderr,
-								mCommand.environment );
+	bool res = mCommand.arguments.empty()
+				   ? mProcess.create( mCommand.command,
+									  Process::getDefaultOptions() | Process::Options::EnableAsync |
+										  Process::Options::CombinedStdoutStderr,
+									  mCommand.environment )
+				   : mProcess.create( mCommand.command, mCommand.arguments,
+									  Process::getDefaultOptions() | Process::Options::EnableAsync |
+										  Process::Options::CombinedStdoutStderr,
+									  mCommand.environment );
 	if ( res )
 		setState( State::Running );
 

src/tools/ecode/plugins/debugger/busprocess.hpp

@@ -10,6 +10,8 @@ class BusProcess : public Bus {
   public:
 	BusProcess( const Command& command );
 
+	virtual ~BusProcess();
+
 	bool start() override;
 
 	bool close() override;

src/tools/ecode/plugins/debugger/bussocket.cpp

@@ -5,6 +5,10 @@ namespace ecode {
 
 BusSocket::BusSocket( const Connection& connection ) : mConnection( connection ) {}
 
+BusSocket::~BusSocket() {
+	close();
+}
+
 bool BusSocket::start() {
 	bool res =
 		mSocket.connect( IpAddress( mConnection.host ), mConnection.port ) == Socket::Status::Done;

src/tools/ecode/plugins/debugger/bussocket.hpp

@@ -10,6 +10,8 @@ class BusSocket : public Bus {
   public:
 	BusSocket( const Connection& connection );
 
+	virtual ~BusSocket();
+
 	bool start() override;
 
 	bool close() override;

src/tools/ecode/plugins/debugger/config.hpp

@@ -48,6 +48,7 @@ struct ProtocolSettings {
 	bool redirectStderr{ false };
 	bool redirectStdout{ false };
 	bool supportsSourceRequest{ true };
+	std::string launchCommand{ "launch" };
 	json launchRequest;
 	std::string locale{ "en-US" };