Merge branch 'pharo-spec:Pharo13' into p13-fix-RegexSyntaxError-SpSea…

…rchInputFieldOptionsPresenter

src/Spec2-Adapters-Morphic/SpMorphicTextAdapter.class.st

@@ -17,6 +17,12 @@ SpMorphicTextAdapter >> accept: aString notifying: aNotifyier [
 		notifying: aNotifyier
 ]
 
+{ #category : 'widget API' }
+SpMorphicTextAdapter >> addExtraActionsTo: actionGroup [
+
+	"override to add extra actions between user defined and edition"
+]
+
 { #category : 'initialization' }
 SpMorphicTextAdapter >> addFocusRotationKeyBindings [
 	"Text areas needs to be able to process tab. Cancel the binding."
@@ -91,9 +97,10 @@ SpMorphicTextAdapter >> codePaneMenu: aMenu shifted: shifted [
 
 	self presenter internalActions ifNotNil: [ :group |
 		actionGroup add: group beRoot ].
+	self addExtraActionsTo: actionGroup.
 	self presenter actions ifNotNil: [ :group |
 		actionGroup add: group beRoot ].
-	self presenter hasEditionContextMenu ifTrue: [ 
+	self presenter hasEditionContextMenu ifTrue: [
 		actionGroup add: self presenter editionCommandsGroup beRoot ].
 
 	menuPresenter := self presenter newMenu.

src/Spec2-Backend-Tests/SpNotebookAdapterTest.class.st

@@ -18,6 +18,18 @@ SpNotebookAdapterTest >> initializeTestedInstance [
 		addPage: (SpNotebookPage title: 'Mock2' icon: (self iconNamed: #changeUpdate) provider: [ SpLabelPresenter new ])
 ]
 
+{ #category : 'tests' }
+SpNotebookAdapterTest >> testAccessPage [
+
+	| newPage |
+
+	newPage := SpNotebookPage title: 'Mock3' provider: [ SpLabelPresenter new ].
+	presenter addPage: newPage.
+	self assert: (presenter pageNamed: 'Mock3') equals: newPage.
+	presenter removeAll.
+	self should: [ presenter pageNamed: 'Mock3' ] raise: NotFound.
+]
+
 { #category : 'tests' }
 SpNotebookAdapterTest >> testAddPage [
 	self assert: self adapter numberOfTabs equals: 2.
@@ -42,6 +54,14 @@ SpNotebookAdapterTest >> testClickOnPage [
 	self assert: self adapter selectedPageName equals: 'Mock2'
 ]
 
+{ #category : 'tests' }
+SpNotebookAdapterTest >> testHasPages [
+
+	self assert: presenter hasPages.
+	presenter removeAll.
+	self deny: presenter hasPages.
+]
+
 { #category : 'tests' }
 SpNotebookAdapterTest >> testRemoveAll [
 

src/Spec2-Code-Commands/SpCodeDebugItCommand.class.st

@@ -31,9 +31,7 @@ SpCodeDebugItCommand class >> defaultName [
 { #category : 'default' }
 SpCodeDebugItCommand class >> defaultShortcutKey [
 
-	^ $d shift command mac 
-		| $d shift control win
-		| $d shift control unix
+	^ $d shift actionModifier
 ]
 
 { #category : 'private' }

src/Spec2-Code-Commands/SpCodeDoItCommand.class.st

@@ -31,9 +31,7 @@ SpCodeDoItCommand class >> defaultName [
 { #category : 'default' }
 SpCodeDoItCommand class >> defaultShortcutKey [
 
-	^ $d command mac 
-		| $d control win 
-		| $d control unix
+	^ $d actionModifier
 ]
 
 { #category : 'accessing' }

src/Spec2-Code-Commands/SpCodeInspectItCommand.class.st

@@ -31,9 +31,7 @@ SpCodeInspectItCommand class >> defaultName [
 { #category : 'default' }
 SpCodeInspectItCommand class >> defaultShortcutKey [
 
-	^ $i command mac 
-		| $i control win
-		| $i control unix
+	^ $i actionModifier
 ]
 
 { #category : 'documentation' }

src/Spec2-Code-Commands/SpCodePrintItCommand.class.st

@@ -31,9 +31,7 @@ SpCodePrintItCommand class >> defaultName [
 { #category : 'default' }
 SpCodePrintItCommand class >> defaultShortcutKey [
 
-	^ $p command mac
-		| $p control win
-		| $p control unix
+	^ $p actionModifier
 ]
 
 { #category : 'execution' }

src/Spec2-Code-Morphic/SpMorphicCodeAdapter.class.st

@@ -5,6 +5,14 @@ Class {
 	#package : 'Spec2-Code-Morphic'
 }
 
+{ #category : 'widget API' }
+SpMorphicCodeAdapter >> addExtraActionsTo: group [
+
+	self presenter isOverrideContextMenu ifTrue: [ ^ self ].
+
+	group add: self presenter rootCommandsGroup beRoot
+]
+
 { #category : 'widget API' }
 SpMorphicCodeAdapter >> behavior [
 

src/Spec2-Code/SpCodePresenter.class.st

@@ -434,7 +434,7 @@ SpCodePresenter >> hasEditionContextMenu [
 	"Answer if edition context menu is active. 
 	 Edition context menu is available by default, but it can be disabled by calling `SpTextPresenter>>#withoutEditionContextMenu` or `SpCodePresenter>>#overridingContextMenu`"
 
-	^ super hasEditionContextMenu and: [ overrideContextMenu not ]
+	^ super hasEditionContextMenu and: [ self isOverrideContextMenu not ]
 ]
 
 { #category : 'testing' }
@@ -539,6 +539,12 @@ SpCodePresenter >> interactionModel: anInteractionModel [
 	self basicInteractionModel: anInteractionModel
 ]
 
+{ #category : 'private - testing' }
+SpCodePresenter >> isOverrideContextMenu [
+
+	^ overrideContextMenu
+]
+
 { #category : 'private - bindings' }
 SpCodePresenter >> isScripting [
 

src/Spec2-Commands/SpBrowseInstancesCommand.class.st

@@ -23,5 +23,5 @@ SpBrowseInstancesCommand class >> shortName [
 { #category : 'executing' }
 SpBrowseInstancesCommand >> execute [
 
-	self target instanceSide inspectAllInstances
+	self target instanceSide allInstances inspect
 ]

src/Spec2-Commands/SpBrowseSubInstancesCommand.class.st

@@ -23,5 +23,5 @@ SpBrowseSubInstancesCommand class >> shortName [
 { #category : 'executing' }
 SpBrowseSubInstancesCommand >> execute [
 
-	self target instanceSide inspectSubInstances
+	self target instanceSide allSubInstances inspect
 ]

src/Spec2-CommonWidgets/SpFilteringListPresenter.class.st

@@ -265,6 +265,12 @@ SpFilteringListPresenter >> unfilteredItems [
 	^ unfilteredItems
 ]
 
+{ #category : 'accessing' }
+SpFilteringListPresenter >> unfilteredItems: someItems [
+
+	unfilteredItems := someItems
+]
+
 { #category : 'api - events' }
 SpFilteringListPresenter >> whenSelectionChangedDo: aBlock [
 

src/Spec2-Core/SpApplication.class.st

@@ -36,7 +36,7 @@ Example:
 ```
 MyApplication>>start
 
-   (self new: MyMainPresenter) openWithSpec
+   (self new: MyMainPresenter) open
 ```
 
 

src/Spec2-Core/SpNotebookPresenter.class.st

@@ -41,6 +41,18 @@ SpNotebookPresenter >> addPageTitle: aString provider: aBlock [
 	^ self addPage: (SpNotebookPage title: aString provider: aBlock)
 ]
 
+{ #category : 'testing' }
+SpNotebookPresenter >> hasPageNamed: aTitle [
+
+	^ self pages anySatisfy: [ : page | 	page title = aTitle ]
+]
+
+{ #category : 'testing' }
+SpNotebookPresenter >> hasPages [
+
+	^ self pages isNotEmpty
+]
+
 { #category : 'initialization' }
 SpNotebookPresenter >> initialize [
 
@@ -55,6 +67,13 @@ SpNotebookPresenter >> pageAt: index [
 	^ self pages at: index
 ]
 
+{ #category : 'api' }
+SpNotebookPresenter >> pageNamed: aTitle [
+	"Answer the receiver's <SpNotebookPage> with aTitle as name. Raise a <NotFound> exception if not present"
+
+	^ self pages detect: [ : page | page title = aTitle ]
+]
+
 { #category : 'private' }
 SpNotebookPresenter >> pageTitleChanged: aPage [ 
 

src/Spec2-ListView/SpListViewPresenter.class.st

@@ -143,8 +143,10 @@ SpListViewPresenter class >> exampleWithIconsAndMorph [
 	 It shows also the fact you can put any presenter inside, giving a huge power 
 	 to your lists."
 
+	| application |
+	application := SpApplication new useBackend: #Gtk.
 	^ self new
-		application: (SpApplication new useBackend: #Gtk);
+		application: application;
 		items: self environment allClasses;
 		setup: [ :aPresenter |
 			| presenter morph |
@@ -157,7 +159,7 @@ SpListViewPresenter class >> exampleWithIconsAndMorph [
 						morph: ((morph := SimpleButtonMorph new)
 							color: Color blue;
 							target: [ 
-								self inform: 'Clicked: ', morph label ];
+								application inform: 'Clicked: ', morph label ];
 							actionSelector: #value;
 							yourself);
 						yourself);