Add tests on local var of dictionary conprehension

Author: jecisc

src/Famix-Python-Importer-Tests/FamixPythonProject1Test.class.st

@@ -3395,6 +3395,28 @@ FamixPythonProject1Test >> testLocalMethodInvocationSourceAnchor [
 	self assert: invocation sourceText equals: 'self.get_name()'
 ]
 
+{ #category : 'tests - local variables' }
+FamixPythonProject1Test >> testLocalVariableInDictionaryComprehension [
+
+	| variable |
+	variable := self localVariableNamed: 'localVariableInDictionaryComprehension'.
+
+	self assert: variable class equals: FamixPythonLocalVariable.
+	self assert: variable name equals: 'localVariableInDictionaryComprehension'.
+	self assert: variable parentBehaviouralEntity equals: (self moduleNamed: 'moduleAtRoot15').
+	self deny: variable isStub
+]
+
+{ #category : 'tests - local variables' }
+FamixPythonProject1Test >> testLocalVariableInDictionaryComprehensionSourceAnchor [
+
+	| variable |
+	variable := self localVariableNamed: 'localVariableInDictionaryComprehension'.
+
+	self assert: variable sourceAnchor isNotNil.
+	self assert: variable sourceText equals: 'localVariableInDictionaryComprehension'
+]
+
 { #category : 'tests - local variables' }
 FamixPythonProject1Test >> testLocalVariableInFunctionSourceAnchor [
 
@@ -5752,6 +5774,25 @@ FamixPythonProject1Test >> testReadAccessInUnaryOperator [
 	self assert: (module accesses anySatisfy: [ :anAccess | anAccess variable = global ])
 ]
 
+{ #category : 'tests - accesses' }
+FamixPythonProject1Test >> testReadAccessOfLocalInDictionaryComprehension [
+
+	| global module access |
+	global := self localVariableNamed: 'localVarToAccessInDictionaryComprehension'.
+	module := self moduleNamed: 'moduleAtRoot13'.
+
+	access := (global incomingAccesses select: [ :anAccess | anAccess accessor = module ]) detectMax: [ :anAccess | anAccess sourceAnchor startPos ].
+
+	self assert: access class equals: FamixPythonAccess.
+	self assert: access source equals: module.
+	self assert: access accessor equals: module.
+	self assert: access target equals: global.
+	self assert: access variable equals: global.
+	self deny: access isWrite.
+	self assert: access isRead.
+	self assert: (module accesses anySatisfy: [ :anAccess | anAccess variable = global ])
+]
+
 { #category : 'tests - accesses' }
 FamixPythonProject1Test >> testReadAccessSourceAnchor [
 

src/Famix-Python-Importer/FamixPythonVisitor.class.st

@@ -267,14 +267,6 @@ FamixPythonVisitor >> initialize [
 	importPaths := IdentityDictionary new
 ]
 
-{ #category : 'testing' }
-FamixPythonVisitor >> isAccessOrReferenceNode: anIdentifierNode [
-	"I should return true if an Identifier node represent an access or a reference."
-
-	^ #( elif_clause list argument_list return_statement lambda if_statement comparison_operator binary_operator assignment not_operator expression_statement
-	     augmented_assignment unary_operator boolean_operator pair list_splat default_parameter dictionary_splat #if_clause #for_in_clause generator_expression list_comprehension) includes: anIdentifierNode parent type
-]
-
 { #category : 'testing' }
 FamixPythonVisitor >> isMetaclassDefinition: aClassDefinitionNode [
 
@@ -287,7 +279,7 @@ FamixPythonVisitor >> isMetaclassDefinition: aClassDefinitionNode [
 FamixPythonVisitor >> manageAccessOrReferencesFrom: anIdentifierNode [
 	"To know if the identifier can be an access or reference we need to check its parents."
 
-	(self isAccessOrReferenceNode: anIdentifierNode) ifTrue: [
+	anIdentifierNode isAccessOrReferenceNode ifTrue: [
 			self
 				resolve: ((SRIdentifierResolvable identifier: anIdentifierNode sourceText)
 						 expectedKind: {

src/Famix-Python-Importer/FamixTSNodeWrapper.extension.st

@@ -7,6 +7,15 @@ FamixTSNodeWrapper >> assignationNode [
 	^ self parent ifNotNil: [ self parent assignationNode ]
 ]
 
+{ #category : '*Famix-Python-Importer' }
+FamixTSNodeWrapper >> isAccessOrReferenceNode [
+	"I should return true if an Identifier node represent an access or a reference."
+
+	^ #( elif_clause list argument_list return_statement lambda if_statement comparison_operator binary_operator assignment not_operator expression_statement
+	     augmented_assignment unary_operator boolean_operator pair list_splat default_parameter dictionary_splat #if_clause #for_in_clause generator_expression
+	     list_comprehension dictionary_comprehension ) includes: self parent type
+]
+
 { #category : '*Famix-Python-Importer' }
 FamixTSNodeWrapper >> isInField: aName ofParentOfType: aType [
 
@@ -33,6 +42,9 @@ FamixTSNodeWrapper >> isLocalVariableDeclaration [
 	"[localVarInListComprehension for localVarInListComprehension in [4, 5] if localVarInListComprehension > 2]"
 	(self isInField: #body ofParentOfType: #list_comprehension) ifTrue: [ ^ true ].
 
+	"{localVariableInDictionaryComprehension * localVariableInDictionaryComprehension: localVariableInDictionaryComprehension for localVariableInDictionaryComprehension in [4, 5] if localVariableInDictionaryComprehension > 10}"
+	(self isInField: #body ofParentOfType: #dictionary_comprehension) ifTrue: [ ^ true ].
+	
 	^ false
 ]