Magic-Mirror/jd-gui
1
0
Fork 0
mirror of https://github.com/java-decompiler/jd-gui.git synced 2024-12-02 17:46:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes issue on displaying search results

Browse Source
This commit is contained in:
emmanue1 2015-03-28 17:01:32 +01:00
parent fdee19b656
commit 12acf77025
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
services/src/main/groovy/jd/gui/view/component/ClassFilePage.groovy
View File

@ -19,10 +19,14 @@ import jd.gui.util.decompiler.ContainerLoader
import jd.gui.util.decompiler.GuiPreferences
import org.fife.ui.rsyntaxtextarea.DocumentRange
import org.fife.ui.rsyntaxtextarea.SyntaxConstants
import org.fife.ui.rsyntaxtextarea.folding.FoldManager
import javax.swing.text.BadLocationException
import javax.swing.text.DefaultCaret
import java.awt.Color
import java.awt.Insets
import java.awt.Point
import java.awt.Rectangle
import java.util.regex.Pattern
class ClassFilePage
@ -350,7 +354,8 @@ class ClassFilePage
if (!highlightScope || declaration.type.equals(highlightScope)) {
if ((t && declaration.isAType()) || (c && declaration.isAConstructor())) {
matchAndAddDocumentRange(pattern, getMostInnerTypeName(declaration.type), declaration.startPosition, declaration.endPosition, ranges)
} else if ((f && declaration.isAField()) || (m && declaration.isAMethod())) {
}
if ((f && declaration.isAField()) || (m && declaration.isAMethod())) {
matchAndAddDocumentRange(pattern, declaration.name, declaration.startPosition, declaration.endPosition, ranges)
}
}
@ -359,14 +364,16 @@ class ClassFilePage
if (highlightFlags.indexOf('r') != -1) {
// Highlight references
for (def hyperlink : hyperlinks.entrySet()) {
ReferenceData reference = hyperlink.reference as ReferenceData
for (def entry : hyperlinks.entrySet()) {
def hyperlink = entry.value
def reference = hyperlink.reference as ReferenceData
if (!highlightScope || reference.owner.equals(highlightScope)) {
if ((t && reference.isAType()) || (c && reference.isAConstructor())) {
matchAndAddDocumentRange(pattern, getMostInnerTypeName(reference.type), reference.startPosition, reference.endPosition, ranges)
} else if ((f && reference.isAField()) || (m && reference.isAMethod())) {
matchAndAddDocumentRange(pattern, reference.name, reference.startPosition, reference.endPosition, ranges)
matchAndAddDocumentRange(pattern, getMostInnerTypeName(reference.type), hyperlink.startPosition, hyperlink.endPosition, ranges)
}
if ((f && reference.isAField()) || (m && reference.isAMethod())) {
matchAndAddDocumentRange(pattern, reference.name, hyperlink.startPosition, hyperlink.endPosition, ranges)
}
}
}