Fix var name of constructor argument in helpers

src/Famix-Value-Entities-Extensions/FamixValueOfObjectAttribute.extension.st

@@ -9,3 +9,11 @@ FamixValueOfObjectAttribute >> mooseNameOn: aStream [
 		 ifNil: [ '<attribute>' ]) << $=.
 	value printValueOn: aStream
 ]
+
+{ #category : #'*Famix-Value-Entities-Extensions' }
+FamixValueOfObjectAttribute >> varName [
+
+	^ self attribute
+		  ifNotNil: [ :attribute | attribute name ]
+		  ifNil: [ value varName ]
+]

src/Famix-Value-Entities/FamixValueOfObjectAttribute.class.st

@@ -78,11 +78,3 @@ FamixValueOfObjectAttribute >> value: anObject [
 	<generated>
 	value := anObject
 ]
-
-{ #category : #generate }
-FamixValueOfObjectAttribute >> varName [
-
-	^ self attribute
-		  ifNotNil: [ :attribute | attribute name ]
-		  ifNil: [ value varName ]
-]

src/Famix-Value-Exporter/FamixValue2FASTJavaVisitor.class.st

@@ -37,8 +37,10 @@ FamixValue2FASTJavaVisitor >> addAttributesFrom: object asArgumentsTo: newExpres
 						 object value
 							 detect: [ :objAttribute | "find the matching value attribute"
 								 objAttribute attribute == paramAttribute ]
-							 ifFound: [ :objAttribute |
-							 self makeVariableExpression: objAttribute value ]
+							 ifFound: [ :objAttribute | "dispatch for var naming context"
+								 objectExportStrategy
+									 makeVariableExpression: objAttribute value
+									 on: self ]
 							 ifNone: [ "the object does not have the attribute set"
 								 paramAttribute declaredType asFASTJavaDefaultValueOn:
 									 self model ] ]) ]

src/Famix-Value-Exporter/FamixValueHelperObjectExportStrategy.class.st

@@ -133,3 +133,11 @@ FamixValueHelperObjectExportStrategy >> makeSetterInvocationsFor: attributes on:
 					named: attribute varName ]
 			ifNil: [ visitor makeReflectionSetterInvocation: attribute ] ]
 ]
+
+{ #category : #ast }
+FamixValueHelperObjectExportStrategy >> makeVariableExpression: value on: visitor [
+	"Used when constructing an object to correctly name the argument variable.
+	For helpers, the var name is the same as the helper method parameter."
+
+	^ visitor model newVariableExpression name: value varName
+]

src/Famix-Value-Exporter/FamixValueInlineObjectExportStrategy.class.st

@@ -11,3 +11,11 @@ FamixValueInlineObjectExportStrategy >> export: object on: visitor [
 	(visitor filterAttributesToSet: object relevantAttributes for: object)
 		do: [ :attribute | visitor visitObjectAttribute: attribute ]
 ]
+
+{ #category : #ast }
+FamixValueInlineObjectExportStrategy >> makeVariableExpression: value on: visitor [
+	"Used when constructing an object to correctly name the argument variable.
+	When inline, the visitor can handle naming the variable on its own."
+
+	^ visitor makeVariableExpression: value
+]