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

CppEditor: Clean up CanonicalSymbol

Browse Source 
* Remove the static function since it's not really needed
* Make it independent of SemanticInfo

Change-Id: I8d8ea5578f5f9364a26c543277e56bdb5b947049
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-06-09 21:51:14 -04:00
parent d34654c1aa
commit 3d849e377e
1 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -95,54 +95,45 @@ namespace {
class CanonicalSymbol class CanonicalSymbol
{ {
public: public:
CPPEditorWidget *editor; CanonicalSymbol(CPPEditorWidget *editor,
TypeOfExpression typeOfExpression; const Document::Ptr &document,
SemanticInfo info; const Snapshot &snapshot)
: m_editor(editor),
CanonicalSymbol(CPPEditorWidget *editor, const SemanticInfo &info) m_document(document),
: editor(editor), info(info) m_snapshot(snapshot)
{ {
typeOfExpression.init(info.doc, info.snapshot); m_typeOfExpression.init(document, snapshot);
typeOfExpression.setExpandTemplates(true); m_typeOfExpression.setExpandTemplates(true);
} }
const LookupContext &context() const const LookupContext &context() const
{ {
return typeOfExpression.context(); return m_typeOfExpression.context();
} }
Scope *getScopeAndExpression(const QTextCursor &cursor, QString *code) Scope *getScopeAndExpression(const QTextCursor &cursor, QString *code)
{ {
return getScopeAndExpression(editor, info, cursor, code); if (!m_document)
}
static Scope *getScopeAndExpression(CPPEditorWidget *editor, const SemanticInfo &info,
const QTextCursor &cursor,
QString *code)
{
if (!info.doc)
return 0; return 0;
QTextCursor tc = cursor; QTextCursor tc = cursor;
int line, col; int line, column;
editor->convertPosition(tc.position(), &line, &col); m_editor->convertPosition(tc.position(), &line, &column);
++col; // 1-based line and 1-based column ++column; // 1-based line and 1-based column
QTextDocument *document = editor->document();
int pos = tc.position(); int pos = tc.position();
QTextDocument *textDocument = m_editor->document();
if (!isValidIdentifierChar(document->characterAt(pos))) if (!isValidIdentifierChar(textDocument->characterAt(pos)))
if (!(pos > 0 && isValidIdentifierChar(document->characterAt(pos - 1)))) if (!(pos > 0 && isValidIdentifierChar(textDocument->characterAt(pos - 1))))
return 0; return 0;
while (isValidIdentifierChar(document->characterAt(pos))) while (isValidIdentifierChar(textDocument->characterAt(pos)))
++pos; ++pos;
tc.setPosition(pos); tc.setPosition(pos);
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor;
*code = expressionUnderCursor(tc); *code = expressionUnderCursor(tc);
return info.doc->scopeAt(line, col); return m_document->scopeAt(line, column);
} }
Symbol *operator()(const QTextCursor &cursor) Symbol *operator()(const QTextCursor &cursor)
@@ -157,7 +148,7 @@ public:
Symbol *operator()(Scope *scope, const QString &code) Symbol *operator()(Scope *scope, const QString &code)
{ {
return canonicalSymbol(scope, code, typeOfExpression); return canonicalSymbol(scope, code, m_typeOfExpression);
} }
static Symbol *canonicalSymbol(Scope *scope, const QString &code, static Symbol *canonicalSymbol(Scope *scope, const QString &code,
@@ -197,6 +188,11 @@ public:
return 0; return 0;
} }
private:
CPPEditorWidget *m_editor;
TypeOfExpression m_typeOfExpression;
Document::Ptr m_document;
Snapshot m_snapshot;
}; };
QTimer *newSingleShotTimer(QObject *parent, int msecInterval) QTimer *newSingleShotTimer(QObject *parent, int msecInterval)
@@ -446,7 +442,7 @@ void CPPEditorWidget::findUsages()
if (const Macro *macro = findCanonicalMacro(textCursor(), info.doc)) { if (const Macro *macro = findCanonicalMacro(textCursor(), info.doc)) {
d->m_modelManager->findMacroUsages(*macro); d->m_modelManager->findMacroUsages(*macro);
} else { } else {
CanonicalSymbol cs(this, info); CanonicalSymbol cs(this, info.doc, info.snapshot);
Symbol *canonicalSymbol = cs(textCursor()); Symbol *canonicalSymbol = cs(textCursor());
if (canonicalSymbol) if (canonicalSymbol)
d->m_modelManager->findUsages(canonicalSymbol, cs.context()); d->m_modelManager->findUsages(canonicalSymbol, cs.context());
@@ -465,7 +461,7 @@ void CPPEditorWidget::renameUsages(const QString &replacement)
if (const Macro *macro = findCanonicalMacro(textCursor(), info.doc)) { if (const Macro *macro = findCanonicalMacro(textCursor(), info.doc)) {
d->m_modelManager->renameMacroUsages(*macro, replacement); d->m_modelManager->renameMacroUsages(*macro, replacement);
} else { } else {
CanonicalSymbol cs(this, info); CanonicalSymbol cs(this, info.doc, info.snapshot);
if (Symbol *canonicalSymbol = cs(textCursor())) if (Symbol *canonicalSymbol = cs(textCursor()))
if (canonicalSymbol->identifier() != 0) if (canonicalSymbol->identifier() != 0)
d->m_modelManager->renameUsages(canonicalSymbol, cs.context(), replacement); d->m_modelManager->renameUsages(canonicalSymbol, cs.context(), replacement);
@@ -566,9 +562,9 @@ void CPPEditorWidget::markSymbols(const QTextCursor &tc, const SemanticInfo &inf
setExtraSelections(CodeSemanticsSelection, selections); setExtraSelections(CodeSemanticsSelection, selections);
} else { } else {
CanonicalSymbol cs(this, info); CanonicalSymbol cs(this, info.doc, info.snapshot);
QString expression; QString expression;
if (Scope *scope = cs.getScopeAndExpression(this, info, tc, &expression)) { if (Scope *scope = cs.getScopeAndExpression(tc, &expression)) {
if (d->m_referencesWatcher) if (d->m_referencesWatcher)
d->m_referencesWatcher->cancel(); d->m_referencesWatcher->cancel();
d->m_referencesWatcher.reset(new QFutureWatcher<QList<int> >); d->m_referencesWatcher.reset(new QFutureWatcher<QList<int> >);