From aa7676b288e42fe3886de9169217e4a55f1d3cf1 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Tue, 11 Jun 2024 16:10:10 +0200 Subject: [PATCH] Fix errors in Slime rules (due to code that was forgotten when moving from RB to Renraku framework) --- .../instance/afterCheck.mappings..st | 2 +- .../instance/afterCheck.mappings..st | 4 ++++ .../instance/testUsesWrongRenderer.st | 10 +++++++++- .../monticello.meta/categories.st | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 repository/Seaside-Pharo110-Slime.package/WAUsesWrongRendererRule.class/instance/afterCheck.mappings..st 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 index ab4e81938..c7be1361e 100644 --- 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 \ No newline at end of file + ^ aNode methodNode methodClass instVarNames includes: aNode name \ No newline at end of file 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 new file mode 100644 index 000000000..ddc188294 --- /dev/null +++ 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 \ No newline at end of file diff --git a/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUsesWrongRenderer.st b/repository/Seaside-Tests-Slime.package/WASlimeTest.class/instance/testUsesWrongRenderer.st index e7d320f72..a0573f03b 100644 --- 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: } \ No newline at end of file + 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 index 30bd069a5..c742ec2eb 100644 --- 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: #()!