core: prefer to ask the grammar handler for insert-stmt; core: fix in…

…sert cursor pos after adding new list block
hpi-swa · Feb 11, 2022 · bd61eb3 · bd61eb3
1 parent b89346d
commit bd61eb3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/Sandblocks-Core/SBBlock.class.st b/packages/Sandblocks-Core/SBBlock.class.st
@@ -1337,6 +1337,11 @@ SBBlock >> insertStatementAbove [
 SBBlock >> insertStatementAboveOrBelow: anAboveBoolean [
 
 	| candidate |
+	self grammarHandler ifNotNil: [:g |
+		^ g
+			block: self;
+			insertStatementAboveOrBelow: anAboveBoolean].
+
 	" default behavior is to find the first parent that can take multiple children "
 	candidate := self.
 	[candidate parentSandblock fixedNumberOfChildren and: [candidate isArtefact not]] whileTrue: [candidate := candidate parentSandblock].

diff --git a/packages/Sandblocks-Core/SBBlockCursor.class.st b/packages/Sandblocks-Core/SBBlockCursor.class.st
@@ -211,7 +211,7 @@ SBBlockCursor >> initialize [
 SBBlockCursor >> insertPositionIn: aBlock near: aPoint [
 
 	aPoint
-		ifNil: [aBlock cursorPositionsDo: [:pos | (pos class = SBCursorInsert and: [pos container = aBlock]) ifTrue: [^ pos]]]
+		ifNil: [aBlock cursorPositionsDo: [:pos | (pos class = SBCursorInsert and: [pos container containingSandblock = aBlock]) ifTrue: [^ pos]]]
 		ifNotNil: [ | best bestDistance |
 			best := nil.
 			bestDistance := 20.