ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #378: Improve attached properties in scripting code completion

Browse Source
This commit is contained in:
Jenkins nymea 2020-05-10 22:56:40 +02:00
commit 589a2a40f8
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-app/scripting/codecompletion.cpp
View File

@ -513,7 +513,7 @@ void CodeCompletion::update()
} }
// Always append attached class names // Always append attached class names
foreach (const QString &s, m_attachedClasses.keys()) { foreach (const QString &s, m_attachedClasses.keys()) {
entries.append(CompletionModel::Entry(s, s, "type")); entries.append(CompletionModel::Entry(s, s, "attachedProperty"));
} }
// Add generic qml syntax // Add generic qml syntax

2
libnymea-app/scripting/completionmodel.cpp
View File

@ -138,7 +138,7 @@ bool CompletionProxyModel::lessThan(const QModelIndex &source_left, const QModel
CompletionModel::Entry left = m_model->get(source_left.row()); CompletionModel::Entry left = m_model->get(source_left.row());
CompletionModel::Entry right = m_model->get(source_right.row()); CompletionModel::Entry right = m_model->get(source_right.row());
static QStringList ordering = {"property", "method", "event", "type", "keyword" }; static QStringList ordering = {"property", "method", "event", "type", "attachedProperty", "keyword" };
int leftOrder = ordering.indexOf(left.decoration); int leftOrder = ordering.indexOf(left.decoration);
int rightOrder = ordering.indexOf(right.decoration); int rightOrder = ordering.indexOf(right.decoration);

2
nymea-app/ui/magic/scripting/CompletionBox.qml
View File

@ -142,6 +142,8 @@ Rectangle {
return "yellow"; return "yellow";
case "property": case "property":
return "#ff5555"; return "#ff5555";
case "attachedProperty":
return "orange"
case "method": case "method":
return "blue"; return "blue";
case "event": case "event":