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

CPlusPlus: Remove TranslationUnit::getTokenStartPosition()

Browse Source 
It was exactly the same as getTokenPosition().

Change-Id: I292522faa18933ec400b556c384786eb9efdfb3a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Christian Kandeler
2023-07-12 13:03:20 +02:00
parent 3093142a70
commit fdc834c0d1
11 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -379,12 +379,6 @@ int TranslationUnit::findColumnNumber(int utf16CharOffset, int lineNumber) const
return utf16CharOffset - _lineOffsets[lineNumber]; 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 TranslationUnit::getTokenPositionInDocument(int index, const QTextDocument *doc) const
{ {
int line, column; int line, column;
@@ -399,9 +393,9 @@ int TranslationUnit::getTokenEndPositionInDocument(int index, const QTextDocumen
return Utils::Text::positionInText(doc, line, column); return Utils::Text::positionInText(doc, line, column);
} }
void TranslationUnit::getTokenStartPosition(int index, int *line, void TranslationUnit::getTokenPosition(int index, int *line,
int *column, int *column,
const StringLiteral **fileName) const const StringLiteral **fileName) const
{ return getPosition(tokenAt(index).utf16charsBegin(), line, column, fileName); } { return getPosition(tokenAt(index).utf16charsBegin(), line, column, fileName); }
void TranslationUnit::getTokenEndPosition(int index, int *line, void TranslationUnit::getTokenEndPosition(int index, int *line,

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

@@ -110,24 +110,16 @@ public:
void resetAST(); void resetAST();
void release(); void release();
void getTokenStartPosition(int index, int *line, void getTokenPosition(int index, int *line,
int *column = nullptr, int *column = nullptr,
const StringLiteral **fileName = nullptr) const; const StringLiteral **fileName = nullptr) const;
void getTokenEndPosition(int index, int *line, void getTokenEndPosition(int index, int *line,
int *column = nullptr, int *column = nullptr,
const StringLiteral **fileName = nullptr) const; const StringLiteral **fileName = nullptr) const;
void getPosition(int utf16charOffset, void getPosition(int utf16charOffset,
int *line, int *line,
int *column = nullptr, int *column = nullptr,
const StringLiteral **fileName = nullptr) const; 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 getTokenPositionInDocument(int index, const QTextDocument *doc) const;
int getTokenEndPositionInDocument(int index, const QTextDocument *doc) const; int getTokenEndPositionInDocument(int index, const QTextDocument *doc) const;

14
src/libs/qmljs/qmljsfindexportedcpptypes.cpp
View File

@@ -247,7 +247,7 @@ protected:
nameLit = translationUnit()->stringLiteral(nameAst->literal_token); nameLit = translationUnit()->stringLiteral(nameAst->literal_token);
if (!nameLit) { if (!nameLit) {
int line, column; int line, column;
translationUnit()->getTokenStartPosition(nameExp->firstToken(), &line, &column); translationUnit()->getTokenPosition(nameExp->firstToken(), &line, &column);
_messages += Document::DiagnosticMessage( _messages += Document::DiagnosticMessage(
Document::DiagnosticMessage::Warning, Document::DiagnosticMessage::Warning,
_doc->filePath(), _doc->filePath(),
@@ -308,7 +308,7 @@ protected:
if (packageName.isEmpty()) { if (packageName.isEmpty()) {
packageName = QmlJS::CppQmlTypes::defaultPackage; packageName = QmlJS::CppQmlTypes::defaultPackage;
int line, column; int line, column;
translationUnit()->getTokenStartPosition(ast->firstToken(), &line, &column); translationUnit()->getTokenPosition(ast->firstToken(), &line, &column);
_messages += Document::DiagnosticMessage( _messages += Document::DiagnosticMessage(
Document::DiagnosticMessage::Warning, Document::DiagnosticMessage::Warning,
_doc->filePath(), _doc->filePath(),
@@ -346,7 +346,7 @@ protected:
// we want to do lookup later, so also store the surrounding scope // we want to do lookup later, so also store the surrounding scope
int line, column; int line, column;
translationUnit()->getTokenStartPosition(ast->firstToken(), &line, &column); translationUnit()->getTokenPosition(ast->firstToken(), &line, &column);
exportedType.scope = _doc->scopeAt(line, column); exportedType.scope = _doc->scopeAt(line, column);
if (typeId){ if (typeId){
@@ -490,7 +490,7 @@ protected:
nameLit = translationUnit()->stringLiteral(nameAst->literal_token); nameLit = translationUnit()->stringLiteral(nameAst->literal_token);
if (!nameLit) { if (!nameLit) {
int line, column; int line, column;
translationUnit()->getTokenStartPosition(ast->expression_list->value->firstToken(), &line, &column); translationUnit()->getTokenPosition(ast->expression_list->value->firstToken(), &line, &column);
_messages += Document::DiagnosticMessage( _messages += Document::DiagnosticMessage(
Document::DiagnosticMessage::Warning, Document::DiagnosticMessage::Warning,
_doc->filePath(), _doc->filePath(),
@@ -504,9 +504,9 @@ protected:
contextProperty.name = QString::fromUtf8(nameLit->chars(), nameLit->size()); contextProperty.name = QString::fromUtf8(nameLit->chars(), nameLit->size());
contextProperty.expression = stringOf(skipQVariant(ast->expression_list->next->value, translationUnit())); 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 // we want to do lookup later, so also store the line and column of the target scope
translationUnit()->getTokenStartPosition(ast->firstToken(), translationUnit()->getTokenPosition(ast->firstToken(),
&contextProperty.line, &contextProperty.line,
&contextProperty.column); &contextProperty.column);
_contextProperties += contextProperty; _contextProperties += contextProperty;

2
src/plugins/autotest/gtest/gtestvisitors.cpp
View File

@@ -91,7 +91,7 @@ bool GTestVisitor::visit(CPlusPlus::FunctionDefinitionAST *ast)
int line = 0; int line = 0;
int column = 0; int column = 0;
unsigned token = id->firstToken(); unsigned token = id->firstToken();
m_document->translationUnit()->getTokenStartPosition(token, &line, &column); m_document->translationUnit()->getTokenPosition(token, &line, &column);
GTestCodeLocationAndType locationAndType; GTestCodeLocationAndType locationAndType;
locationAndType.m_name = testCaseName; locationAndType.m_name = testCaseName;

2
src/plugins/autotest/qtest/qttestvisitors.cpp
View File

@@ -218,7 +218,7 @@ bool TestDataFunctionVisitor::visit(CallAST *ast)
return true; return true;
int line = 0; int line = 0;
int column = 0; int column = 0;
m_currentDoc->translationUnit()->getTokenStartPosition( m_currentDoc->translationUnit()->getTokenPosition(
firstToken, &line, &column); firstToken, &line, &column);
QtTestCodeLocationAndType locationAndType; QtTestCodeLocationAndType locationAndType;
locationAndType.m_name = name; locationAndType.m_name = name;

2
src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
View File

@@ -342,7 +342,7 @@ Link attemptDeclDef(const QTextCursor &cursor, Snapshot snapshot,
result = target->toLink(); result = target->toLink();
int startLine, startColumn, endLine, endColumn; int startLine, startColumn, endLine, endColumn;
document->translationUnit()->getTokenStartPosition(name->firstToken(), &startLine, document->translationUnit()->getTokenPosition(name->firstToken(), &startLine,
&startColumn); &startColumn);
document->translationUnit()->getTokenEndPosition(name->lastToken() - 1, &endLine, document->translationUnit()->getTokenEndPosition(name->lastToken() - 1, &endLine,
&endColumn); &endColumn);

2
src/plugins/cppeditor/cppquickfixes.cpp
View File

@@ -1941,7 +1941,7 @@ LookupResult lookUpDefinition(const CppQuickFixInterface &interface, const NameA
// Find the enclosing scope // Find the enclosing scope
int line, column; int line, column;
const Document::Ptr doc = interface.semanticInfo().doc; 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); Scope *scope = doc->scopeAt(line, column);
if (!scope) if (!scope)
return LookupResult::NotDeclared; return LookupResult::NotDeclared;

2
src/plugins/cppeditor/cpprefactoringchanges.cpp
View File

@@ -112,7 +112,7 @@ void CppRefactoringFile::setCppDocument(Document::Ptr document)
Scope *CppRefactoringFile::scopeAt(unsigned index) const Scope *CppRefactoringFile::scopeAt(unsigned index) const
{ {
int line, column; int line, column;
cppDocument()->translationUnit()->getTokenStartPosition(index, &line, &column); cppDocument()->translationUnit()->getTokenPosition(index, &line, &column);
return cppDocument()->scopeAt(line, column); return cppDocument()->scopeAt(line, column);
} }

4
src/plugins/cppeditor/cppselectionchanger.cpp
View File

@@ -114,7 +114,7 @@ int CppSelectionChanger::getTokenStartCursorPosition(
const QTextCursor &cursor) const const QTextCursor &cursor) const
{ {
int startLine, startColumn; int startLine, startColumn;
m_unit->getTokenStartPosition(tokenIndex, &startLine, &startColumn); m_unit->getTokenPosition(tokenIndex, &startLine, &startColumn);
const QTextDocument *document = cursor.document(); const QTextDocument *document = cursor.document();
const int startPosition = document->findBlockByNumber(startLine - 1).position() const int startPosition = document->findBlockByNumber(startLine - 1).position()
@@ -144,7 +144,7 @@ void CppSelectionChanger::printTokenDebugInfo(
{ {
int line, column; int line, column;
const Token token = m_unit->tokenAt(tokenIndex); 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 startPos = getTokenStartCursorPosition(tokenIndex, cursor);
const int endPos = getTokenEndCursorPosition(tokenIndex, cursor); const int endPos = getTokenEndCursorPosition(tokenIndex, cursor);

12
src/plugins/cppeditor/insertionpointlocator.cpp
View File

@@ -292,7 +292,7 @@ InsertionLocation InsertionPointLocator::methodDeclarationInClass(const Translat
int line = 0, column = 0; int line = 0, column = 0;
if (pos == InsertionPointLocator::AccessSpecEnd) if (pos == InsertionPointLocator::AccessSpecEnd)
tu->getTokenStartPosition(beforeToken, &line, &column); tu->getTokenPosition(beforeToken, &line, &column);
else else
tu->getTokenEndPosition(beforeToken, &line, &column); tu->getTokenEndPosition(beforeToken, &line, &column);
@@ -436,7 +436,7 @@ public:
} }
if (lastToken == _bestToken.get()) // No matching namespace found 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 else // Insert at end of matching namespace
translationUnit()->getTokenEndPosition(_bestToken.get(), line, column); translationUnit()->getTokenEndPosition(_bestToken.get(), line, column);
} }
@@ -497,7 +497,7 @@ protected:
if (_result) if (_result)
return false; return false;
int line, column; int line, column;
translationUnit()->getTokenStartPosition(ast->firstToken(), &line, &column); translationUnit()->getTokenPosition(ast->firstToken(), &line, &column);
if (line > _line || (line == _line && column > _column)) if (line > _line || (line == _line && column > _column))
return false; return false;
translationUnit()->getTokenEndPosition(ast->lastToken() - 1, &line, &column); translationUnit()->getTokenEndPosition(ast->lastToken() - 1, &line, &column);
@@ -608,12 +608,12 @@ static InsertionLocation nextToSurroundingDefinitions(Symbol *declaration,
if (!functionDefinition) if (!functionDefinition)
return noResult; return noResult;
targetFile->cppDocument()->translationUnit()->getTokenStartPosition(functionDefinition->firstToken(), &line, &column); targetFile->cppDocument()->translationUnit()->getTokenPosition(functionDefinition->firstToken(), &line, &column);
const QList<AST *> path = ASTPath(targetFile->cppDocument())(line, column); const QList<AST *> path = ASTPath(targetFile->cppDocument())(line, column);
for (auto it = path.rbegin(); it != path.rend(); ++it) { for (auto it = path.rbegin(); it != path.rend(); ++it) {
if (const auto templateDecl = (*it)->asTemplateDeclaration()) { if (const auto templateDecl = (*it)->asTemplateDeclaration()) {
if (templateDecl->declaration == functionDefinition) { if (templateDecl->declaration == functionDefinition) {
targetFile->cppDocument()->translationUnit()->getTokenStartPosition( targetFile->cppDocument()->translationUnit()->getTokenPosition(
templateDecl->firstToken(), &line, &column); templateDecl->firstToken(), &line, &column);
} }
break; break;
@@ -779,7 +779,7 @@ InsertionLocation insertLocationForMethodDefinition(Symbol *symbol,
int lastLine; int lastLine;
if (hasIncludeGuard) { if (hasIncludeGuard) {
const TranslationUnit * const tu = file->cppDocument()->translationUnit(); const TranslationUnit * const tu = file->cppDocument()->translationUnit();
tu->getTokenStartPosition(tu->ast()->lastToken(), &lastLine); tu->getTokenPosition(tu->ast()->lastToken(), &lastLine);
} }
int i = 0; int i = 0;
for ( ; i < list.count(); ++i) { for ( ; i < list.count(); ++i) {

4
src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
View File

@@ -126,7 +126,7 @@ static ASTNodes astNodes;
static QTextCursor createCursor(TranslationUnit *unit, AST *ast, QTextDocument *document) static QTextCursor createCursor(TranslationUnit *unit, AST *ast, QTextDocument *document)
{ {
int startLine, startColumn, endLine, endColumn; int startLine, startColumn, endLine, endColumn;
unit->getTokenStartPosition(ast->firstToken(), &startLine, &startColumn); unit->getTokenPosition(ast->firstToken(), &startLine, &startColumn);
unit->getTokenEndPosition(ast->lastToken() - 1, &endLine, &endColumn); unit->getTokenEndPosition(ast->lastToken() - 1, &endLine, &endColumn);
QTextCursor tc(document); QTextCursor tc(document);
@@ -1058,7 +1058,7 @@ void generateAST_cpp(const Snapshot &snapshot, const QDir &cplusplusDir)
QTextCursor cursor(&cpp_document); QTextCursor cursor(&cpp_document);
int line = 0, column = 0; 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; const int start = cpp_document.findBlockByNumber(line - 1).position() + column - 1;
cursor.setPosition(start); cursor.setPosition(start);
int doxyStart = start; int doxyStart = start;