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

QmlDesigner: Add invalid ids to QmlJSCheck

Browse Source 
Also improving document message for exceptions.

Change-Id: I7878987ce73f5d4891ced3c702c7804b25b07eb3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Thomas Hartmann
2022-03-24 12:35:54 +01:00
parent d3dae6b7dd
commit 3b5c56bcfa
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/qmljs/qmljscheck.cpp
View File

@@ -570,7 +570,8 @@ public:
"x", "y", "opacity", "parent", "item", "flow", "x", "y", "opacity", "parent", "item", "flow",
"color", "margin", "padding", "print", "border", "font", "color", "margin", "padding", "print", "border", "font",
"text", "source", "state", "visible", "focus", "data", "text", "source", "state", "visible", "focus", "data",
"clip", "layer", "scale", "enabled", "anchors"}) "clip", "layer", "scale", "enabled", "anchors",
"texture", "shaderInfo", "sprite", "spriteSequence", "baseState"})
{} {}
}; };

6
src/plugins/qmldesigner/designercore/model/documentmessage.cpp
View File

@@ -42,7 +42,7 @@ DocumentMessage::DocumentMessage(Exception *exception):
m_line(exception->line()), m_line(exception->line()),
m_column(-1), m_column(-1),
m_description(exception->description()), m_description(exception->description()),
m_url(exception->file()) m_url(QUrl::fromLocalFile(exception->file()))
{ {
} }
@@ -84,14 +84,14 @@ QString DocumentMessage::toString() const
if (line() != -1) { if (line() != -1) {
if (!str.isEmpty()) if (!str.isEmpty())
str += QLatin1Char(' '); str += QLatin1Char(' ');
str += ::QmlDesigner::DocumentMessage::tr("line %1").arg(line()); str += ::QmlDesigner::DocumentMessage::tr("line %1\n").arg(line());
} }
if (column() != -1) { if (column() != -1) {
if (!str.isEmpty()) if (!str.isEmpty())
str += QLatin1Char(' '); str += QLatin1Char(' ');
str += ::QmlDesigner::DocumentMessage::tr("column %1").arg(column()); str += ::QmlDesigner::DocumentMessage::tr("column %1\n").arg(column());
} }
if (!str.isEmpty()) if (!str.isEmpty())