From 5dedd1fba7a32d81e7f8f6ed45e67b21b7ed036d Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 1 Jun 2021 11:51:23 +0200 Subject: [PATCH] Fix parsing line and column information from file paths Amends 84ea908b2d51a6639481823d69fcca51ef81159a Change-Id: I9f203d4d4903549e220caa8e3c4b9887da68d049 Reviewed-by: David Schulz --- src/libs/utils/linecolumn.cpp | 2 +- src/libs/utils/link.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/linecolumn.cpp b/src/libs/utils/linecolumn.cpp index de094d9d8f6..1415ddd8c0c 100644 --- a/src/libs/utils/linecolumn.cpp +++ b/src/libs/utils/linecolumn.cpp @@ -57,7 +57,7 @@ LineColumn LineColumn::extractFromFileName(const QString &fileName, int &postfix } } else { const QRegularExpressionMatch vsMatch = vsRegexp.match(fileName); - postfixPos = match.capturedStart(0); + postfixPos = vsMatch.capturedStart(0); filePath = fileName.left(vsMatch.capturedStart(0)); if (vsMatch.lastCapturedIndex() > 1) // index 1 includes closing ) lineColumn.line = vsMatch.captured(2).toInt(); diff --git a/src/libs/utils/link.cpp b/src/libs/utils/link.cpp index 92526909b4b..6197ce4f93c 100644 --- a/src/libs/utils/link.cpp +++ b/src/libs/utils/link.cpp @@ -46,7 +46,7 @@ Link Link::fromString(const QString &fileName, bool canContainLineNumber, QStrin const LineColumn lineColumn = LineColumn::extractFromFileName(fileName, postfixPos); if (postfix && postfixPos >= 0) *postfix = fileName.mid(postfixPos); - return {Utils::FilePath::fromString(fileName.left(postfixPos - 1)), + return {Utils::FilePath::fromString(fileName.left(postfixPos)), lineColumn.line, lineColumn.column}; }