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

ClangCodeModel: Work around clangd cursor issue, part 2

Browse Source 
Amends 825c9ea64f to work also for member access via pointer.

Change-Id: I8ee68d0f6d93c65c2f82a63bce5baef2aa2159de
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2021-12-03 12:54:21 +01:00
parent 3d47a0ef09
commit 7ffaa89f02
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/clangcodemodel/clangdclient.cpp
View File

@@ -1094,7 +1094,7 @@ public:
static CppEditor::CppEditorWidget *widgetFromDocument(const TextDocument *doc); static CppEditor::CppEditorWidget *widgetFromDocument(const TextDocument *doc);
QString searchTermFromCursor(const QTextCursor &cursor) const; QString searchTermFromCursor(const QTextCursor &cursor) const;
static QTextCursor adjustedCursor(const QTextCursor &cursor, const TextDocument *doc); QTextCursor adjustedCursor(const QTextCursor &cursor, const TextDocument *doc);
void setHelpItemForTooltip(const MessageId &token, const QString &fqn = {}, void setHelpItemForTooltip(const MessageId &token, const QString &fqn = {},
HelpItem::Category category = HelpItem::Unknown, HelpItem::Category category = HelpItem::Unknown,
@@ -1384,7 +1384,7 @@ void ClangdClient::findUsages(TextDocument *document, const QTextCursor &cursor,
if (searchTerm.isEmpty()) if (searchTerm.isEmpty())
return; return;
const QTextCursor adjustedCursor = Private::adjustedCursor(cursor, document); const QTextCursor adjustedCursor = d->adjustedCursor(cursor, document);
const bool categorize = CppEditor::codeModelSettings()->categorizeFindReferences(); const bool categorize = CppEditor::codeModelSettings()->categorizeFindReferences();
// If it's a "normal" symbol, go right ahead. // If it's a "normal" symbol, go right ahead.
@@ -1452,7 +1452,7 @@ void ClangdClient::handleDocumentClosed(TextDocument *doc)
QTextCursor ClangdClient::adjustedCursorForHighlighting(const QTextCursor &cursor, QTextCursor ClangdClient::adjustedCursorForHighlighting(const QTextCursor &cursor,
TextEditor::TextDocument *doc) TextEditor::TextDocument *doc)
{ {
return Private::adjustedCursor(cursor, doc); return d->adjustedCursor(cursor, doc);
} }
const LanguageClient::Client::CustomInspectorTabs ClangdClient::createCustomInspectorTabs() const LanguageClient::Client::CustomInspectorTabs ClangdClient::createCustomInspectorTabs()
@@ -1793,7 +1793,7 @@ void ClangdClient::followSymbol(TextDocument *document,
) )
{ {
QTC_ASSERT(documentOpen(document), openDocument(document)); QTC_ASSERT(documentOpen(document), openDocument(document));
const QTextCursor adjustedCursor = Private::adjustedCursor(cursor, document); const QTextCursor adjustedCursor = d->adjustedCursor(cursor, document);
if (!resolveTarget) { if (!resolveTarget) {
d->followSymbolData.reset(); d->followSymbolData.reset();
symbolSupport().findLinkAt(document, adjustedCursor, std::move(callback), false); symbolSupport().findLinkAt(document, adjustedCursor, std::move(callback), false);
@@ -2384,14 +2384,29 @@ QTextCursor ClangdClient::Private::adjustedCursor(const QTextCursor &cursor,
const Document::Ptr cppDoc = widget->semanticInfo().doc; const Document::Ptr cppDoc = widget->semanticInfo().doc;
if (!cppDoc) if (!cppDoc)
return cursor; return cursor;
const QList<AST *> astPath = ASTPath(cppDoc)(cursor); const QList<AST *> builtinAstPath = ASTPath(cppDoc)(cursor);
for (auto it = astPath.rbegin(); it != astPath.rend(); ++it) { for (auto it = builtinAstPath.rbegin(); it != builtinAstPath.rend(); ++it) {
const MemberAccessAST * const memberAccess = (*it)->asMemberAccess(); const MemberAccessAST * const memberAccess = (*it)->asMemberAccess();
if (!memberAccess) if (!memberAccess)
continue; continue;
const TranslationUnit * const tu = cppDoc->translationUnit(); const TranslationUnit * const tu = cppDoc->translationUnit();
if (tu->tokenAt(memberAccess->access_token).kind() != T_DOT) switch (tu->tokenAt(memberAccess->access_token).kind()) {
case T_DOT:
break;
case T_ARROW: {
const Utils::optional<AstNode> clangdAst = astCache.get(doc);
if (!clangdAst)
return cursor; return cursor;
const QList<AstNode> clangdAstPath = getAstPath(*clangdAst, Range(cursor));
for (auto it = clangdAstPath.rbegin(); it != clangdAstPath.rend(); ++it) {
if (it->detailIs("operator->") && it->arcanaContains("CXXMethod"))
return cursor;
}
break;
}
default:
return cursor;
}
int dotLine, dotColumn; int dotLine, dotColumn;
tu->getTokenPosition(memberAccess->access_token, &dotLine, &dotColumn); tu->getTokenPosition(memberAccess->access_token, &dotLine, &dotColumn);
const int dotPos = Utils::Text::positionInText(doc->document(), dotLine, dotColumn); const int dotPos = Utils::Text::positionInText(doc->document(), dotLine, dotColumn);