mirror of
https://github.com/Palm1r/QodeAssist.git
synced 2025-06-04 01:28:58 -04:00
feat: Add list for ignoring in request for llm
This commit is contained in:
parent
7515599acb
commit
365f8306cb
@ -289,6 +289,11 @@ LLMCore::ContextData LLMClientInterface::prepareContext(
|
|||||||
return reader.prepareContext(lineNumber, cursorPosition, m_completeSettings);
|
return reader.prepareContext(lineNumber, cursorPosition, m_completeSettings);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Context::ContextManager *LLMClientInterface::contextManager() const
|
||||||
|
{
|
||||||
|
return m_contextManager;
|
||||||
|
}
|
||||||
|
|
||||||
void LLMClientInterface::sendCompletionToClient(
|
void LLMClientInterface::sendCompletionToClient(
|
||||||
const QString &completion, const QJsonObject &request, bool isComplete)
|
const QString &completion, const QJsonObject &request, bool isComplete)
|
||||||
{
|
{
|
||||||
|
@ -62,6 +62,8 @@ public:
|
|||||||
// exposed for tests
|
// exposed for tests
|
||||||
void sendData(const QByteArray &data) override;
|
void sendData(const QByteArray &data) override;
|
||||||
|
|
||||||
|
Context::ContextManager *contextManager() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void startImpl() override;
|
void startImpl() override;
|
||||||
|
|
||||||
|
@ -49,6 +49,7 @@ namespace QodeAssist {
|
|||||||
|
|
||||||
QodeAssistClient::QodeAssistClient(LLMClientInterface *clientInterface)
|
QodeAssistClient::QodeAssistClient(LLMClientInterface *clientInterface)
|
||||||
: LanguageClient::Client(clientInterface)
|
: LanguageClient::Client(clientInterface)
|
||||||
|
, m_llmClient(clientInterface)
|
||||||
, m_recentCharCount(0)
|
, m_recentCharCount(0)
|
||||||
{
|
{
|
||||||
setName("QodeAssist");
|
setName("QodeAssist");
|
||||||
@ -73,6 +74,14 @@ void QodeAssistClient::openDocument(TextEditor::TextDocument *document)
|
|||||||
if (!isEnabled(project))
|
if (!isEnabled(project))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (m_llmClient->contextManager()
|
||||||
|
->ignoreManager()
|
||||||
|
->shouldIgnore(document->filePath().toUrlishString(), project)) {
|
||||||
|
LOG_MESSAGE(QString("Ignoring file due to .qodeassistignore: %1")
|
||||||
|
.arg(document->filePath().toUrlishString()));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Client::openDocument(document);
|
Client::openDocument(document);
|
||||||
connect(
|
connect(
|
||||||
document,
|
document,
|
||||||
@ -152,6 +161,14 @@ void QodeAssistClient::requestCompletions(TextEditor::TextEditorWidget *editor)
|
|||||||
if (!isEnabled(project))
|
if (!isEnabled(project))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (m_llmClient->contextManager()
|
||||||
|
->ignoreManager()
|
||||||
|
->shouldIgnore(editor->textDocument()->filePath().toUrlishString(), project)) {
|
||||||
|
LOG_MESSAGE(QString("Ignoring file due to .qodeassistignore: %1")
|
||||||
|
.arg(editor->textDocument()->filePath().toUrlishString()));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
MultiTextCursor cursor = editor->multiTextCursor();
|
MultiTextCursor cursor = editor->multiTextCursor();
|
||||||
if (cursor.hasMultipleCursors() || cursor.hasSelection() || editor->suggestionVisible())
|
if (cursor.hasMultipleCursors() || cursor.hasSelection() || editor->suggestionVisible())
|
||||||
return;
|
return;
|
||||||
@ -181,6 +198,14 @@ void QodeAssistClient::requestQuickRefactor(
|
|||||||
if (!isEnabled(project))
|
if (!isEnabled(project))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (m_llmClient->contextManager()
|
||||||
|
->ignoreManager()
|
||||||
|
->shouldIgnore(editor->textDocument()->filePath().toUrlishString(), project)) {
|
||||||
|
LOG_MESSAGE(QString("Ignoring file due to .qodeassistignore: %1")
|
||||||
|
.arg(editor->textDocument()->filePath().toUrlishString()));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!m_refactorHandler) {
|
if (!m_refactorHandler) {
|
||||||
m_refactorHandler = new QuickRefactorHandler(this);
|
m_refactorHandler = new QuickRefactorHandler(this);
|
||||||
connect(
|
connect(
|
||||||
|
@ -69,6 +69,7 @@ private:
|
|||||||
CompletionProgressHandler m_progressHandler;
|
CompletionProgressHandler m_progressHandler;
|
||||||
EditorChatButtonHandler m_chatButtonHandler;
|
EditorChatButtonHandler m_chatButtonHandler;
|
||||||
QuickRefactorHandler *m_refactorHandler{nullptr};
|
QuickRefactorHandler *m_refactorHandler{nullptr};
|
||||||
|
LLMClientInterface *m_llmClient;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace QodeAssist
|
} // namespace QodeAssist
|
||||||
|
@ -8,6 +8,7 @@ add_library(Context STATIC
|
|||||||
TokenUtils.hpp TokenUtils.cpp
|
TokenUtils.hpp TokenUtils.cpp
|
||||||
ProgrammingLanguage.hpp ProgrammingLanguage.cpp
|
ProgrammingLanguage.hpp ProgrammingLanguage.cpp
|
||||||
IContextManager.hpp
|
IContextManager.hpp
|
||||||
|
IgnoreManager.hpp IgnoreManager.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(Context
|
target_link_libraries(Context
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
#include "settings/GeneralSettings.hpp"
|
#include "settings/GeneralSettings.hpp"
|
||||||
#include <coreplugin/editormanager/editormanager.h>
|
#include <coreplugin/editormanager/editormanager.h>
|
||||||
#include <projectexplorer/project.h>
|
#include <projectexplorer/project.h>
|
||||||
|
#include <projectexplorer/projectmanager.h>
|
||||||
#include <projectexplorer/projectnodes.h>
|
#include <projectexplorer/projectnodes.h>
|
||||||
#include <texteditor/textdocument.h>
|
#include <texteditor/textdocument.h>
|
||||||
|
|
||||||
@ -36,6 +37,7 @@ namespace QodeAssist::Context {
|
|||||||
|
|
||||||
ContextManager::ContextManager(QObject *parent)
|
ContextManager::ContextManager(QObject *parent)
|
||||||
: QObject(parent)
|
: QObject(parent)
|
||||||
|
, m_ignoreManager(new IgnoreManager(this))
|
||||||
{}
|
{}
|
||||||
|
|
||||||
QString ContextManager::readFile(const QString &filePath) const
|
QString ContextManager::readFile(const QString &filePath) const
|
||||||
@ -52,6 +54,13 @@ QList<ContentFile> ContextManager::getContentFiles(const QStringList &filePaths)
|
|||||||
{
|
{
|
||||||
QList<ContentFile> files;
|
QList<ContentFile> files;
|
||||||
for (const QString &path : filePaths) {
|
for (const QString &path : filePaths) {
|
||||||
|
auto project = ProjectExplorer::ProjectManager::projectForFile(
|
||||||
|
Utils::FilePath::fromString(path));
|
||||||
|
if (project && m_ignoreManager->shouldIgnore(path, project)) {
|
||||||
|
LOG_MESSAGE(QString("Ignoring file in context due to .qodeassistignore: %1").arg(path));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
ContentFile contentFile = createContentFile(path);
|
ContentFile contentFile = createContentFile(path);
|
||||||
files.append(contentFile);
|
files.append(contentFile);
|
||||||
}
|
}
|
||||||
@ -121,6 +130,14 @@ QList<QPair<QString, QString>> ContextManager::openedFiles(const QStringList exc
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
auto filePath = textDocument->filePath().toUrlishString();
|
auto filePath = textDocument->filePath().toUrlishString();
|
||||||
|
|
||||||
|
auto project = ProjectExplorer::ProjectManager::projectForFile(textDocument->filePath());
|
||||||
|
if (project && m_ignoreManager->shouldIgnore(filePath, project)) {
|
||||||
|
LOG_MESSAGE(
|
||||||
|
QString("Ignoring file in context due to .qodeassistignore: %1").arg(filePath));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (!excludeFiles.contains(filePath)) {
|
if (!excludeFiles.contains(filePath)) {
|
||||||
files.append({filePath, textDocument->plainText()});
|
files.append({filePath, textDocument->plainText()});
|
||||||
}
|
}
|
||||||
@ -144,6 +161,13 @@ QString ContextManager::openedFilesContext(const QStringList excludeFiles)
|
|||||||
if (excludeFiles.contains(filePath))
|
if (excludeFiles.contains(filePath))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
auto project = ProjectExplorer::ProjectManager::projectForFile(textDocument->filePath());
|
||||||
|
if (project && m_ignoreManager->shouldIgnore(filePath, project)) {
|
||||||
|
LOG_MESSAGE(
|
||||||
|
QString("Ignoring file in context due to .qodeassistignore: %1").arg(filePath));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
context += QString("File: %1\n").arg(filePath);
|
context += QString("File: %1\n").arg(filePath);
|
||||||
context += textDocument->plainText();
|
context += textDocument->plainText();
|
||||||
|
|
||||||
@ -153,4 +177,9 @@ QString ContextManager::openedFilesContext(const QStringList excludeFiles)
|
|||||||
return context;
|
return context;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IgnoreManager *ContextManager::ignoreManager() const
|
||||||
|
{
|
||||||
|
return m_ignoreManager;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace QodeAssist::Context
|
} // namespace QodeAssist::Context
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
|
|
||||||
#include "ContentFile.hpp"
|
#include "ContentFile.hpp"
|
||||||
#include "IContextManager.hpp"
|
#include "IContextManager.hpp"
|
||||||
|
#include "IgnoreManager.hpp"
|
||||||
#include "ProgrammingLanguage.hpp"
|
#include "ProgrammingLanguage.hpp"
|
||||||
|
|
||||||
namespace ProjectExplorer {
|
namespace ProjectExplorer {
|
||||||
@ -49,6 +50,11 @@ public:
|
|||||||
bool isSpecifyCompletion(const DocumentInfo &documentInfo) const override;
|
bool isSpecifyCompletion(const DocumentInfo &documentInfo) const override;
|
||||||
QList<QPair<QString, QString>> openedFiles(const QStringList excludeFiles = QStringList{}) const;
|
QList<QPair<QString, QString>> openedFiles(const QStringList excludeFiles = QStringList{}) const;
|
||||||
QString openedFilesContext(const QStringList excludeFiles = QStringList{});
|
QString openedFilesContext(const QStringList excludeFiles = QStringList{});
|
||||||
|
|
||||||
|
IgnoreManager *ignoreManager() const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
IgnoreManager *m_ignoreManager;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace QodeAssist::Context
|
} // namespace QodeAssist::Context
|
||||||
|
146
context/IgnoreManager.cpp
Normal file
146
context/IgnoreManager.cpp
Normal file
@ -0,0 +1,146 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2025 Petr Mironychev
|
||||||
|
*
|
||||||
|
* This file is part of QodeAssist.
|
||||||
|
*
|
||||||
|
* QodeAssist is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* QodeAssist is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "IgnoreManager.hpp"
|
||||||
|
|
||||||
|
#include <projectexplorer/project.h>
|
||||||
|
#include <QDir>
|
||||||
|
#include <QFile>
|
||||||
|
#include <QFileInfo>
|
||||||
|
#include <QRegularExpression>
|
||||||
|
#include <QTextStream>
|
||||||
|
|
||||||
|
#include "logger/Logger.hpp"
|
||||||
|
|
||||||
|
namespace QodeAssist::Context {
|
||||||
|
|
||||||
|
IgnoreManager::IgnoreManager(QObject *parent)
|
||||||
|
: QObject(parent)
|
||||||
|
{
|
||||||
|
connect(&m_fileWatcher, &QFileSystemWatcher::fileChanged, this, [this](const QString &path) {
|
||||||
|
for (auto it = m_projectIgnorePatterns.begin(); it != m_projectIgnorePatterns.end(); ++it) {
|
||||||
|
if (ignoreFilePath(it.key()) == path) {
|
||||||
|
reloadIgnorePatterns(it.key());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
IgnoreManager::~IgnoreManager() = default;
|
||||||
|
|
||||||
|
bool IgnoreManager::shouldIgnore(const QString &filePath, ProjectExplorer::Project *project) const
|
||||||
|
{
|
||||||
|
if (!project)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (!m_projectIgnorePatterns.contains(project)) {
|
||||||
|
const_cast<IgnoreManager *>(this)->reloadIgnorePatterns(project);
|
||||||
|
}
|
||||||
|
|
||||||
|
const QStringList &patterns = m_projectIgnorePatterns[project];
|
||||||
|
if (patterns.isEmpty())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
QDir projectDir(project->projectDirectory().toUrlishString());
|
||||||
|
QString relativePath = projectDir.relativeFilePath(filePath);
|
||||||
|
|
||||||
|
return matchesIgnorePatterns(relativePath, patterns);
|
||||||
|
}
|
||||||
|
|
||||||
|
void IgnoreManager::reloadIgnorePatterns(ProjectExplorer::Project *project)
|
||||||
|
{
|
||||||
|
if (!project)
|
||||||
|
return;
|
||||||
|
|
||||||
|
QStringList patterns = loadIgnorePatterns(project);
|
||||||
|
m_projectIgnorePatterns[project] = patterns;
|
||||||
|
|
||||||
|
QString ignoreFile = ignoreFilePath(project);
|
||||||
|
if (QFileInfo::exists(ignoreFile)) {
|
||||||
|
if (m_fileWatcher.files().contains(ignoreFile))
|
||||||
|
m_fileWatcher.removePath(ignoreFile);
|
||||||
|
|
||||||
|
m_fileWatcher.addPath(ignoreFile);
|
||||||
|
|
||||||
|
if (!m_projectConnections.contains(project)) {
|
||||||
|
auto connection = connect(project, &QObject::destroyed, this, [this, project]() {
|
||||||
|
m_projectIgnorePatterns.remove(project);
|
||||||
|
m_projectConnections.remove(project);
|
||||||
|
});
|
||||||
|
m_projectConnections[project] = connection;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QStringList IgnoreManager::loadIgnorePatterns(ProjectExplorer::Project *project)
|
||||||
|
{
|
||||||
|
QStringList patterns;
|
||||||
|
if (!project)
|
||||||
|
return patterns;
|
||||||
|
|
||||||
|
QString path = ignoreFilePath(project);
|
||||||
|
QFile file(path);
|
||||||
|
|
||||||
|
if (!file.exists())
|
||||||
|
return patterns;
|
||||||
|
|
||||||
|
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
||||||
|
LOG_MESSAGE(QString("Could not open .qodeassistignore file: %1").arg(path));
|
||||||
|
return patterns;
|
||||||
|
}
|
||||||
|
|
||||||
|
QTextStream in(&file);
|
||||||
|
while (!in.atEnd()) {
|
||||||
|
QString line = in.readLine().trimmed();
|
||||||
|
if (!line.isEmpty() && !line.startsWith('#'))
|
||||||
|
patterns << line;
|
||||||
|
}
|
||||||
|
|
||||||
|
return patterns;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IgnoreManager::matchesIgnorePatterns(const QString &path, const QStringList &patterns) const
|
||||||
|
{
|
||||||
|
for (const QString &pattern : patterns) {
|
||||||
|
QString regexPattern = QRegularExpression::escape(pattern);
|
||||||
|
|
||||||
|
regexPattern.replace("\\*\\*", ".*"); // ** matches any characters including /
|
||||||
|
regexPattern.replace("\\*", "[^/]*"); // * matches any characters except /
|
||||||
|
regexPattern.replace("\\?", "."); // ? matches any single character
|
||||||
|
|
||||||
|
regexPattern = QString("^%1$").arg(regexPattern);
|
||||||
|
|
||||||
|
QRegularExpression regex(regexPattern);
|
||||||
|
if (regex.match(path).hasMatch())
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString IgnoreManager::ignoreFilePath(ProjectExplorer::Project *project) const
|
||||||
|
{
|
||||||
|
if (!project)
|
||||||
|
return QString();
|
||||||
|
|
||||||
|
return project->projectDirectory().toUrlishString() + "/.qodeassist/qodeassistignore";
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace QodeAssist::Context
|
54
context/IgnoreManager.hpp
Normal file
54
context/IgnoreManager.hpp
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2025 Petr Mironychev
|
||||||
|
*
|
||||||
|
* This file is part of QodeAssist.
|
||||||
|
*
|
||||||
|
* QodeAssist is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* QodeAssist is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <QFileSystemWatcher>
|
||||||
|
#include <QMap>
|
||||||
|
#include <QObject>
|
||||||
|
#include <QStringList>
|
||||||
|
|
||||||
|
namespace ProjectExplorer {
|
||||||
|
class Project;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace QodeAssist::Context {
|
||||||
|
|
||||||
|
class IgnoreManager : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit IgnoreManager(QObject *parent = nullptr);
|
||||||
|
~IgnoreManager() override;
|
||||||
|
|
||||||
|
bool shouldIgnore(const QString &filePath, ProjectExplorer::Project *project = nullptr) const;
|
||||||
|
void reloadIgnorePatterns(ProjectExplorer::Project *project);
|
||||||
|
|
||||||
|
private:
|
||||||
|
QStringList loadIgnorePatterns(ProjectExplorer::Project *project);
|
||||||
|
bool matchesIgnorePatterns(const QString &path, const QStringList &patterns) const;
|
||||||
|
QString ignoreFilePath(ProjectExplorer::Project *project) const;
|
||||||
|
|
||||||
|
mutable QMap<ProjectExplorer::Project *, QStringList> m_projectIgnorePatterns;
|
||||||
|
QFileSystemWatcher m_fileWatcher;
|
||||||
|
QMap<ProjectExplorer::Project *, QMetaObject::Connection> m_projectConnections;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace QodeAssist::Context
|
Loading…
x
Reference in New Issue
Block a user