Mercurial > octave

changeset 29717:3e046fba8805

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Rik <rik@octave.org>
date Tue, 01 Jun 2021 09:22:52 -0700
parents da9c55b3e9fa (current diff) 0e888d2f79b7 (diff)
children 504fcc051d51
files libgui/src/m-editor/octave-qscintilla.cc
diffstat 1 files changed, 15 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/m-editor/octave-qscintilla.cc	Sun May 30 21:00:22 2021 +0200
+++ b/libgui/src/m-editor/octave-qscintilla.cc	Tue Jun 01 09:22:52 2021 -0700
@@ -604,28 +604,40 @@
     if (prevline.contains (case_key) && do_smart_indent)
       {
         QString last_line = text (line-1);
+        int prev_ind = indentation (line-1);
         int act_ind = indentation (line);
 
-        if (last_line.contains ("switch"))
+        if (last_line.contains (QRegExp ("^[\t ]*switch")))
           {
             indent (line+1);
             act_ind = indentation (line+1);
           }
         else
-          unindent (line);
+          {
+            if (prev_ind == act_ind)
+              unindent (line);
+            else if (prev_ind > act_ind)
+              act_ind = prev_ind;
+          }
 
         setIndentation (line+1, act_ind);
         setCursorPosition (line+1, act_ind);
       }
 
     ekey = QRegExp ("^[\t ]*(?:end|endif|endfor|endwhile|until|endfunction"
-                    "|end_try_catch|end_unwind_protect)[\r]?[\t #%\n(;]");
+                    "|endswitch|end_try_catch|end_unwind_protect)[\r]?[\t #%\n(;]");
     if (prevline.contains (ekey))
       {
         if (indentation (line-1) <= indentation (line))
           {
             unindent (line+1);
             unindent (line);
+            if (prevline.contains ("endswitch"))
+              {
+                // endswitch has to me unndented twice
+                unindent (line+1);
+                unindent (line);
+              }
             setCursorPosition (line+1,
                                indentation (line));
           }
@@ -655,7 +667,6 @@
 
     QRegExp mid_block_regexp
       = QRegExp ("^[\t ]*(?:elseif|else"
-                 "|otherwise"
                  "|unwind_protect_cleanup|catch)"
                  "[\r\n\t #%]");