From fdc834c0d1a3476e491d6e2050d9927fb1f5ddc9 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 12 Jul 2023 13:03:20 +0200 Subject: [PATCH] CPlusPlus: Remove TranslationUnit::getTokenStartPosition() It was exactly the same as getTokenPosition(). Change-Id: I292522faa18933ec400b556c384786eb9efdfb3a Reviewed-by: Christian Stenger Reviewed-by: --- src/libs/3rdparty/cplusplus/TranslationUnit.cpp | 12 +++--------- src/libs/3rdparty/cplusplus/TranslationUnit.h | 14 +++----------- src/libs/qmljs/qmljsfindexportedcpptypes.cpp | 14 +++++++------- src/plugins/autotest/gtest/gtestvisitors.cpp | 2 +- src/plugins/autotest/qtest/qttestvisitors.cpp | 2 +- .../cppeditor/cppfollowsymbolundercursor.cpp | 2 +- src/plugins/cppeditor/cppquickfixes.cpp | 2 +- src/plugins/cppeditor/cpprefactoringchanges.cpp | 2 +- src/plugins/cppeditor/cppselectionchanger.cpp | 4 ++-- src/plugins/cppeditor/insertionpointlocator.cpp | 12 ++++++------ .../cplusplus-update-frontend.cpp | 4 ++-- 11 files changed, 28 insertions(+), 42 deletions(-) diff --git a/src/libs/3rdparty/cplusplus/TranslationUnit.cpp b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp index 62f4c570c79..d5c7a5fc9b8 100644 --- a/src/libs/3rdparty/cplusplus/TranslationUnit.cpp +++ b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp @@ -379,12 +379,6 @@ int TranslationUnit::findColumnNumber(int utf16CharOffset, int lineNumber) const return utf16CharOffset - _lineOffsets[lineNumber]; } -void TranslationUnit::getTokenPosition(int index, - int *line, - int *column, - const StringLiteral **fileName) const -{ return getPosition(tokenAt(index).utf16charsBegin(), line, column, fileName); } - int TranslationUnit::getTokenPositionInDocument(int index, const QTextDocument *doc) const { int line, column; @@ -399,9 +393,9 @@ int TranslationUnit::getTokenEndPositionInDocument(int index, const QTextDocumen return Utils::Text::positionInText(doc, line, column); } -void TranslationUnit::getTokenStartPosition(int index, int *line, - int *column, - const StringLiteral **fileName) const +void TranslationUnit::getTokenPosition(int index, int *line, + int *column, + const StringLiteral **fileName) const { return getPosition(tokenAt(index).utf16charsBegin(), line, column, fileName); } void TranslationUnit::getTokenEndPosition(int index, int *line, diff --git a/src/libs/3rdparty/cplusplus/TranslationUnit.h b/src/libs/3rdparty/cplusplus/TranslationUnit.h index 9694177a752..9ae01755fb5 100644 --- a/src/libs/3rdparty/cplusplus/TranslationUnit.h +++ b/src/libs/3rdparty/cplusplus/TranslationUnit.h @@ -110,24 +110,16 @@ public: void resetAST(); void release(); - void getTokenStartPosition(int index, int *line, - int *column = nullptr, - const StringLiteral **fileName = nullptr) const; - + void getTokenPosition(int index, int *line, + int *column = nullptr, + const StringLiteral **fileName = nullptr) const; void getTokenEndPosition(int index, int *line, int *column = nullptr, const StringLiteral **fileName = nullptr) const; - void getPosition(int utf16charOffset, int *line, int *column = nullptr, const StringLiteral **fileName = nullptr) const; - - void getTokenPosition(int index, - int *line, - int *column = nullptr, - const StringLiteral **fileName = nullptr) const; - int getTokenPositionInDocument(int index, const QTextDocument *doc) const; int getTokenEndPositionInDocument(int index, const QTextDocument *doc) const; diff --git a/src/libs/qmljs/qmljsfindexportedcpptypes.cpp b/src/libs/qmljs/qmljsfindexportedcpptypes.cpp index 7716e77ed5a..e3c5cb6fc76 100644 --- a/src/libs/qmljs/qmljsfindexportedcpptypes.cpp +++ b/src/libs/qmljs/qmljsfindexportedcpptypes.cpp @@ -247,7 +247,7 @@ protected: nameLit = translationUnit()->stringLiteral(nameAst->literal_token); if (!nameLit) { int line, column; - translationUnit()->getTokenStartPosition(nameExp->firstToken(), &line, &column); + translationUnit()->getTokenPosition(nameExp->firstToken(), &line, &column); _messages += Document::DiagnosticMessage( Document::DiagnosticMessage::Warning, _doc->filePath(), @@ -308,7 +308,7 @@ protected: if (packageName.isEmpty()) { packageName = QmlJS::CppQmlTypes::defaultPackage; int line, column; - translationUnit()->getTokenStartPosition(ast->firstToken(), &line, &column); + translationUnit()->getTokenPosition(ast->firstToken(), &line, &column); _messages += Document::DiagnosticMessage( Document::DiagnosticMessage::Warning, _doc->filePath(), @@ -346,7 +346,7 @@ protected: // we want to do lookup later, so also store the surrounding scope int line, column; - translationUnit()->getTokenStartPosition(ast->firstToken(), &line, &column); + translationUnit()->getTokenPosition(ast->firstToken(), &line, &column); exportedType.scope = _doc->scopeAt(line, column); if (typeId){ @@ -490,7 +490,7 @@ protected: nameLit = translationUnit()->stringLiteral(nameAst->literal_token); if (!nameLit) { int line, column; - translationUnit()->getTokenStartPosition(ast->expression_list->value->firstToken(), &line, &column); + translationUnit()->getTokenPosition(ast->expression_list->value->firstToken(), &line, &column); _messages += Document::DiagnosticMessage( Document::DiagnosticMessage::Warning, _doc->filePath(), @@ -504,9 +504,9 @@ protected: contextProperty.name = QString::fromUtf8(nameLit->chars(), nameLit->size()); contextProperty.expression = stringOf(skipQVariant(ast->expression_list->next->value, translationUnit())); // we want to do lookup later, so also store the line and column of the target scope - translationUnit()->getTokenStartPosition(ast->firstToken(), - &contextProperty.line, - &contextProperty.column); + translationUnit()->getTokenPosition(ast->firstToken(), + &contextProperty.line, + &contextProperty.column); _contextProperties += contextProperty; diff --git a/src/plugins/autotest/gtest/gtestvisitors.cpp b/src/plugins/autotest/gtest/gtestvisitors.cpp index ea7f89863b3..9e9315a518d 100644 --- a/src/plugins/autotest/gtest/gtestvisitors.cpp +++ b/src/plugins/autotest/gtest/gtestvisitors.cpp @@ -91,7 +91,7 @@ bool GTestVisitor::visit(CPlusPlus::FunctionDefinitionAST *ast) int line = 0; int column = 0; unsigned token = id->firstToken(); - m_document->translationUnit()->getTokenStartPosition(token, &line, &column); + m_document->translationUnit()->getTokenPosition(token, &line, &column); GTestCodeLocationAndType locationAndType; locationAndType.m_name = testCaseName; diff --git a/src/plugins/autotest/qtest/qttestvisitors.cpp b/src/plugins/autotest/qtest/qttestvisitors.cpp index 318691db94f..51f62febb00 100644 --- a/src/plugins/autotest/qtest/qttestvisitors.cpp +++ b/src/plugins/autotest/qtest/qttestvisitors.cpp @@ -218,7 +218,7 @@ bool TestDataFunctionVisitor::visit(CallAST *ast) return true; int line = 0; int column = 0; - m_currentDoc->translationUnit()->getTokenStartPosition( + m_currentDoc->translationUnit()->getTokenPosition( firstToken, &line, &column); QtTestCodeLocationAndType locationAndType; locationAndType.m_name = name; diff --git a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp index 862866e01c5..f61f0276410 100644 --- a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp +++ b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp @@ -342,7 +342,7 @@ Link attemptDeclDef(const QTextCursor &cursor, Snapshot snapshot, result = target->toLink(); int startLine, startColumn, endLine, endColumn; - document->translationUnit()->getTokenStartPosition(name->firstToken(), &startLine, + document->translationUnit()->getTokenPosition(name->firstToken(), &startLine, &startColumn); document->translationUnit()->getTokenEndPosition(name->lastToken() - 1, &endLine, &endColumn); diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 9786083f6f8..176a03fb4b5 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -1941,7 +1941,7 @@ LookupResult lookUpDefinition(const CppQuickFixInterface &interface, const NameA // Find the enclosing scope int line, column; const Document::Ptr doc = interface.semanticInfo().doc; - doc->translationUnit()->getTokenStartPosition(nameAst->firstToken(), &line, &column); + doc->translationUnit()->getTokenPosition(nameAst->firstToken(), &line, &column); Scope *scope = doc->scopeAt(line, column); if (!scope) return LookupResult::NotDeclared; diff --git a/src/plugins/cppeditor/cpprefactoringchanges.cpp b/src/plugins/cppeditor/cpprefactoringchanges.cpp index 98eaaa8febb..9ed1fc284cf 100644 --- a/src/plugins/cppeditor/cpprefactoringchanges.cpp +++ b/src/plugins/cppeditor/cpprefactoringchanges.cpp @@ -112,7 +112,7 @@ void CppRefactoringFile::setCppDocument(Document::Ptr document) Scope *CppRefactoringFile::scopeAt(unsigned index) const { int line, column; - cppDocument()->translationUnit()->getTokenStartPosition(index, &line, &column); + cppDocument()->translationUnit()->getTokenPosition(index, &line, &column); return cppDocument()->scopeAt(line, column); } diff --git a/src/plugins/cppeditor/cppselectionchanger.cpp b/src/plugins/cppeditor/cppselectionchanger.cpp index cd199856925..7b9f6767451 100644 --- a/src/plugins/cppeditor/cppselectionchanger.cpp +++ b/src/plugins/cppeditor/cppselectionchanger.cpp @@ -114,7 +114,7 @@ int CppSelectionChanger::getTokenStartCursorPosition( const QTextCursor &cursor) const { int startLine, startColumn; - m_unit->getTokenStartPosition(tokenIndex, &startLine, &startColumn); + m_unit->getTokenPosition(tokenIndex, &startLine, &startColumn); const QTextDocument *document = cursor.document(); const int startPosition = document->findBlockByNumber(startLine - 1).position() @@ -144,7 +144,7 @@ void CppSelectionChanger::printTokenDebugInfo( { int line, column; const Token token = m_unit->tokenAt(tokenIndex); - m_unit->getTokenStartPosition(tokenIndex, &line, &column); + m_unit->getTokenPosition(tokenIndex, &line, &column); const int startPos = getTokenStartCursorPosition(tokenIndex, cursor); const int endPos = getTokenEndCursorPosition(tokenIndex, cursor); diff --git a/src/plugins/cppeditor/insertionpointlocator.cpp b/src/plugins/cppeditor/insertionpointlocator.cpp index ece52aa559a..3eb1d4aebe3 100644 --- a/src/plugins/cppeditor/insertionpointlocator.cpp +++ b/src/plugins/cppeditor/insertionpointlocator.cpp @@ -292,7 +292,7 @@ InsertionLocation InsertionPointLocator::methodDeclarationInClass(const Translat int line = 0, column = 0; if (pos == InsertionPointLocator::AccessSpecEnd) - tu->getTokenStartPosition(beforeToken, &line, &column); + tu->getTokenPosition(beforeToken, &line, &column); else tu->getTokenEndPosition(beforeToken, &line, &column); @@ -436,7 +436,7 @@ public: } if (lastToken == _bestToken.get()) // No matching namespace found - translationUnit()->getTokenStartPosition(lastToken, line, column); + translationUnit()->getTokenPosition(lastToken, line, column); else // Insert at end of matching namespace translationUnit()->getTokenEndPosition(_bestToken.get(), line, column); } @@ -497,7 +497,7 @@ protected: if (_result) return false; int line, column; - translationUnit()->getTokenStartPosition(ast->firstToken(), &line, &column); + translationUnit()->getTokenPosition(ast->firstToken(), &line, &column); if (line > _line || (line == _line && column > _column)) return false; translationUnit()->getTokenEndPosition(ast->lastToken() - 1, &line, &column); @@ -608,12 +608,12 @@ static InsertionLocation nextToSurroundingDefinitions(Symbol *declaration, if (!functionDefinition) return noResult; - targetFile->cppDocument()->translationUnit()->getTokenStartPosition(functionDefinition->firstToken(), &line, &column); + targetFile->cppDocument()->translationUnit()->getTokenPosition(functionDefinition->firstToken(), &line, &column); const QList path = ASTPath(targetFile->cppDocument())(line, column); for (auto it = path.rbegin(); it != path.rend(); ++it) { if (const auto templateDecl = (*it)->asTemplateDeclaration()) { if (templateDecl->declaration == functionDefinition) { - targetFile->cppDocument()->translationUnit()->getTokenStartPosition( + targetFile->cppDocument()->translationUnit()->getTokenPosition( templateDecl->firstToken(), &line, &column); } break; @@ -779,7 +779,7 @@ InsertionLocation insertLocationForMethodDefinition(Symbol *symbol, int lastLine; if (hasIncludeGuard) { const TranslationUnit * const tu = file->cppDocument()->translationUnit(); - tu->getTokenStartPosition(tu->ast()->lastToken(), &lastLine); + tu->getTokenPosition(tu->ast()->lastToken(), &lastLine); } int i = 0; for ( ; i < list.count(); ++i) { diff --git a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp index 9661081091b..71b4221872a 100644 --- a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp +++ b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp @@ -126,7 +126,7 @@ static ASTNodes astNodes; static QTextCursor createCursor(TranslationUnit *unit, AST *ast, QTextDocument *document) { int startLine, startColumn, endLine, endColumn; - unit->getTokenStartPosition(ast->firstToken(), &startLine, &startColumn); + unit->getTokenPosition(ast->firstToken(), &startLine, &startColumn); unit->getTokenEndPosition(ast->lastToken() - 1, &endLine, &endColumn); QTextCursor tc(document); @@ -1058,7 +1058,7 @@ void generateAST_cpp(const Snapshot &snapshot, const QDir &cplusplusDir) QTextCursor cursor(&cpp_document); int line = 0, column = 0; - AST_cpp_document->translationUnit()->getTokenStartPosition(funDef->firstToken(), &line, &column); + AST_cpp_document->translationUnit()->getTokenPosition(funDef->firstToken(), &line, &column); const int start = cpp_document.findBlockByNumber(line - 1).position() + column - 1; cursor.setPosition(start); int doxyStart = start;