Merge pull request #4 from moosetechnology/fix/dependency-to-comment

Fix/dependency to comment

Author: LeoDefossez

src/Famix-Diff-Core/FamixDiffResolver.class.st

@@ -187,15 +187,17 @@ FamixDiffResolver >> hasParentMatched: entity [
 	
 	We use #parentsDo: instead of #parents because this is faster."
 
-	entity parentsDo: [ :parent | ((self shouldMatch: parent) not or: [ self matched: parent ]) ifFalse: [ ^ false ] ].
+	entity containersDo: [ :parent | ((self shouldMatch: parent) not or: [ self matched: parent ]) ifFalse: [ ^ false ] ].
 
 	^ true
 ]
 
 { #category : 'testing' }
 FamixDiffResolver >> hasParentMatched: entity ignoringParentsIn: aCollection [
 
-	entity parentsDo: [ :parent | ((aCollection includes: parent) or: [ (self shouldMatch: parent) not or: [ self matched: parent ] ]) ifFalse: [ ^ false ] ].
+	entity containersDo: [ :parent |
+		((aCollection includes: parent) or: [ (self shouldMatch: parent) not or: [ self matched: parent ] ]) ifFalse: [
+			^ false ] ].
 
 	^ true
 ]

src/Famix-Diff-Core/FamixDiffResult.class.st

@@ -51,9 +51,13 @@ FamixDiffResult >> groupAdditionsAndRemovalsByRoots [
 	"When entities are not found in the base or target model we create additions and removals. This API method return a new set of changes that keeps only the top level additions and removals. If we add a package for example it will remove all its added classes methods and variables to keep a high level view of the changes."
 
 	^ self select: [ :change |
-		  change entity isAssociation not and: [
-			  (change isAddition and: [ change entity parents noneSatisfy: [ :parent | self additions anySatisfy: [ :change2 | change2 entity = parent ] ] ]) or: [
-				  change isRemoval and: [ change entity parents noneSatisfy: [ :parent | self removals anySatisfy: [ :change2 | change2 entity = parent ] ] ] ] ] ]
+			  change entity isAssociation not and: [
+					  (change isAddition and: [
+						   change entity containers noneSatisfy: [ :parent |
+							   self additions anySatisfy: [ :change2 | change2 entity = parent ] ] ]) or: [
+							  change isRemoval and: [
+								  change entity containers noneSatisfy: [ :parent |
+									  self removals anySatisfy: [ :change2 | change2 entity = parent ] ] ] ] ] ]
 ]
 
 { #category : 'accessing' }

src/Famix-Diff-Core/MooseEntity.extension.st

@@ -1,5 +1,11 @@
 Extension { #name : 'MooseEntity' }
 
+{ #category : '*Famix-Diff-Core' }
+MooseEntity >> isComment [
+
+	^ false
+]
+
 { #category : '*Famix-Diff-Core' }
 MooseEntity >> shouldBeConsideredForDiff [
 

src/Famix-Diff-Core/TEntityMetaLevelDependency.extension.st

@@ -18,22 +18,21 @@ TEntityMetaLevelDependency >> can: baseSize beSameAs: targetSize withThreashold:
 
 { #category : '*Famix-Diff-Core' }
 TEntityMetaLevelDependency >> compareParentsWith: otherEntity resolver: resolver [
-
 	"I check that the parents of both entities are the same."
 
 	<famixDiff: #identity priority: 5>
 	<famixDiff: #rename priority: 5>
 	| baseParents targetParents |
-	baseParents := self parents.
-	targetParents := otherEntity parents.
+	baseParents := self containers.
+	targetParents := otherEntity containers.
 
 	baseParents size = targetParents size ifFalse: [ ^ false ].
 
-	baseParents do: [ :baseParent | 
-		targetParents
-			detect: [ :targetParent | "We delegate the comparison to the resolver because it's possible a parent is the same but got renamed. This should deal with this case." 
-				resolver is: baseParent sameAs: targetParent ]
-			ifNone: [ ^ false "A parent of the base entity does not have a matching parent so we escape." ] ].
+	baseParents do: [ :baseParent |
+			targetParents
+				detect: [ :targetParent | "We delegate the comparison to the resolver because it's possible a parent is the same but got renamed. This should deal with this case."
+					resolver is: baseParent sameAs: targetParent ]
+				ifNone: [ ^ false "A parent of the base entity does not have a matching parent so we escape." ] ].
 
 	^ true
 ]
@@ -91,8 +90,8 @@ TEntityMetaLevelDependency >> hasEqualContentAndDependencies: otherEntity resolv
 	<famixDiff: #rename priority: 10>
 	<famixDiff: #move priority: 10>
 	| baseChildren targetChildren intersect baseOutgoingDependencies targetOutgoingDependencies baseIncomingDependencies targetIncomingDependencies |
-	baseChildren := self children.
-	targetChildren := otherEntity children.
+	baseChildren := self containedEntities.
+	targetChildren := otherEntity containedEntities.
 
 	baseOutgoingDependencies := self queryAllLocalOutgoing.
 	targetOutgoingDependencies := otherEntity queryAllLocalOutgoing.
@@ -101,8 +100,10 @@ TEntityMetaLevelDependency >> hasEqualContentAndDependencies: otherEntity resolv
 	targetIncomingDependencies := otherEntity queryAllLocalIncoming.
 
 	"If we have nothing in the class we consider they are different."
-	(baseChildren isEmpty and: [ baseOutgoingDependencies isEmpty and: [ baseIncomingDependencies isEmpty ] ]) ifTrue: [ ^ false ].
-	(targetChildren isEmpty and: [ targetOutgoingDependencies isEmpty and: [ targetIncomingDependencies isEmpty ] ]) ifTrue: [ ^ false ].
+	(baseChildren isEmpty and: [ baseOutgoingDependencies isEmpty and: [ baseIncomingDependencies isEmpty ] ]) ifTrue: [
+		^ false ].
+	(targetChildren isEmpty and: [ targetOutgoingDependencies isEmpty and: [ targetIncomingDependencies isEmpty ] ])
+		ifTrue: [ ^ false ].
 
 	"This is for perf. If the number of entity is too different, no need to compare them."
 	(self
@@ -113,22 +114,26 @@ TEntityMetaLevelDependency >> hasEqualContentAndDependencies: otherEntity resolv
 	intersect := OrderedCollection new.
 
 	"Since we did not treat the children with the resolver  yet we do not check via the resolver if they are the same entities because even if they are renamed we will not know it yet."
-	intersect addAll: (baseChildren select: [ :baseChild | targetChildren anySatisfy: [ :targetChild | baseChild name = targetChild name ] ]).
+	intersect addAll:
+		(baseChildren select: [ :baseChild | targetChildren anySatisfy: [ :targetChild | baseChild name = targetChild name ] ]).
 
 	intersect addAll: (baseOutgoingDependencies select: [ :baseDependency |
 				 targetOutgoingDependencies anySatisfy: [ :targetDependency |
 						 targetDependency class = baseDependency class and: [
 								 (baseDependency target isNotNil and: [ targetDependency target isNotNil ]) and: [ "<=== THIS SHOULD NOT BE HERE. Target should never be nil but verveineJ has a bug. Remove this once the bug is fixed."
-									 baseDependency allTargets allSatisfy: [ :baseTarget | targetDependency allTargets anySatisfy: [ :targetTarget | baseTarget name = targetTarget name ] ] ] ] ] ]).
+										 baseDependency allTargets allSatisfy: [ :baseTarget |
+											 targetDependency allTargets anySatisfy: [ :targetTarget | baseTarget name = targetTarget name ] ] ] ] ] ]).
 
 	intersect addAll: (baseIncomingDependencies select: [ :baseDependency |
 				 targetIncomingDependencies anySatisfy: [ :targetDependency |
 						 targetDependency class = baseDependency class and: [
 								 (baseDependency source isNotNil and: [ targetDependency source isNotNil ]) and: [ "<=== THIS SHOULD NOT BE HERE. Target should never be nil but verveineJ has a bug. Remove this once the bug is fixed."
 									 baseDependency source name = targetDependency source name ] ] ] ]).
 
-	intersect size / (baseChildren size + baseOutgoingDependencies size + baseIncomingDependencies size) >= (1 - resolver tolerance) ifFalse: [ ^ false ].
-	intersect size / (targetChildren size + targetOutgoingDependencies size + targetIncomingDependencies size) >= (1 - resolver tolerance) ifFalse: [ ^ false ].
+	intersect size / (baseChildren size + baseOutgoingDependencies size + baseIncomingDependencies size)
+	>= (1 - resolver tolerance) ifFalse: [ ^ false ].
+	intersect size / (targetChildren size + targetOutgoingDependencies size + targetIncomingDependencies size)
+	>= (1 - resolver tolerance) ifFalse: [ ^ false ].
 	^ true
 ]