From ee685e4d00111741e008329379c87d7690ff8a41 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 4 Feb 2024 15:32:27 +0100 Subject: [PATCH 1/9] revert using special branch of SmalltalkCI --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 831cdc8f..9d5a0f3e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,8 +21,6 @@ jobs: - uses: actions/checkout@v3 - uses: hpi-swa/setup-smalltalkCI@v1 with: - smalltalkCI-source: 'jbrichau/smalltalkCI' - smalltalkCI-branch: 'fix-issue-623' smalltalk-image: ${{ matrix.smalltalk }} - name: Run tests run: smalltalkci -s ${{ matrix.smalltalk }} From c89bb8df31f8ab20786449093d0d43b8ac6b654c Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 4 Feb 2024 15:54:27 +0100 Subject: [PATCH 2/9] remove unneeded class category in Slime tests --- .../instance/testReferencesNotPortableClass.st | 1 - .../instance/testSubclassesNotPortableClass.st | 1 - .../GRReSlimeTest.class/instance/testUsesNotPortableClass.st | 1 - .../monticello.meta/categories.st | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st index 6c1b5b23..ea1908c7 100644 --- a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st +++ b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st @@ -3,7 +3,6 @@ testReferencesNotPortableClass | class | class := self defineSubClassOf: #GRObject. - class category: 'SomeCategory'. self compile: 'invalid ^ Semaphore new' in: class. self compile: 'valid ^ GRObject new' in: class. self diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st index 2ced3881..c113779d 100644 --- a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st +++ b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st @@ -3,7 +3,6 @@ testSubclassesNotPortableClass | class | class := self defineSubClassOf: #Mutex. - class category: 'SomeCategory'. self assertRule: GRSubclassesNotPortableClassRule matches: { class } \ No newline at end of file diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st index 5699c982..965d58ad 100644 --- a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st +++ b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st @@ -3,7 +3,6 @@ testUsesNotPortableClass | class | class := self defineSubClassOf: #GRObject. - class category: 'SomeCategory'. self compile: 'invalid ^ Semaphore new' in: class. self compile: 'valid ^ GRObject new' in: class. self diff --git a/repository/Grease-Tests-Pharo-Slime.package/monticello.meta/categories.st b/repository/Grease-Tests-Pharo-Slime.package/monticello.meta/categories.st index 6c2ac5ef..bb71bcda 100644 --- a/repository/Grease-Tests-Pharo-Slime.package/monticello.meta/categories.st +++ b/repository/Grease-Tests-Pharo-Slime.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'Grease-Tests-Pharo-Slime'! +self packageOrganizer ensurePackage: #'Grease-Tests-Pharo-Slime' withTags: #()! From 5216ca7bb6e9200f90d3d56400691e69d80bd725 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 4 Feb 2024 15:54:46 +0100 Subject: [PATCH 3/9] Replace deprecated message --- .../instance/testCompileIntoClassified.st | 2 +- .../monticello.meta/categories.st | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testCompileIntoClassified.st b/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testCompileIntoClassified.st index 112d896b..8fe4388c 100644 --- a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testCompileIntoClassified.st +++ b/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testCompileIntoClassified.st @@ -11,5 +11,5 @@ testCompileIntoClassified classified: protocol. [ self assert: (self class selectors includes: selector). - selectors := self class organization listAtCategoryNamed: protocol. + selectors := self class selectorsInProtocol: protocol. self assert: selectors = (Array with: selector) ] ensure: [ self class removeSelector: selector ] \ No newline at end of file diff --git a/repository/Grease-Tests-Pharo-Core.package/monticello.meta/categories.st b/repository/Grease-Tests-Pharo-Core.package/monticello.meta/categories.st index 8f89143a..7bce97a3 100644 --- a/repository/Grease-Tests-Pharo-Core.package/monticello.meta/categories.st +++ b/repository/Grease-Tests-Pharo-Core.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'Grease-Tests-Pharo-Core'! +self packageOrganizer ensurePackage: #'Grease-Tests-Pharo-Core' withTags: #()! From edd9b010d3107ec883f8367491b61cfa4be63942 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 4 Feb 2024 16:07:21 +0100 Subject: [PATCH 4/9] class packages are important in the tests, as indicated by the failures that otherwise result --- .../instance/testReferencesNotPortableClass.st | 1 + .../instance/testSubclassesNotPortableClass.st | 1 + .../GRReSlimeTest.class/instance/testUsesNotPortableClass.st | 1 + 3 files changed, 3 insertions(+) diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st index ea1908c7..0b0c9235 100644 --- a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st +++ b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st @@ -3,6 +3,7 @@ testReferencesNotPortableClass | class | class := self defineSubClassOf: #GRObject. + class package: 'SomeCategory' tag: ''. self compile: 'invalid ^ Semaphore new' in: class. self compile: 'valid ^ GRObject new' in: class. self diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st index c113779d..a58675a4 100644 --- a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st +++ b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st @@ -3,6 +3,7 @@ testSubclassesNotPortableClass | class | class := self defineSubClassOf: #Mutex. + class package: 'SomeCategory' tag: ''. self assertRule: GRSubclassesNotPortableClassRule matches: { class } \ No newline at end of file diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st index 965d58ad..2bdf3356 100644 --- a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st +++ b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st @@ -3,6 +3,7 @@ testUsesNotPortableClass | class | class := self defineSubClassOf: #GRObject. + class package: 'SomeCategory' tag: ''. self compile: 'invalid ^ Semaphore new' in: class. self compile: 'valid ^ GRObject new' in: class. self From 203d08e83154a278d288c26cd150db2e12cd4bb3 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 4 Feb 2024 16:14:52 +0100 Subject: [PATCH 5/9] make class package work across all Pharo versions for generating test classes --- .../instance/defineSubClassOf..st | 18 +---------------- .../instance/defineSubClassOf.inPackage..st | 20 +++++++++++++++++++ .../testReferencesNotPortableClass.st | 3 +-- .../testSubclassesNotPortableClass.st | 3 +-- .../instance/testUsesNotPortableClass.st | 3 +-- 5 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/defineSubClassOf.inPackage..st diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/defineSubClassOf..st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/defineSubClassOf..st index 92da2de7..fdcf43d7 100644 --- a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/defineSubClassOf..st +++ b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/defineSubClassOf..st @@ -1,20 +1,4 @@ accessing-code defineSubClassOf: aSuperSymbol - | class | - class := SystemVersion current major >= 12 - ifTrue: [ - factory make: [ :aBuilder | - aBuilder - superclass: (Smalltalk at: aSuperSymbol); - package: self category ] ] - ifFalse: [ - factory - newSubclassOf: (Smalltalk at: aSuperSymbol) - instanceVariableNames: '' - classVariableNames: 'classVarsString' - category: self category ]. - environment - addClass: class; - addClass: class classSide. - ^ class \ No newline at end of file + ^ self defineSubClassOf: aSuperSymbol inPackage: self category \ No newline at end of file diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/defineSubClassOf.inPackage..st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/defineSubClassOf.inPackage..st new file mode 100644 index 00000000..9ad6f16a --- /dev/null +++ b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/defineSubClassOf.inPackage..st @@ -0,0 +1,20 @@ +accessing-code +defineSubClassOf: aSuperSymbol inPackage: packageName + + | class | + class := SystemVersion current major >= 12 + ifTrue: [ + factory make: [ :aBuilder | + aBuilder + superclass: (Smalltalk at: aSuperSymbol); + package: packageName ] ] + ifFalse: [ + factory + newSubclassOf: (Smalltalk at: aSuperSymbol) + instanceVariableNames: '' + classVariableNames: 'classVarsString' + category: packageName ]. + environment + addClass: class; + addClass: class classSide. + ^ class \ No newline at end of file diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st index 0b0c9235..a3070f80 100644 --- a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st +++ b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testReferencesNotPortableClass.st @@ -2,8 +2,7 @@ tests-block testReferencesNotPortableClass | class | - class := self defineSubClassOf: #GRObject. - class package: 'SomeCategory' tag: ''. + class := self defineSubClassOf: #GRObject inPackage: 'SomeCategory'. self compile: 'invalid ^ Semaphore new' in: class. self compile: 'valid ^ GRObject new' in: class. self diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st index a58675a4..c86dc173 100644 --- a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st +++ b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testSubclassesNotPortableClass.st @@ -2,8 +2,7 @@ tests-block testSubclassesNotPortableClass | class | - class := self defineSubClassOf: #Mutex. - class package: 'SomeCategory' tag: ''. + class := self defineSubClassOf: #Mutex inPackage: 'SomeCategory'. self assertRule: GRSubclassesNotPortableClassRule matches: { class } \ No newline at end of file diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st index 2bdf3356..f65d00a4 100644 --- a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st +++ b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testUsesNotPortableClass.st @@ -2,8 +2,7 @@ tests-block testUsesNotPortableClass | class | - class := self defineSubClassOf: #GRObject. - class package: 'SomeCategory' tag: ''. + class := self defineSubClassOf: #GRObject inPackage: 'SomeCategory'. self compile: 'invalid ^ Semaphore new' in: class. self compile: 'valid ^ GRObject new' in: class. self From a886828af03d80face9597931baf636bb5e91689 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 4 Feb 2024 16:21:28 +0100 Subject: [PATCH 6/9] remove dead code --- .../GRTestAssertionsRule.class/instance/checkMethod..st | 7 ------- .../monticello.meta/categories.st | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 repository/Grease-Pharo110-Slime.package/GRTestAssertionsRule.class/instance/checkMethod..st diff --git a/repository/Grease-Pharo110-Slime.package/GRTestAssertionsRule.class/instance/checkMethod..st b/repository/Grease-Pharo110-Slime.package/GRTestAssertionsRule.class/instance/checkMethod..st deleted file mode 100644 index bab892c3..00000000 --- a/repository/Grease-Pharo110-Slime.package/GRTestAssertionsRule.class/instance/checkMethod..st +++ /dev/null @@ -1,7 +0,0 @@ -running -checkMethod: aContext - aContext methodClass isMeta - ifTrue: [ ^ self ]. - (aContext methodClass allSuperclasses includes:(Smalltalk at: #TestCase)) - ifFalse: [ ^ self ]. - ^ super checkMethod: aContext \ No newline at end of file diff --git a/repository/Grease-Pharo110-Slime.package/monticello.meta/categories.st b/repository/Grease-Pharo110-Slime.package/monticello.meta/categories.st index ff4f5aed..f4dc770b 100644 --- a/repository/Grease-Pharo110-Slime.package/monticello.meta/categories.st +++ b/repository/Grease-Pharo110-Slime.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'Grease-Pharo110-Slime'! +self packageOrganizer ensurePackage: #'Grease-Pharo110-Slime' withTags: #()! From 666789421d28f0eff2c4bc4c8f9734a27603c40d Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 4 Feb 2024 17:12:40 +0100 Subject: [PATCH 7/9] fix code style --- .../GRReSlimeTest.class/instance/testTestCaseFailRule.st | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testTestCaseFailRule.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testTestCaseFailRule.st index c4044a19..1fecfedc 100644 --- a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testTestCaseFailRule.st +++ b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/testTestCaseFailRule.st @@ -6,5 +6,4 @@ testTestCaseFailRule self compile: 'testMethod self fail' in: class. self runTransformation: GRTestAssertionsRule - changes: #( - 'testMethod self assert: false' ) \ No newline at end of file + changes: #( 'testMethod self assert: false' ) \ No newline at end of file From d3e13f75c9cf017267049c6333cd339f19e70951 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Mon, 11 Mar 2024 22:03:14 +0100 Subject: [PATCH 8/9] Moved the Renraku Slime rules back to a separate hierarchy to ensure compatibility with versions of Seaside older than 3.5.6. --- .../GRAnsiBooleansRule.class/properties.json | 2 +- .../GRAnsiCharactersRule.class/properties.json | 2 +- .../GRAnsiCollectionsRule.class/properties.json | 2 +- .../GRAnsiConditionalsRule.class/properties.json | 2 +- .../GRAnsiConvertorRule.class/properties.json | 2 +- .../GRAnsiExceptionsRule.class/properties.json | 2 +- .../GRAnsiStreamsRule.class/properties.json | 2 +- .../GRAnsiStringsRule.class/properties.json | 2 +- .../properties.json | 2 +- .../GRDeprecatedApiProtocolRule.class/properties.json | 2 +- .../properties.json | 2 +- .../GRNonPortableMessageRule.class/properties.json | 2 +- .../properties.json | 2 +- .../GRObjectInRule.class/properties.json | 2 +- .../GRReSlimeBlockLintRule.class/README.md | 0 .../GRReSlimeBlockLintRule.class/class/isVisible.st | 4 ++++ .../GRReSlimeBlockLintRule.class/properties.json | 11 +++++++++++ .../GRReSlimeParseTreeLintRule.class/README.md | 0 .../class/isVisible.st | 4 ++++ .../GRReSlimeParseTreeLintRule.class/properties.json | 11 +++++++++++ .../GRReSlimeTransformationRule.class/README.md | 0 .../class/isVisible.st | 4 ++++ .../GRReSlimeTransformationRule.class/properties.json | 11 +++++++++++ .../GRSlimeBlockLintRule.class/README.md | 1 + .../GRSlimeBlockLintRule.class/properties.json | 4 ++-- .../GRSlimeParseTreeLintRule.class/README.md | 1 + .../GRSlimeParseTreeLintRule.class/properties.json | 4 ++-- .../GRSlimeTransformationRule.class/README.md | 1 + .../GRSlimeTransformationRule.class/properties.json | 4 ++-- .../GRTestAssertionsRule.class/properties.json | 2 +- .../properties.json | 2 +- .../GRUsesClassForHashRule.class/properties.json | 2 +- .../GRUsesNotPortableClassRule.class/properties.json | 2 +- .../monticello.meta/categories.st | 2 +- 34 files changed, 73 insertions(+), 25 deletions(-) create mode 100644 repository/Grease-Pharo110-Slime.package/GRReSlimeBlockLintRule.class/README.md create mode 100644 repository/Grease-Pharo110-Slime.package/GRReSlimeBlockLintRule.class/class/isVisible.st create mode 100644 repository/Grease-Pharo110-Slime.package/GRReSlimeBlockLintRule.class/properties.json create mode 100644 repository/Grease-Pharo110-Slime.package/GRReSlimeParseTreeLintRule.class/README.md create mode 100644 repository/Grease-Pharo110-Slime.package/GRReSlimeParseTreeLintRule.class/class/isVisible.st create mode 100644 repository/Grease-Pharo110-Slime.package/GRReSlimeParseTreeLintRule.class/properties.json create mode 100644 repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/README.md create mode 100644 repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/class/isVisible.st create mode 100644 repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/properties.json diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/properties.json index 4cab4c2d..208c1ba2 100644 --- a/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRAnsiBooleansRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeTransformationRule", + "super" : "GRReSlimeTransformationRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiCharactersRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRAnsiCharactersRule.class/properties.json index 2517609b..d5fe699b 100644 --- a/repository/Grease-Pharo110-Slime.package/GRAnsiCharactersRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRAnsiCharactersRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeTransformationRule", + "super" : "GRReSlimeTransformationRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiCollectionsRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRAnsiCollectionsRule.class/properties.json index 1261c334..b6b9f5c5 100644 --- a/repository/Grease-Pharo110-Slime.package/GRAnsiCollectionsRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRAnsiCollectionsRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeTransformationRule", + "super" : "GRReSlimeTransformationRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiConditionalsRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRAnsiConditionalsRule.class/properties.json index 542f8001..c9539d38 100644 --- a/repository/Grease-Pharo110-Slime.package/GRAnsiConditionalsRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRAnsiConditionalsRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeTransformationRule", + "super" : "GRReSlimeTransformationRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiConvertorRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRAnsiConvertorRule.class/properties.json index 0069fdf8..0e6e4cb4 100644 --- a/repository/Grease-Pharo110-Slime.package/GRAnsiConvertorRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRAnsiConvertorRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeTransformationRule", + "super" : "GRReSlimeTransformationRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiExceptionsRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRAnsiExceptionsRule.class/properties.json index 6bd99b1d..51375683 100644 --- a/repository/Grease-Pharo110-Slime.package/GRAnsiExceptionsRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRAnsiExceptionsRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeTransformationRule", + "super" : "GRReSlimeTransformationRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiStreamsRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRAnsiStreamsRule.class/properties.json index d367dbf7..2539d9c8 100644 --- a/repository/Grease-Pharo110-Slime.package/GRAnsiStreamsRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRAnsiStreamsRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeTransformationRule", + "super" : "GRReSlimeTransformationRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRAnsiStringsRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRAnsiStringsRule.class/properties.json index 39506d7e..f544f2e7 100644 --- a/repository/Grease-Pharo110-Slime.package/GRAnsiStringsRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRAnsiStringsRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeTransformationRule", + "super" : "GRReSlimeTransformationRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRBasicNewInitializeMissingRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRBasicNewInitializeMissingRule.class/properties.json index e15fd361..67a42ffc 100644 --- a/repository/Grease-Pharo110-Slime.package/GRBasicNewInitializeMissingRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRBasicNewInitializeMissingRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeBlockLintRule", + "super" : "GRReSlimeBlockLintRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRDeprecatedApiProtocolRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRDeprecatedApiProtocolRule.class/properties.json index 724ee707..87feb3c9 100644 --- a/repository/Grease-Pharo110-Slime.package/GRDeprecatedApiProtocolRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRDeprecatedApiProtocolRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeParseTreeLintRule", + "super" : "GRReSlimeParseTreeLintRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRInvalidObjectInitializationRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRInvalidObjectInitializationRule.class/properties.json index 37adfef6..4cbd7077 100644 --- a/repository/Grease-Pharo110-Slime.package/GRInvalidObjectInitializationRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRInvalidObjectInitializationRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeBlockLintRule", + "super" : "GRReSlimeBlockLintRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRNonPortableMessageRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRNonPortableMessageRule.class/properties.json index e1e9857f..95a60d91 100644 --- a/repository/Grease-Pharo110-Slime.package/GRNonPortableMessageRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRNonPortableMessageRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeBlockLintRule", + "super" : "GRReSlimeBlockLintRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRNotPortableCollectionsRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRNotPortableCollectionsRule.class/properties.json index 33f1f490..2a5a777c 100644 --- a/repository/Grease-Pharo110-Slime.package/GRNotPortableCollectionsRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRNotPortableCollectionsRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeTransformationRule", + "super" : "GRReSlimeTransformationRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRObjectInRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRObjectInRule.class/properties.json index c4168e75..96ac6c53 100644 --- a/repository/Grease-Pharo110-Slime.package/GRObjectInRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRObjectInRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "pmm 9/12/2009 10:37", - "super" : "GRSlimeTransformationRule", + "super" : "GRReSlimeTransformationRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRReSlimeBlockLintRule.class/README.md b/repository/Grease-Pharo110-Slime.package/GRReSlimeBlockLintRule.class/README.md new file mode 100644 index 00000000..e69de29b diff --git a/repository/Grease-Pharo110-Slime.package/GRReSlimeBlockLintRule.class/class/isVisible.st b/repository/Grease-Pharo110-Slime.package/GRReSlimeBlockLintRule.class/class/isVisible.st new file mode 100644 index 00000000..0e3a239e --- /dev/null +++ b/repository/Grease-Pharo110-Slime.package/GRReSlimeBlockLintRule.class/class/isVisible.st @@ -0,0 +1,4 @@ +testing +isVisible + + ^ self name ~= #GRReSlimeBlockLintRule \ No newline at end of file diff --git a/repository/Grease-Pharo110-Slime.package/GRReSlimeBlockLintRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRReSlimeBlockLintRule.class/properties.json new file mode 100644 index 00000000..806ebfd3 --- /dev/null +++ b/repository/Grease-Pharo110-Slime.package/GRReSlimeBlockLintRule.class/properties.json @@ -0,0 +1,11 @@ +{ + "commentStamp" : "JohanBrichau 3/11/2024 21:53", + "super" : "ReAbstractRule", + "category" : "Grease-Pharo110-Slime", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "GRReSlimeBlockLintRule", + "type" : "normal" +} \ No newline at end of file diff --git a/repository/Grease-Pharo110-Slime.package/GRReSlimeParseTreeLintRule.class/README.md b/repository/Grease-Pharo110-Slime.package/GRReSlimeParseTreeLintRule.class/README.md new file mode 100644 index 00000000..e69de29b diff --git a/repository/Grease-Pharo110-Slime.package/GRReSlimeParseTreeLintRule.class/class/isVisible.st b/repository/Grease-Pharo110-Slime.package/GRReSlimeParseTreeLintRule.class/class/isVisible.st new file mode 100644 index 00000000..2d2913fb --- /dev/null +++ b/repository/Grease-Pharo110-Slime.package/GRReSlimeParseTreeLintRule.class/class/isVisible.st @@ -0,0 +1,4 @@ +testing +isVisible + + ^ self name ~= #GRReSlimeParseTreeLintRule \ No newline at end of file diff --git a/repository/Grease-Pharo110-Slime.package/GRReSlimeParseTreeLintRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRReSlimeParseTreeLintRule.class/properties.json new file mode 100644 index 00000000..e5d01d93 --- /dev/null +++ b/repository/Grease-Pharo110-Slime.package/GRReSlimeParseTreeLintRule.class/properties.json @@ -0,0 +1,11 @@ +{ + "commentStamp" : "", + "super" : "ReNodeMatchRule", + "category" : "Grease-Pharo110-Slime", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "GRReSlimeParseTreeLintRule", + "type" : "normal" +} \ No newline at end of file diff --git a/repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/README.md b/repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/README.md new file mode 100644 index 00000000..e69de29b diff --git a/repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/class/isVisible.st b/repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/class/isVisible.st new file mode 100644 index 00000000..b84d2a50 --- /dev/null +++ b/repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/class/isVisible.st @@ -0,0 +1,4 @@ +testing +isVisible + + ^ self name ~= #GRReSlimeTransformationRule \ No newline at end of file diff --git a/repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/properties.json new file mode 100644 index 00000000..eaa3dd3e --- /dev/null +++ b/repository/Grease-Pharo110-Slime.package/GRReSlimeTransformationRule.class/properties.json @@ -0,0 +1,11 @@ +{ + "commentStamp" : "", + "super" : "ReNodeRewriteRule", + "category" : "Grease-Pharo110-Slime", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "GRReSlimeTransformationRule", + "type" : "normal" +} \ No newline at end of file diff --git a/repository/Grease-Pharo110-Slime.package/GRSlimeBlockLintRule.class/README.md b/repository/Grease-Pharo110-Slime.package/GRSlimeBlockLintRule.class/README.md index e69de29b..acb02dfd 100644 --- a/repository/Grease-Pharo110-Slime.package/GRSlimeBlockLintRule.class/README.md +++ b/repository/Grease-Pharo110-Slime.package/GRSlimeBlockLintRule.class/README.md @@ -0,0 +1 @@ +For compatibility for versions of Seaside older than 3.5.6 \ No newline at end of file diff --git a/repository/Grease-Pharo110-Slime.package/GRSlimeBlockLintRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRSlimeBlockLintRule.class/properties.json index e1389bfa..667ba1a9 100644 --- a/repository/Grease-Pharo110-Slime.package/GRSlimeBlockLintRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRSlimeBlockLintRule.class/properties.json @@ -1,6 +1,6 @@ { - "commentStamp" : "", - "super" : "ReAbstractRule", + "commentStamp" : "JohanBrichau 3/11/2024 21:54", + "super" : "RBBlockLintRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRSlimeParseTreeLintRule.class/README.md b/repository/Grease-Pharo110-Slime.package/GRSlimeParseTreeLintRule.class/README.md index e69de29b..acb02dfd 100644 --- a/repository/Grease-Pharo110-Slime.package/GRSlimeParseTreeLintRule.class/README.md +++ b/repository/Grease-Pharo110-Slime.package/GRSlimeParseTreeLintRule.class/README.md @@ -0,0 +1 @@ +For compatibility for versions of Seaside older than 3.5.6 \ No newline at end of file diff --git a/repository/Grease-Pharo110-Slime.package/GRSlimeParseTreeLintRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRSlimeParseTreeLintRule.class/properties.json index 28ab8124..eab60df9 100644 --- a/repository/Grease-Pharo110-Slime.package/GRSlimeParseTreeLintRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRSlimeParseTreeLintRule.class/properties.json @@ -1,6 +1,6 @@ { - "commentStamp" : "", - "super" : "ReNodeMatchRule", + "commentStamp" : "JohanBrichau 3/11/2024 21:54", + "super" : "RBParseTreeLintRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRSlimeTransformationRule.class/README.md b/repository/Grease-Pharo110-Slime.package/GRSlimeTransformationRule.class/README.md index e69de29b..acb02dfd 100644 --- a/repository/Grease-Pharo110-Slime.package/GRSlimeTransformationRule.class/README.md +++ b/repository/Grease-Pharo110-Slime.package/GRSlimeTransformationRule.class/README.md @@ -0,0 +1 @@ +For compatibility for versions of Seaside older than 3.5.6 \ No newline at end of file diff --git a/repository/Grease-Pharo110-Slime.package/GRSlimeTransformationRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRSlimeTransformationRule.class/properties.json index df276035..d528ef91 100644 --- a/repository/Grease-Pharo110-Slime.package/GRSlimeTransformationRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRSlimeTransformationRule.class/properties.json @@ -1,6 +1,6 @@ { - "commentStamp" : "", - "super" : "ReNodeRewriteRule", + "commentStamp" : "JohanBrichau 3/11/2024 21:54", + "super" : "RBTransformationRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRTestAssertionsRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRTestAssertionsRule.class/properties.json index 572f670a..cd52efa5 100644 --- a/repository/Grease-Pharo110-Slime.package/GRTestAssertionsRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRTestAssertionsRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "pmm 8/17/2014 11:24", - "super" : "GRSlimeTransformationRule", + "super" : "GRReSlimeTransformationRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRUsesCanPerformOrUnderstandRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRUsesCanPerformOrUnderstandRule.class/properties.json index a30a05da..70456891 100644 --- a/repository/Grease-Pharo110-Slime.package/GRUsesCanPerformOrUnderstandRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRUsesCanPerformOrUnderstandRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeParseTreeLintRule", + "super" : "GRReSlimeParseTreeLintRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRUsesClassForHashRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRUsesClassForHashRule.class/properties.json index 063aef8f..c679f3eb 100644 --- a/repository/Grease-Pharo110-Slime.package/GRUsesClassForHashRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRUsesClassForHashRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeParseTreeLintRule", + "super" : "GRReSlimeParseTreeLintRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/GRUsesNotPortableClassRule.class/properties.json b/repository/Grease-Pharo110-Slime.package/GRUsesNotPortableClassRule.class/properties.json index 128f88b8..2965264e 100644 --- a/repository/Grease-Pharo110-Slime.package/GRUsesNotPortableClassRule.class/properties.json +++ b/repository/Grease-Pharo110-Slime.package/GRUsesNotPortableClassRule.class/properties.json @@ -1,6 +1,6 @@ { "commentStamp" : "", - "super" : "GRSlimeBlockLintRule", + "super" : "GRReSlimeBlockLintRule", "category" : "Grease-Pharo110-Slime", "classinstvars" : [ ], "pools" : [ ], diff --git a/repository/Grease-Pharo110-Slime.package/monticello.meta/categories.st b/repository/Grease-Pharo110-Slime.package/monticello.meta/categories.st index f4dc770b..ff4f5aed 100644 --- a/repository/Grease-Pharo110-Slime.package/monticello.meta/categories.st +++ b/repository/Grease-Pharo110-Slime.package/monticello.meta/categories.st @@ -1 +1 @@ -self packageOrganizer ensurePackage: #'Grease-Pharo110-Slime' withTags: #()! +SystemOrganization addCategory: #'Grease-Pharo110-Slime'! From 31b4870e295f78ebb4d9fefb53523e197862b61e Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Mon, 11 Mar 2024 22:17:51 +0100 Subject: [PATCH 9/9] Fix tests --- .../GRReSlimeTest.class/instance/rules.st | 6 +++--- .../monticello.meta/categories.st | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/rules.st b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/rules.st index 13c0034b..46d95352 100644 --- a/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/rules.st +++ b/repository/Grease-Tests-Pharo-Slime.package/GRReSlimeTest.class/instance/rules.st @@ -2,9 +2,9 @@ running rules ^ (OrderedCollection new - addAll: GRSlimeBlockLintRule allSubclasses; - addAll: GRSlimeParseTreeLintRule allSubclasses; - addAll: GRSlimeTransformationRule allSubclasses; + addAll: GRReSlimeBlockLintRule allSubclasses; + addAll: GRReSlimeParseTreeLintRule allSubclasses; + addAll: GRReSlimeTransformationRule allSubclasses; add: ReMultiplePeriodsTerminatingStatementRule; add: ReMethodSignaturePeriodRule; yourself) reject: #isAbstract \ No newline at end of file diff --git a/repository/Grease-Tests-Pharo-Slime.package/monticello.meta/categories.st b/repository/Grease-Tests-Pharo-Slime.package/monticello.meta/categories.st index bb71bcda..6c2ac5ef 100644 --- a/repository/Grease-Tests-Pharo-Slime.package/monticello.meta/categories.st +++ b/repository/Grease-Tests-Pharo-Slime.package/monticello.meta/categories.st @@ -1 +1 @@ -self packageOrganizer ensurePackage: #'Grease-Tests-Pharo-Slime' withTags: #()! +SystemOrganization addCategory: #'Grease-Tests-Pharo-Slime'!