Move nil guards before dependent work

Gabriel-Darbord · codex · Gabriel-Darbord · commit fa0fc8fb7368 · 2026-05-30T18:42:35.000+02:00
Co-authored-by: Codex &lt;codex@openai.com&gt;
diff --git a/src/ArrowSyntaxRendering/ASRArrowSyntaxTextStyler.class.st b/src/ArrowSyntaxRendering/ASRArrowSyntaxTextStyler.class.st
@@ -121,6 +121,6 @@ ASRArrowSyntaxTextStyler >> style: aText ast: ast [
 { #category : 'private' }
 ASRArrowSyntaxTextStyler >> textStyleForArrowRendering [
 
-	view ifNotNil: [ ^ view textStyle ].
-	^ self defaultTextStyle
+	view ifNil: [ ^ self defaultTextStyle ].
+	^ view textStyle
 ]
diff --git a/src/ArrowSyntaxRendering/ASRSubstitutionFont.class.st b/src/ArrowSyntaxRendering/ASRSubstitutionFont.class.st
@@ -246,8 +246,8 @@ ASRSubstitutionFont >> installOn: aDisplayContext foregroundColor: foregroundCol
 { #category : 'measuring' }
 ASRSubstitutionFont >> kerningLeft: leftCharacter right: rightCharacter [
 
-	(self hides: leftCharacter) ifTrue: [ ^ 0 ].
 	rightCharacter ifNil: [ ^ 0 ].
+	(self hides: leftCharacter) ifTrue: [ ^ 0 ].
 	(self hides: rightCharacter) ifTrue: [ ^ 0 ].
 	^ self baseFont
 		  kerningLeft: (self displayCharacterFor: leftCharacter)

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,6 @@ ASRArrowSyntaxTextStyler >> style: aText ast: ast [`
`121`	`121`	`{ #category : 'private' }`
`122`	`122`	`ASRArrowSyntaxTextStyler >> textStyleForArrowRendering [`
`123`	`123`
`124`		`- view ifNotNil: [ ^ view textStyle ].`
`125`		`- ^ self defaultTextStyle`
	`124`	`+ view ifNil: [ ^ self defaultTextStyle ].`
	`125`	`+ ^ view textStyle`
`126`	`126`	`]`