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

CppTools: Avoid concurrent access to QTextDocument

Browse Source 
Do not pass QTextCursor to another thread, but determine what we need
from it in the main thread.

Change-Id: I86900cfc5a28849efc1bd1dacb9b1452a5db252e
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-06-16 14:15:02 +02:00
parent 17b197f303
commit e50ad1e09c
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,22 +163,23 @@ private:
class FindUses
{
public:
static CursorInfo find(const QTextCursor &textCursor,
const Document::Ptr document,
const Snapshot &snapshot)
static CursorInfo find(const Document::Ptr document, const Snapshot &snapshot,
int line, int column, Scope *scope, const QString &expression)
{
const FindUses findUses(textCursor, document, snapshot);
FindUses findUses(document, snapshot, line, column, scope, expression);
return findUses.doFind();
}
private:
FindUses(const QTextCursor &textCursor, const Document::Ptr document, const Snapshot &snapshot)
: m_document(document), m_snapshot(snapshot)
FindUses(const Document::Ptr document, const Snapshot &snapshot, int line, int column,
Scope *scope, const QString &expression)
: m_document(document)
, m_line(line)
, m_column(column)
, m_scope(scope)
, m_expression(expression)
, m_snapshot(snapshot)
{
TextEditor::Convenience::convertPosition(textCursor.document(), textCursor.position(),
&m_line, &m_column);
CanonicalSymbol canonicalSymbol(document, snapshot);
m_scope = canonicalSymbol.getScopeAndExpression(textCursor, &m_expression);
}
CursorInfo doFind() const
@@ -353,7 +354,15 @@ QFuture<CursorInfo> BuiltinCursorInfo::run(const CursorInfoParams &cursorInfoPar
return fi.future();
}
return Utils::runAsync(&FindUses::find, cursorInfoParams.textCursor, document, snapshot);
const QTextCursor &textCursor = cursorInfoParams.textCursor;
int line, column;
TextEditor::Convenience::convertPosition(textCursor.document(), textCursor.position(),
&line, &column);
CanonicalSymbol canonicalSymbol(document, snapshot);
QString expression;
Scope *scope = canonicalSymbol.getScopeAndExpression(textCursor, &expression);
return Utils::runAsync(&FindUses::find, document, snapshot, line, column, scope, expression);
}
} // namespace Internal