Stacktrace analyzer window fixes #6841
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,11 +27,9 @@ | |
| import javax.swing.text.StyledDocument; | ||
| import org.netbeans.api.annotations.common.CheckForNull; | ||
| import org.netbeans.api.annotations.common.NullAllowed; | ||
| import org.netbeans.api.java.classpath.ClassPath; | ||
| import org.netbeans.api.java.classpath.GlobalPathRegistry; | ||
| import org.netbeans.api.progress.ProgressHandle; | ||
| import org.netbeans.spi.java.classpath.support.ClassPathSupport; | ||
| import org.openide.awt.StatusDisplayer; | ||
| import org.openide.cookies.EditorCookie; | ||
|
|
@@ -57,11 +55,12 @@ class StackLineAnalyser { | |
| private static final String IDENTIFIER = | ||
| "\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*"; // NOI18N | ||
| private static final Pattern LINE_PATTERN = Pattern.compile( | ||
| "at\\s+" + // initial at // NOI18N | ||
| "("+IDENTIFIER+"(?:\\."+IDENTIFIER+")*/)?" + // optional module name // NOI18N | ||
| "(("+IDENTIFIER+"(\\."+IDENTIFIER+")*)\\.)?("+IDENTIFIER+")" + // class name // NOI18N | ||
| "\\.("+IDENTIFIER+"|\\<init\\>|\\<clinit\\>)\\s*"+ // method name | ||
| "\\((?:"+IDENTIFIER+"(?:\\."+IDENTIFIER+")*/)?"+IDENTIFIER+"(\\.(?:\\p{javaJavaIdentifierPart}+))?"+ // '(File.java' // NOI18N | ||
| "\\:([0-9]*)\\)"); // ':123)' // NOI18N | ||
|
Comment on lines
57
to
+63
There was a problem hiding this comment. the original goal was to add a few optional The file extension group is now optional |
||
|
|
||
| static boolean matches(String line) { | ||
| Matcher matcher = LINE_PATTERN.matcher(line); | ||
|
|
@@ -71,7 +70,7 @@ static boolean matches(String line) { | |
| static Link analyse(String line) { | ||
| Matcher matcher = LINE_PATTERN.matcher(line); | ||
| if (matcher.find()) { | ||
| int lineNumber; | ||
| try { | ||
| lineNumber = Integer.parseInt(matcher.group(8)); | ||
| } catch (NumberFormatException nfe) { | ||
|
|
@@ -81,7 +80,7 @@ static Link analyse(String line) { | |
| if (matcher.group(1) != null) { | ||
| moduleStart = matcher.start(1); | ||
| } | ||
| String ext = matcher.group(7); | ||
| if (matcher.group(2)==null ) { | ||
| return new Link(matcher.group(5), | ||
| lineNumber, | ||
|
|
@@ -144,75 +143,67 @@ void show () { | |
| resources.add(name + ".java"); //NOI18N | ||
| idx = name.lastIndexOf('$'); | ||
| } | ||
| final ProgressHandle handle = ProgressHandle.createHandle( | ||
| NbBundle.getMessage(StackLineAnalyser.class, "TXT_OpeningSource", resources.get(0))); | ||
| handle.start(); | ||
| RP.execute(() -> { | ||
| DataObject dobj = null; | ||
| try { | ||
| final ClassPath classPath = ClassPathSupport.createClassPath( | ||
| GlobalPathRegistry.getDefault().getSourceRoots().toArray(new FileObject[0])); | ||
| for (String resource : resources) { | ||
| dobj = findDataObject(classPath.findResource(resource)); | ||
| if (dobj != null) | ||
| break; | ||
| } | ||
| } finally { | ||
| final DataObject dataObject = dobj; | ||
| Mutex.EVENT.readAccess(() -> { | ||
| try { | ||
| if (dataObject == null) { | ||
| StatusDisplayer.getDefault().setStatusText( | ||
| NbBundle.getMessage(StackLineAnalyser.class, | ||
| "AnalyzeStackTopComponent.sourceNotFound", | ||
| new Object[]{resources.get(0)})); | ||
| return; | ||
| } | ||
| try { | ||
| EditorCookie editorCookie = dataObject.getLookup().lookup(EditorCookie.class); | ||
| LineCookie lineCookie = dataObject.getLookup().lookup(LineCookie.class); | ||
| if (editorCookie != null && lineCookie != null && lineNumber != -1) { | ||
| StyledDocument doc = editorCookie.openDocument(); | ||
| if (doc != null) { | ||
| if (lineNumber != -1) { | ||
| try { | ||
| Line l = lineCookie.getLineSet().getCurrent(lineNumber - 1); | ||
| if (l != null) { | ||
| l.show(Line.ShowOpenType.OPEN, Line.ShowVisibilityType.FRONT); | ||
| return; | ||
| } | ||
| } catch (IndexOutOfBoundsException oob) { | ||
| //line number is no more valid, do not report as an error | ||
| StatusDisplayer.getDefault().setStatusText( | ||
| NbBundle.getMessage(StackLineAnalyser.class, | ||
| "AnalyzeStackTopComponent.lineNotFound", | ||
| new Object[]{lineNumber})); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| OpenCookie openCookie = dataObject.getLookup().lookup(OpenCookie.class); | ||
| if (openCookie != null) { | ||
| openCookie.open(); | ||
| return; | ||
| } | ||
| } catch (IOException e) { | ||
| Exceptions.printStackTrace(e); | ||
| } | ||
| } finally { | ||
| handle.finish(); | ||
| } | ||
| }); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
recommend to enable ignore whitespace changes for reviewing this one - sorry about this