loplugin:flatten in framework..package

Change-Id: Ide8a97eae6e2fdc7d2dcccba1480ac55a9b555bc
Reviewed-on: https://gerrit.libreoffice.org/42593
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 16 insertions, 15 deletions

diff --git a/compilerplugins/clang/flatten.cxx b/compilerplugins/clang/flatten.cxx
index adcc4972fd8f..ceff258179dd 100644
--- a/compilerplugins/clang/flatten.cxx
+++ b/compilerplugins/clang/flatten.cxx
@@ -153,7 +153,7 @@ bool Flatten::rewrite(const IfStmt* ifStmt)
     if (!replaceText(elseRange, thenString)) {
         return false;
     }
-    if (!removeText(elseKeywordRange, RewriteOptions(RemoveLineIfEmpty))) {
+    if (!removeText(elseKeywordRange)) {
         return false;
     }
     if (!replaceText(thenRange, elseString)) {
@@ -169,22 +169,24 @@ bool Flatten::rewrite(const IfStmt* ifStmt)
 std::string stripOpenAndCloseBrace(std::string s)
 {
     size_t i = s.find("{");
-    if (i != std::string::npos) {
+    if (i == std::string::npos)
+        throw "did not find {";
+
+    ++i;
+    // strip to line end
+    while (s[i] == ' ')
         ++i;
-        // strip to line end
-        while (s[i] == ' ')
-            ++i;
-        if (s[i] == '\n')
-            ++i;
-        s = s.substr(i);
-    }
+    if (s[i] == '\n')
+         ++i;
+    s = s.substr(i);
+
     i = s.rfind("}");
-    if (i != std::string::npos) {
+    if (i == std::string::npos)
+        throw "did not find }";
+    --i;
+    while (s[i] == ' ')
         --i;
-        while (s[i] == ' ')
-            --i;
-        s = s.substr(0,i);
-    }
+    s = s.substr(0,i);
     return s;
 }
 
@@ -272,7 +274,6 @@ SourceRange Flatten::extendOverComments(SourceRange range)
         --p1;
     startLoc = startLoc.getLocWithOffset(p1 - SM.getCharacterData( startLoc ));
 
-    p2 += Lexer::MeasureTokenLength( endLoc, SM, compiler.getLangOpts());
     // look for trailing ";"
     while (*p2 == ';')
         ++p2;