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

ClangCodeModel: Forward to the built-in code model

Browse Source 
... if the user tries to complete inside a comment or string.

Fixes: QTCREATORBUG-20828
Change-Id: I245e1bd16acaf696601cabe33f27210da21cc12a
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Christian Kandeler
2023-10-17 10:34:57 +02:00
parent 57a485b9e7
commit d16d1718f3
8 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/cppeditor/cpptoolsreuse.cpp
View File

@@ -293,29 +293,33 @@ bool isInCommentOrString(const TextEditor::AssistInterface *interface,
{
QTextCursor tc(interface->textDocument());
tc.setPosition(interface->position());
return isInCommentOrString(tc, features);
}
bool isInCommentOrString(const QTextCursor &cursor, CPlusPlus::LanguageFeatures features)
{
SimpleLexer tokenize;
features.qtMocRunEnabled = true;
tokenize.setLanguageFeatures(features);
tokenize.setSkipComments(false);
const Tokens &tokens = tokenize(tc.block().text(),
BackwardsScanner::previousBlockState(tc.block()));
const int tokenIdx = SimpleLexer::tokenBefore(tokens, qMax(0, tc.positionInBlock() - 1));
const Tokens &tokens = tokenize(cursor.block().text(),
BackwardsScanner::previousBlockState(cursor.block()));
const int tokenIdx = SimpleLexer::tokenBefore(tokens, qMax(0, cursor.positionInBlock() - 1));
const Token tk = (tokenIdx == -1) ? Token() : tokens.at(tokenIdx);
if (tk.isComment())
return true;
if (!tk.isLiteral())
if (!tk.isStringLiteral())
return false;
if (tokens.size() == 3 && tokens.at(0).kind() == T_POUND
&& tokens.at(1).kind() == T_IDENTIFIER) {
const QString &line = tc.block().text();
&& tokens.at(1).kind() == T_IDENTIFIER) {
const QString &line = cursor.block().text();
const Token &idToken = tokens.at(1);
QStringView identifier = QStringView(line).mid(idToken.utf16charsBegin(),
idToken.utf16chars());
if (identifier == QLatin1String("include")
|| identifier == QLatin1String("include_next")
|| (features.objCEnabled && identifier == QLatin1String("import"))) {
|| identifier == QLatin1String("include_next")
|| (features.objCEnabled && identifier == QLatin1String("import"))) {
return false;
}
}