Changeset View
Changeset View
Standalone View
Standalone View
src/vimode/completionreplayer.cpp
Show First 20 Lines • Show All 139 Lines • ▼ Show 20 Line(s) | 133 | { | |||
---|---|---|---|---|---|
140 | 140 | | |||
141 | return m_CompletionsToReplay.top()[m_nextCompletionIndex.top()++]; | 141 | return m_CompletionsToReplay.top()[m_nextCompletionIndex.top()++]; | ||
142 | } | 142 | } | ||
143 | 143 | | |||
144 | int CompletionReplayer::findNextMergeableBracketPos(const KTextEditor::Cursor &startPos) const | 144 | int CompletionReplayer::findNextMergeableBracketPos(const KTextEditor::Cursor &startPos) const | ||
145 | { | 145 | { | ||
146 | KTextEditor::DocumentPrivate *doc = m_viInputModeManager->view()->doc(); | 146 | KTextEditor::DocumentPrivate *doc = m_viInputModeManager->view()->doc(); | ||
147 | const QString lineAfterCursor = doc->text(KTextEditor::Range(startPos, KTextEditor::Cursor(startPos.line(), doc->lineLength(startPos.line())))); | 147 | const QString lineAfterCursor = doc->text(KTextEditor::Range(startPos, KTextEditor::Cursor(startPos.line(), doc->lineLength(startPos.line())))); | ||
148 | static const QRegularExpression whitespaceThenOpeningBracket(QLatin1String("^\\s*(\\()")); | 148 | static const QRegularExpression whitespaceThenOpeningBracket(QStringLiteral("^\\s*(\\()")); | ||
149 | QRegularExpressionMatch match = whitespaceThenOpeningBracket.match(lineAfterCursor); | 149 | QRegularExpressionMatch match = whitespaceThenOpeningBracket.match(lineAfterCursor); | ||
150 | int nextMergableBracketAfterCursorPos = -1; | 150 | int nextMergableBracketAfterCursorPos = -1; | ||
151 | if (match.hasMatch()) { | 151 | if (match.hasMatch()) { | ||
152 | nextMergableBracketAfterCursorPos = match.capturedStart(1); | 152 | nextMergableBracketAfterCursorPos = match.capturedStart(1); | ||
153 | } | 153 | } | ||
154 | return nextMergableBracketAfterCursorPos; | 154 | return nextMergableBracketAfterCursorPos; | ||
155 | } | 155 | } |