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

ClangCodeModel: Use central functions for getting token positions

Browse Source 
Change-Id: I192e2807067467906b38e164933755f763133cb4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2022-08-23 12:53:01 +02:00
parent 5f0270ae4a
commit d454184467
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/3rdparty/cplusplus/TranslationUnit.cpp vendored
View File

@@ -392,6 +392,13 @@ int TranslationUnit::getTokenPositionInDocument(int index, const QTextDocument *
return Utils::Text::positionInText(doc, line, column); return Utils::Text::positionInText(doc, line, column);
} }
int TranslationUnit::getTokenEndPositionInDocument(int index, const QTextDocument *doc) const
{
int line, column;
getTokenEndPosition(index, &line, &column);
return Utils::Text::positionInText(doc, line, column);
}
void TranslationUnit::getTokenStartPosition(int index, int *line, void TranslationUnit::getTokenStartPosition(int index, int *line,
int *column, int *column,
const StringLiteral **fileName) const const StringLiteral **fileName) const

1
src/libs/3rdparty/cplusplus/TranslationUnit.h vendored
View File

@@ -129,6 +129,7 @@ public:
const StringLiteral **fileName = nullptr) const; const StringLiteral **fileName = nullptr) const;
int getTokenPositionInDocument(int index, const QTextDocument *doc) const; int getTokenPositionInDocument(int index, const QTextDocument *doc) const;
int getTokenEndPositionInDocument(int index, const QTextDocument *doc) const;
void pushLineOffset(int offset); void pushLineOffset(int offset);
void pushPreprocessorLine(int utf16charOffset, void pushPreprocessorLine(int utf16charOffset,

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

@@ -1116,14 +1116,10 @@ QTextCursor ClangdClient::Private::adjustedCursor(const QTextCursor &cursor,
return cursor; return cursor;
const TranslationUnit * const tu = cppDoc->translationUnit(); const TranslationUnit * const tu = cppDoc->translationUnit();
const auto posForToken = [doc, tu](int tok) { const auto posForToken = [doc, tu](int tok) {
int line, column; return tu->getTokenPositionInDocument(tok, doc->document());
tu->getTokenPosition(tok, &line, &column);
return Utils::Text::positionInText(doc->document(), line, column);
}; };
const auto endPosForToken = [doc, tu](int tok) { const auto endPosForToken = [doc, tu](int tok) {
int line, column; return tu->getTokenEndPositionInDocument(tok, doc->document());
tu->getTokenEndPosition(tok, &line, &column);
return Utils::Text::positionInText(doc->document(), line, column);
}; };
const auto leftMovedCursor = [cursor] { const auto leftMovedCursor = [cursor] {
QTextCursor c = cursor; QTextCursor c = cursor;