3 files changed, 23 insertions(+), 4 deletions(-)

M module-gui/gui/widgets/text/core/cursors/TextBlockCursor.cpp
M module-gui/gui/widgets/text/core/cursors/TextBlockCursor.hpp
M module-gui/test/test-catch-text/test-gui-TextBlockCursor.cpp

@@ 313,8 313,9 @@ namespace gui
             // Iterate through white space
             while (currentBlock()->getText(getPosition() - detectIndex).substr(0, 1) == " ") {
 
-                // If dot with space found return true
-                if (currentBlock()->getText(getPosition() - detectIndex - 1).substr(0, 2) == ". ") {
+                // If sentence detect signs with space found return true
+                if (checkSentenceBeginningSigns(
+                        currentBlock()->getText(getPosition() - detectIndex - 1).substr(0, 2))) {
                     return true;
                 }
                 detectIndex++;


@@ 326,6 327,18 @@ namespace gui
         return false;
     }
 
+    auto BlockCursor::checkSentenceBeginningSigns(const std::string &textToCompare) const -> bool
+    {
+        auto sentenceDetectSigns = {". ", "? ", "! "};
+
+        for (auto sings : sentenceDetectSigns) {
+            if (textToCompare == sings) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     const TextBlock &BlockCursor::operator*()
     {
         return *currentBlock();


@@ 361,4 374,5 @@ namespace gui
     {
         return document->blocks.end();
     }
+
 } // namespace gui

@@ 41,6 41,7 @@ namespace gui
         [[nodiscard]] auto checkNpos() const -> bool;
         void resetNpos();
         [[nodiscard]] auto checkDocument() const -> bool;
+        [[nodiscard]] auto checkSentenceBeginningSigns(const std::string &textToCompare) const -> bool;
 
       public:
         /// gets cursor pointing in position in block

@@ 526,14 526,18 @@ TEST_CASE("check sentence beginning")
     removeNSignsInBlock(1, cursor);
     REQUIRE(!cursor.checkSentenceBeginning());
 
-    // Add string ending with dot and white space
-    addStringToBlock("Test. ", cursor);
+    // Add string ending with exclamation mark and white space
+    addStringToBlock("Test! ", cursor);
     REQUIRE(cursor.checkSentenceBeginning());
 
     // Add extra sign
     addStringToBlock("P", cursor);
     REQUIRE(!cursor.checkSentenceBeginning());
 
+    // Add string ending with question mark and white space
+    addStringToBlock("Test? ", cursor);
+    REQUIRE(cursor.checkSentenceBeginning());
+
     // Check number of blocks
     REQUIRE(cursor.getBlockNumber() == 0);