Clean up JS .import/.pragma directive scanning

There's a scanner in QQmlJS::Lexer::scanDirectives that can parse those, so
let's get rid of extra parser that operates on a string. Instead this way we
can do the scanning all in one shot, avoid detaching a copy of the source code
string and (most importantly) bring the parser closer to the copy in Qt
Creator, which uses the directives approach to extract imports and pragma.

Change-Id: Iff6eb8d91a45d8a70f383f953115692be48259de
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>

2 files changed, 57 insertions, 36 deletions

diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 6f5ec28c4d..08710d358f 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -246,6 +246,41 @@ static QVariantList findQmlImportsInQmlFile(const QString &filePath)
     return findQmlImportsInQmlCode(filePath, code);
 }
 
+struct ImportCollector : public QQmlJS::Directives
+{
+    QVariantList imports;
+
+    virtual void importFile(const QString &jsfile, const QString &module, int line, int column)
+    {
+        QVariantMap entry;
+        entry[QLatin1String("type")] = QStringLiteral("javascript");
+        entry[QLatin1String("path")] = jsfile;
+        imports << entry;
+
+        Q_UNUSED(module);
+        Q_UNUSED(line);
+        Q_UNUSED(column);
+    }
+
+    virtual void importModule(const QString &uri, const QString &version, const QString &module, int line, int column)
+    {
+        QVariantMap entry;
+        if (uri.contains(QLatin1Char('/'))) {
+            entry[QLatin1String("type")] = QStringLiteral("directory");
+            entry[QLatin1String("name")] = uri;
+        } else {
+            entry[QLatin1String("type")] = QStringLiteral("module");
+            entry[QLatin1String("name")] = uri;
+            entry[QLatin1String("version")] = version;
+        }
+        imports << entry;
+
+        Q_UNUSED(module);
+        Q_UNUSED(line);
+        Q_UNUSED(column);
+    }
+};
+
 // Scan a single javascrupt file for import statements
 QVariantList findQmlImportsInJavascriptFile(const QString &filePath)
 {
@@ -256,42 +291,22 @@ QVariantList findQmlImportsInJavascriptFile(const QString &filePath)
            return QVariantList();
     }
 
-    QVariantList imports;
-
     QString sourceCode = QString::fromUtf8(file.readAll());
     file.close();
-    QmlIR::Document doc(/*debug mode*/false);
-    QQmlJS::DiagnosticMessage error;
-    doc.extractScriptMetaData(sourceCode, &error);
-    if (!error.message.isEmpty())
-        return imports;
 
-    foreach (const QV4::CompiledData::Import *import, doc.imports) {
-        QVariantMap entry;
-        const QString name = doc.stringAt(import->uriIndex);
-        switch (import->type) {
-        case QV4::CompiledData::Import::ImportScript:
-            entry[QStringLiteral("type")] = QStringLiteral("javascript");
-            entry[QStringLiteral("path")] = name;
-            break;
-        case QV4::CompiledData::Import::ImportLibrary:
-            if (name.contains(QLatin1Char('/'))) {
-                entry[QStringLiteral("type")] = QStringLiteral("directory");
-                entry[QStringLiteral("name")] = name;
-            } else {
-                entry[QStringLiteral("type")] = QStringLiteral("module");
-                entry[QStringLiteral("name")] = name;
-                entry[QStringLiteral("version")] = QString::number(import->majorVersion) + QLatin1Char('.') + QString::number(import->minorVersion);
-            }
-            break;
-        default:
-            Q_UNREACHABLE();
-            continue;
-        }
-        imports << entry;
-    }
+    QQmlJS::Engine ee;
+    ImportCollector collector;
+    ee.setDirectives(&collector);
+    QQmlJS::Lexer lexer(&ee);
+    lexer.setCode(sourceCode, /*line*/1, /*qml mode*/false);
+    QQmlJS::Parser parser(&ee);
+    parser.parseProgram();
 
-    return imports;
+    foreach (const QQmlJS::DiagnosticMessage &m, parser.diagnosticMessages())
+        if (m.isError())
+            return QVariantList();
+
+    return collector.imports;
 }
 
 // Scan a single qml or js file for import statements
diff --git a/tools/qmlmin/main.cpp b/tools/qmlmin/main.cpp
index aa3adf053d..aa99b242a7 100644
--- a/tools/qmlmin/main.cpp
+++ b/tools/qmlmin/main.cpp
@@ -93,7 +93,7 @@ public:
         _directives += QLatin1String(".pragma library\n");
     }
 
-    virtual void importFile(const QString &jsfile, const QString &module)
+    virtual void importFile(const QString &jsfile, const QString &module, int line, int column)
     {
         _directives += QLatin1String(".import");
         _directives += QLatin1Char('"');
@@ -102,9 +102,11 @@ public:
         _directives += QLatin1String("as ");
         _directives += module;
         _directives += QLatin1Char('\n');
+        Q_UNUSED(line);
+        Q_UNUSED(column);
     }
 
-    virtual void importModule(const QString &uri, const QString &version, const QString &module)
+    virtual void importModule(const QString &uri, const QString &version, const QString &module, int line, int column)
     {
         _directives += QLatin1String(".import ");
         _directives += uri;
@@ -113,6 +115,8 @@ public:
         _directives += QLatin1String(" as ");
         _directives += module;
         _directives += QLatin1Char('\n');
+        Q_UNUSED(line);
+        Q_UNUSED(column);
     }
 
 protected:
@@ -262,7 +266,8 @@ bool Minify::parse(int startToken)
 
     if (startToken == T_FEED_JS_PROGRAM) {
         // parse optional pragma directive
-        if (scanDirectives(this)) {
+        DiagnosticMessage error;
+        if (scanDirectives(this, &error)) {
             // append the scanned directives to the minifier code.
             append(directives());
 
@@ -433,7 +438,8 @@ bool Tokenize::parse(int startToken)
 
     if (startToken == T_FEED_JS_PROGRAM) {
         // parse optional pragma directive
-        if (scanDirectives(this)) {
+        DiagnosticMessage error;
+        if (scanDirectives(this, &error)) {
             // append the scanned directives as one token to
             // the token stream.
             _minifiedCode.append(directives());