GP-6940 - Fixed a bug in function editor namespace combo box when tabbing from signature

This commit is contained in:
dragonmacher
2026-06-16 12:23:06 -04:00
parent 70c871c213
commit 31ff8bd600
2 changed files with 15 additions and 1 deletions
@@ -17,6 +17,7 @@ package ghidra.app.plugin.core.function.editor;
import java.util.*;
import generic.json.Json;
import ghidra.program.model.data.VoidDataType;
import ghidra.program.model.lang.PrototypeModel;
import ghidra.program.model.listing.*;
@@ -80,6 +81,11 @@ class FunctionDataView {
callFixupName = otherFunctionData.callFixupName;
}
@Override
public String toString() {
return Json.toString(this);
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof FunctionDataView otherFunctionData)) {
@@ -1050,8 +1050,16 @@ public class FunctionEditorModel {
// ignore
}
Namespace ns = createNamespace(result.namespace());
// We allow the user to omit the namespace when parsing the signature. If the value is
// null, then don't change the current value. Assume any non-null value is a valid choice.
Namespace ns = functionData.getNamespace();
SymbolPath nsPath = result.namespace();
if (nsPath != null) {
ns = createNamespace(result.namespace());
}
setFunctionData(ns, f);
isInParsingMode = false;
}