From 7081c0653a88886fa3a53e364d0b1d8639787bd6 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Thu, 2 Apr 2026 13:25:20 -0400
Subject: [PATCH] Test fixes

---
 .../core/script/GhidraScriptEditorComponentProvider.java  | 4 ++--
 .../src/main/java/docking/actions/KeyBindingsModel.java   | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptEditorComponentProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptEditorComponentProvider.java
index a4389f04d0..3d9dd35788 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptEditorComponentProvider.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptEditorComponentProvider.java
@@ -249,8 +249,8 @@ public class GhidraScriptEditorComponentProvider extends ComponentProvider {
 
 			@Override
 			public boolean isEnabledForContext(ActionContext context) {
-				Object contextObject = context.getContextObject();
-				if (contextObject != GhidraScriptEditorComponentProvider.this) {
+				ComponentProvider contextProvider = context.getComponentProvider();
+				if (contextProvider != GhidraScriptEditorComponentProvider.this) {
 					return false;
 				}
 
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/actions/KeyBindingsModel.java b/Ghidra/Framework/Docking/src/main/java/docking/actions/KeyBindingsModel.java
index 7137f6db12..9a6553e7c6 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/actions/KeyBindingsModel.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/actions/KeyBindingsModel.java
@@ -120,8 +120,12 @@ public class KeyBindingsModel {
 
 			String name = names.get(i);
 			KeyBindingState state = actionInfoByFullName.get(name);
-			String fullName = state.getFullName();
-			sb.append(fullName);
+
+			// Note: we do not use state.getFullName() here as that only displays 'Shared' for 
+			// shared actions.  We would like to see all shared action owners here.
+			String shortName = state.getName();
+			sb.append(shortName);
+			sb.append(" (").append(state.getOwnerDescription()).append(')');
 			if (i < names.size() - 1) {
 				sb.append("\n");
 			}