some regex fixes

fhackenberger · Aug 7, 2024 · 08b5a6c · 08b5a6c
1 parent 523cb10
commit 08b5a6c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -13,7 +13,7 @@
             "cwd": "${workspaceFolder}",
             "environment": [
                 { "name": "XDG_DATA_DIRS", "value": "${workspaceFolder}/app:${env:XDG_DATA_DIRS-/usr/local/share:/usr/share}" },
-            ]
-        }
-    ]
+            ],
+        },
+    ],
 }
diff --git a/app/loghighlighter.cpp b/app/loghighlighter.cpp
@@ -63,10 +63,10 @@ void LogHighlighter::highlightBlock(const QString &text)
     for (const auto &rule : m_highlightingRules) {
         auto m = rule.pattern.match(text);
         while (m.hasMatch()) {
-            int index = m.lastCapturedIndex();
+            int index = m.capturedStart();
             const int length = m.capturedLength();
             setFormat(index, length, rule.format);
-            m = rule.pattern.match(text, m.lastCapturedIndex());
+            m = rule.pattern.match(text, m.capturedEnd());
         }
     }
 

diff --git a/app/tikzeditor.cpp b/app/tikzeditor.cpp
@@ -622,7 +622,7 @@ void TikzEditor::insertCompletion(const QString &completion)
     QString insertWord = completion.right(extra);
     const QRegularExpression rx("<[^<>]*>");
     const auto m = rx.match(insertWord);
-    const int offset = m.lastCapturedIndex() - 1; // put cursor at the first option
+    const int offset = m.capturedStart() - 1; // put cursor at the first option
     insertWord.replace(rx, s_completionPlaceHolder);
 
     cursor.insertText(insertWord);

diff --git a/app/tikzeditorhighlighter.cpp b/app/tikzeditorhighlighter.cpp
@@ -178,10 +178,10 @@ void TikzHighlighter::highlightBlock(const QString &text)
             auto m = rule.pattern.match(text);
             while (m.hasMatch()) {
                 const int length = m.capturedLength();
-                const int index = m.lastCapturedIndex();
+                const int index = m.capturedStart();
                 if (index == 0 || text.at(index - 1) != QLatin1Char('\\'))
                     setFormat(index, length, m_formatList[rule.type]);
-                m = rule.pattern.match(text, index + length);
+                m = rule.pattern.match(text, m.capturedEnd());
             }
         }
     }