qmllint: Honor --silent argument

Change-Id: Ie63654139aeb7bfd241be865f33c399c23e08cc3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

5 files changed, 28 insertions, 30 deletions

diff --git a/tools/qmllint/findunqualified.cpp b/tools/qmllint/findunqualified.cpp
index 4404ddf49a..52cc36aeeb 100644
--- a/tools/qmllint/findunqualified.cpp
+++ b/tools/qmllint/findunqualified.cpp
@@ -40,8 +40,6 @@
 #include <private/qqmljsparser_p.h>
 #include <private/qv4codegen_p.h>
 
-QDebug operator<<(QDebug dbg, const QQmlJS::AST::SourceLocation &loc);
-
 static QQmlJS::TypeDescriptionReader createReaderForFile(QString const &filename)
 {
     QFile f(filename);
@@ -139,9 +137,8 @@ void FindUnqualifiedIDVisitor::importHelper(QString id, QString prefix, int majo
         if (QFile::exists(qmltypesPath)) {
             auto reader = createReaderForFile(qmltypesPath);
             auto succ = reader(&objects, &moduleApis, &dependencies);
-            if (!succ) {
-                qDebug() << reader.errorMessage();
-            }
+            if (!succ)
+                m_colorOut.writeUncolored(reader.errorMessage());
             break;
         }
     }
@@ -292,13 +289,17 @@ FindUnqualifiedIDVisitor::localQmlFile2FakeMetaObject(QString filePath)
             } else if (cast<VariableStatement *>(sourceElement->sourceElement)) {
                 // nothing to do
             } else {
-                qDebug() << "unsupportedd sourceElement at" << sourceElement->firstSourceLocation()
-                         << sourceElement->sourceElement->kind;
+                const auto loc = sourceElement->firstSourceLocation();
+                m_colorOut.writeUncolored(
+                            "unsupportedd sourceElement at "
+                            + QString::fromLatin1("%1:%2: ").arg(loc.startLine).arg(loc.startColumn)
+                            + QString::number(sourceElement->sourceElement->kind));
             }
             break;
         }
         default: {
-            qDebug() << "unsupported element of kind" << initMembers->member->kind;
+            m_colorOut.writeUncolored("unsupported element of kind "
+                                      + QString::number(initMembers->member->kind));
         }
         }
         initMembers = initMembers->next;
@@ -368,9 +369,8 @@ bool FindUnqualifiedIDVisitor::visit(QQmlJS::AST::UiProgram *)
         while (it.hasNext()) {
             auto reader = createReaderForFile(it.next());
             auto succ = reader(&objects, &moduleApis, &dependencies);
-            if (!succ) {
-                qDebug() << reader.errorMessage();
-            }
+            if (!succ)
+                m_colorOut.writeUncolored(reader.errorMessage());
         }
     }
     // add builtins
@@ -578,13 +578,15 @@ bool FindUnqualifiedIDVisitor::visit(QQmlJS::AST::IdentifierExpression *idexp)
 }
 
 FindUnqualifiedIDVisitor::FindUnqualifiedIDVisitor(QStringList const &qmltypeDirs,
-                                                   const QString &code, const QString &fileName)
+                                                   const QString &code, const QString &fileName,
+                                                   bool silent)
     : m_rootScope(new ScopeTree { ScopeType::JSFunctionScope, "global" }),
       m_currentScope(m_rootScope.get()),
       m_qmltypeDirs(qmltypeDirs),
       m_code(code),
       m_rootId(QLatin1String("<id>")),
