Merge pull request #229 from OpenSmock/dev-menuextensionv3

Better menu building test and working on menu extension v3

Author: LabordePierre

src/Molecule-IDE-Tests/MolWorldTest.class.st

@@ -4,12 +4,6 @@ Class {
 	#category : #'Molecule-IDE-Tests-Cases'
 }
 
-{ #category : #running }
-MolWorldTest >> testMenuDefinition [
-
-	self assert: (MolWorld menuDefinition: nil) isNil
-]
-
 { #category : #running }
 MolWorldTest >> testMenuKey [
 
@@ -24,51 +18,18 @@ MolWorldTest >> testOpenDefineComponentDialog [
 	self assert: dialog notNil.
 ]
 
-{ #category : #running }
-MolWorldTest >> testOrder [
-
-	self assert: MolWorld order equals: 999
-]
-
-{ #category : #running }
-MolWorldTest >> testParent [
-
-	self assert: MolWorld parent equals: #Tools
-]
-
-{ #category : #tests }
-MolWorldTest >> testWorldMenu [
-	| menuElements moleculeMenuEntry libraryMenu |
-	
-	menuElements := self currentWorld worldState menuBuilder menuSpec items.
-	libraryMenu := menuElements detect:[ :e | e name = #Tools ].
-	
-	"Find Molecule entry"
-	moleculeMenuEntry := libraryMenu subMenu items detect:[ :e | e name = #Molecule].
-	self assert: moleculeMenuEntry notNil.
-]
-
 { #category : #tests }
 MolWorldTest >> testWorldMenuBuilding [
-	| menuBuilder |
-	menuBuilder := WorldState new menuBuilder.
 
+	| menuBuilder menuMethods |
+	menuBuilder := PragmaMenuAndShortcutRegistration new.
 	MolWorld menu00MoleculeOn: menuBuilder.
 
-	MolWorld menu10SystemStatusOn: menuBuilder.
-	MolWorld menu20DebugOn: menuBuilder.
-	MolWorld menu21BrowseClassesOn: menuBuilder.
-	MolWorld menu30ComponentManagerCleanUpOn: menuBuilder.
-	MolWorld menu40ExamplesOn: menuBuilder.
-	MolWorld menu50GithubOn: menuBuilder.
-	MolWorld menu60ReportBugOn: menuBuilder.
+	menuMethods := MolWorld class pragmas select:[ :p | p selector = #worldMenu ] thenCollect:[ :p | p methodSelector ].
+	self assert: menuMethods notEmpty.
 
-	MolWorld toolsMenu110DeepCleanUp: menuBuilder.
-	MolWorld toolsMenu10DefineComponentOn: menuBuilder.
-	MolWorld toolsMenu90DefineDirtyComponentsOn: menuBuilder.
-	MolWorld toolsMenu40InspectAllComponentInstances: menuBuilder.
-	MolWorld toolsMenu80InspectDirtyComponentTypes: menuBuilder.
-	MolWorld toolsMenu70InspectDirtyComponents: menuBuilder.
-	MolWorld toolsMenu30ToggleDynamicContractUpdate: menuBuilder.
-	MolWorld toolsMenu20ToggleLogsOn: menuBuilder.
+	menuMethods do:[ :p |
+		MolWorld perform: p with: menuBuilder.
+	].
+
 ]

src/Molecule-IDE/MolWorld.class.st

@@ -69,11 +69,11 @@ MolWorld class >> menu00MoleculeOn: aBuilder [
 
 	<worldMenu>
 	(aBuilder item: self menuKey)
-		parent: self parent;
+		parent: #Tools;
 		label: 'Molecule';
 		icon: MolIcon moleculeIcon;
 		help: 'A component framework';
-		order: self order;
+		order: 999;
 		with:[
 			(aBuilder group: #MoleculeStatus)
 				order: 1;
@@ -83,7 +83,9 @@ MolWorld class >> menu00MoleculeOn: aBuilder [
 				withSeparatorAfter.	
 			(aBuilder group: #MoleculeLinks)
 				order: 3.
-		]
+		].
+	
+	self worldMenuPostBuildSetup: aBuilder
 ]
 
 { #category : #menu }
@@ -213,23 +215,6 @@ MolWorld class >> menu60ReportBugOn: aBuilder [
 		action: [WebBrowser openOn: 'https://github.com/OpenSmock/Molecule/issues/new']
 ]
 
-{ #category : #'private - menu' }
-MolWorld class >> menuDefinition: aPragmaString [
-	"Get a menu definition related to a pragme, if not found return nil"
-
-	| list |
-	aPragmaString ifNil: [ ^ nil ].
-
-	list := Pragma allNamed: aPragmaString.
-
-	^ list ifEmpty: [ nil ] ifNotEmpty: [ :e |
-			  | pragma class |
-			  pragma := e first.
-			  class := pragma methodClass.
-			  (class instanceSide respondsTo: pragma methodSelector) ifTrue: [
-				  class instanceSide perform: pragma methodSelector ] ]
-]
-
 { #category : #'private - menu' }
 MolWorld class >> menuKey [
 
@@ -249,24 +234,6 @@ MolWorld class >> openDefineComponentDialog [
 	^ dialogWindow 
 ]
 
-{ #category : #'menu - definitions' }
-MolWorld class >> order [
-	"Define the order of the root of this World Menu, override me to change the it"
-
-	"Use this pragma to overidde me in a new method => <MoleculeOrderWorldMenuDefinition>"
-
-	^ (self menuDefinition: 'MoleculeOrderWorldMenuDefinition') ifNil: [ 999 ]
-]
-
-{ #category : #'menu - definitions' }
-MolWorld class >> parent [
-	"Define the root parent of this World Menu, override me to change the location"
-
-	"Use this pragma to overidde me in a new method => <MoleculeParentWorldMenuDefinition>"
-
-	^ (self menuDefinition: 'MoleculeParentWorldMenuDefinition') ifNil: [ #Tools ]
-]
-
 { #category : #'menu - tools' }
 MolWorld class >> toolsMenu100DefineAllComponentsOn: aBuilder [
 	<worldMenu>
@@ -441,6 +408,24 @@ MolWorld class >> toolsMenu90DefineDirtyComponentsOn: aBuilder [
 		label: 'Define dirty Components'
 ]
 
+{ #category : #'private - menu' }
+MolWorld class >> worldMenuPostBuildSetup: aBuilder [
+	"Setup a menu item after his build"
+
+	| list item |
+	aBuilder ifNil:[ ^ self ].
+	list := (Pragma allNamed: 'worldMenuItem:') select: [ :e |
+		        e hasArguments and: [ e arguments first = self menuKey ] ].
+	
+	item := aBuilder items detect:[ :e | e item = self menuKey ] ifNone:[ ^ self ].
+	
+	list do: [ :pragma |
+			| class |
+			class := pragma methodClass.
+			(class instanceSide respondsTo: pragma methodSelector) ifTrue: [
+				class instanceSide perform: pragma methodSelector with: item ] ]
+]
+
 { #category : #'see class side' }
 MolWorld >> seeClassSide [ 
 ]