Correctly insert content block closing bracket

Author: IgKh

core/katvan_codemodel.cpp

@@ -282,28 +282,41 @@ QTextBlock CodeModel::findMatchingIndentBlock(QTextBlock block) const
     return block;
 }
 
-parsing::ParserState::Kind CodeModel::getStateForBracketInsertion(QTextCursor cursor) const
+std::tuple<State, State> CodeModel::getStatesForBracketInsertion(QTextCursor cursor) const
 {
+    State prevState = State::INVALID;
+    State currState = State::INVALID;
+
     // First, there might be an interesting state that the parser may have
     // already implicitly closed; e.g. block scoped states closed by reaching
-    // end of line, or certain "instant" states. These take precedence.
+    // end of line, or certain "instant" states. These take precedence in
+    // being the "current" state - while they are also the "previous" state.
     if (!cursor.atBlockStart()) {
         auto span = spanAtPosition(cursor.block(), cursor.position() - 1);
-        if (span && span->implicitlyClosed) {
-            return span->state;
+        if (span) {
+            prevState = span->state;
+            if (span->implicitlyClosed) {
+                currState = span->state;
+            }
         }
     }
 
-    auto span = spanAtPosition(cursor.block(), cursor.position());
-    if (span) {
-        return span->state;
+    if (currState == State::INVALID) {
+        auto span = spanAtPosition(cursor.block(), cursor.position());
+        if (span) {
+            currState = span->state;
+        }
+        else {
+            currState = State::CONTENT;
+        }
     }
-    return State::CONTENT;
+
+    return std::make_tuple(prevState, currState);
 }
 
 std::optional<QChar> CodeModel::getMatchingCloseBracket(QTextCursor cursor, QChar openBracket) const
 {
-    State state = getStateForBracketInsertion(cursor);
+    auto [prevState, state] = getStatesForBracketInsertion(cursor);
 
     QChar prevChar;
     if (!cursor.atBlockStart()) {
@@ -340,7 +353,8 @@ std::optional<QChar> CodeModel::getMatchingCloseBracket(QTextCursor cursor, QCha
         }
     }
     else if (openBracket == QLatin1Char('[')) {
-        if (isInCode || isCodeFunctionCall || ((isInContent || isInMath) && prevChar == QLatin1Char('#'))) {
+        if (isInCode || isCodeFunctionCall || ((isInContent || isInMath) && prevChar == QLatin1Char('#')) ||
+            prevState == State::CODE_ARGUMENTS || prevState == State::CONTENT_BLOCK) {
             return QLatin1Char(']');
         }
     }

core/katvan_codemodel.h

@@ -111,9 +111,9 @@ class CodeModel : public QObject
     // Find the inner most state span still in effect at the given global position
     std::optional<StateSpan> spanAtPosition(QTextBlock block, int globalPos) const;
 
-    // Find the relevant "current" state for the cursor to consider which brackets
-    // can be auto-inserted.
-    parsing::ParserState::Kind getStateForBracketInsertion(QTextCursor cursor) const;
+    // Find the relevant "previous" and current" states for the cursor to consider
+    // which brackets can be auto-inserted.
+    std::tuple<parsing::ParserState::Kind, parsing::ParserState::Kind> getStatesForBracketInsertion(QTextCursor cursor) const;
 
     QTextDocument* d_document;
 };

tests/katvan_codemodel.t.cpp

@@ -301,7 +301,8 @@ Q_GLOBAL_STATIC(QStringList, GET_MATCHING_CLOSE_BRACKET_TEST_DOC, {
     /* 3 */ "$\"AB\" = ln(1 + x)$",
     /* 4 */ "// a comment",
     /* 5 */ "`raw content`",
-    /* 6 */ "#par $ x = #rect $"
+    /* 6 */ "#par $ x = #rect $",
+    /* 7 */ "#text()"
 })
 
 class CodeModel_GetMatchingCloseBracketTests : public ::testing::Test {
@@ -418,6 +419,8 @@ TEST_F(CodeModel_GetMatchingCloseBracketTests, SquareBrackets)
 
     EXPECT_THAT(model.getMatchingCloseBracket(cursorAt(6, 4),  QLatin1Char('[')), ::testing::Eq(QLatin1Char(']')));
     EXPECT_THAT(model.getMatchingCloseBracket(cursorAt(6, 16), QLatin1Char('[')), ::testing::Eq(QLatin1Char(']')));
+
+    EXPECT_THAT(model.getMatchingCloseBracket(cursorAt(7, 7),  QLatin1Char('[')), ::testing::Eq(QLatin1Char(']')));
 }
 
 TEST_F(CodeModel_GetMatchingCloseBracketTests, MathDelimiters)