From 4082ce517e5aa9dca983f41d21dd5a7bf84efdb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sun, 15 Sep 2024 12:40:59 -0300 Subject: [PATCH] Fix error parsing document symbols with the old format (fixes document symbols in pylsp). --- src/eepp/system/process.cpp | 10 +++++----- src/tools/ecode/plugins/lsp/lspclientserver.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/eepp/system/process.cpp b/src/eepp/system/process.cpp index 03e38b59b..2bbbb340a 100644 --- a/src/eepp/system/process.cpp +++ b/src/eepp/system/process.cpp @@ -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 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() ); diff --git a/src/tools/ecode/plugins/lsp/lspclientserver.cpp b/src/tools/ecode/plugins/lsp/lspclientserver.cpp index 7bbdfe858..87d02c159 100644 --- a/src/tools/ecode/plugins/lsp/lspclientserver.cpp +++ b/src/tools/ecode/plugins/lsp/lspclientserver.cpp @@ -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 );