Merge pull request #1927 from BerndN/patch-4

[Bug 20621] Refine indentation for some if variants

Author: livecodepanos

Toolset/palettes/script editor/behaviors/revsecommoneditorbehavior.livecodescript

@@ -431,10 +431,16 @@ private function textFormatIndentLineRemoves pPreviousLine, pLine
 
       else
 
-         if "then" is among the words of pPreviousLine and token -1 of pPreviousLine is not "then" and token 1 of pPreviousLine is "if" and token - 1 of pLine is "else" then
+         if "then" is among the words of pPreviousLine and token -1 of pPreviousLine is not "then" \
+               and "else" is among the tokens of pPreviousLine and token 1 of pPreviousLine is "if" and token -1 of pLine is "else" then
             return item 1 of sTextFormatKeywordMap["else"]
          end if
 
+         if "then" is among the words of pPreviousLine and token -1 of pPreviousLine is not "then" \
+               and token 1 of pPreviousLine is "if" and token -1 of pLine is "else" then
+            return 0
+         end if
+         
          if "then" is among the words of pPreviousLine and token -1 of pPreviousLine is not "then" then
             return 0
          else