-      m_filePath(fileName)
+      m_filePath(fileName),
+      m_colorOut(silent)
 {
     // setup color output
     m_colorOut.insertColorMapping(Error, ColorOutput::RedForeground);
@@ -806,12 +808,3 @@ void FindUnqualifiedIDVisitor::endVisit(QQmlJS::AST::UiObjectDefinition *)
 {
     leaveEnvironment();
 }
-
-QDebug operator<<(QDebug dbg, const QQmlJS::AST::SourceLocation &loc)
-{
-    QDebugStateSaver saver(dbg);
-    dbg.nospace() << loc.startLine;
-    dbg.nospace() << ":";
-    dbg.nospace() << loc.startColumn;
-    return dbg.maybeSpace();
-}
diff --git a/tools/qmllint/findunqualified.h b/tools/qmllint/findunqualified.h
index f7d1aab1f4..98e14f8dc7 100644
--- a/tools/qmllint/findunqualified.h
+++ b/tools/qmllint/findunqualified.h
@@ -43,7 +43,8 @@ enum class ScopeType;
 class FindUnqualifiedIDVisitor : public QQmlJS::AST::Visitor {
 
 public:
-    explicit FindUnqualifiedIDVisitor(QStringList const &qmltypeDirs, const QString& code, const QString& fileName);
+    explicit FindUnqualifiedIDVisitor(QStringList const &qmltypeDirs, const QString& code,
+                                      const QString& fileName, bool silent);
     ~FindUnqualifiedIDVisitor() override;
     bool check();
 
diff --git a/tools/qmllint/main.cpp b/tools/qmllint/main.cpp
index 235ec16c6e..0fa2ab53e4 100644
--- a/tools/qmllint/main.cpp
+++ b/tools/qmllint/main.cpp
@@ -50,7 +50,8 @@ static bool lint_file(const QString &filename, const bool silent, const bool war
 {
     QFile file(filename);
     if (!file.open(QFile::ReadOnly)) {
-        qWarning() << "Failed to open file" << filename << file.error();
+        if (!silent)
+            qWarning() << "Failed to open file" << filename << file.error();
         return false;
     }
 
@@ -76,7 +77,7 @@ static bool lint_file(const QString &filename, const bool silent, const bool war
 
     if (success && !isJavaScript && warnUnqualied) {
         auto root = parser.rootNode();
-        FindUnqualifiedIDVisitor v { qmltypeDirs, code, filename};
+        FindUnqualifiedIDVisitor v { qmltypeDirs, code, filename, silent };
         root->accept(&v);
         success = v.check();
     }
diff --git a/tools/qmllint/qcoloroutput.cpp b/tools/qmllint/qcoloroutput.cpp
index d2e723700a..eb4c721663 100644
--- a/tools/qmllint/qcoloroutput.cpp
+++ b/tools/qmllint/qcoloroutput.cpp
@@ -39,7 +39,7 @@
 class ColorOutputPrivate
 {
 public:
-    ColorOutputPrivate() : currentColorID(-1)
+    ColorOutputPrivate(bool silent) : currentColorID(-1), silent(silent)
 
     {
         /* - QIODevice::Unbuffered because we want it to appear when the user actually calls, performance
@@ -53,6 +53,7 @@ public:
     ColorOutput::ColorMapping   colorMapping;
     int                         currentColorID;
     bool                        coloringEnabled;
+    bool                        silent;
 
     static const char *const foregrounds[];
     static const char *const backgrounds[];
@@ -238,7 +239,7 @@ ColorOutput::ColorMapping ColorOutput::colorMapping() const
 /*!
   Constructs a ColorOutput instance, ready for use.
  */
-ColorOutput::ColorOutput() : d(new ColorOutputPrivate())
+ColorOutput::ColorOutput(bool silent) : d(new ColorOutputPrivate(silent))
 {
 }
 
@@ -258,7 +259,8 @@ ColorOutput::~ColorOutput() = default; // must be here so that QScopedPointer ha
  */
 void ColorOutput::write(const QString &message, int colorID)
 {
-    d->write(colorify(message, colorID));
+    if (!d->silent)
+        d->write(colorify(message, colorID));
 }
 
 /*!
@@ -269,7 +271,8 @@ void ColorOutput::write(const QString &message, int colorID)
  */
 void ColorOutput::writeUncolored(const QString &message)
 {
-    d->write(message + QLatin1Char('\n'));
+    if (!d->silent)
+        d->write(message + QLatin1Char('\n'));
 }
 
 /*!
diff --git a/tools/qmllint/qcoloroutput_p.h b/tools/qmllint/qcoloroutput_p.h
index 710bf5db74..aefa765a87 100644
--- a/tools/qmllint/qcoloroutput_p.h
+++ b/tools/qmllint/qcoloroutput_p.h
@@ -89,7 +89,7 @@ public:
     typedef QFlags<ColorCodeComponent> ColorCode;
     typedef QHash<int, ColorCode> ColorMapping;
 
-    ColorOutput();
+    ColorOutput(bool silent);
     ~ColorOutput();
 
     void setColorMapping(const ColorMapping &cMapping);