mirror/QodeAssist
1
0
Fork 0
mirror of https://github.com/Palm1r/QodeAssist.git synced 2025-05-28 03:10:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Reduce dependency on TextDocument in ContextManager (#128)

Browse Source
This commit is contained in:
Povilas Kanapickas 2025-03-10 19:06:19 +02:00 committed by GitHub
parent c724bace06
commit 3d770f91c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
LLMClientInterface.cpp
View File

@ -170,7 +170,8 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
auto updatedContext = prepareContext(request, documentInfo);
bool isPreset1Active = Context::ContextManager::isSpecifyCompletion(request, m_generalSettings);
bool isPreset1Active
= Context::ContextManager::isSpecifyCompletion(documentInfo, m_generalSettings);
const auto providerName = !isPreset1Active ? m_generalSettings.ccProvider()
: m_generalSettings.ccPreset1Provider();
@ -279,7 +280,10 @@ LLMCore::ContextData LLMClientInterface::prepareContext(
void LLMClientInterface::sendCompletionToClient(
const QString &completion, const QJsonObject &request, bool isComplete)
{
bool isPreset1Active = Context::ContextManager::isSpecifyCompletion(request, m_generalSettings);
auto filePath = Context::extractFilePathFromRequest(request);
auto documentInfo = m_documentReader.readDocument(filePath);
bool isPreset1Active
= Context::ContextManager::isSpecifyCompletion(documentInfo, m_generalSettings);
auto templateName = !isPreset1Active ? m_generalSettings.ccTemplate()
: m_generalSettings.ccPreset1Template();

19
context/ContextManager.cpp
View File

@ -26,9 +26,6 @@
#include "GeneralSettings.hpp"
#include "Logger.hpp"
#include "Utils.hpp"
#include <texteditor/textdocument.h>
#include <utils/filepath.h>
namespace QodeAssist::Context {
@ -71,24 +68,20 @@ ContentFile ContextManager::createContentFile(const QString &filePath) const
return contentFile;
}
ProgrammingLanguage ContextManager::getDocumentLanguage(const QJsonObject &request)
ProgrammingLanguage ContextManager::getDocumentLanguage(const DocumentInfo &documentInfo)
{
auto filePath = extractFilePathFromRequest(request);
TextEditor::TextDocument *textDocument = TextEditor::TextDocument::textDocumentForFilePath(
Utils::FilePath::fromString(filePath));
if (!textDocument) {
LOG_MESSAGE("Error: Document is not available for" + filePath);
if (!documentInfo.document) {
LOG_MESSAGE("Error: Document is not available for" + documentInfo.filePath);
return Context::ProgrammingLanguage::Unknown;
}
return Context::ProgrammingLanguageUtils::fromMimeType(textDocument->mimeType());
return Context::ProgrammingLanguageUtils::fromMimeType(documentInfo.mimeType);
}
bool ContextManager::isSpecifyCompletion(
const QJsonObject &request, const Settings::GeneralSettings &generalSettings)
const DocumentInfo &documentInfo, const Settings::GeneralSettings &generalSettings)
{
Context::ProgrammingLanguage documentLanguage = getDocumentLanguage(request);
Context::ProgrammingLanguage documentLanguage = getDocumentLanguage(documentInfo);
Context::ProgrammingLanguage preset1Language = Context::ProgrammingLanguageUtils::fromString(
generalSettings.preset1Language.displayForIndex(generalSettings.preset1Language()));

5
context/ContextManager.hpp
View File

@ -23,6 +23,7 @@
#include <QString>
#include "ContentFile.hpp"
#include "IDocumentReader.hpp"
#include "ProgrammingLanguage.hpp"
#include "settings/GeneralSettings.hpp"
@ -37,9 +38,9 @@ public:
QString readFile(const QString &filePath) const;
QList<ContentFile> getContentFiles(const QStringList &filePaths) const;
static ProgrammingLanguage getDocumentLanguage(const QJsonObject &request);
static ProgrammingLanguage getDocumentLanguage(const DocumentInfo &documentInfo);
static bool isSpecifyCompletion(
const QJsonObject &request, const Settings::GeneralSettings &generalSettings);
const DocumentInfo &documentInfo, const Settings::GeneralSettings &generalSettings);
private:
explicit ContextManager(QObject *parent = nullptr);