Clang: Move text cursor utility methods into ClangCodeModel

These 3 are only used in ClangCodeModel.

Change-Id: Id7c2cead40473bcb746e4b105aa36cb7d51a2740
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>

src/libs/utils/textutils.h

@@ -29,7 +29,6 @@
 #include "utils_global.h"
 
 #include <QString>
-#include <QTextCursor>
 
 QT_FORWARD_DECLARE_CLASS(QTextDocument)
 QT_FORWARD_DECLARE_CLASS(QTextCursor)
@@ -59,50 +58,5 @@ QTCREATOR_UTILS_EXPORT int utf8NthLineOffset(const QTextDocument *textDocument,
                                              const QByteArray &buffer,
                                              int line);
 
-template <class CharacterProvider>
-void moveToPrevChar(CharacterProvider &provider, QTextCursor &cursor)
-{
-    cursor.movePosition(QTextCursor::PreviousCharacter);
-    while (provider.characterAt(cursor.position()).isSpace())
-        cursor.movePosition(QTextCursor::PreviousCharacter);
-}
-
-template <class CharacterProvider>
-void moveToPrevWord(CharacterProvider &provider, QTextCursor &cursor)
-{
-    cursor.movePosition(QTextCursor::PreviousWord);
-    while (provider.characterAt(cursor.position()) == ':')
-        cursor.movePosition(QTextCursor::PreviousWord, QTextCursor::MoveAnchor, 2);
-}
-
-template <class CharacterProvider>
-bool matchPreviousWord(CharacterProvider &provider, QTextCursor cursor, QString pattern)
-{
-    cursor.movePosition(QTextCursor::PreviousWord);
-    while (provider.characterAt(cursor.position()) == ':')
-        cursor.movePosition(QTextCursor::PreviousWord, QTextCursor::MoveAnchor, 2);
-
-    int previousWordStart = cursor.position();
-    cursor.movePosition(QTextCursor::NextWord);
-    moveToPrevChar(provider, cursor);
-    QString toMatch = provider.textAt(previousWordStart, cursor.position() - previousWordStart + 1);
-
-    pattern = pattern.simplified();
-    while (!pattern.isEmpty() && pattern.endsWith(toMatch)) {
-        pattern.chop(toMatch.length());
-        if (pattern.endsWith(' '))
-            pattern.chop(1);
-        if (!pattern.isEmpty()) {
-            cursor.movePosition(QTextCursor::StartOfWord);
-            cursor.movePosition(QTextCursor::PreviousWord);
-            previousWordStart = cursor.position();
-            cursor.movePosition(QTextCursor::NextWord);
-            moveToPrevChar(provider, cursor);
-            toMatch = provider.textAt(previousWordStart, cursor.position() - previousWordStart + 1);
-        }
-    }
-    return pattern.isEmpty();
-}
-
 } // Text
 } // Utils

src/plugins/clangcodemodel/clangassistproposalitem.cpp

