yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-3756-dragonmacher-plate-comment-annotations'

Browse source
This commit is contained in:
Ryan Kurtz 2025-06-17 10:56:45 -04:00
commit 69872037e5
2 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/EolCommentFieldFactory.java
View file

@ -64,7 +64,6 @@ public class EolCommentFieldFactory extends FieldFactory {
private int repeatableCommentStyle;
private int automaticCommentStyle;
private int refRepeatableCommentStyle;
private int offcutCommentStyle;
private EolExtraCommentsOption extraCommentsOption = new EolExtraCommentsOption();

30
Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/PlateFieldFactory.java
View file

@ -17,8 +17,9 @@ package ghidra.app.util.viewer.field;
import java.awt.Color;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
@ -209,25 +210,16 @@ public class PlateFieldFactory extends FieldFactory {
}
private String getCommentText(CodeUnit cu, List<String> offcutComments) {
String[] comments = cu.getCommentAsArray(CommentType.PLATE);
if (comments == null) {
return null;
Stream<String> commentsStream = Stream.empty();
String[] plateComments = cu.getCommentAsArray(CommentType.PLATE);
if (plateComments != null) {
commentsStream = Arrays.stream(plateComments);
}
StringBuilder buffy = new StringBuilder();
for (String comment : comments) {
if (buffy.length() != 0) {
buffy.append('\n');
}
buffy.append(comment);
}
for (String offcut : offcutComments) {
if (buffy.length() != 0) {
buffy.append('\n');
}
buffy.append(offcut);
}
return buffy.toString();
Program program = cu.getProgram();
Stream<String> comments = Stream.concat(commentsStream, offcutComments.stream());
return comments.map(c -> CommentUtils.getDisplayString(c, program))
.collect(Collectors.joining("\n"));
}
/*