Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix reading MatchedMatcher data in BlazePyTracebackParser #6693

Merged
merged 1 commit into from
Sep 2, 2024
+8 −2
Merged

Fix reading MatchedMatcher data in BlazePyTracebackParser #6693

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions python/src/com/google/idea/blaze/python/run/BlazePyTracebackParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,14 @@ protected LinkInTrace findLinkInTrace(String line, Matcher matchedMatcher) {
if (!enabled.getValue()) {
return super.findLinkInTrace(line, matchedMatcher);
}
final String fileName = matchedMatcher.group(1).replace('\\', '/');
final int lineNumber = Integer.parseInt(matchedMatcher.group(2));
final String file1 = matchedMatcher.group("file");
final String file2 = matchedMatcher.group("file2");

String fileName = (file1 != null ? file1 : file2).replace('\\', '/');

String lineNumber1 = matchedMatcher.group("line");
String lineNumber2 = matchedMatcher.group("line2");
int lineNumber = Integer.parseInt((lineNumber1 != null ? lineNumber1 : lineNumber2));
final int startPos = line.indexOf('\"') + 1;
final int endPos = line.indexOf('\"', startPos);
return new LinkInTrace(getCanonicalFilePath(fileName), lineNumber, startPos, endPos);
Expand Down
Loading