fixed bugs

Author: vision-05

src/Core/datatypes.cpp

@@ -25,6 +25,9 @@ better::Text better::backspace(better::Text text) { //couple of bugs with backsp
     immer::flex_vector<char> newLine;
 
     if(text.cursor.column > 0) {
+        if(text.topColumnNumber == text.cursor.column) {
+            text.topColumnNumber -= 1; 
+        }
         newLine = text.textEdit[text.cursor.row].erase(text.cursor.column - 1); //make case for deleting newline
     }
     else {
@@ -47,9 +50,19 @@ better::Text better::backspace(better::Text text) { //couple of bugs with backsp
 better::Text better::newLine(better::Text textEdit) { //create cases for the following: newline at start of line, newline at end of line, newline in middle of line, newline at end of text
     const int textWidth {150};
     const int textHeight {60};
+
+    std::vector<better::Text> texts {};
+
     bool endOfText {textEdit.cursor.row == textEdit.textEdit.size() - 1 ? true : false};
     bool textSizeRightSize {textEdit.textEdit.size() > (textHeight - 1) ? true : false}; //if end of text make sure to not just append a new row
-    return {endOfText ? textEdit.textEdit.set(textEdit.cursor.row, textEdit.textEdit[textEdit.cursor.row].take(textEdit.cursor.column)).push_back(textEdit.textEdit[textEdit.cursor.row].drop(textEdit.cursor.column)) : textEdit.textEdit.insert(textEdit.cursor.row + 1, textEdit.textEdit[textEdit.cursor.row].drop(textEdit.cursor.column)).set(textEdit.cursor.row, textEdit.textEdit[textEdit.cursor.row].take(textEdit.cursor.column)), {textEdit.cursor.row + 1, 0}, {{false,false,false,false},textEdit.data.isShift,textEdit.data.isCaps,textEdit.data.isScroll,textEdit.data.isCtrl,textEdit.data.clearHistory,-1,textEdit.data.menu,textEdit.data.filename}, endOfText ? (textSizeRightSize ? textEdit.topLineNumber + 1 : 0) : textEdit.topLineNumber, 0, textEdit.highlightStart, textEdit.highlightEnd}; //insert newline unless at bottom
+    better::Text newText {endOfText ? textEdit.textEdit.set(textEdit.cursor.row, textEdit.textEdit[textEdit.cursor.row].take(textEdit.cursor.column)).push_back(textEdit.textEdit[textEdit.cursor.row].drop(textEdit.cursor.column)) : textEdit.textEdit.insert(textEdit.cursor.row + 1, textEdit.textEdit[textEdit.cursor.row].drop(textEdit.cursor.column)).set(textEdit.cursor.row, textEdit.textEdit[textEdit.cursor.row].take(textEdit.cursor.column)), {textEdit.cursor.row + 1, 0}, {{false,false,false,false},textEdit.data.isShift,textEdit.data.isCaps,textEdit.data.isScroll,textEdit.data.isCtrl,textEdit.data.clearHistory,-1,textEdit.data.menu,textEdit.data.filename}, endOfText ? (textSizeRightSize ? textEdit.topLineNumber + 1 : 0) : textEdit.topLineNumber, 0, textEdit.highlightStart, textEdit.highlightEnd}; //insert newline unless at bottom
+    int prevIndent {better::getPreviousIndentLevel(textEdit, textEdit.cursor.row)};
+    texts.push_back(newText);
+    for(int i{}; i < prevIndent; ++i) {
+        texts.push_back(better::updateText(texts.back(),' '));
+    }
+    //create new case for between {},[] and ()
+    return texts.back();
 }
 
 better::charMapArr better::makeCharMapArr(::Uint8 charArray[16]) {
@@ -81,3 +94,17 @@ Uint8 better::getBlue(Uint32 color) {
 Uint8 better::getAlpha(Uint32 color) {
     return static_cast<Uint8>(color & 0x000000FF);
 }
+
+int better::getPreviousIndentLevel(better::Text text, int row) {
+    int notSpace {0};
+    for(int i{}; i < text.textEdit[row].size(); ++i) {
+        if(text.textEdit[row][i] == ' ') {
+            notSpace++;
+        }
+        else {
+            break;
+        }
+    }
+    return notSpace;
+}
+

src/Core/datatypes.hpp

@@ -57,6 +57,8 @@ Uint8 getGreen(Uint32 color);
 Uint8 getBlue(Uint32 color);
 Uint8 getAlpha(Uint32 color);
 
+int getPreviousIndentLevel(better::Text text, int row);
+
 }
 
 #endif

src/Core/main.cpp

@@ -8,7 +8,6 @@
 #include <vector>
 #include <string>
 #include <unordered_map>
-#include <iostream>
 
 #include "datatypes.hpp"
 #include "fileUtils.hpp"
@@ -328,6 +327,7 @@ better::Text better::keyDown(better::Text text, SDL_Event event, SDL_Surface* su
         return better::horizontalNav(text, event.key.keysym.scancode, text.data.textHeight, text.data.textWidth);
     }
     else if(event.key.keysym.scancode == SDL_SCANCODE_RETURN) {
+        text.highlightStart = text.highlightEnd;
         return better::newLine(text);
     }
 
@@ -417,14 +417,12 @@ better::Text better::handleKey(better::Text text, char key) {
     switch(key) {
         case '\b':
             return better::backspace(text);
-        case '{':
-            return better::verticalNav(better::horizontalNav(better::updateText(better::newLine(better::newLine(better::updateText(text,key))),'}'), SDL_SCANCODE_LEFT, text.data.textHeight, text.data.textWidth), SDL_SCANCODE_UP, text.data.textHeight, text.data.textWidth);
         case '\'':
             return better::horizontalNav(better::updateText(better::updateText(text,'\''),'\''),SDL_SCANCODE_LEFT, text.data.textHeight, text.data.textWidth);
         case '\"':
             return better::horizontalNav(better::updateText(better::updateText(text,key),'\"'),SDL_SCANCODE_LEFT, text.data.textHeight, text.data.textWidth);
         default:
-            if(key == '(' || key == '<' || key == '[') {
+            if(key == '(' || key == '{' || key == '[') {
                 return better::autoBracket(text,key);
             }
             else {

src/Core/makefile

@@ -1,2 +1,2 @@
 main: main.cpp datatypes.cpp fileUtils.cpp renderchars.cpp menubar.cpp
-	clang++ -g -O3 -std=c++20 -o BetterCode.exe main.cpp datatypes.cpp fileUtils.cpp renderchars.cpp menubar.cpp -m64 -I"C:/Program Files/LLVM/lib/clang/11.0.0/include/immer-0.6.2/" -I"C:/Program Files/LLVM/lib/clang/11.0.0/include/immer-0.6.2/immer/" -I"C:/Program Files/LLVM/lib/clang/11.0.0/include/immer-0.6.2/immer/detail/rbts/" -lC:/Users/TFran/VisionCode/src/Libs/SDL2main -lC:/Users/TFran/VisionCode/src/Libs/SDL2
+	clang++ -O3 -std=c++20 -o BetterCode.exe main.cpp datatypes.cpp fileUtils.cpp renderchars.cpp menubar.cpp -m64 -I"C:/Program Files/LLVM/lib/clang/11.0.0/include/immer-0.6.2/" -I"C:/Program Files/LLVM/lib/clang/11.0.0/include/immer-0.6.2/immer/" -I"C:/Program Files/LLVM/lib/clang/11.0.0/include/immer-0.6.2/immer/detail/rbts/" -lC:/Users/TFran/VisionCode/src/Libs/SDL2main -lC:/Users/TFran/VisionCode/src/Libs/SDL2

src/Core/renderchars.cpp

@@ -167,7 +167,7 @@ void better::renderText(SDL_Surface* surface, immer::flex_vector<immer::flex_vec
             colSize = topColumn + textWidth;
         }
         comment = false;
-        for(int j{topColumn}, otherj{}; j < colSize; ++j, ++otherj) {
+        for(int j{}, otherj{}; j < colSize; ++j, ++otherj) {
             if(highlight && ((i >= highlightStart.row && i <= highlightEnd.row) && (j >= highlightStart.column && j <= highlightEnd.column)) || (((highlightEnd.row != highlightStart.row && highlightEnd.column != highlightStart.column)) && ((i == highlightStart.row && j >= highlightStart.column) || (i == highlightEnd.row && j <= highlightEnd.column) || (i < highlightEnd.row && i > highlightStart.row)))) {
                 background = colorhighlight;
             }
@@ -202,7 +202,9 @@ void better::renderText(SDL_Surface* surface, immer::flex_vector<immer::flex_vec
             else {
                 foreground = colorfg;
             }
-            better::createLetter(surface, vector[i][j], otherj, otheri, foreground, background); //render text line by line
+            if(j >= topColumn && j < topColumn + textWidth) {
+                better::createLetter(surface, vector[i][j], otherj - topColumn, otheri, foreground, background); //render text line by line
+            }
         }
     }
 }