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 <qthjk@ovi.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/src/libs/qmljs/qmljslineinfo.cpp b/src/libs/qmljs/qmljslineinfo.cpp
index 54e67eeb2a..d2f4cbd5d9 100644
--- a/src/libs/qmljs/qmljslineinfo.cpp
+++ b/src/libs/qmljs/qmljslineinfo.cpp
@@ -205,11 +205,10 @@ QString LineInfo::trimmedCodeLine(const QString &t)
                 while (i >= 2) {
                     const Token &prev = yyLinizerState.tokens.at(i-1);
                     const Token &prevPrev = yyLinizerState.tokens.at(i-2);
-                    if (prev.kind == Token::Dot && prevPrev.kind == Token::Identifier) {
+                    if (prev.kind == Token::Dot && prevPrev.kind == Token::Identifier)
                         i -= 2;
-                    } else {
+                    else
                         break;
-                    }
                 }
 
                 // it could also be 'a = \n Foo \n {', but that sounds unlikely