feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: move convenience from texteditor to utils

Browse Source 
Allows to use this header without texteditor dependency.

Change-Id: I706f42799c3ea42473a716fa9ef9f3cfbef6fdd4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2017-09-21 12:35:24 +02:00
parent a959fe59da
commit 80a472740d
27 changed files with 89 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cpptools/builtincursorinfo.cpp
View File

@@ -32,12 +32,11 @@
#include "cppsemanticinfo.h"
#include "cpptoolsreuse.h"
#include <texteditor/convenience.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/Macro.h>
#include <cplusplus/TranslationUnit.h>
#include <utils/textutils.h>
#include <utils/qtcassert.h>
#include <utils/runextensions.h>
@@ -346,8 +345,7 @@ QFuture<CursorInfo> BuiltinCursorInfo::run(const CursorInfoParams &cursorInfoPar
const QTextCursor &textCursor = cursorInfoParams.textCursor;
int line, column;
TextEditor::Convenience::convertPosition(textCursor.document(), textCursor.position(),
&line, &column);
Utils::Text::convertPosition(textCursor.document(), textCursor.position(), &line, &column);
CanonicalSymbol canonicalSymbol(document, snapshot);
QString expression;
Scope *scope = canonicalSymbol.getScopeAndExpression(textCursor, &expression);

4
src/plugins/cpptools/builtineditordocumentprocessor.cpp
View File

@@ -33,7 +33,6 @@
#include "cpptoolsreuse.h"
#include "cppworkingcopy.h"
#include <texteditor/convenience.h>
#include <texteditor/fontsettings.h>
#include <texteditor/refactoroverlay.h>
#include <texteditor/texteditorsettings.h>
@@ -41,6 +40,7 @@
#include <cplusplus/CppDocument.h>
#include <cplusplus/SimpleLexer.h>
#include <utils/textutils.h>
#include <utils/qtcassert.h>
#include <utils/runextensions.h>
@@ -105,7 +105,7 @@ CppTools::CheckSymbols *createHighlighter(const CPlusPlus::Document::Ptr &doc,
typedef TextEditor::HighlightingResult Result;
QList<Result> macroUses;
using TextEditor::Convenience::convertPosition;
using Utils::Text::convertPosition;
// Get macro definitions
foreach (const CPlusPlus::Macro& macro, doc->definedMacros()) {

5
src/plugins/cpptools/cppcanonicalsymbol.cpp
View File

@@ -26,10 +26,11 @@
#include "cppcanonicalsymbol.h"
#include <cpptools/cpptoolsreuse.h>
#include <texteditor/convenience.h>
#include <cplusplus/ExpressionUnderCursor.h>
#include <utils/textutils.h>
#include <QTextCursor>
#include <QTextDocument>
@@ -58,7 +59,7 @@ Scope *CanonicalSymbol::getScopeAndExpression(const QTextCursor &cursor, QString
QTextCursor tc = cursor;
int line, column;
TextEditor::Convenience::convertPosition(cursor.document(), tc.position(), &line, &column);
Utils::Text::convertPosition(cursor.document(), tc.position(), &line, &column);
++column; // 1-based line and 1-based column
int pos = tc.position();

5
src/plugins/cpptools/cppcompletion_test.cpp
View File

@@ -30,12 +30,12 @@
#include "cpptoolstestcase.h"
#include <texteditor/codeassist/iassistproposal.h>
#include <texteditor/convenience.h>
#include <texteditor/texteditor.h>
#include <texteditor/textdocument.h>
#include <coreplugin/editormanager/editormanager.h>
#include <utils/changeset.h>
#include <utils/textutils.h>
#include <utils/fileutils.h>
#include <QDebug>
@@ -127,8 +127,7 @@ public:
const int pos = proposal.d->basePosition();
const int length = m_position - pos;
const QString prefix = Convenience::textAt(QTextCursor(m_textDocument), pos,
length);
const QString prefix = Utils::Text::textAt(QTextCursor(m_textDocument), pos, length);
if (!prefix.isEmpty())
listmodel->filter(prefix);
if (listmodel->isSortable(prefix))

10
src/plugins/cpptools/cppcompletionassist.cpp
View File

@@ -38,11 +38,11 @@
#include <texteditor/codeassist/genericproposal.h>
#include <texteditor/codeassist/ifunctionhintproposalmodel.h>
#include <texteditor/codeassist/functionhintproposal.h>
#include <texteditor/convenience.h>
#include <texteditor/snippets/snippet.h>
#include <texteditor/texteditorsettings.h>
#include <texteditor/completionsettings.h>
#include <utils/textutils.h>
#include <utils/mimetypes/mimedatabase.h>
#include <utils/qtcassert.h>
@@ -1091,7 +1091,7 @@ int InternalCppCompletionAssistProcessor::startCompletionHelper()
}
int line = 0, column = 0;
Convenience::convertPosition(m_interface->textDocument(), startOfExpression, &line, &column);
Utils::Text::convertPosition(m_interface->textDocument(), startOfExpression, &line, &column);
const QString fileName = m_interface->fileName();
return startCompletionInternal(fileName, line, column, expression, endOfExpression);
}
@@ -1124,7 +1124,8 @@ bool InternalCppCompletionAssistProcessor::tryObjCCompletion()
m_model->m_typeOfExpression->init(thisDocument, m_interface->snapshot());
int line = 0, column = 0;
Convenience::convertPosition(m_interface->textDocument(), m_interface->position(), &line, &column);
Utils::Text::convertPosition(m_interface->textDocument(), m_interface->position(), &line,
&column);
Scope *scope = thisDocument->scopeAt(line, column);
if (!scope)
return false;
@@ -2014,7 +2015,8 @@ bool InternalCppCompletionAssistProcessor::completeConstructorOrFunction(const Q
// get current line and column
int lineSigned = 0, columnSigned = 0;
Convenience::convertPosition(m_interface->textDocument(), m_interface->position(), &lineSigned, &columnSigned);
Utils::Text::convertPosition(m_interface->textDocument(), m_interface->position(),
&lineSigned, &columnSigned);
unsigned line = lineSigned, column = columnSigned;
// find a scope that encloses the current location, starting from the lastVisibileSymbol

9
src/plugins/cpptools/cppfollowsymbolundercursor.cpp
View File

@@ -37,7 +37,7 @@
#include <cplusplus/SimpleLexer.h>
#include <cplusplus/TypeOfExpression.h>
#include <texteditor/textdocumentlayout.h>
#include <texteditor/convenience.h>
#include <utils/textutils.h>
#include <utils/qtcassert.h>
#include <QList>
@@ -493,8 +493,7 @@ Link FollowSymbolUnderCursor::findLink(
int lineNumber = 0, positionInBlock = 0;
QTextCursor cursor = data.cursor();
QTextDocument *document = cursor.document();
TextEditor::Convenience::convertPosition(document, cursor.position(), &lineNumber,
&positionInBlock);
Utils::Text::convertPosition(document, cursor.position(), &lineNumber, &positionInBlock);
const unsigned line = lineNumber;
const unsigned column = positionInBlock + 1;
@@ -703,8 +702,8 @@ Link FollowSymbolUnderCursor::findLink(
}
} else if (d->isUsingDeclaration()) {
int tokenBeginLineNumber = 0, tokenBeginColumnNumber = 0;
TextEditor::Convenience::convertPosition(document, beginOfToken, &tokenBeginLineNumber,
&tokenBeginColumnNumber);
Utils::Text::convertPosition(document, beginOfToken, &tokenBeginLineNumber,
&tokenBeginColumnNumber);
if (unsigned(tokenBeginLineNumber) > d->line()
|| (unsigned(tokenBeginLineNumber) == d->line()
&& unsigned(tokenBeginColumnNumber) > d->column())) {

4
src/plugins/cpptools/cppselectionchanger.cpp
View File

@@ -25,7 +25,7 @@
#include "cppselectionchanger.h"
#include <texteditor/convenience.h>
#include <utils/textutils.h>
#include <utils/qtcassert.h>
#include <QDebug>
@@ -34,7 +34,7 @@
#include <QTextDocument>
using namespace CPlusPlus;
using namespace TextEditor::Convenience;
using namespace Utils::Text;
enum {
debug = false

4
src/plugins/cpptools/cpptoolsreuse.cpp
View File

@@ -32,11 +32,11 @@
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/idocument.h>
#include <coreplugin/messagemanager.h>
#include <texteditor/convenience.h>
#include <cplusplus/Overview.h>
#include <cplusplus/LookupContext.h>
#include <utils/algorithm.h>
#include <utils/textutils.h>
#include <utils/qtcassert.h>
#include <QDebug>
@@ -216,7 +216,7 @@ const Macro *findCanonicalMacro(const QTextCursor &cursor, Document::Ptr documen
QTC_ASSERT(document, return 0);
int line, column;
TextEditor::Convenience::convertPosition(cursor.document(), cursor.position(), &line, &column);
Utils::Text::convertPosition(cursor.document(), cursor.position(), &line, &column);
if (const Macro *macro = document->findMacroDefinitionAt(line)) {
QTextCursor macroCursor = cursor;

9
src/plugins/cpptools/doxygengenerator.cpp
View File

@@ -25,11 +25,10 @@
#include "doxygengenerator.h"
#include <texteditor/convenience.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/SimpleLexer.h>
#include <utils/textutils.h>
#include <utils/fileutils.h>
#include <utils/qtcassert.h>
@@ -73,10 +72,8 @@ void DoxygenGenerator::setAddLeadingAsterisks(bool add)
static int lineBeforeCursor(const QTextCursor &cursor)
{
int line, column;
const bool converted = TextEditor::Convenience::convertPosition(cursor.document(),
cursor.position(),
&line,
&column);
const bool converted = Utils::Text::convertPosition(cursor.document(), cursor.position(), &line,
&column);
QTC_ASSERT(converted, return std::numeric_limits<int>::max());
return line - 1;