move vertically to closest text fields rather than closest blocks

hpi-swa · Apr 16, 2021 · 3bac95f · 3bac95f
1 parent 3357d9c
commit 3bac95f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/packages/Sandblocks-Core/SBBlock.class.st b/packages/Sandblocks-Core/SBBlock.class.st
@@ -1581,22 +1581,21 @@ SBBlock >> nextVerticalNear: aNumber calcDistance: aDistBlock validBlock: aValid
 	artefact := self containingFloat.
 	tolerance := 10.
 
-	allCandidates := Array streamContents: [:stream |
-		artefact allBlocksDo: [:candidate |
-			(candidate hasChildSandblocks not and: [aValidBlock value: candidate]) ifTrue: [stream nextPut: candidate]]].
+	allCandidates := Array streamContents: [:stream | artefact allMorphsDo: [:candidate | (candidate isTextMorph and: [aValidBlock value: candidate]) ifTrue: [stream nextPut: candidate]]].
 
 	candidates := OrderedCollection new.
 	candidatesBestDistance := 900000000.
 	allCandidates do: [:candidate | | distance |
 		distance := aDistBlock value: candidate.
 		distance < candidatesBestDistance
 			ifTrue: [
-				(candidatesBestDistance between: distance and: distance + tolerance) ifTrue: [candidates add: candidate] ifFalse: [candidates := OrderedCollection with: candidate].
+				(candidatesBestDistance between: distance and: distance + tolerance)
+					ifTrue: [candidates add: candidate]
+					ifFalse: [candidates := OrderedCollection with: candidate].
 				candidatesBestDistance := distance]
-			ifFalse: [
-				(distance between: candidatesBestDistance and: candidatesBestDistance + tolerance) ifTrue: [candidates add: candidate]]].
+			ifFalse: [(distance between: candidatesBestDistance and: candidatesBestDistance + tolerance) ifTrue: [candidates add: candidate]]].
 
-	^ candidates detectMin: [:candidate | (candidate left - artefact left to: candidate right - artefact left) distanceTo: aNumber]
+	^ (candidates detectMin: [:candidate | (candidate left - artefact left to: candidate right - artefact left) distanceTo: aNumber]) ifNotNil: #containingSandblock
 ]
 
 { #category : #callbacks }

diff --git a/packages/Sandblocks-Smalltalk/SBStNewMessageSend.class.st b/packages/Sandblocks-Smalltalk/SBStNewMessageSend.class.st
@@ -219,7 +219,7 @@ SBStNewMessageSend >> useSuggestion: aString [
 				ifAbsent: [
 					stream nextPut: ((SBInsertCommand newFor: self containingArtefact)
 						container: self;
-						morph: (self newNullBlock
+						morph: ((self newEmptyChildNear: nil before: false)
 							contents: partContents;
 							argumentLabel: (possibleArgumentNames at: index ifAbsent: []));
 						index: index + 1)]].