Restore offset/length in QQmlJS::DiagnosticMessage

This is needed in a few places outside of declarative, so this change
restores the loc member in DiagnosticMessage and moves
QQmlJS::AST::SourceLocation into common's QQmlJS namespace/directory.
QQmlError is unaffected and retains only line/column.

Amends d4d197d06279f9257647628f7e1ccc9ec763a6bb

Change-Id: Ifb9d344228e3c6e9e26fc4fe112686f9336ea2b2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/qml/qml/qqmlcustomparser.cpp b/src/qml/qml/qqmlcustomparser.cpp
index ecd5020482..5e6e1187e2 100644
--- a/src/qml/qml/qqmlcustomparser.cpp
+++ b/src/qml/qml/qqmlcustomparser.cpp
@@ -40,6 +40,7 @@
 #include "qqmlcustomparser_p.h"
 
 #include <private/qv4compileddata_p.h>
+#include <private/qqmlsourcecoordinate_p.h>
 
 #include <QtCore/qdebug.h>
 
@@ -100,10 +101,10 @@ void QQmlCustomParser::clearErrors()
 */
 void QQmlCustomParser::error(const QV4::CompiledData::Location &location, const QString &description)
 {
-    QQmlJS::DiagnosticMessage error;
-    error.line = location.line;
-    error.column = location.column;
-    error.message = description;
+    QQmlError error;
+    error.setLine(qmlConvertSourceCoordinate<quint32, int>(location.line));
+    error.setColumn(qmlConvertSourceCoordinate<quint32, int>(location.column));
+    error.setDescription(description);
 
     exceptions << error;
 }