Cynosphere/bcv-vf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Better LDC Search

Browse source 
Strings should be searched with case sensitivity rather than exact comparison
This commit is contained in:
Konloch 2021-07-29 17:28:35 -07:00
parent f3ccf93c7c
commit e94bee0fb6
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/the/bytecode/club/bytecodeviewer/searching/impl/LDCSearch.java
View file

@ -70,10 +70,11 @@ public class LDCSearch implements SearchTypeDetails
@Override @Override
public void search(final ResourceContainer container, final ClassNode node, final SearchResultNotifier srn, public void search(final ResourceContainer container, final ClassNode node, final SearchResultNotifier srn,
boolean exact) boolean caseSensitive)
{ {
final Iterator<MethodNode> methods = node.methods.iterator(); final Iterator<MethodNode> methods = node.methods.iterator();
final String srchText = searchText.getText(); final String srchText = searchText.getText();
final String srchTextLowerCase = searchText.getText().toLowerCase();
if (srchText.isEmpty()) if (srchText.isEmpty())
return; return;
@ -97,7 +98,14 @@ public class LDCSearch implements SearchTypeDetails
desc2 = method.desc; desc2 = method.desc;
} catch (ArrayIndexOutOfBoundsException ignored) { } } catch (ArrayIndexOutOfBoundsException ignored) { }
if ((exact && ldcString.equals(srchText)) || (!exact && ldcString.contains(srchText))) //TODO re-add this at some point when the search pane is redone
boolean exact = false;
final boolean exactMatch = exact && ldcString.equals(srchText);
final boolean caseInsensitiveMatch = !exact && caseSensitive && ldcString.contains(srchText);
final boolean caseSensitiveMatch = !exact && !caseSensitive && ldcString.toLowerCase().contains(srchTextLowerCase);
final boolean anyMatch = exactMatch || caseInsensitiveMatch || caseSensitiveMatch;
if (anyMatch)
{ {
srn.notifyOfResult(container.name + ">" + node.name + "." + method.name srn.notifyOfResult(container.name + ">" + node.name + "." + method.name
+ desc2 + desc2