Tab action has been fixed.

Author: Dman95

codeeditor.cpp

@@ -291,12 +291,13 @@ void CodeEditor::setDebugMode(bool mode)
 
 void CodeEditor::putTab()
 {
-    QString insertion = "    ";
-
     QTextCursor cursor = textCursor();
     if (cursor.selectionEnd() - cursor.selectionStart() <= 0) {
+        int spacesToAdd = 4 - cursor.columnNumber() % 4;
+        QString insertion(spacesToAdd, ' ');
         insertPlainText(insertion);
     } else {
+        QString insertion = "    ";
         QTextBlock firstBlock = document()->findBlock(cursor.selectionStart());
         QTextBlock lastBlock = document()->findBlock(cursor.selectionEnd() - 1);
 
@@ -311,26 +312,32 @@ void CodeEditor::putTab()
 
 void CodeEditor::deleteTab()
 {
-    QString deletion = "    ";
-
     QTextCursor cursor = textCursor();
     if (cursor.selectionEnd() - cursor.selectionStart() <= 0) {
-        //delete 4 spaces (tab)
-        cursor.movePosition(QTextCursor::Left, QTextCursor::KeepAnchor, deletion.length());
-        QString selected = cursor.selectedText();
-        if (selected.startsWith(deletion))
-            cursor.deletePreviousChar();
+        int spacesToDelete = 4 - (4 - cursor.columnNumber() % 4) % 4;
+        for (int i = 0; i < spacesToDelete; ++i) {
+            if (cursor.columnNumber() != 0 && document()->characterAt(cursor.position() - 1) == ' ') {
+                cursor.movePosition(QTextCursor::Left, QTextCursor::KeepAnchor, 1);
+            } else {
+                break;
+            }
+        }
+        cursor.removeSelectedText();
     } else {
         QTextBlock firstBlock = document()->findBlock(cursor.selectionStart());
         QTextBlock lastBlock = document()->findBlock(cursor.selectionEnd() - 1);
-
         cursor.setPosition(firstBlock.position());
         cursor.beginEditBlock();
         do {
-            if (cursor.block().text().startsWith(deletion)) {
-                cursor.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor, deletion.length());
-                cursor.removeSelectedText();
+            int spacesToDelete = 4;
+            for (int i = 0; i < spacesToDelete; ++i) {
+                if (document()->characterAt(cursor.position()) == ' ') {
+                    cursor.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor, 1);
+                } else {
+                    break;
+                }
             }
+            cursor.removeSelectedText();
         } while (cursor.movePosition(QTextCursor::NextBlock) && cursor.position() <= lastBlock.position());
         cursor.endEditBlock();
     }