From eab523bc72bfb5632c65351f8be4255bd9016f1e Mon Sep 17 00:00:00 2001 From: Tom Beckmann Date: Mon, 3 Jan 2022 22:17:59 +0100 Subject: [PATCH] core: fix some incompatibilities w/ 5.3; tutorial: some more unbound shortcuts fixed --- packages/Sandblocks-Core/SBForceConnector.class.st | 2 +- packages/Sandblocks-Core/SBGroup.class.st | 2 +- packages/Sandblocks-Core/SBSelection.class.st | 6 ++++++ packages/Sandblocks-Tutorial/SBTutorialStep.class.st | 6 +++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/Sandblocks-Core/SBForceConnector.class.st b/packages/Sandblocks-Core/SBForceConnector.class.st index 29a7ab84..1c4f5081 100644 --- a/packages/Sandblocks-Core/SBForceConnector.class.st +++ b/packages/Sandblocks-Core/SBForceConnector.class.st @@ -117,7 +117,7 @@ SBForceConnector >> lineWidth [ { #category : #'as yet unclassified' } SBForceConnector >> morphicLayerNumber [ - ^ SBBlock defaultLayer + 1 + ^ 101 ] { #category : #'as yet unclassified' } diff --git a/packages/Sandblocks-Core/SBGroup.class.st b/packages/Sandblocks-Core/SBGroup.class.st index b07531b6..0b5e94f4 100644 --- a/packages/Sandblocks-Core/SBGroup.class.st +++ b/packages/Sandblocks-Core/SBGroup.class.st @@ -212,7 +212,7 @@ SBGroup >> isArtefact [ { #category : #accessing } SBGroup >> morphicLayerNumber [ - ^ SBForceConnector defaultLayer + 1 + ^ 101 ] { #category : #'as yet unclassified' } diff --git a/packages/Sandblocks-Core/SBSelection.class.st b/packages/Sandblocks-Core/SBSelection.class.st index a9d86528..a0ee58c6 100644 --- a/packages/Sandblocks-Core/SBSelection.class.st +++ b/packages/Sandblocks-Core/SBSelection.class.st @@ -257,6 +257,12 @@ SBSelection >> relatedClass [ ^ self methodClass ] +{ #category : #'as yet unclassified' } +SBSelection >> reportError: anError process: aProcess source: aBlock [ + + +] + { #category : #'as yet unclassified' } SBSelection >> sandblockEditor [ diff --git a/packages/Sandblocks-Tutorial/SBTutorialStep.class.st b/packages/Sandblocks-Tutorial/SBTutorialStep.class.st index 027bdaa4..338527fb 100644 --- a/packages/Sandblocks-Tutorial/SBTutorialStep.class.st +++ b/packages/Sandblocks-Tutorial/SBTutorialStep.class.st @@ -145,7 +145,7 @@ SBTutorialStep class >> stepAssignments: anEditor [ 7 > 8 ifTrue: [Transcript showln: 'hi']] in: anEditor. step - addStep: 'Wrap the expression `42 squared` in an assignment by selecting the expression (use <#selectUp>) and press <#wrapInAssignment>. Then type `largeNum` as name.' + addStep: 'Wrap the expression `42 squared` in an assignment by selecting the expression (use <#moveCursorLarger>) and press <#wrapInAssignment>. Then type `largeNum` as name.' checkCondition: [:editor | method statements first isAssignment]. step addStep: 'Hit save (<#save>) and declare the variable as method temporary. Note that there is no other way to declare temporary variables currently (i.e., place them in the pipes)' @@ -243,7 +243,7 @@ SBTutorialStep class >> stepDeleting: anEditor [ Paste the 6 again at the start of the list by walking to the 1 and pressing <#pasteBefore> for paste-before.' checkCondition: [:editor | method body statements first firstSubmorph contents = '6']. step - addStep: 'Finally, select the entire array using <#selectUp> and replace it with the still copied 6 using <#pasteReplace> for paste-replace.' + addStep: 'Finally, select the entire array using <#moveCursorLarger> and replace it with the still copied 6 using <#pasteReplace> for paste-replace.' checkCondition: [:editor | method body statements first contents = '6']] ] @@ -512,7 +512,7 @@ SBTutorialStep class >> stepSelection: anEditor [ addStep: 'First, select the block closure argument '':each''. Note that the type of your selection is displayed in the bottom-left corner.' checkCondition: [:editor | editor selection = method body statements third arguments first bindings first]. step - addStep: 'Then repeatedly use <#selectUp> to enlargen your selection to select the full `do:` message send. You can use <#selectDown> to go down again.' + addStep: 'Then repeatedly use <#moveCursorLarger> to enlargen your selection to select the full `do:` message send. You can use <#moveCursorSmaller> to go down again.' checkCondition: [:editor | editor selection = method body statements third]. step addStep: 'Finally, as an example use <#deleteBlock> to delete the full `do:` message send.'