2013-01-14 23:11:10 +04:00
|
|
|
/****************************************************************************
|
|
|
|
|
**
|
2016-01-15 14:57:40 +01:00
|
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
|
|
|
** Contact: https://www.qt.io/licensing/
|
2013-01-14 23:11:10 +04:00
|
|
|
**
|
|
|
|
|
** This file is part of Qt Creator.
|
|
|
|
|
**
|
|
|
|
|
** Commercial License Usage
|
|
|
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
|
|
** accordance with the commercial license agreement provided with the
|
|
|
|
|
** Software or, alternatively, in accordance with the terms contained in
|
2016-01-15 14:57:40 +01:00
|
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
2013-01-14 23:11:10 +04:00
|
|
|
**
|
2016-01-15 14:57:40 +01:00
|
|
|
** GNU General Public License Usage
|
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
|
|
|
** General Public License version 3 as published by the Free Software
|
|
|
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
|
|
|
** included in the packaging of this file. Please review the following
|
|
|
|
|
** information to ensure the GNU General Public License requirements will
|
|
|
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
2013-01-14 23:11:10 +04:00
|
|
|
**
|
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
|
|
#include "pythoneditorplugin.h"
|
2014-08-20 15:05:32 +02:00
|
|
|
#include "pythoneditor.h"
|
2013-01-14 23:11:10 +04:00
|
|
|
#include "pythoneditorconstants.h"
|
2016-08-03 00:07:44 +02:00
|
|
|
#include "pythonhighlighter.h"
|
2013-01-14 23:11:10 +04:00
|
|
|
|
|
|
|
|
#include <coreplugin/icore.h>
|
|
|
|
|
#include <coreplugin/coreconstants.h>
|
2015-06-09 15:19:54 +02:00
|
|
|
#include <coreplugin/documentmanager.h>
|
2013-01-14 23:11:10 +04:00
|
|
|
#include <coreplugin/fileiconprovider.h>
|
|
|
|
|
#include <coreplugin/id.h>
|
|
|
|
|
#include <coreplugin/editormanager/editormanager.h>
|
2015-06-09 15:19:54 +02:00
|
|
|
|
2013-01-14 23:11:10 +04:00
|
|
|
#include <extensionsystem/pluginmanager.h>
|
2015-06-09 15:19:54 +02:00
|
|
|
|
|
|
|
|
#include <projectexplorer/applicationlauncher.h>
|
2018-03-06 15:28:06 +01:00
|
|
|
#include <projectexplorer/buildtargetinfo.h>
|
2015-06-09 15:19:54 +02:00
|
|
|
#include <projectexplorer/kitmanager.h>
|
|
|
|
|
#include <projectexplorer/localenvironmentaspect.h>
|
|
|
|
|
#include <projectexplorer/runconfiguration.h>
|
|
|
|
|
#include <projectexplorer/runconfigurationaspects.h>
|
|
|
|
|
#include <projectexplorer/project.h>
|
2017-03-03 18:16:34 +01:00
|
|
|
#include <projectexplorer/projectmanager.h>
|
|
|
|
|
#include <projectexplorer/projectnodes.h>
|
2016-01-27 16:56:36 +01:00
|
|
|
#include <projectexplorer/runnables.h>
|
2015-06-09 15:19:54 +02:00
|
|
|
#include <projectexplorer/target.h>
|
|
|
|
|
|
2013-01-14 23:11:10 +04:00
|
|
|
#include <texteditor/texteditorconstants.h>
|
2015-06-09 15:19:54 +02:00
|
|
|
|
2016-09-30 23:13:45 +02:00
|
|
|
#include <utils/algorithm.h>
|
2015-06-09 15:19:54 +02:00
|
|
|
#include <utils/detailswidget.h>
|
|
|
|
|
#include <utils/pathchooser.h>
|
|
|
|
|
#include <utils/qtcprocess.h>
|
2016-08-03 17:55:54 +02:00
|
|
|
#include <utils/utilsicons.h>
|
2013-01-14 23:11:10 +04:00
|
|
|
|
|
|
|
|
#include <QCoreApplication>
|
2018-03-06 15:28:06 +01:00
|
|
|
#include <QDir>
|
2015-06-09 15:19:54 +02:00
|
|
|
#include <QFormLayout>
|
2017-03-09 23:02:32 +01:00
|
|
|
#include <QRegExp>
|
2013-01-14 23:11:10 +04:00
|
|
|
|
2015-06-09 15:19:54 +02:00
|
|
|
using namespace Core;
|
|
|
|
|
using namespace ProjectExplorer;
|
2013-01-14 23:11:10 +04:00
|
|
|
using namespace PythonEditor::Constants;
|
2015-06-09 15:19:54 +02:00
|
|
|
using namespace Utils;
|
2013-01-14 23:11:10 +04:00
|
|
|
|
|
|
|
|
namespace PythonEditor {
|
2013-08-23 13:41:17 +02:00
|
|
|
namespace Internal {
|
2013-01-14 23:11:10 +04:00
|
|
|
|
2015-06-09 15:19:54 +02:00
|
|
|
const char PythonRunConfigurationPrefix[] = "PythonEditor.RunConfiguration.";
|
|
|
|
|
const char InterpreterKey[] = "PythonEditor.RunConfiguation.Interpreter";
|
|
|
|
|
const char MainScriptKey[] = "PythonEditor.RunConfiguation.MainScript";
|
|
|
|
|
const char PythonMimeType[] = "text/x-python-project"; // ### FIXME
|
|
|
|
|
const char PythonProjectId[] = "PythonProject";
|
|
|
|
|
|
|
|
|
|
class PythonRunConfiguration;
|
|
|
|
|
class PythonProjectFile;
|
|
|
|
|
|
|
|
|
|
class PythonProject : public Project
|
|
|
|
|
{
|
2017-11-17 08:24:47 +01:00
|
|
|
Q_OBJECT
|
2015-06-09 15:19:54 +02:00
|
|
|
public:
|
2017-03-03 18:16:34 +01:00
|
|
|
explicit PythonProject(const Utils::FileName &filename);
|
2015-06-09 15:19:54 +02:00
|
|
|
|
|
|
|
|
bool addFiles(const QStringList &filePaths);
|
|
|
|
|
bool removeFiles(const QStringList &filePaths);
|
|
|
|
|
bool setFiles(const QStringList &filePaths);
|
|
|
|
|
bool renameFile(const QString &filePath, const QString &newFilePath);
|
2018-03-06 15:28:06 +01:00
|
|
|
void refresh(Target *target = nullptr);
|
2015-06-09 15:19:54 +02:00
|
|
|
|
2018-03-09 13:30:13 +01:00
|
|
|
bool needsConfiguration() const final { return false; }
|
|
|
|
|
|
2015-06-09 15:19:54 +02:00
|
|
|
private:
|
2015-07-23 11:23:52 +02:00
|
|
|
RestoreResult fromMap(const QVariantMap &map, QString *errorMessage) override;
|
2018-03-09 12:23:00 +01:00
|
|
|
bool setupTarget(Target *t) override
|
2018-03-06 15:28:06 +01:00
|
|
|
{
|
|
|
|
|
refresh(t);
|
|
|
|
|
return Project::setupTarget(t);
|
|
|
|
|
}
|
2015-07-23 11:23:52 +02:00
|
|
|
|
2015-06-09 15:19:54 +02:00
|
|
|
bool saveRawFileList(const QStringList &rawFileList);
|
|
|
|
|
bool saveRawList(const QStringList &rawList, const QString &fileName);
|
|
|
|
|
void parseProject();
|
|
|
|
|
QStringList processEntries(const QStringList &paths,
|
|
|
|
|
QHash<QString, QString> *map = 0) const;
|
|
|
|
|
|
|
|
|
|
QStringList m_rawFileList;
|
|
|
|
|
QStringList m_files;
|
|
|
|
|
QHash<QString, QString> m_rawListEntries;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class PythonProjectNode : public ProjectNode
|
|
|
|
|
{
|
|
|
|
|
public:
|
2015-10-29 17:12:36 +01:00
|
|
|
PythonProjectNode(PythonProject *project);
|
2015-06-09 15:19:54 +02:00
|
|
|
|
2015-07-23 11:23:52 +02:00
|
|
|
bool showInSimpleTree() const override;
|
2015-11-02 17:00:46 +01:00
|
|
|
QString addFileFilter() const override;
|
2015-07-23 11:23:52 +02:00
|
|
|
bool renameFile(const QString &filePath, const QString &newFilePath) override;
|
2015-06-09 15:19:54 +02:00
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
PythonProject *m_project;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class PythonRunConfigurationWidget : public QWidget
|
|
|
|
|
{
|
2015-07-23 14:31:43 +03:00
|
|
|
Q_OBJECT
|
2015-06-09 15:19:54 +02:00
|
|
|
public:
|
|
|
|
|
PythonRunConfigurationWidget(PythonRunConfiguration *runConfiguration, QWidget *parent = 0);
|
|
|
|
|
void setInterpreter(const QString &interpreter);
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
PythonRunConfiguration *m_runConfiguration;
|
|
|
|
|
DetailsWidget *m_detailsContainer;
|
|
|
|
|
FancyLineEdit *m_interpreterChooser;
|
|
|
|
|
QLabel *m_scriptLabel;
|
|
|
|
|
};
|
|
|
|
|
|
2016-10-05 17:59:59 +02:00
|
|
|
class PythonRunConfiguration : public RunConfiguration
|
2015-06-09 15:19:54 +02:00
|
|
|
{
|
2015-07-23 14:31:43 +03:00
|
|
|
Q_OBJECT
|
2015-07-23 11:23:52 +02:00
|
|
|
|
|
|
|
|
Q_PROPERTY(bool supportsDebugger READ supportsDebugger)
|
|
|
|
|
Q_PROPERTY(QString interpreter READ interpreter)
|
|
|
|
|
Q_PROPERTY(QString mainScript READ mainScript)
|
|
|
|
|
Q_PROPERTY(QString arguments READ arguments)
|
|
|
|
|
|
2015-06-09 15:19:54 +02:00
|
|
|
public:
|
2017-09-01 13:23:02 +02:00
|
|
|
explicit PythonRunConfiguration(Target *target);
|
2015-06-09 15:19:54 +02:00
|
|
|
|
2015-07-23 11:23:52 +02:00
|
|
|
QWidget *createConfigurationWidget() override;
|
|
|
|
|
QVariantMap toMap() const override;
|
|
|
|
|
bool fromMap(const QVariantMap &map) override;
|
2017-03-10 09:05:52 +01:00
|
|
|
Runnable runnable() const override;
|
2018-03-06 16:48:51 +01:00
|
|
|
void doAdditionalSetup(const RunConfigurationCreationInfo &info) override;
|
2015-06-09 15:19:54 +02:00
|
|
|
|
2015-07-23 11:23:52 +02:00
|
|
|
bool supportsDebugger() const { return true; }
|
2015-06-09 15:19:54 +02:00
|
|
|
QString mainScript() const { return m_mainScript; }
|
2015-07-23 11:23:52 +02:00
|
|
|
QString arguments() const;
|
2015-06-09 15:19:54 +02:00
|
|
|
QString interpreter() const { return m_interpreter; }
|
|
|
|
|
void setInterpreter(const QString &interpreter) { m_interpreter = interpreter; }
|
|
|
|
|
|
|
|
|
|
private:
|
2018-03-06 17:14:43 +01:00
|
|
|
friend class ProjectExplorer::RunConfigurationFactory;
|
2017-09-01 13:23:02 +02:00
|
|
|
|
2015-06-09 15:19:54 +02:00
|
|
|
QString defaultDisplayName() const;
|
|
|
|
|
|
|
|
|
|
QString m_interpreter;
|
|
|
|
|
QString m_mainScript;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////
|
|
|
|
|
|
2017-09-01 13:23:02 +02:00
|
|
|
PythonRunConfiguration::PythonRunConfiguration(Target *target)
|
ProjectExplorer/all: Re-organize BuildSteps/{Deploy,Build}Config setup
This follow the rough pattern of recent *RunConfigurationFactory changes
for build and deploy configurations.
- Collapse the two lines of constructors similar to what
890c1906e6fb2ec did for RunConfigurations
* Deploy* was purely mechanical
* Build* ctors are split in connects() in the ctor body
to create "empty shell for clone" etc
and build step additions in initialize() functions which
are only used in the create() case.
-- Allows to collapse the shared 'ctor()' functions, too.
- Move FooBuildConfigurationFactory::create() implementations
to FooBuildConfiguration() constructor. That was a strange
and unneeded ping-pong between factories and objects, and
furthermore allows one level less of indirection (and for a
later, left out here, some reduction of the
FooBuildConfiguration interfaces that were only used to
accommodate the *Factory::create() functions.
- Most {Build,Deploy}Configuration{,Factory} classes had a canHandle(),
but there wasn't one in the base classses. Have one there.
- Most canHandle() functions were checking simple restrictions on
e.g. project or target types, specify those by setters in the
constructors instead and check them in the base canHandle()
- clone() is generally replaced by a creation of a "shell object"
and a fromMap(source->toMap()), implemented in the base, there
are two cases left for Android and Qbs that needed(?) some extra
polish
- generally use canHandle() in base implementation, instead
of doing that in all Derived::canFoo()
- as a result, canCreate/create/canClone/clone reimplementations
are not needed anymore, keep the base implementation for
now (could be inlined into their only users later), but
de-virtualize them.
- Combine Ios{Preset,DSym}BuildStepFactory. There was only one
'dsym' build step they could create.
- Split the 'mangled' id into the ProjectConfiguration subtype
specific constant identifier, and a QString extraId() bit.
Only maintain the mangled id in saved settings.
- Make ProjectConfiguration::m_id a constant member, adapt
all constructors of derived classe.
Not done in this patch:
- Finish possible cosmetic changes on top
- Add a way to specify restrictions to supported Qt versions
(used in Android/Ios), as the base implementation does not
depend on the qtsupport plugin
- Combine the QList<X> availableFoo() + createFoo(X) function
pairs to somthing like a direct
QList<struct { X; std::function<X()>; }> fooCreators()
to avoid e.g. the baseId.withSuffix() <-> id.suffixAfter(base)
pingpong
- Remove the *Factories from the global object pool
- Do something about priority(). Falling back to plain
qmake in android+qmake setup is not helpful.
Change-Id: I2be7d88d554c5aa8b7db8edf5b93278e1ae0112a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-11-29 12:28:40 +01:00
|
|
|
: RunConfiguration(target, PythonRunConfigurationPrefix)
|
2015-06-09 15:19:54 +02:00
|
|
|
{
|
2016-01-25 15:00:20 +01:00
|
|
|
addExtraAspect(new LocalEnvironmentAspect(this, LocalEnvironmentAspect::BaseEnvironmentModifier()));
|
2016-08-03 00:07:44 +02:00
|
|
|
addExtraAspect(new ArgumentsAspect(this, "PythonEditor.RunConfiguration.Arguments"));
|
|
|
|
|
addExtraAspect(new TerminalAspect(this, "PythonEditor.RunConfiguration.UseTerminal"));
|
2017-09-01 13:23:02 +02:00
|
|
|
}
|
|
|
|
|
|
2015-06-09 15:19:54 +02:00
|
|
|
QVariantMap PythonRunConfiguration::toMap() const
|
|
|
|
|
{
|
|
|
|
|
QVariantMap map(RunConfiguration::toMap());
|
2016-08-03 00:07:44 +02:00
|
|
|
map.insert(MainScriptKey, m_mainScript);
|
|
|
|
|
map.insert(InterpreterKey, m_interpreter);
|
2015-06-09 15:19:54 +02:00
|
|
|
return map;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool PythonRunConfiguration::fromMap(const QVariantMap &map)
|
|
|
|
|
{
|
2018-01-08 18:58:34 +01:00
|
|
|
if (!RunConfiguration::fromMap(map))
|
|
|
|
|
return false;
|
2016-08-03 00:07:44 +02:00
|
|
|
m_mainScript = map.value(MainScriptKey).toString();
|
|
|
|
|
m_interpreter = map.value(InterpreterKey).toString();
|
2018-01-08 18:58:34 +01:00
|
|
|
return true;
|
2015-06-09 15:19:54 +02:00
|
|
|
}
|
|
|
|
|
|
2018-03-06 16:48:51 +01:00
|
|
|
void PythonRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &info)
|
|
|
|
|
{
|
|
|
|
|
Environment sysEnv = Environment::systemEnvironment();
|
|
|
|
|
const QString exec = sysEnv.searchInPath("python").toString();
|
|
|
|
|
m_interpreter = exec.isEmpty() ? "python" : exec;
|
2018-03-12 16:33:28 +01:00
|
|
|
m_mainScript = info.targetName;
|
2018-03-06 16:48:51 +01:00
|
|
|
setDefaultDisplayName(defaultDisplayName());
|
|
|
|
|
}
|
|
|
|
|
|
2015-06-09 15:19:54 +02:00
|
|
|
QString PythonRunConfiguration::defaultDisplayName() const
|
|
|
|
|
{
|
2017-07-17 14:34:05 +02:00
|
|
|
return tr("Run %1").arg(m_mainScript);
|
2015-06-09 15:19:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QWidget *PythonRunConfiguration::createConfigurationWidget()
|
|
|
|
|
{
|
|
|
|
|
return new PythonRunConfigurationWidget(this);
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-10 09:05:52 +01:00
|
|
|
Runnable PythonRunConfiguration::runnable() const
|
|
|
|
|
{
|
|
|
|
|
StandardRunnable r;
|
|
|
|
|
QtcProcess::addArg(&r.commandLineArguments, m_mainScript);
|
|
|
|
|
QtcProcess::addArgs(&r.commandLineArguments, extraAspect<ArgumentsAspect>()->arguments());
|
|
|
|
|
r.executable = m_interpreter;
|
|
|
|
|
r.runMode = extraAspect<TerminalAspect>()->runMode();
|
|
|
|
|
r.environment = extraAspect<EnvironmentAspect>()->environment();
|
|
|
|
|
return r;
|
|
|
|
|
}
|
|
|
|
|
|
2015-07-23 11:23:52 +02:00
|
|
|
QString PythonRunConfiguration::arguments() const
|
|
|
|
|
{
|
|
|
|
|
auto aspect = extraAspect<ArgumentsAspect>();
|
|
|
|
|
QTC_ASSERT(aspect, return QString());
|
|
|
|
|
return aspect->arguments();
|
|
|
|
|
}
|
|
|
|
|
|
2015-06-09 15:19:54 +02:00
|
|
|
PythonRunConfigurationWidget::PythonRunConfigurationWidget(PythonRunConfiguration *runConfiguration, QWidget *parent)
|
|
|
|
|
: QWidget(parent), m_runConfiguration(runConfiguration)
|
|
|
|
|
{
|
|
|
|
|
auto fl = new QFormLayout();
|
|
|
|
|
fl->setMargin(0);
|
|
|
|
|
fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
|
|
|
|
|
|
|
|
|
|
m_interpreterChooser = new FancyLineEdit(this);
|
|
|
|
|
m_interpreterChooser->setText(runConfiguration->interpreter());
|
|
|
|
|
connect(m_interpreterChooser, &QLineEdit::textChanged,
|
|
|
|
|
this, &PythonRunConfigurationWidget::setInterpreter);
|
|
|
|
|
|
|
|
|
|
m_scriptLabel = new QLabel(this);
|
|
|
|
|
m_scriptLabel->setText(runConfiguration->mainScript());
|
|
|
|
|
|
|
|
|
|
fl->addRow(tr("Interpreter: "), m_interpreterChooser);
|
|
|
|
|
fl->addRow(tr("Script: "), m_scriptLabel);
|
|
|
|
|
runConfiguration->extraAspect<ArgumentsAspect>()->addToMainConfigurationWidget(this, fl);
|
|
|
|
|
runConfiguration->extraAspect<TerminalAspect>()->addToMainConfigurationWidget(this, fl);
|
|
|
|
|
|
|
|
|
|
m_detailsContainer = new DetailsWidget(this);
|
|
|
|
|
m_detailsContainer->setState(DetailsWidget::NoSummary);
|
|
|
|
|
|
|
|
|
|
auto details = new QWidget(m_detailsContainer);
|
|
|
|
|
m_detailsContainer->setWidget(details);
|
|
|
|
|
details->setLayout(fl);
|
|
|
|
|
|
|
|
|
|
auto vbx = new QVBoxLayout(this);
|
|
|
|
|
vbx->setMargin(0);
|
|
|
|
|
vbx->addWidget(m_detailsContainer);
|
2018-03-06 15:28:06 +01:00
|
|
|
|
|
|
|
|
connect(runConfiguration->target(), &Target::applicationTargetsChanged, this, [this] {
|
|
|
|
|
m_scriptLabel->setText(QDir::toNativeSeparators(m_runConfiguration->mainScript()));
|
|
|
|
|
});
|
2015-06-09 15:19:54 +02:00
|
|
|
}
|
|
|
|
|
|
2018-03-06 17:14:43 +01:00
|
|
|
class PythonRunConfigurationFactory : public RunConfigurationFactory
|
2015-06-09 15:19:54 +02:00
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
PythonRunConfigurationFactory()
|
|
|
|
|
{
|
2017-11-20 11:56:19 +01:00
|
|
|
registerRunConfiguration<PythonRunConfiguration>(PythonRunConfigurationPrefix);
|
2017-12-08 14:50:57 +01:00
|
|
|
addSupportedProjectType(PythonProjectId);
|
2015-06-09 15:19:54 +02:00
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
2017-03-29 11:25:01 +02:00
|
|
|
PythonProject::PythonProject(const FileName &fileName) :
|
|
|
|
|
Project(Constants::C_PY_MIMETYPE, fileName, [this]() { refresh(); })
|
2015-06-09 15:19:54 +02:00
|
|
|
{
|
|
|
|
|
setId(PythonProjectId);
|
2017-01-30 14:59:10 +01:00
|
|
|
setProjectLanguages(Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
|
2017-04-07 14:35:49 +02:00
|
|
|
setDisplayName(fileName.toFileInfo().completeBaseName());
|
2015-06-09 15:19:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static QStringList readLines(const QString &absoluteFileName)
|
|
|
|
|
{
|
|
|
|
|
QStringList lines;
|
|
|
|
|
|
|
|
|
|
QFile file(absoluteFileName);
|
|
|
|
|
if (file.open(QFile::ReadOnly)) {
|
|
|
|
|
QTextStream stream(&file);
|
|
|
|
|
|
|
|
|
|
forever {
|
|
|
|
|
QString line = stream.readLine();
|
|
|
|
|
if (line.isNull())
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
lines.append(line);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return lines;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool PythonProject::saveRawFileList(const QStringList &rawFileList)
|
|
|
|
|
{
|
2016-01-08 12:12:27 +01:00
|
|
|
bool result = saveRawList(rawFileList, projectFilePath().toString());
|
2015-06-09 15:19:54 +02:00
|
|
|
// refresh(PythonProject::Files);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool PythonProject::saveRawList(const QStringList &rawList, const QString &fileName)
|
|
|
|
|
{
|
2016-07-18 10:04:42 +02:00
|
|
|
FileChangeBlocker changeGuarg(fileName);
|
2015-06-09 15:19:54 +02:00
|
|
|
// Make sure we can open the file for writing
|
|
|
|
|
FileSaver saver(fileName, QIODevice::Text);
|
|
|
|
|
if (!saver.hasError()) {
|
|
|
|
|
QTextStream stream(saver.file());
|
|
|
|
|
foreach (const QString &filePath, rawList)
|
2016-08-03 00:07:44 +02:00
|
|
|
stream << filePath << '\n';
|
2015-06-09 15:19:54 +02:00
|
|
|
saver.setResult(&stream);
|
|
|
|
|
}
|
|
|
|
|
bool result = saver.finalize(ICore::mainWindow());
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool PythonProject::addFiles(const QStringList &filePaths)
|
|
|
|
|
{
|
|
|
|
|
QStringList newList = m_rawFileList;
|
|
|
|
|
|
2016-01-08 12:12:27 +01:00
|
|
|
QDir baseDir(projectDirectory().toString());
|
2015-06-09 15:19:54 +02:00
|
|
|
foreach (const QString &filePath, filePaths)
|
|
|
|
|
newList.append(baseDir.relativeFilePath(filePath));
|
|
|
|
|
|
|
|
|
|
QSet<QString> toAdd;
|
|
|
|
|
|
|
|
|
|
foreach (const QString &filePath, filePaths) {
|
|
|
|
|
QString directory = QFileInfo(filePath).absolutePath();
|
|
|
|
|
if (!toAdd.contains(directory))
|
|
|
|
|
toAdd << directory;
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-08 12:12:27 +01:00
|
|
|
bool result = saveRawList(newList, projectFilePath().toString());
|
2015-06-09 15:19:54 +02:00
|
|
|
refresh();
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool PythonProject::removeFiles(const QStringList &filePaths)
|
|
|
|
|
{
|
|
|
|
|
QStringList newList = m_rawFileList;
|
|
|
|
|
|
|
|
|
|
foreach (const QString &filePath, filePaths) {
|
|
|
|
|
QHash<QString, QString>::iterator i = m_rawListEntries.find(filePath);
|
|
|
|
|
if (i != m_rawListEntries.end())
|
|
|
|
|
newList.removeOne(i.value());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return saveRawFileList(newList);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool PythonProject::setFiles(const QStringList &filePaths)
|
|
|
|
|
{
|
|
|
|
|
QStringList newList;
|
2016-01-08 12:12:27 +01:00
|
|
|
QDir baseDir(projectFilePath().toString());
|
2015-06-09 15:19:54 +02:00
|
|
|
foreach (const QString &filePath, filePaths)
|
|
|
|
|
newList.append(baseDir.relativeFilePath(filePath));
|
|
|
|
|
|
|
|
|
|
return saveRawFileList(newList);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool PythonProject::renameFile(const QString &filePath, const QString &newFilePath)
|
|
|
|
|
{
|
|
|
|
|
QStringList newList = m_rawFileList;
|
|
|
|
|
|
|
|
|
|
QHash<QString, QString>::iterator i = m_rawListEntries.find(filePath);
|
|
|
|
|
if (i != m_rawListEntries.end()) {
|
|
|
|
|
int index = newList.indexOf(i.value());
|
|
|
|
|
if (index != -1) {
|
2016-01-08 12:12:27 +01:00
|
|
|
QDir baseDir(projectFilePath().toString());
|
2015-06-09 15:19:54 +02:00
|
|
|
newList.replace(index, baseDir.relativeFilePath(newFilePath));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return saveRawFileList(newList);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void PythonProject::parseProject()
|
|
|
|
|
{
|
|
|
|
|
m_rawListEntries.clear();
|
2016-01-08 12:12:27 +01:00
|
|
|
m_rawFileList = readLines(projectFilePath().toString());
|
|
|
|
|
m_rawFileList << projectFilePath().fileName();
|
2015-06-09 15:19:54 +02:00
|
|
|
m_files = processEntries(m_rawFileList, &m_rawListEntries);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @brief Provides displayName relative to project node
|
|
|
|
|
*/
|
2016-10-05 17:59:59 +02:00
|
|
|
class PythonFileNode : public FileNode
|
2015-06-09 15:19:54 +02:00
|
|
|
{
|
|
|
|
|
public:
|
2017-10-18 14:10:10 +02:00
|
|
|
PythonFileNode(const Utils::FileName &filePath, const QString &nodeDisplayName,
|
|
|
|
|
FileType fileType = FileType::Source)
|
|
|
|
|
: FileNode(filePath, fileType, false)
|
2015-06-09 15:19:54 +02:00
|
|
|
, m_displayName(nodeDisplayName)
|
|
|
|
|
{}
|
|
|
|
|
|
2015-10-29 16:59:27 +01:00
|
|
|
QString displayName() const override { return m_displayName; }
|
2015-06-09 15:19:54 +02:00
|
|
|
private:
|
|
|
|
|
QString m_displayName;
|
|
|
|
|
};
|
|
|
|
|
|
2018-03-06 15:28:06 +01:00
|
|
|
void PythonProject::refresh(Target *target)
|
2015-06-09 15:19:54 +02:00
|
|
|
{
|
2017-07-13 10:51:15 +02:00
|
|
|
emitParsingStarted();
|
2015-06-09 15:19:54 +02:00
|
|
|
parseProject();
|
|
|
|
|
|
2016-01-08 12:12:27 +01:00
|
|
|
QDir baseDir(projectDirectory().toString());
|
2018-03-06 15:28:06 +01:00
|
|
|
BuildTargetInfoList appTargets;
|
2017-03-03 15:13:06 +01:00
|
|
|
auto newRoot = new PythonProjectNode(this);
|
2017-03-10 17:30:40 +01:00
|
|
|
for (const QString &f : m_files) {
|
|
|
|
|
const QString displayName = baseDir.relativeFilePath(f);
|
2017-10-18 14:10:10 +02:00
|
|
|
FileType fileType = f.endsWith(".pyqtc") ? FileType::Project : FileType::Source;
|
|
|
|
|
newRoot->addNestedNode(new PythonFileNode(FileName::fromString(f), displayName, fileType));
|
2018-03-06 15:28:06 +01:00
|
|
|
if (fileType == FileType::Source) {
|
|
|
|
|
BuildTargetInfo bti;
|
|
|
|
|
bti.targetName = f;
|
|
|
|
|
bti.targetFilePath = FileName::fromString(f);
|
|
|
|
|
bti.projectFilePath = projectFilePath();
|
|
|
|
|
appTargets.list.append(bti);
|
|
|
|
|
}
|
2017-03-10 17:30:40 +01:00
|
|
|
}
|
2017-03-03 15:13:06 +01:00
|
|
|
setRootProjectNode(newRoot);
|
2016-10-20 13:18:54 +02:00
|
|
|
|
2018-03-06 15:28:06 +01:00
|
|
|
if (!target)
|
|
|
|
|
target = activeTarget();
|
|
|
|
|
if (target)
|
|
|
|
|
target->setApplicationTargets(appTargets);
|
|
|
|
|
|
2017-07-13 10:51:15 +02:00
|
|
|
emitParsingFinished(true);
|
2015-06-09 15:19:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Expands environment variables in the given \a string when they are written
|
|
|
|
|
* like $$(VARIABLE).
|
|
|
|
|
*/
|
|
|
|
|
static void expandEnvironmentVariables(const QProcessEnvironment &env, QString &string)
|
|
|
|
|
{
|
|
|
|
|
static QRegExp candidate(QLatin1String("\\$\\$\\((.+)\\)"));
|
|
|
|
|
|
|
|
|
|
int index = candidate.indexIn(string);
|
|
|
|
|
while (index != -1) {
|
|
|
|
|
const QString value = env.value(candidate.cap(1));
|
|
|
|
|
|
|
|
|
|
string.replace(index, candidate.matchedLength(), value);
|
|
|
|
|
index += value.length();
|
|
|
|
|
|
|
|
|
|
index = candidate.indexIn(string, index);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Expands environment variables and converts the path from relative to the
|
|
|
|
|
* project to an absolute path.
|
|
|
|
|
*
|
|
|
|
|
* The \a map variable is an optional argument that will map the returned
|
|
|
|
|
* absolute paths back to their original \a entries.
|
|
|
|
|
*/
|
|
|
|
|
QStringList PythonProject::processEntries(const QStringList &paths,
|
|
|
|
|
QHash<QString, QString> *map) const
|
|
|
|
|
{
|
|
|
|
|
const QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
|
2016-01-08 12:12:27 +01:00
|
|
|
const QDir projectDir(projectDirectory().toString());
|
2015-06-09 15:19:54 +02:00
|
|
|
|
|
|
|
|
QFileInfo fileInfo;
|
|
|
|
|
QStringList absolutePaths;
|
|
|
|
|
foreach (const QString &path, paths) {
|
|
|
|
|
QString trimmedPath = path.trimmed();
|
|
|
|
|
if (trimmedPath.isEmpty())
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
expandEnvironmentVariables(env, trimmedPath);
|
|
|
|
|
|
|
|
|
|
trimmedPath = FileName::fromUserInput(trimmedPath).toString();
|
|
|
|
|
|
|
|
|
|
fileInfo.setFile(projectDir, trimmedPath);
|
|
|
|
|
if (fileInfo.exists()) {
|
|
|
|
|
const QString absPath = fileInfo.absoluteFilePath();
|
|
|
|
|
absolutePaths.append(absPath);
|
|
|
|
|
if (map)
|
|
|
|
|
map->insert(absPath, trimmedPath);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
absolutePaths.removeDuplicates();
|
|
|
|
|
return absolutePaths;
|
|
|
|
|
}
|
|
|
|
|
|
2015-07-23 11:23:52 +02:00
|
|
|
Project::RestoreResult PythonProject::fromMap(const QVariantMap &map, QString *errorMessage)
|
2015-06-09 15:19:54 +02:00
|
|
|
{
|
2015-07-23 11:23:52 +02:00
|
|
|
Project::RestoreResult res = Project::fromMap(map, errorMessage);
|
|
|
|
|
if (res == RestoreResult::Ok) {
|
2017-10-18 12:58:59 +02:00
|
|
|
refresh();
|
|
|
|
|
|
2015-07-23 11:23:52 +02:00
|
|
|
Kit *defaultKit = KitManager::defaultKit();
|
|
|
|
|
if (!activeTarget() && defaultKit)
|
2015-11-16 17:10:55 +01:00
|
|
|
addTarget(createTarget(defaultKit));
|
2015-06-09 15:19:54 +02:00
|
|
|
}
|
|
|
|
|
|
2015-07-23 11:23:52 +02:00
|
|
|
return res;
|
2015-06-09 15:19:54 +02:00
|
|
|
}
|
|
|
|
|
|
2015-10-29 17:12:36 +01:00
|
|
|
PythonProjectNode::PythonProjectNode(PythonProject *project)
|
2016-09-30 23:13:45 +02:00
|
|
|
: ProjectNode(project->projectDirectory())
|
2015-06-09 15:19:54 +02:00
|
|
|
, m_project(project)
|
|
|
|
|
{
|
2015-10-29 17:12:36 +01:00
|
|
|
setDisplayName(project->projectFilePath().toFileInfo().completeBaseName());
|
2015-06-09 15:19:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QHash<QString, QStringList> sortFilesIntoPaths(const QString &base, const QSet<QString> &files)
|
|
|
|
|
{
|
|
|
|
|
QHash<QString, QStringList> filesInPath;
|
|
|
|
|
const QDir baseDir(base);
|
|
|
|
|
|
|
|
|
|
foreach (const QString &absoluteFileName, files) {
|
|
|
|
|
QFileInfo fileInfo(absoluteFileName);
|
|
|
|
|
FileName absoluteFilePath = FileName::fromString(fileInfo.path());
|
|
|
|
|
QString relativeFilePath;
|
|
|
|
|
|
|
|
|
|
if (absoluteFilePath.isChildOf(baseDir)) {
|
|
|
|
|
relativeFilePath = absoluteFilePath.relativeChildPath(FileName::fromString(base)).toString();
|
|
|
|
|
} else {
|
|
|
|
|
// 'file' is not part of the project.
|
|
|
|
|
relativeFilePath = baseDir.relativeFilePath(absoluteFilePath.toString());
|
2016-08-03 00:07:44 +02:00
|
|
|
if (relativeFilePath.endsWith('/'))
|
2015-06-09 15:19:54 +02:00
|
|
|
relativeFilePath.chop(1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
filesInPath[relativeFilePath].append(absoluteFileName);
|
|
|
|
|
}
|
|
|
|
|
return filesInPath;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool PythonProjectNode::showInSimpleTree() const
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2015-11-02 17:00:46 +01:00
|
|
|
QString PythonProjectNode::addFileFilter() const
|
|
|
|
|
{
|
|
|
|
|
return QLatin1String("*.py");
|
|
|
|
|
}
|
|
|
|
|
|
2015-06-09 15:19:54 +02:00
|
|
|
bool PythonProjectNode::renameFile(const QString &filePath, const QString &newFilePath)
|
|
|
|
|
{
|
|
|
|
|
return m_project->renameFile(filePath, newFilePath);
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-10 09:05:52 +01:00
|
|
|
// PythonRunConfigurationWidget
|
2015-06-09 15:19:54 +02:00
|
|
|
|
|
|
|
|
void PythonRunConfigurationWidget::setInterpreter(const QString &interpreter)
|
|
|
|
|
{
|
|
|
|
|
m_runConfiguration->setInterpreter(interpreter);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
//
|
|
|
|
|
// PythonEditorPlugin
|
|
|
|
|
//
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
2018-02-06 12:46:02 +01:00
|
|
|
class PythonEditorPluginPrivate
|
2013-01-14 23:11:10 +04:00
|
|
|
{
|
2018-02-06 12:46:02 +01:00
|
|
|
public:
|
|
|
|
|
PythonEditorFactory editorFactory;
|
|
|
|
|
PythonRunConfigurationFactory runConfigFactory;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static PythonEditorPluginPrivate *dd = nullptr;
|
2013-01-14 23:11:10 +04:00
|
|
|
|
|
|
|
|
PythonEditorPlugin::~PythonEditorPlugin()
|
|
|
|
|
{
|
2018-02-06 12:46:02 +01:00
|
|
|
delete dd;
|
|
|
|
|
dd = nullptr;
|
2013-01-14 23:11:10 +04:00
|
|
|
}
|
|
|
|
|
|
2013-08-30 16:38:57 +02:00
|
|
|
bool PythonEditorPlugin::initialize(const QStringList &arguments, QString *errorMessage)
|
2013-01-14 23:11:10 +04:00
|
|
|
{
|
|
|
|
|
Q_UNUSED(arguments)
|
2015-02-04 09:32:46 +01:00
|
|
|
Q_UNUSED(errorMessage)
|
2013-01-14 23:11:10 +04:00
|
|
|
|
2018-02-06 12:46:02 +01:00
|
|
|
dd = new PythonEditorPluginPrivate;
|
2017-03-03 18:16:34 +01:00
|
|
|
|
2018-02-06 12:46:02 +01:00
|
|
|
ProjectManager::registerProjectType<PythonProject>(PythonMimeType);
|
2017-06-19 13:27:59 +02:00
|
|
|
|
|
|
|
|
auto constraint = [](RunConfiguration *runConfiguration) {
|
|
|
|
|
auto rc = dynamic_cast<PythonRunConfiguration *>(runConfiguration);
|
|
|
|
|
return rc && !rc->interpreter().isEmpty();
|
|
|
|
|
};
|
|
|
|
|
RunControl::registerWorker<SimpleTargetRunner>(ProjectExplorer::Constants::NORMAL_RUN_MODE, constraint);
|
2013-01-14 23:11:10 +04:00
|
|
|
|
2016-11-07 18:42:19 +01:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void PythonEditorPlugin::extensionsInitialized()
|
|
|
|
|
{
|
2013-01-14 23:11:10 +04:00
|
|
|
// Initialize editor actions handler
|
|
|
|
|
// Add MIME overlay icons (these icons displayed at Project dock panel)
|
2016-08-03 00:07:44 +02:00
|
|
|
const QIcon icon = QIcon::fromTheme(C_PY_MIME_ICON);
|
2013-09-12 16:06:33 +02:00
|
|
|
if (!icon.isNull())
|
|
|
|
|
Core::FileIconProvider::registerIconOverlayForMimeType(icon, C_PY_MIMETYPE);
|
2013-01-14 23:11:10 +04:00
|
|
|
}
|
|
|
|
|
|
2013-08-23 13:41:17 +02:00
|
|
|
} // namespace Internal
|
2013-01-14 23:11:10 +04:00
|
|
|
} // namespace PythonEditor
|
2015-07-23 14:31:43 +03:00
|
|
|
|
|
|
|
|
#include "pythoneditorplugin.moc"
|