Merge pull request #743 from moosetechnology/prettier-740

Gabriel-Darbord · web-flow · commit 08b6c3b0e0c7 · 2024-03-29T12:14:08.000+01:00
Streamline `mooseNameOn:`
diff --git a/src/Famix-Java-Entities/FamixJavaClass.class.st b/src/Famix-Java-Entities/FamixJavaClass.class.st
@@ -173,15 +173,14 @@ FamixJavaClass >> methodsWithoutSutbsAndConstructors [
 		each isStub not and: [each isConstructor not]]) asSet
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #printing }
 FamixJavaClass >> mooseNameOn: aStream [
 
 	self typeContainer ifNotNil: [ :parent |
-		| separator |
 		parent mooseNameOn: aStream.
-		separator := '::'.
-		self isInnerClass ifTrue: [ separator := '$' ].
-		aStream nextPutAll: separator ].
+		self isInnerClass
+			ifTrue: [ aStream nextPut: $$ ]
+			ifFalse: [ aStream nextPutAll: '::' ] ].
 	self name ifNotNil: [ :n | aStream nextPutAll: n ]
 ]
 
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st
@@ -56,7 +56,7 @@ FamixStImplicitVariable >> isSuper [
 	^ self name == #super
 ]
 
-{ #category : #testing }
+{ #category : #printing }
 FamixStImplicitVariable >> mooseNameOn: stream [ 
 	| parent |
 	parent := self parentBehaviouralEntity.
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st
@@ -46,7 +46,7 @@ FamixStLocalVariable class >> annotation [
 	^ self
 ]
 
-{ #category : #accessing }
+{ #category : #printing }
 FamixStLocalVariable >> mooseNameOn: stream [ 
 	| parent |
 	parent := self parentBehaviouralEntity.
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st
@@ -46,7 +46,7 @@ FamixStParameter class >> annotation [
 	^ self
 ]
 
-{ #category : #accessing }
+{ #category : #printing }
 FamixStParameter >> mooseNameOn: stream [ 
 	| parent |
 	parent := self parentBehaviouralEntity.
diff --git a/src/Famix-Traits/FamixTEnumValue.trait.st b/src/Famix-Traits/FamixTEnumValue.trait.st
@@ -66,7 +66,7 @@ FamixTEnumValue >> isEnumValue [
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : #printing }
 FamixTEnumValue >> mooseNameOn: aStream [
 	(self belongsTo isNotNil and: [ self belongsTo name isNotNil ])
 		ifTrue: [ self belongsTo mooseNameOn: aStream.
diff --git a/src/Famix-Traits/FamixTType.trait.st b/src/Famix-Traits/FamixTType.trait.st
@@ -84,7 +84,7 @@ FamixTType >> isType [
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : #printing }
 FamixTType >> mooseNameOn: aStream [
 	self typeContainer
 		ifNotNil: [ :parent |
diff --git a/src/Moose-Core/MooseGroup.class.st b/src/Moose-Core/MooseGroup.class.st
@@ -127,7 +127,7 @@ MooseGroup >> mooseDescription [
 		ifNotNil: [ :model | model mooseDescriptionFor: self class ]
 ]
 
-{ #category : #accessing }
+{ #category : #printing }
 MooseGroup >> mooseNameOn: aStream [
 	"Hook to customize the rendered text of an entity. Do not specialize mooseName, but change/specialize this method if necessary."
 	aStream

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ FamixStImplicitVariable >> isSuper [`
`56`	`56`	`^ self name == #super`
`57`	`57`	`]`
`58`	`58`
`59`		`-{ #category : #testing }`
	`59`	`+{ #category : #printing }`
`60`	`60`	`FamixStImplicitVariable >> mooseNameOn: stream [`
`61`	`61`	`\| parent \|`
`62`	`62`	`parent := self parentBehaviouralEntity.`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ FamixStLocalVariable class >> annotation [`
`46`	`46`	`^ self`
`47`	`47`	`]`
`48`	`48`
`49`		`-{ #category : #accessing }`
	`49`	`+{ #category : #printing }`
`50`	`50`	`FamixStLocalVariable >> mooseNameOn: stream [`
`51`	`51`	`\| parent \|`
`52`	`52`	`parent := self parentBehaviouralEntity.`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ FamixStParameter class >> annotation [`
`46`	`46`	`^ self`
`47`	`47`	`]`
`48`	`48`
`49`		`-{ #category : #accessing }`
	`49`	`+{ #category : #printing }`
`50`	`50`	`FamixStParameter >> mooseNameOn: stream [`
`51`	`51`	`\| parent \|`
`52`	`52`	`parent := self parentBehaviouralEntity.`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ FamixTEnumValue >> isEnumValue [`
`66`	`66`	`^ true`
`67`	`67`	`]`
`68`	`68`
`69`		`-{ #category : #accessing }`
	`69`	`+{ #category : #printing }`
`70`	`70`	`FamixTEnumValue >> mooseNameOn: aStream [`
`71`	`71`	`(self belongsTo isNotNil and: [ self belongsTo name isNotNil ])`
`72`	`72`	`ifTrue: [ self belongsTo mooseNameOn: aStream.`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ FamixTType >> isType [`
`84`	`84`	`^ true`
`85`	`85`	`]`
`86`	`86`
`87`		`-{ #category : #accessing }`
	`87`	`+{ #category : #printing }`
`88`	`88`	`FamixTType >> mooseNameOn: aStream [`
`89`	`89`	`self typeContainer`
`90`	`90`	`ifNotNil: [ :parent \|`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ MooseGroup >> mooseDescription [`
`127`	`127`	`ifNotNil: [ :model \| model mooseDescriptionFor: self class ]`
`128`	`128`	`]`
`129`	`129`
`130`		`-{ #category : #accessing }`
	`130`	`+{ #category : #printing }`
`131`	`131`	`MooseGroup >> mooseNameOn: aStream [`
`132`	`132`	`"Hook to customize the rendered text of an entity. Do not specialize mooseName, but change/specialize this method if necessary."`
`133`	`133`	`aStream`