From b4e70c48791fcf17b58f10e38cf49454f8e7309f Mon Sep 17 00:00:00 2001
From: Roy Qu <royqh1979@gmail.com>
Date: Tue, 30 Nov 2021 20:43:58 +0800
Subject: [PATCH] - fix: indent can't be correctly undo  - change: press tab
 when there are selections will do indent

---
 NEWS.md                          |  5 ++++
 RedPandaIDE/qsynedit/SynEdit.cpp | 39 +++++++++++++++++---------------
 RedPandaIDE/version.h            |  2 +-
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index d36ba18f..ef95632d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,10 @@
+Version 0.10.4 For Dev-C++ 7 Beta
+ - fix: indent can't be correctly undo
+ - change: press tab when there are selections will do indent
+
 Version 0.10.3 For Dev-C++ 7 Beta
  - enhancement: treat files ended with ".C" or ".CPP"  as C++ files
+ - enhancement: add option "ignore spaces when validating problem cases" to the "Executor"/"Problem Set" option tab.
 
 Version 0.10.2 For Dev-C++ 7 Beta
  - fix: select by mouse can't correctly set mouse's column position
diff --git a/RedPandaIDE/qsynedit/SynEdit.cpp b/RedPandaIDE/qsynedit/SynEdit.cpp
index 9c733be6..1f383624 100644
--- a/RedPandaIDE/qsynedit/SynEdit.cpp
+++ b/RedPandaIDE/qsynedit/SynEdit.cpp
@@ -2442,8 +2442,9 @@ bool SynEdit::canDoBlockIndent()
     BufferCoord BE;
 
     if (selAvail()) {
-        BB = blockBegin();
-        BE = blockEnd();
+//        BB = blockBegin();
+//        BE = blockEnd();
+        return true;
     } else {
         BB = caretXY();
         BE = caretXY();
@@ -2579,16 +2580,16 @@ void SynEdit::computeScroll(int X, int Y, bool isDragging)
 
 void SynEdit::doBlockIndent()
 {
-    BufferCoord  OrgCaretPos;
+    BufferCoord  oldCaretPos;
     BufferCoord  BB, BE;
     QString StrToInsert;
     int e,x,i;
     QString Spaces;
-    SynSelectionMode OrgSelectionMode;
+    SynSelectionMode oldSelectionMode;
     BufferCoord InsertionPos;
 
-    OrgSelectionMode = mActiveSelectionMode;
-    OrgCaretPos = caretXY();
+    oldSelectionMode = mActiveSelectionMode;
+    oldCaretPos = caretXY();
     StrToInsert = nullptr;
 
     auto action = finally([&,this]{
@@ -2596,9 +2597,9 @@ void SynEdit::doBlockIndent()
             BB.Char += Spaces.length();
         if (BE.Char > 1)
           BE.Char+=Spaces.length();
-        setCaretAndSelection(OrgCaretPos,
+        setCaretAndSelection(oldCaretPos,
           BB, BE);
-        setActiveSelectionMode(OrgSelectionMode);
+        setActiveSelectionMode(oldSelectionMode);
     });
     // keep current selection detail
     if (selAvail()) {
@@ -2647,7 +2648,7 @@ void SynEdit::doBlockIndent()
           {BE.Char + Spaces.length(), BE.Line},
           "", SynSelectionMode::smColumn);
         //adjust the x position of orgcaretpos appropriately
-        OrgCaretPos.Char = x;
+        oldCaretPos.Char = x;
     }
 }
 
@@ -2665,7 +2666,7 @@ void SynEdit::doBlockUnindent()
         BB = caretXY();
         BE = caretXY();
     }
-    BufferCoord OrgCaretPos = caretXY();
+    BufferCoord oldCaretPos = caretXY();
     int x = 0;
 
     int e = BE.Line;
@@ -2694,7 +2695,7 @@ void SynEdit::doBlockUnindent()
             FirstIndent = charsToDelete;
         if (i==e)
             LastIndent = charsToDelete;
-        if (i==OrgCaretPos.Line)
+        if (i==oldCaretPos.Line)
             x = charsToDelete;
         QString TempString = Line.mid(charsToDelete);
         mLines->putString(i-1,TempString);
@@ -2704,10 +2705,10 @@ void SynEdit::doBlockUnindent()
   // restore selection
   //adjust the x position of orgcaretpos appropriately
 
-    OrgCaretPos.Char -= x;
+    oldCaretPos.Char -= x;
     BB.Char -= FirstIndent;
     BE.Char -= LastIndent;
-    setCaretAndSelection(OrgCaretPos, BB, BE);
+    setCaretAndSelection(oldCaretPos, BB, BE);
 }
 
 void SynEdit::doAddChar(QChar AChar)
@@ -4117,6 +4118,7 @@ void SynEdit::doUndoItem()
                         Item->changeStartPos(),
                         Item->changeEndPos());
             QString TmpStr = selText();
+            qDebug()<<TmpStr;
             setSelTextPrimitiveEx(
                         Item->changeSelMode(),
                         Item->changeStr(),
@@ -4532,11 +4534,12 @@ QString SynEdit::selText()
                   std::swap(ColFrom, ColTo);
               QString result;
               for (int i = First; i <= Last; i++) {
-                  int l = columnToChar(i,ColFrom);
-                  int r = columnToChar(i,ColTo-1);
+                  int l = columnToChar(i+1,ColFrom);
+                  int r = columnToChar(i+1,ColTo-1)+1;
                   QString s = mLines->getString(i);
                   result += s.mid(l-1,r-l);
-                  result+=lineBreak();
+                  if (i<Last)
+                      result+=lineBreak();
               }
               return result;
         }
@@ -5062,8 +5065,8 @@ void SynEdit::deleteSelection(const BufferCoord &BB, const BufferCoord &BE)
             std::swap(ColFrom, ColTo);
         QString result;
         for (int i = First; i <= Last; i++) {
-            int l = columnToChar(i,ColFrom);
-            int r = columnToChar(i,ColTo-1);
+            int l = columnToChar(i+1,ColFrom);
+            int r = columnToChar(i+1,ColTo-1)+1;
             QString s = mLines->getString(i);
             s.remove(l-1,r-l);
             properSetLine(i,s);
diff --git a/RedPandaIDE/version.h b/RedPandaIDE/version.h
index 5c3e78e2..9e68b84e 100644
--- a/RedPandaIDE/version.h
+++ b/RedPandaIDE/version.h
@@ -2,6 +2,6 @@
 #define VERSION_H
 #include <QObject>
 
-#define DEVCPP_VERSION "beta.0.10.3"
+#define DEVCPP_VERSION "beta.0.10.4"
 
 #endif // VERSION_H