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

c++ editor: Fix automatic completion for includes

Browse Source 
Reviewed-by: Roberto Raggi
This commit is contained in:
Leandro Melo
2011-05-18 14:08:19 +02:00
parent 21cfa5c6cc
commit 0dc449944d
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -748,8 +748,22 @@ bool CppCompletionAssistProcessor::accepts() const
const int tokenIdx = SimpleLexer::tokenBefore(tokens, qMax(0, tc.positionInBlock() - 1));
const Token tk = (tokenIdx == -1) ? Token() : tokens.at(tokenIdx);
if (!tk.isComment() && !tk.isLiteral())
if (!tk.isComment() && !tk.isLiteral()) {
return true;
} else if (tk.isLiteral()
&& tokens.size() == 3
&& tokens.at(0).kind() == T_POUND
&& tokens.at(1).kind() == T_IDENTIFIER) {
const QString &line = tc.block().text();
const Token &idToken = tokens.at(1);
const QStringRef &identifier =
line.midRef(idToken.begin(), idToken.end() - idToken.begin());
if (identifier == QLatin1String("include")
|| identifier == QLatin1String("include_next")
|| (m_objcEnabled && identifier == QLatin1String("import"))) {
return true;
}
}
}
}
}