Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-15 21:45:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Implemented workspace/didChangeConfiguration command in LSP client. Now it's possible to set LSP settings for this command (SpartanJ/ecode#694).

Browse Source
This commit is contained in:
Martín Lucas Golini
2025-10-30 22:15:20 -03:00
parent f7a08b6f42
commit 4814569db1
5 changed files with 89 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,35 @@
namespace ecode {
void LSPClientServer::sanitizeCommand( std::string& cmd, const std::string& workspaceFolder ) {
static std::string cpucount( String::toString( Sys::getCPUCount() ) );
static std::string userdir = Sys::getUserDirectory();
String::replaceAll( cmd, "$NPROC", cpucount );
String::replaceAll( cmd, "${nproc}", cpucount );
String::replaceAll( cmd, "$PROJECTPATH", workspaceFolder );
String::replaceAll( cmd, "${project_root}", workspaceFolder );
String::replaceAll( cmd, "${workspaceFolder}", workspaceFolder );
String::replaceAll( cmd, "$HOME", userdir );
String::replaceAll( cmd, "${home}", userdir );
}
void LSPClientServer::sanitizeCommand( nlohmann::json& jsonObj,
const std::string& workspaceFolder ) {
if ( jsonObj.is_string() ) {
std::string s = jsonObj.get<std::string>();
sanitizeCommand( s, workspaceFolder );
jsonObj = s; // Assign the modified string back to the JSON object
} else if ( jsonObj.is_object() ) {
for ( auto& el : jsonObj.items() ) {
sanitizeCommand( el.value(), workspaceFolder );
}
} else if ( jsonObj.is_array() ) {
for ( auto& el : jsonObj ) {
sanitizeCommand( el, workspaceFolder );
}
}
}
#define CONTENT_LENGTH "Content-Length"
#define CONTENT_LENGTH_HEADER "Content-Length:"
@@ -204,6 +233,12 @@ static std::vector<LSPLocation> parseDocumentLocation( const json& result ) {
return ret;
}
static json changeConfigurationParams( const json& settings ) {
json ret;
ret["settings"] = settings;
return ret;
}
static json changeWorkspaceFoldersParams( const std::vector<LSPWorkspaceFolder>& added,
const std::vector<LSPWorkspaceFolder>& removed ) {
json event;
@@ -1164,6 +1199,7 @@ void LSPClientServer::initialize() {
{ "formatting", json{ { "dynamicRegistration", true } } },
{ "rangeFormatting", json{ { "dynamicRegistration", true } } },
{ "codeLens", json{ { "dynamicRegistration", true } } },
{ "didChangeConfiguration", json{ { "dynamicRegistration", true } } },
} },
{ "window", json{ { "workDoneProgress", true },
{ "showMessage", showMessage },
@@ -1219,7 +1255,10 @@ void LSPClientServer::initialize() {
#endif
mCapabilities.languages = mLanguagesSupported;
mReady = true;
write( newRequest( "initialized" ) );
write( newRequest( "initialized" ), [this]( const IdType&, const json& ) {
if ( !mLSP.settings.empty() )
didChangeConfiguration( mLSP.settings, mWorkspaceFolder.getFSPath(), true );
} );
sendQueuedMessages();
notifyServerInitialized();
@@ -2230,6 +2269,19 @@ void LSPClientServer::switchSourceHeader( const URI& document ) {
} );
}
LSPClientServer::LSPRequestHandle
LSPClientServer::didChangeConfiguration( const nlohmann::json& settings,
const std::string& workspaceFolder, bool async ) {
auto finalSettings = settings;
sanitizeCommand( finalSettings, workspaceFolder );
auto params = changeConfigurationParams( finalSettings );
if ( async && needsAsync() ) {
sendAsync( newRequest( "workspace/didChangeConfiguration", params ) );
return {};
}
return send( newRequest( "workspace/didChangeConfiguration", params ) );
}
LSPClientServer::LSPRequestHandle
LSPClientServer::didChangeWorkspaceFolders( const std::vector<LSPWorkspaceFolder>& added,
const std::vector<LSPWorkspaceFolder>& removed,