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

Fix error parsing document symbols with the old format (fixes document symbols in pylsp).

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-09-15 12:40:59 -03:00
parent 23bde61361
commit 4082ce517e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/eepp/system/process.cpp
View File

@@ -32,7 +32,7 @@ namespace EE { namespace System {
static bool isFlatpakEnv() {
static bool sChecked = false;
static bool sIsFlatpak = false;
if (!sChecked) {
if ( !sChecked ) {
sIsFlatpak = getenv( "FLATPAK_ID" ) != NULL;
sChecked = true;
}
@@ -106,18 +106,18 @@ bool Process::create( const std::string& command, const std::vector<std::string>
options &= ~Process::InheritEnvironment;
}
std::size_t deltaExtra = 0;
#if EE_PLATFORM == EE_PLATFORM_LINUX
#if EE_PLATFORM == EE_PLATFORM_LINUX
deltaExtra = isFlatpakEnv() ? 2 : 0;
#endif
#endif
envArr.reserve( environment.size() + envVars.size() );
strings.reserve( cmdArr.size() + 1 + deltaExtra );
envStrings.reserve( envArr.size() + 1 );
#if EE_PLATFORM == EE_PLATFORM_LINUX
#if EE_PLATFORM == EE_PLATFORM_LINUX
if ( isFlatpakEnv() ) {
strings.push_back( "/usr/bin/flatpak-spawn" );
strings.push_back( "--host" );
}
#endif
#endif
strings.push_back( rcommand.c_str() );
for ( size_t i = 0; i < cmdArr.size(); ++i )
strings.push_back( cmdArr[i].c_str() );

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

@@ -452,7 +452,7 @@ static LSPSymbolInformationList parseDocumentSymbols( const json& result, bool i
const auto& srange = symbol.contains( MEMBER_SELECTION_RANGE )
? symbol.at( MEMBER_SELECTION_RANGE )
: symbol[MEMBER_LOCATION].at( MEMBER_SELECTION_RANGE );
: symbol[MEMBER_LOCATION].at( MEMBER_RANGE );
auto range = parseRange( mrange );
auto selectionRange = parseRange( srange );