Fixes: pharo-project#7687 but I do not understand why we can remove a…

… class (while we could remove a trait).
VincentBlondeau · Nov 7, 2020 · e8264f2 · e8264f2
1 parent 8b6e028
commit e8264f2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/Refactoring-Changes/RBAddClassTraitChange.class.st b/src/Refactoring-Changes/RBAddClassTraitChange.class.st
@@ -9,7 +9,16 @@ Class {
 
 { #category : #private }
 RBAddClassTraitChange class >> definitionPatterns [
-	^ #('`traitName classTrait uses: `@traitComposition' '`traitName classTrait'  '`traitName classTrait uses: `@traitComposition instanceVariableNames: `@instVars' '`traitName classTrait instanceVariableNames: `@instVars')
+	^ #(
+	
+	'`traitName classTrait uses: `@traitComposition' '`traitName classTrait'  
+	'`traitName classTrait uses: `@traitComposition instanceVariableNames: `@instVars' 
+	'`traitName classTrait instanceVariableNames: `@instVars'
+	
+	'`traitName classTrait uses: `@traitComposition slots: `@instVars' 
+	'`traitName classTrait slots: `@instVars'
+	
+	)
 ]
 
 { #category : #converting }

diff --git a/src/Refactoring-Changes/RBAddMetaclassChange.class.st b/src/Refactoring-Changes/RBAddMetaclassChange.class.st
@@ -13,7 +13,11 @@ Class {
 { #category : #private }
 RBAddMetaclassChange class >> definitionPatterns [
 	^ #('`className class instanceVariableNames: `#instanceVariableNames'
-		'`className class uses: `@traitComposition instanceVariableNames: `#instanceVariableNames')
+		'`className class uses: `@traitComposition instanceVariableNames: `#instanceVariableNames'
+		'`className class uses: `@traitComposition slots: `#instanceVariableNames'
+		'`className class slots: `#instanceVariableNames'
+		'`className class'
+		)
 ]
 
 { #category : #converting }

diff --git a/src/Refactoring-Changes/RBAddTraitChange.class.st b/src/Refactoring-Changes/RBAddTraitChange.class.st
@@ -14,7 +14,13 @@ Class {
 
 { #category : #private }
 RBAddTraitChange class >> definitionPatterns [
-	^ #('Trait named: `#traitName uses: `@traitComposition package: `#package' 'Trait named: `#traitName uses: `@traitComposition slots: `@slotDefinition package: `#package' )
+	^ #('Trait named: `#traitName uses: `@traitComposition package: `#package' 'Trait named: `#traitName uses: `@traitComposition slots: `@slotDefinition package: `#package'
+	
+	'Trait << `#traitName package: `#package'
+	'Trait << `#traitName uses: `@traitComposition package: `#package'
+	'Trait << `#traitName slots `@slotDefinition package: `#package'
+	'Trait << `#traitName slots `@slotDefinition package: `#package'
+	 )
 ]
 
 { #category : #converting }