Empty lines from custom code must be cropped.

This is to avoid lines composed only of irritating trailing spaces.

Reviewed by Bruno Araújo <bruno.araujo@openbossa.org>
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>

1 files changed, 14 insertions, 8 deletions

diff --git a/generator.cpp b/generator.cpp
index 376f56050..d1e89fd32 100644
--- a/generator.cpp
+++ b/generator.cpp
@@ -242,16 +242,22 @@ QTextStream& formatCode(QTextStream &s, const QString& code, Indentor &indentor)
         }
     }
 
+    static QRegExp emptyLine("\\s*[\\r]?[\\n]?\\s*");
+
     foreach(QString line, lst) {
-        while (line.end()->isSpace())
-            line.chop(1);
-        int limit = 0;
-        for(int i = 0; i < spacesToRemove; ++i) {
-            if (!line[i].isSpace())
-                break;
-            limit++;
+        if (!line.isEmpty() && !emptyLine.exactMatch(line)) {
+            while (line.end()->isSpace())
+                line.chop(1);
+            int limit = 0;
+            for(int i = 0; i < spacesToRemove; ++i) {
+                if (!line[i].isSpace())
+                    break;
+                limit++;
+            }
+
+            s << indentor << line.remove(0, limit);
         }
-        s << indentor << line.remove(0, limit) << endl;
+        s << endl;
     }
     return s;
 }