diff --git a/src/lib/data/indexer/TaskExecuteCustomCommands.cpp b/src/lib/data/indexer/TaskExecuteCustomCommands.cpp index ba450f4a..71d2191d 100644 --- a/src/lib/data/indexer/TaskExecuteCustomCommands.cpp +++ b/src/lib/data/indexer/TaskExecuteCustomCommands.cpp @@ -231,7 +231,7 @@ void TaskExecuteCustomCommands::runIndexerCommand(std::shared_ptrgetLine(startLoc->getLineNumber()).substr(startLoc->getColumnNumber() - 1, endLoc->getColumnNumber() - startLoc->getColumnNumber() + 1)); - + for (const Id tokenId : startLoc->getTokenIds()) { const StorageEdge edge = storage.getEdgeById(tokenId); @@ -313,7 +313,7 @@ void TaskExecuteCustomCommands::runPythonPostProcessing(PersistentStorage& stora { for (const StorageNode& targetNode : nodeNameToStorageNodes[token]) { - if (Edge::intToType(edge.type) == Edge::EDGE_CALL && + if (Edge::intToType(edge.type) == Edge::EDGE_CALL && ( NodeType::intToType(targetNode.type) != NodeType::NODE_FUNCTION || NodeType::intToType(targetNode.type) != NodeType::NODE_METHOD diff --git a/src/lib_gui/utility/utilityApp.cpp b/src/lib_gui/utility/utilityApp.cpp index d13d5898..a7301257 100644 --- a/src/lib_gui/utility/utilityApp.cpp +++ b/src/lib_gui/utility/utilityApp.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include "License.h" #include "ApplicationSettings.h" @@ -28,6 +29,11 @@ std::string utility::executeProcess(const std::string& command, const FilePath& process.setWorkingDirectory(QString::fromStdWString(workingDirectory.wstr())); } + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + QStringList envlist = env.toStringList(); + envlist.replaceInStrings(QRegularExpression("^(?i)PATH=(.*)"), "PATH=/opt/local/bin:/usr/local/bin:$HOME/bin:\\1"); + process.setEnvironment(envlist); + { std::lock_guard lock(s_runningProcessesMutex); process.start(command.c_str()); @@ -59,6 +65,11 @@ std::string utility::executeProcessUntilNoOutput(const std::string& command, con process.setWorkingDirectory(QString::fromStdWString(workingDirectory.wstr())); } + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + QStringList envlist = env.toStringList(); + envlist.replaceInStrings(QRegularExpression("^(?i)PATH=(.*)"), "PATH=/opt/local/bin:/usr/local/bin:$HOME/bin:\\1"); + process.setEnvironment(envlist); + { std::lock_guard lock(s_runningProcessesMutex); process.start(command.c_str()); @@ -141,6 +152,11 @@ int utility::executeProcessAndGetExitCode( command += " " + QString::fromStdWString(commandArgument); } + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + QStringList envlist = env.toStringList(); + envlist.replaceInStrings(QRegularExpression("^(?i)PATH=(.*)"), "PATH=/opt/local/bin:/usr/local/bin:$HOME/bin:\\1"); + process.setEnvironment(envlist); + { std::lock_guard lock(s_runningProcessesMutex); process.start(command); diff --git a/src/lib_python/project/SourceGroupPythonEmpty.cpp b/src/lib_python/project/SourceGroupPythonEmpty.cpp index 7b5b370d..34423733 100644 --- a/src/lib_python/project/SourceGroupPythonEmpty.cpp +++ b/src/lib_python/project/SourceGroupPythonEmpty.cpp @@ -1,5 +1,6 @@ #include "SourceGroupPythonEmpty.h" +#include "ApplicationSettings.h" #include "FileManager.h" #include "IndexerCommandCustom.h" #include "ProjectSettings.h" @@ -51,6 +52,11 @@ std::vector> SourceGroupPythonEmpty::getIndexerC args += L" --environment-directory-path=" + m_settings->getEnvironmentDirectoryPathExpandedAndAbsolute().wstr(); } + if (ApplicationSettings::getInstance()->getVerboseIndexerLoggingEnabled()) + { + args += L" --verbose"; + } + std::vector> indexerCommands; for (const FilePath& sourceFilePath : getAllSourceFilePaths()) {