fixes: pharo-project#7648 Class using complex slots should automatica…

…lly be displayed using fluidclass definition.

- next step traits since they can also have complex slots

src/Kernel-Tests/FluidClassDefinitionPrinterTest.class.st

@@ -65,6 +65,20 @@ FluidClassDefinitionPrinterTest >> testChronologyConstants [
 	package: ''Kernel'''
 ]
 
+{ #category : #'tests - complex slots' }
+FluidClassDefinitionPrinterTest >> testClassDefinitionWithComplexSlotShouldBeDisplay [
+
+	ClassDefinitionPrinter showFluidClassDefinition: false.
+	self assert: MockWithComplexSlot needsSlotClassDefinition.
+
+	self 
+		assert: (self forClass: MockWithComplexSlot) 
+		equals: 'Object << #MockWithComplexSlot
+	slots: { #aComplexSlot => PropertySlot };
+	tag: ''Fluid'';
+	package: ''Kernel-Tests''' 
+]
+
 { #category : #'tests - template' }
 FluidClassDefinitionPrinterTest >> testCompactClassTemplate [
 
@@ -76,6 +90,15 @@ FluidClassDefinitionPrinterTest >> testCompactClassTemplate [
 	package: ''Kernel'''
 ]
 
+{ #category : #'tests - complex slots' }
+FluidClassDefinitionPrinterTest >> testDefinitionWithComplexSlot [
+
+	self assert: (self forClass: MockWithComplexSlot) equals: 'Object << #MockWithComplexSlot
+	slots: { #aComplexSlot => PropertySlot };
+	tag: ''Fluid'';
+	package: ''Kernel-Tests''' 
+]
+
 { #category : #'tests - expanded' }
 FluidClassDefinitionPrinterTest >> testExpandedEmptyLayoutClass [
 

src/Kernel-Tests/MockWithComplexSlot.class.st

@@ -0,0 +1,15 @@
+Class {
+	#name : #MockWithComplexSlot,
+	#superclass : #Object,
+	#instVars : [
+		'#aComplexSlot => PropertySlot'
+	],
+	#category : #'Kernel-Tests-Fluid'
+}
+
+{ #category : #initialization }
+MockWithComplexSlot >> initialize [
+
+	self class initializeSlots: self.
+	super initialize.
+]

src/Kernel/OldPharoClassDefinitionPrinter.class.st

@@ -7,46 +7,41 @@ Class {
 { #category : #delegating }
 OldPharoClassDefinitionPrinter >> classDefinitionString [
 
-	| poolString stream |
+	^ forClass needsSlotClassDefinition 
+		ifTrue: [ (ClassDefinitionPrinter fluid for: forClass) classDefinitionString ]
+		ifFalse: [  	| poolString stream |
 	poolString := forClass sharedPoolsString.
 	stream := (String new: 800) writeStream.
 	forClass superclass
 		ifNotNil: [ stream nextPutAll: forClass superclass name ]
 		ifNil: [ stream nextPutAll: 'ProtoObject' ].
-
 	stream
 		nextPutAll: forClass kindOfSubclass;
-		store: forClass name.
-
+		store: forClass name.		
 	forClass hasTraitComposition ifTrue: [ 
 		stream
 			crtab;
 			nextPutAll: 'uses: ';
 			nextPutAll: forClass traitCompositionString ].
-
 	stream
 		crtab;
 		nextPutAll: 'instanceVariableNames: '''.
 	forClass instanceVariablesOn: stream.
 	stream nextPut: $'.
-	
 	stream
 		crtab;
 		nextPutAll: 'classVariableNames: '''.
 	forClass classVariablesOn: stream.
 	stream nextPut: $'.
-
 	poolString = '' ifFalse: [ 
 		stream 
 			crtab;
 			nextPutAll: 'poolDictionaries: ';
 			store: poolString ].
-
 	stream
 		crtab;
 		nextPutAll: 'package: ';
 		store: forClass category asString.
-
 	forClass superclass ifNil: [ 
 		stream
 			nextPutAll: '.';
@@ -56,8 +51,7 @@ OldPharoClassDefinitionPrinter >> classDefinitionString [
 		stream
 			space;
 			nextPutAll: 'superclass: nil' ].
-
-	^ stream contents
+	stream contents ]
 ]
 
 { #category : #template }