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

Export Wizard values to JavaScript macro

Browse Source 
Registers a new function "value('name')", available to the wizard json
files, which returns the value of the variable "name" as a JavaScript
object. So, variables with a string value are actual JavaScript strings,
booleans are booleans, lists are lists, and dictionaries are
dictionaries.

The patch also makes it actually possible to assign JSON lists and
dictionaries to values.

This removes some hacks involving creating complex JavaScript objects
through string substitution.

Change-Id: I4ac6da22bc5bccc9fadee97694c2fa14d44c9307
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Eike Ziller
2019-04-16 16:46:36 +02:00
parent 0c5837a111
commit e0d38ae414
57 changed files with 891 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/plugins/coreplugin/jsexpander.cpp
View File

@@ -34,8 +34,26 @@
#include <QDebug>
#include <QJSEngine>
namespace Core {
#include <unordered_map>
namespace std {
template<> struct hash<QString>
{
using argument_type = QString;
using result_type = size_t;
result_type operator()(const argument_type &v) const
{
return hash<string>()(v.toStdString());
}
};
} // namespace std
using ExtensionMap = std::unordered_map<QString, Core::JsExpander::ObjectFactory>;
Q_GLOBAL_STATIC(ExtensionMap, globalJsExtensions);
static Core::JsExpander *globalExpander = nullptr;
namespace Core {
namespace Internal {
class JsExpanderPrivate {
@@ -45,9 +63,14 @@ public:
} // namespace Internal
static Internal::JsExpanderPrivate *d;
void JsExpander::registerGlobalObject(const QString &name, const ObjectFactory &factory)
{
globalJsExtensions->insert({name, factory});
if (globalExpander)
globalExpander->registerObject(name, factory());
}
void JsExpander::registerQObjectForJs(const QString &name, QObject *obj)
void JsExpander::registerObject(const QString &name, QObject *obj)
{
QJSValue jsObj = d->m_engine.newQObject(obj);
d->m_engine.globalObject().setProperty(name, jsObj);
@@ -77,16 +100,21 @@ QString JsExpander::evaluate(const QString &expression, QString *errorMessage)
return QString();
}
JsExpander::JsExpander()
QJSEngine &JsExpander::engine()
{
d = new Internal::JsExpanderPrivate;
Utils::globalMacroExpander()->registerPrefix("JS",
return d->m_engine;
}
void JsExpander::registerForExpander(Utils::MacroExpander *macroExpander)
{
macroExpander->registerPrefix(
"JS",
QCoreApplication::translate("Core::JsExpander",
"Evaluate simple JavaScript statements.<br>"
"The statements may not contain '{' nor '}' characters."),
[](QString in) -> QString {
[this](QString in) -> QString {
QString errorMessage;
QString result = JsExpander::evaluate(in, &errorMessage);
QString result = evaluate(in, &errorMessage);
if (!errorMessage.isEmpty()) {
qWarning() << errorMessage;
return errorMessage;
@@ -94,8 +122,21 @@ JsExpander::JsExpander()
return result;
}
});
}
registerQObjectForJs(QLatin1String("Util"), new Internal::UtilsJsExtension);
JsExpander *JsExpander::createGlobalJsExpander()
{
globalExpander = new JsExpander();
registerGlobalObject<Internal::UtilsJsExtension>("Util");
globalExpander->registerForExpander(Utils::globalMacroExpander());
return globalExpander;
}
JsExpander::JsExpander()
{
d = new Internal::JsExpanderPrivate;
for (const std::pair<const QString, ObjectFactory> &obj : *globalJsExtensions)
registerObject(obj.first, obj.second());
}
JsExpander::~JsExpander()