Merge pull request #1415 from SeasideSt/devwork

Johan Brichau · web-flow · commit 3074c6960e75 · 2024-06-12T10:48:39.000+02:00
Fix errors in Slime rules (due to code that was forgotten when moving from RB to Renraku framework)
diff --git a/repository/Seaside-Pharo110-Slime.package/WAChangesStateWhileRenderingRule.class/instance/afterCheck.mappings..st b/repository/Seaside-Pharo110-Slime.package/WAChangesStateWhileRenderingRule.class/instance/afterCheck.mappings..st
@@ -5,4 +5,4 @@ afterCheck: aNode mappings: dict
 	aNode isWrite ifFalse: [ ^ false ].
 	(WASlime isWithinCallback: aNode) ifTrue:[ ^ false ].
 
-	^ true
+	^ aNode methodNode methodClass instVarNames includes: aNode name
diff --git a/repository/Seaside-Pharo110-Slime.package/WAUsesWrongRendererRule.class/instance/afterCheck.mappings..st b/repository/Seaside-Pharo110-Slime.package/WAUsesWrongRendererRule.class/instance/afterCheck.mappings..st
@@ -0,0 +1,4 @@
+hooks
+afterCheck: aNode mappings: dict
+
+	^ aNode arguments first references: aNode receiver leftmostChainReceiver name
diff --git a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUsesWrongRenderer.st b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUsesWrongRenderer.st
@@ -9,4 +9,12 @@ testUsesWrongRenderer
 		in: class.
 	self 
 		assertRule: WAUsesWrongRendererRule
-		matches: { class>>#renderContentOn: }
+		matches: { class>>#renderContentOn: }.
+		
+	self
+		compile: 'renderContentOn: html
+			html jQuery load html: [ :r | html div ]'
+		in: class.
+	self 
+		assertRule: WAUsesWrongRendererRule
+		matches: { class>>#renderContentOn: }.
diff --git a/repository/Seaside-Tests-Slime.package/monticello.meta/categories.st b/repository/Seaside-Tests-Slime.package/monticello.meta/categories.st
@@ -1 +1 @@
-SystemOrganization addCategory: #'Seaside-Tests-Slime'!
+self packageOrganizer ensurePackage: #'Seaside-Tests-Slime' withTags: #()!

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +hooks
 +afterCheck: aNode mappings: dict
++
 +	^ aNode arguments first references: aNode receiver leftmostChainReceiver name
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-SystemOrganization addCategory: #'Seaside-Tests-Slime'!`
	`1`	`+self packageOrganizer ensurePackage: #'Seaside-Tests-Slime' withTags: #()!`