Remove braces for single lines of conditions

#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <[email protected]>

1 files changed, 6 insertions, 10 deletions

diff --git a/src/libs/qmljs/qmljsscopebuilder.cpp b/src/libs/qmljs/qmljsscopebuilder.cpp
index 65dfc783efc..1f8095709e0 100644
--- a/src/libs/qmljs/qmljsscopebuilder.cpp
+++ b/src/libs/qmljs/qmljsscopebuilder.cpp
@@ -81,14 +81,12 @@ void ScopeBuilder::push(AST::Node *node)
                     break;
             }
             // signals defined in QML
-            if (const ASTSignal *astsig = value_cast<ASTSignal>(value)) {
+            if (const ASTSignal *astsig = value_cast<ASTSignal>(value))
                 _scopeChain->appendJsScope(astsig->bodyScope());
-            }
             // signals defined in C++
             else if (const CppComponentValue *qmlObject = value_cast<CppComponentValue>(owner)) {
-                if (const ObjectValue *scope = qmlObject->signalScope(name)) {
+                if (const ObjectValue *scope = qmlObject->signalScope(name))
                     _scopeChain->appendJsScope(scope);
-                }
             }
         }
     }
@@ -170,11 +168,10 @@ void ScopeBuilder::setQmlScopeObject(Node *node)
     }
 
     const ObjectValue *scopeObject = _scopeChain->document()->bind()->findQmlObject(node);
-    if (scopeObject) {
+    if (scopeObject)
         qmlScopeObjects += scopeObject;
-    } else {
+    else
         return; // Probably syntax errors, where we're working with a "recovered" AST.
-    }
 
     // check if the object has a Qt.ListElement or Qt.Connections ancestor
     // ### allow only signal bindings for Connections
@@ -208,11 +205,10 @@ void ScopeBuilder::setQmlScopeObject(Node *node)
                         Evaluate evaluator(_scopeChain);
                         const Value *targetValue = evaluator(scriptBinding->statement);
 
-                        if (const ObjectValue *target = value_cast<ObjectValue>(targetValue)) {
+                        if (const ObjectValue *target = value_cast<ObjectValue>(targetValue))
                             qmlScopeObjects.prepend(target);
-                        } else {
+                        else
                             qmlScopeObjects.clear();
-                        }
                     }
                 }
             }