feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Hook grep into Find In File System dialog

Browse Source 
Change-Id: I0fc77ad61c8874a21afd5b5135df4d30fa795a8e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-01-28 23:37:10 +02:00
committed by Orgad Shaneh
parent 1b9b1541d3
commit 558c08e2c5
7 changed files with 158 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
src/plugins/git/gitgrep.cpp
View File

@@ -27,24 +27,21 @@
#include "gitclient.h"
#include "gitplugin.h"
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/find/findplugin.h>
#include <coreplugin/vcsmanager.h>
#include <texteditor/findinfiles.h>
#include <vcsbase/vcsbaseconstants.h>
#include <utils/filesearch.h>
#include <utils/fileutils.h>
#include <utils/pathchooser.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/runextensions.h>
#include <QDir>
#include <QCheckBox>
#include <QCoreApplication>
#include <QEventLoop>
#include <QFuture>
#include <QFutureWatcher>
#include <QGridLayout>
#include <QLabel>
#include <QSettings>
using namespace Utils;
@@ -54,18 +51,10 @@ namespace Internal {
using namespace Core;
QString GitGrep::id() const
{
return QLatin1String("Git Grep");
}
QString GitGrep::displayName() const
{
return tr("Git Grep");
}
namespace {
const char EnableGitGrep[] = "EnableGitGrep";
class GitGrepRunner : public QObject
{
using FutureInterfaceType = QFutureInterface<FileSearchResultList>;
@@ -180,117 +169,72 @@ private:
} // namespace
static bool validateDirectory(const QString &path)
{
static IVersionControl *gitVc = VcsManager::versionControl(VcsBase::Constants::VCS_ID_GIT);
QTC_ASSERT(gitVc, return false);
return gitVc == VcsManager::findVersionControlForDirectory(path, 0);
}
GitGrep::GitGrep()
{
m_widget = new QCheckBox(tr("&Use Git Grep"));
m_widget->setToolTip(tr("Use Git Grep for searching. This includes only files "
"that are managed by source control."));
TextEditor::FindInFiles *findInFiles = TextEditor::FindInFiles::instance();
QTC_ASSERT(findInFiles, return);
QObject::connect(findInFiles, &TextEditor::FindInFiles::pathChanged,
m_widget.data(), [this](const QString &path) {
m_widget->setEnabled(validateDirectory(path));
});
findInFiles->setFindExtension(this);
}
GitGrep::~GitGrep()
{
delete m_widget.data();
}
QString GitGrep::title() const
{
return tr("Git Grep");
}
QWidget *GitGrep::widget() const
{
return m_widget.data();
}
bool GitGrep::isEnabled() const
{
return m_widget->isEnabled() && m_widget->isChecked();
}
bool GitGrep::isEnabled(const TextEditor::FileFindParameters &parameters) const
{
return parameters.extensionParameters.toBool();
}
QVariant GitGrep::parameters() const
{
return isEnabled();
}
void GitGrep::readSettings(QSettings *settings)
{
m_widget->setChecked(settings->value(QLatin1String(EnableGitGrep), false).toBool());
}
void GitGrep::writeSettings(QSettings *settings) const
{
settings->setValue(QLatin1String(EnableGitGrep), m_widget->isChecked());
}
QFuture<FileSearchResultList> GitGrep::executeSearch(
const TextEditor::FileFindParameters &parameters)
{
return Utils::runAsync<FileSearchResultList>(GitGrepRunner::run, parameters);
}
FileIterator *GitGrep::files(const QStringList &, const QVariant &) const
{
QTC_ASSERT(false, return 0);
}
QVariant GitGrep::additionalParameters() const
{
return qVariantFromValue(path().toString());
}
QString GitGrep::label() const
{
const QChar slash = QLatin1Char('/');
const QStringList &nonEmptyComponents = path().toFileInfo().absoluteFilePath()
.split(slash, QString::SkipEmptyParts);
return tr("Git Grep \"%1\":").arg(nonEmptyComponents.isEmpty() ? QString(slash)
: nonEmptyComponents.last());
}
QString GitGrep::toolTip() const
{
//: %3 is filled by BaseFileFind::runNewSearch
return tr("Path: %1\nFilter: %2\n%3")
.arg(path().toUserOutput(), fileNameFilters().join(QLatin1Char(',')));
}
bool GitGrep::validateDirectory(FancyLineEdit *edit, QString *errorMessage) const
{
static IVersionControl *gitVc =
VcsManager::versionControl(VcsBase::Constants::VCS_ID_GIT);
QTC_ASSERT(gitVc, return false);
if (!m_directory->defaultValidationFunction()(edit, errorMessage))
return false;
const QString path = m_directory->path();
IVersionControl *vc = VcsManager::findVersionControlForDirectory(path, 0);
if (vc == gitVc)
return true;
if (errorMessage)
*errorMessage = tr("The path \"%1\" is not managed by Git").arg(path);
return false;
}
QWidget *GitGrep::createConfigWidget()
{
if (!m_configWidget) {
m_configWidget = new QWidget;
QGridLayout * const gridLayout = new QGridLayout(m_configWidget);
gridLayout->setMargin(0);
m_configWidget->setLayout(gridLayout);
QLabel *dirLabel = new QLabel(tr("Director&y:"));
gridLayout->addWidget(dirLabel, 0, 0, Qt::AlignRight);
m_directory = new PathChooser;
m_directory->setExpectedKind(PathChooser::ExistingDirectory);
m_directory->setHistoryCompleter(QLatin1String("Git.Grep.History"), true);
m_directory->setPromptDialogTitle(tr("Directory to search"));
m_directory->setValidationFunction([this](FancyLineEdit *edit, QString *errorMessage) {
return validateDirectory(edit, errorMessage);
});
connect(m_directory.data(), &PathChooser::validChanged,
this, &GitGrep::enabledChanged);
dirLabel->setBuddy(m_directory);
gridLayout->addWidget(m_directory, 0, 1, 1, 2);
QLabel * const filePatternLabel = new QLabel(tr("Fi&le pattern:"));
filePatternLabel->setMinimumWidth(80);
filePatternLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
filePatternLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
QWidget *patternWidget = createPatternWidget();
filePatternLabel->setBuddy(patternWidget);
gridLayout->addWidget(filePatternLabel, 1, 0);
gridLayout->addWidget(patternWidget, 1, 1, 1, 2);
m_configWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
}
return m_configWidget;
}
FileName GitGrep::path() const
{
return m_directory->fileName();
}
void GitGrep::writeSettings(QSettings *settings)
{
settings->beginGroup(QLatin1String("GitGrep"));
writeCommonSettings(settings);
settings->endGroup();
}
void GitGrep::readSettings(QSettings *settings)
{
settings->beginGroup(QLatin1String("GitGrep"));
readCommonSettings(settings, QLatin1String("*"));
settings->endGroup();
}
bool GitGrep::isValid() const
{
return m_directory->isValid();
}
void GitGrep::setDirectory(const FileName &directory)
{
m_directory->setFileName(directory);
}
} // Internal
} // Git