Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-07-23 03:02:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

ecode: Improvements for the root path handling. Improvements for the workspace symbol search.

Browse Source
This commit is contained in:
Martín Lucas Golini
2023-03-02 03:35:15 -03:00
parent 323c3ebc01
commit 344d1c72f8
7 changed files with 68 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/tools/ecode/plugins/lsp/lspclientservermanager.cpp
View File

@@ -83,7 +83,8 @@ void LSPClientServerManager::tryRunServer( const std::shared_ptr<TextDocument>&
return;
for ( const auto& lsp : lsps ) {
auto rootPath = findRootPath( lsp, doc );
std::string rootPath = mLSPWorkspaceFolder.isEmpty() ? findRootPath( lsp, doc )
: mLSPWorkspaceFolder.uri.getFSPath();
auto lspName = lsp.name.empty() ? lsp.command : lsp.name;
String::HashType id = String::hash( lspName + "|" + lsp.language + "|" + rootPath );
LSPClientServer* server = nullptr;
@@ -95,7 +96,7 @@ void LSPClientServerManager::tryRunServer( const std::shared_ptr<TextDocument>&
if ( ( server = serverUP.get() ) ) {
mClients[id] = std::move( serverUP );
if ( !mLSPWorkspaceFolder.uri.empty() )
server->didChangeWorkspaceFolders( { mLSPWorkspaceFolder }, {} );
server->didChangeWorkspaceFolders( { mLSPWorkspaceFolder }, {}, true );
}
} else {
server = clientIt->second.get();
@@ -356,9 +357,8 @@ LSPDefinition
LSPClientServerManager::getLSPForLang( const std::string& lang,
const std::vector<std::string>& extensions ) const {
for ( const auto& lsp : mLSPs ) {
if ( lsp.language == lang ) {
if ( lsp.language == lang )
return lsp;
}
if ( !lsp.filePatterns.empty() ) {
for ( const auto& file : lsp.filePatterns ) {
@@ -374,10 +374,14 @@ LSPClientServerManager::getLSPForLang( const std::string& lang,
}
void LSPClientServerManager::didChangeWorkspaceFolders( const std::string& folder ) {
std::vector<LSPWorkspaceFolder> oldLSPWorkspaceFolder;
if ( !mLSPWorkspaceFolder.isEmpty() )
oldLSPWorkspaceFolder.emplace_back( mLSPWorkspaceFolder );
mLSPWorkspaceFolder = { "file://" + folder, FileSystem::fileNameFromPath( folder ) };
std::vector<LSPWorkspaceFolder> newWorkspaceFolder = { mLSPWorkspaceFolder };
Lock l( mClientsMutex );
for ( auto& server : mClients )
server.second->didChangeWorkspaceFolders( { mLSPWorkspaceFolder }, {} );
server.second->didChangeWorkspaceFolders( newWorkspaceFolder, oldLSPWorkspaceFolder, true );
}
const LSPWorkspaceFolder& LSPClientServerManager::getLSPWorkspaceFolder() const {