Merge 66bfd44

feenkcom · Jul 17, 2024 · f6acf6a · f6acf6a
2 parents 0745a7b + 66bfd44
commit f6acf6a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 29 deletions.
diff --git a/src/GToolkit-Pharo-Coder-AddOns/GtPharoMethodCoder.extension.st b/src/GToolkit-Pharo-Coder-AddOns/GtPharoMethodCoder.extension.st
@@ -204,41 +204,29 @@ GtPharoMethodCoder >> addExtractToWrappedMethodObjectMenuForAst: anAst to: coder
 { #category : #'*GToolkit-Pharo-Coder-AddOns' }
 GtPharoMethodCoder >> addHierarchyImplementorsMenuAddOnsAst: anAst to: coderAddOns from: aCoderViewModel [
 	<gtCoderContextMenuAddOns: 11>
+
 	(self nodeFrom: aCoderViewModel)
 		ifNotNil: [ :node | 
-			| highlightNode |
-			(node isMessage or: [ node isMessageSend or: [ node isMethodPattern ] ])
-				ifTrue: [ highlightNode := node isMessageSend ifTrue: [ node message ] ifFalse: [ node ].
-					coderAddOns
-						addContextMenuItem: (self
-								createLabel: 'Browse hierarchy implementors'
-								description: node selector)
-						hover: (self highlightNodeBlock: highlightNode)
-						leave: self removeHighlightBlock
-						action: [ :aTextualViewModel | 
-							self
-								browseHierarchyImplementorsAt: highlightNode startPosition
-								requesterObject: aTextualViewModel ] ] ]
+			self 
+				addLinkMenuAddOnsTo: coderAddOns 
+				node: node 
+				selector: #browseHierarchyImplementorsAt:requesterObject: 
+				label: 'Browse hierarchy implementors' 
+				requesterObject: aCoderViewModel ]
 ]
 
 { #category : #'*GToolkit-Pharo-Coder-AddOns' }
 GtPharoMethodCoder >> addHierarchyMessageReferencesMenuAddOnsAst: anAst to: coderAddOns from: aCoderViewModel [
 	<gtCoderContextMenuAddOns: 16>
+
 	(self nodeFrom: aCoderViewModel)
 		ifNotNil: [ :node | 
-			| highlightNode |
-			(node isMessage or: [ node isMessageSend or: [ node isMethodPattern ] ])
-				ifTrue: [ highlightNode := node isMessageSend ifTrue: [ node message ] ifFalse: [ node ].
-					coderAddOns
-						addContextMenuItem: (self
-								createLabel: 'Browse hierarchy references'
-								description: node selector)
-						hover: (self highlightNodeBlock: highlightNode)
-						leave: self removeHighlightBlock
-						action: [ :aTextualViewModel | 
-							self
-								browseHierarchyReferencesAt: highlightNode startPosition
-								requesterObject: aCoderViewModel ] ] ]
+			self 
+				addLinkMenuAddOnsTo: coderAddOns 
+				node: node 
+				selector: #browseHierarchyReferencesAt:requesterObject: 
+				label: 'Browse hierarchy references' 
+				requesterObject: aCoderViewModel ]
 ]
 
 { #category : #'*GToolkit-Pharo-Coder-AddOns' }

diff --git a/src/GToolkit-Pharo-Coder-AddOns/GtSmalltalkSourceCoder.extension.st b/src/GToolkit-Pharo-Coder-AddOns/GtSmalltalkSourceCoder.extension.st
@@ -1,7 +1,18 @@
 Extension { #name : #GtSmalltalkSourceCoder }
 
 { #category : #'*GToolkit-Pharo-Coder-AddOns' }
-GtSmalltalkSourceCoder >> addLinkMenuAddOnsTo: coderAddOns node: node selector: sel shortcut: aShortcut requesterObject: aRequester [
+GtSmalltalkSourceCoder >> addLinkMenuAddOnsTo: coderAddOns node: node selector: sel label: aLabel requesterObject: aRequester [
+	self 
+		addLinkMenuAddOnsTo: coderAddOns 
+		node: node 
+		selector: sel 
+		label: aLabel
+		shortcut: nil 
+		requesterObject: aRequester
+]
+
+{ #category : #'*GToolkit-Pharo-Coder-AddOns' }
+GtSmalltalkSourceCoder >> addLinkMenuAddOnsTo: coderAddOns node: node selector: sel label: aLabel shortcut: aShortcut requesterObject: aRequester [
 	| highlightNode nodeDescription |
 
 	(node isMessage or: [ 
@@ -17,7 +28,7 @@ GtSmalltalkSourceCoder >> addLinkMenuAddOnsTo: coderAddOns node: node selector:
 
 	coderAddOns
 		addContextMenuItem: (self 
-			createLabel: aShortcut name 
+			createLabel: aLabel
 			description: nodeDescription)
 		hover: (self highlightNodeBlock: highlightNode)
 		leave: self removeHighlightBlock
@@ -26,7 +37,19 @@ GtSmalltalkSourceCoder >> addLinkMenuAddOnsTo: coderAddOns node: node selector:
 				perform: sel
 				with: highlightNode startPosition
 				with: aRequester ]
-		shortcutKey: aShortcut combinationForPlatform gtDisplayString
+		shortcutKey: (aShortcut ifNotNil: [
+			aShortcut combinationForPlatform gtDisplayString ])
+]
+
+{ #category : #'*GToolkit-Pharo-Coder-AddOns' }
+GtSmalltalkSourceCoder >> addLinkMenuAddOnsTo: coderAddOns node: node selector: sel shortcut: aShortcut requesterObject: aRequester [
+	self 
+		addLinkMenuAddOnsTo: coderAddOns 
+		node: node 
+		selector: sel 
+		label: aShortcut name 
+		shortcut: aShortcut 
+		requesterObject: aRequester
 ]
 
 { #category : #'*GToolkit-Pharo-Coder-AddOns' }