@@ -198,9 +198,9 @@ void ClangAssistProposalItem::apply(TextDocumentManipulatorInterface &manipulato
             QTextCursor cursor = manipulator.textCursorAt(basePosition);
 
             bool abandonParen = false;
-            if (::Utils::Text::matchPreviousWord(manipulator, cursor, "&")) {
+            if (Utils::Text::matchPreviousWord(manipulator, cursor, "&")) {
-                ::Utils::Text::moveToPrevWord(manipulator, cursor);
+                Utils::Text::moveToPreviousWord(manipulator, cursor);
-                ::Utils::Text::moveToPrevChar(manipulator, cursor);
+                Utils::Text::moveToPreviousChar(manipulator, cursor);
                 const QChar prevChar = manipulator.characterAt(cursor.position());
                 cursor.setPosition(basePosition);
                 abandonParen = QString("(;,{}").contains(prevChar);
@@ -211,7 +211,7 @@ void ClangAssistProposalItem::apply(TextDocumentManipulatorInterface &manipulato
             if (!abandonParen && ccr.completionKind == CodeCompletion::FunctionDefinitionCompletionKind) {
                 const CodeCompletionChunk resultType = ccr.chunks.first();
                 if (resultType.kind == CodeCompletionChunk::ResultType) {
-                    if (::Utils::Text::matchPreviousWord(manipulator, cursor, resultType.text.toString())) {
+                    if (Utils::Text::matchPreviousWord(manipulator, cursor, resultType.text.toString())) {
                         extraCharacters += methodDefinitionParameters(ccr.chunks);
                         // To skip the next block.
                         abandonParen = true;

src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp

@@ -98,9 +98,9 @@ static void addFunctionOverloadAssistProposalItem(QList<AssistProposalItemInterf
     cursor.movePosition(QTextCursor::StartOfWord);
 
     const ClangBackEnd::CodeCompletionChunk resultType = codeCompletion.chunks.first();
-    if (::Utils::Text::matchPreviousWord(*interface->textEditorWidget(),
+    if (Utils::Text::matchPreviousWord(*interface->textEditorWidget(),
-                                         cursor,
+                                       cursor,
-                                         resultType.text.toString())) {
+                                       resultType.text.toString())) {
         // Function definition completion - do not merge completions together.
         addAssistProposalItem(items, codeCompletion, name);
     } else {

src/plugins/clangcodemodel/clangutils.h

@@ -29,6 +29,8 @@
 
 #include <cpptools/projectpart.h>
 
+#include <QTextCursor>
+
 QT_BEGIN_NAMESPACE
 class QTextBlock;
 QT_END_NAMESPACE
@@ -66,5 +68,53 @@ QString diagnosticCategoryPrefixRemoved(const QString &text);
 
 void generateCompilationDB(::Utils::FileName projectDir, CppTools::ProjectInfo projectInfo);
 
+namespace Text {
+
+template <class CharacterProvider>
+void moveToPreviousChar(CharacterProvider &provider, QTextCursor &cursor)
+{
+    cursor.movePosition(QTextCursor::PreviousCharacter);
+    while (provider.characterAt(cursor.position()).isSpace())
+        cursor.movePosition(QTextCursor::PreviousCharacter);
+}
+
+template <class CharacterProvider>
+void moveToPreviousWord(CharacterProvider &provider, QTextCursor &cursor)
+{
+    cursor.movePosition(QTextCursor::PreviousWord);
+    while (provider.characterAt(cursor.position()) == ':')
+        cursor.movePosition(QTextCursor::PreviousWord, QTextCursor::MoveAnchor, 2);
+}
+
+template <class CharacterProvider>
+bool matchPreviousWord(CharacterProvider &provider, QTextCursor cursor, QString pattern)
+{
+    cursor.movePosition(QTextCursor::PreviousWord);
+    while (provider.characterAt(cursor.position()) == ':')
+        cursor.movePosition(QTextCursor::PreviousWord, QTextCursor::MoveAnchor, 2);
+
+    int previousWordStart = cursor.position();
+    cursor.movePosition(QTextCursor::NextWord);
+    moveToPreviousChar(provider, cursor);
+    QString toMatch = provider.textAt(previousWordStart, cursor.position() - previousWordStart + 1);
+
+    pattern = pattern.simplified();
+    while (!pattern.isEmpty() && pattern.endsWith(toMatch)) {
+        pattern.chop(toMatch.length());
+        if (pattern.endsWith(' '))
+            pattern.chop(1);
+        if (!pattern.isEmpty()) {
+            cursor.movePosition(QTextCursor::StartOfWord);
+            cursor.movePosition(QTextCursor::PreviousWord);
+            previousWordStart = cursor.position();
+            cursor.movePosition(QTextCursor::NextWord);
+            moveToPreviousChar(provider, cursor);
+            toMatch = provider.textAt(previousWordStart, cursor.position() - previousWordStart + 1);
+        }
+    }
+    return pattern.isEmpty();
+}
+
+} // namespace Text
 } // namespace Utils
 } // namespace Clang