Method category cleanup - pass 2

fix #9384
pharo-project · Jun 2, 2021 · 1de4954 · 1de4954
1 parent a22a97c
commit 1de4954
Show file tree

Hide file tree

Showing 65 changed files with 321 additions and 400 deletions.
diff --git a/src/AST-Core-Tests/RBMessageNodeTest.class.st b/src/AST-Core-Tests/RBMessageNodeTest.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'AST-Core-Tests-Nodes'
 }
 
-{ #category : #testing }
+{ #category : #tests }
 RBMessageNodeTest >> testArgumentPartsForBinaryMessages [
 	| tree message |
 	tree := self parseMethod: 'test 1 + 2 '.
@@ -14,7 +14,7 @@ RBMessageNodeTest >> testArgumentPartsForBinaryMessages [
 
 ]
 
-{ #category : #testing }
+{ #category : #tests }
 RBMessageNodeTest >> testArgumentPartsForKeywordMessages [
 	| tree message |
 	tree := self parseMethod: 'test self between: x + 2 and: (y foo: 3)'.
@@ -24,7 +24,7 @@ RBMessageNodeTest >> testArgumentPartsForKeywordMessages [
 		
 ]
 
-{ #category : #testing }
+{ #category : #tests }
 RBMessageNodeTest >> testArgumentPartsForKeywordMessages1 [
 	| tree message |
 	tree := self parseMethod: 'test self between: 2 and: 3'.
@@ -34,7 +34,7 @@ RBMessageNodeTest >> testArgumentPartsForKeywordMessages1 [
 		
 ]
 
-{ #category : #testing }
+{ #category : #tests }
 RBMessageNodeTest >> testArgumentPartsForKeywordMessages2 [
 
 		| tree message |
@@ -47,7 +47,7 @@ RBMessageNodeTest >> testArgumentPartsForKeywordMessages2 [
 		self assert: message argumentPartStrings asArray equals: #('x' 'y' 'zzz')
 ]
 
-{ #category : #testing }
+{ #category : #tests }
 RBMessageNodeTest >> testArgumentPartsForUnaryMessages [
 	| tree message |
 	tree := self parseMethod: 'test 1 foo '.
@@ -57,7 +57,7 @@ RBMessageNodeTest >> testArgumentPartsForUnaryMessages [
 		
 ]
 
-{ #category : #testing }
+{ #category : #tests }
 RBMessageNodeTest >> testSelectorAndArgumentNamesForComposedKeywords [
 		| tree message |
 		tree := self parseMethod: 'test self between: x and: y'.
@@ -69,7 +69,7 @@ RBMessageNodeTest >> testSelectorAndArgumentNamesForComposedKeywords [
 		self assert: message selectorAndArgumentNames equals: 'between: x and: y and: zzz'
 ]
 
-{ #category : #testing }
+{ #category : #tests }
 RBMessageNodeTest >> testSelectorAndArgumentNamesForComposedKeywordsAndComplexArgs [
 		| tree message |
 		tree := self parseMethod: 'test self between: x + 2 and: (y foo: 3)'.
@@ -79,7 +79,7 @@ RBMessageNodeTest >> testSelectorAndArgumentNamesForComposedKeywordsAndComplexAr
 		
 ]
 
-{ #category : #testing }
+{ #category : #tests }
 RBMessageNodeTest >> testSelectorAndArgumentNamesForSimpleKeywords [
 		| tree message |
 		tree := self parseMethod: 'test self doit: 5'.
@@ -89,7 +89,7 @@ RBMessageNodeTest >> testSelectorAndArgumentNamesForSimpleKeywords [
 		
 ]
 
-{ #category : #testing }
+{ #category : #tests }
 RBMessageNodeTest >> testSelectorAndArgumentNamesForUnary [
 		| tree message |
 		tree := self parseMethod: 'test self doit'.
@@ -99,7 +99,7 @@ RBMessageNodeTest >> testSelectorAndArgumentNamesForUnary [
 		
 ]
 
-{ #category : #testing }
+{ #category : #tests }
 RBMessageNodeTest >> testSelectorInterval [
 		| tree message |
 		tree := self parseMethod: 'test self doit'.
@@ -110,7 +110,7 @@ RBMessageNodeTest >> testSelectorInterval [
 		self assert: message selectorInterval equals: (11 to: 27).
 ]
 
-{ #category : #testing }
+{ #category : #tests }
 RBMessageNodeTest >> testSelectorPartsForBinaryMessages [
 	| tree message |
 	tree := self parseMethod: 'test 1 + 2 '.
@@ -120,7 +120,7 @@ RBMessageNodeTest >> testSelectorPartsForBinaryMessages [
 		
 ]
 
-{ #category : #testing }
+{ #category : #tests }
 RBMessageNodeTest >> testSelectorPartsForKeywordMessages [
 		| tree message |
 		tree := self parseMethod: 'test self doit: 5'.
@@ -133,7 +133,7 @@ RBMessageNodeTest >> testSelectorPartsForKeywordMessages [
 		
 ]
 
-{ #category : #testing }
+{ #category : #tests }
 RBMessageNodeTest >> testSelectorPartsForUnaryMessages [
 		| tree message |
 		tree := self parseMethod: 'test self doit'.

diff --git a/src/AST-Core/RBEnglobingErrorNode.class.st b/src/AST-Core/RBEnglobingErrorNode.class.st
@@ -20,7 +20,7 @@ Class {
 	#category : #'AST-Core-Nodes - ErrorNodes'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #'instance creation' }
 RBEnglobingErrorNode class >> content: aCollection start: aStart stop: aStop errorMessage: message [
 	^self new 
 		content: aCollection; 

diff --git a/src/AST-Core/RBInvalidCascadeErrorNode.class.st b/src/AST-Core/RBInvalidCascadeErrorNode.class.st
@@ -4,7 +4,7 @@ Class {
 	#category : #'AST-Core-Nodes - ErrorNodes'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 RBInvalidCascadeErrorNode >> cascade [
 
 	^ content first

diff --git a/src/AST-Core/RBLiteralArrayNode.class.st b/src/AST-Core/RBLiteralArrayNode.class.st
@@ -125,7 +125,7 @@ RBLiteralArrayNode >> replaceNode: aNode withNode: anotherNode [
 				collect: [:each | each == aNode ifTrue: [anotherNode] ifFalse: [each]])
 ]
 
-{ #category : #'private-replacing' }
+{ #category : #'private - replacing' }
 RBLiteralArrayNode >> replaceSourceWith: aNode [ 
 	(self class = aNode class and: 
 			[self isForByteArray = aNode isForByteArray 

diff --git a/src/AST-Core/RBLiteralNode.class.st b/src/AST-Core/RBLiteralNode.class.st
@@ -67,15 +67,15 @@ RBLiteralNode >> precedence [
 	^0
 ]
 
-{ #category : #'private-replacing' }
+{ #category : #'private - replacing' }
 RBLiteralNode >> replaceSourceFrom: aNode [ 
 	self addReplacement: (RBStringReplacement 
 				replaceFrom: aNode start
 				to: aNode stop
 				with: self formattedCode)
 ]
 
-{ #category : #'private-replacing' }
+{ #category : #'private - replacing' }
 RBLiteralNode >> replaceSourceWith: aNode [ 
 	self addReplacement: (RBStringReplacement 
 				replaceFrom: self start

diff --git a/src/AST-Core/RBMessageNode.class.st b/src/AST-Core/RBMessageNode.class.st
@@ -155,7 +155,7 @@ RBMessageNode >> isCascaded [
 	^parent notNil and: [parent isCascade]
 ]
 
-{ #category : #'private-replacing' }
+{ #category : #'private - replacing' }
 RBMessageNode >> isContainmentReplacement: aNode [ 
 	^(self mappingFor: self receiver) = aNode 
 		or: [self arguments anySatisfy: [:each | (self mappingFor: each) = aNode]]
@@ -327,7 +327,7 @@ RBMessageNode >> renameSelector: newSelector andArguments: varNodeCollection [
 		selector: newSelector
 ]
 
-{ #category : #'private-replacing' }
+{ #category : #'private - replacing' }
 RBMessageNode >> replaceContainmentSourceWith: aNode [ 
 	| originalNode needsParenthesis |
 	needsParenthesis := aNode hasParentheses not and: [aNode needsParenthesis].
@@ -358,15 +358,15 @@ RBMessageNode >> replaceNode: aNode withNode: anotherNode [
 				collect: [:each | each == aNode ifTrue: [anotherNode] ifFalse: [each]])
 ]
 
-{ #category : #'private-replacing' }
+{ #category : #'private - replacing' }
 RBMessageNode >> replaceSourceWith: aNode [ 
 	(self isContainmentReplacement: aNode) 
 		ifTrue: [^self replaceContainmentSourceWith: aNode].
 	aNode isMessage ifFalse: [^super replaceSourceWith: aNode].
 	^self replaceSourceWithMessageNode: aNode
 ]
 
-{ #category : #'private-replacing' }
+{ #category : #'private - replacing' }
 RBMessageNode >> replaceSourceWithMessageNode: aNode [ 
 	| isBinaryToKeyword newSelectorParts  oldkeywordsIntervals|
 	self numArgs = aNode numArgs ifFalse: [^super replaceSourceWith: aNode].

diff --git a/src/AST-Core/RBMethodNode.class.st b/src/AST-Core/RBMethodNode.class.st
@@ -181,7 +181,7 @@ RBMethodNode >> body: stmtsNode [
 	body parent: self
 ]
 
-{ #category : #'private-replacing' }
+{ #category : #'private - replacing' }
 RBMethodNode >> changeSourceSelector: oldSelector keywordsIntervals: oldIntervals arguments: oldArguments [
 	"If this is the same number of arguments, we try a one to one replacement of selector parts and arguments. If this is not the c
 ase try to rewrite the signature as a whole, what unfortunately drops the comments within the signature."
@@ -228,12 +228,12 @@ RBMethodNode >> clearReplacements [
 	replacements := nil
 ]
 
-{ #category : #'accessing compiled method' }
+{ #category : #'accessing - compiled method' }
 RBMethodNode >> compilationContext [
 	^ compilationContext
 ]
 
-{ #category : #'accessing compiled method' }
+{ #category : #'accessing - compiled method' }
 RBMethodNode >> compilationContext: aCompilationContext [
 	compilationContext := aCompilationContext.
 ]
@@ -461,20 +461,20 @@ RBMethodNode >> matchPragmas: matchNodes against: pragmaNodes inContext: aDictio
 			matchNode match: pragmaNode inContext: aDictionary ] ]
 ]
 
-{ #category : #'accessing compiled method' }
+{ #category : #'accessing - compiled method' }
 RBMethodNode >> method [
 	"return the method that I have been compiled for"
 	^self compilationContext ifNotNil: [ :ccntx |
 		 ccntx compiledMethod ifNil: [ccntx getClass >> self selector]]
 ]
 
-{ #category : #'accessing compiled method' }
+{ #category : #'accessing - compiled method' }
 RBMethodNode >> methodClass [
 
 	^ self compilationContext ifNotNil: [ :ctxt | ctxt getClass ]
 ]
 
-{ #category : #'accessing compiled method' }
+{ #category : #'accessing - compiled method' }
 RBMethodNode >> methodClass: aClass [	
 	compilationContext ifNil: [compilationContext := aClass compiler compilationContext].
 	self compilationContext class: aClass