mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1-dragonmacher-search-highlight-fix-for-multi-rows'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-06-29 14:09:12 -04:00
parent 3c83b681ec 5079276146
commit 46ca278f84
1 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin.java
View File

@@ -16,6 +16,7 @@
package ghidra.app.plugin.core.searchtext; package ghidra.app.plugin.core.searchtext;
import java.awt.*; import java.awt.*;
import java.math.BigInteger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@@ -28,6 +29,7 @@ import org.apache.commons.lang3.StringUtils;
import docking.*; import docking.*;
import docking.action.builder.ActionBuilder; import docking.action.builder.ActionBuilder;
import docking.tool.ToolConstants; import docking.tool.ToolConstants;
import docking.widgets.fieldpanel.support.FieldLocation;
import docking.widgets.fieldpanel.support.Highlight; import docking.widgets.fieldpanel.support.Highlight;
import docking.widgets.table.threaded.*; import docking.widgets.table.threaded.*;
import generic.theme.GIcon; import generic.theme.GIcon;
@@ -725,32 +727,37 @@ public class SearchTextPlugin extends ProgramPlugin implements OptionsChangeList
return NO_HIGHLIGHTS; return NO_HIGHLIGHTS;
} }
int charOffset = searchResult.offset(); /*
int searchStart = charOffset; Find the highlight start and end using the ProgramLocation. The location is in
model space, but the Highlights are in view space. The field factory already knows
how to convert between these 2 spaces by providing a FieldLocation for the view
space.
*/
BigInteger dummyIndex = BigInteger.ZERO;
int dummyFieldNumber = 0;
FieldLocation fieldLocation =
fieldFactory.getFieldLocation(field, dummyIndex, dummyFieldNumber, loc);
/*
We now need to handle the case where the view values have multiple rows. The
Highlight uses character offsets that treat multiple rows as one single line string.
Here we use the ListingField to convert from rows to a character offset.
*/
int row = fieldLocation.getRow();
int col = fieldLocation.getCol();
int screenOffset = field.screenLocationToTextOffset(row, col);
int searchStart = screenOffset;
int searchEnd = searchStart + searchText.length(); int searchEnd = searchStart + searchText.length();
Pattern regexp = Color hlColor = SearchConstants.SEARCH_HIGHLIGHT_COLOR;
UserSearchUtils.createSearchPattern(searchText, searchOptions.isCaseSensitive()); if (searchStart <= cursorTextOffset && searchEnd >= cursorTextOffset) {
Matcher matcher = regexp.matcher(text); // change the highlight color when in the field so it stands out
while (matcher.find()) { hlColor = SearchConstants.SEARCH_HIGHLIGHT_CURRENT_ADDR_COLOR;
int start = matcher.start();
int end = matcher.end();
// ensure the particular regex match is the actual search result
if (start == searchStart && end == searchEnd) {
Color hlColor = SearchConstants.SEARCH_HIGHLIGHT_COLOR;
if (start <= cursorTextOffset && end >= cursorTextOffset) {
// change the highlight color when in the field so it stands out
hlColor = SearchConstants.SEARCH_HIGHLIGHT_CURRENT_ADDR_COLOR;
}
// this is the matching search hit for a single search
int endEx = end - 1;
return new Highlight[] { new Highlight(start, endEx, hlColor) };
}
} }
return NO_HIGHLIGHTS;
// this is the matching search hit for a single search
int endInc = searchEnd - 1; // highlights are inclusive
return new Highlight[] { new Highlight(searchStart, endInc, hlColor) };
} }
private boolean shouldHighlight(ListingField field) { private boolean shouldHighlight(ListingField field) {