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, 4 insertions, 4 deletions

diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp
index 0c61679f0b..243fc5bd30 100644
--- a/src/qml/parser/qqmljslexer.cpp
+++ b/src/qml/parser/qqmljslexer.cpp
@@ -1480,8 +1480,8 @@ bool Lexer::scanDirectives(Directives *directives, DiagnosticMessage *error)
 {
     auto setError = [error, this](QString message) {
         error->message = std::move(message);
-        error->line = tokenStartLine();
-        error->column = tokenStartColumn();
+        error->loc.startLine = tokenStartLine();
+        error->loc.startColumn = tokenStartColumn();
     };
 
     QScopedValueRollback<bool> directivesGuard(_handlingDirectives, true);
@@ -1596,8 +1596,8 @@ bool Lexer::scanDirectives(Directives *directives, DiagnosticMessage *error)
                 else
                     setError(QCoreApplication::translate("QQmlParser", "Module import requires a qualifier"));
                 if (tokenStartLine() != lineNumber) {
-                    error->line = lineNumber;
-                    error->line = column;
+                    error->loc.startLine = lineNumber;
+                    error->loc.startColumn = column;
                 }
                 return false; // expected `as'
             }