First working version of FieldAccessExpression resolution for accesse…

…s and references when there is an import.

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

@@ -859,9 +859,9 @@ FamixPythonProject1Test >> testFunctionSourceAnchor [
 
 	self assert: function sourceAnchor isNotNil.
 	self assert: function sourceText equals: ('def sort_list(list1, list2):
-	zipped_pairs = zip(list2, list1)
-	z = [x for _, x in sorted(zipped_pairs)]
-	return z' copyReplaceAll: String cr with: String lf)
+    zipped_pairs = zip(list2, list1)
+    z = [x for _, x in sorted(zipped_pairs)]
+    return z' copyReplaceAll: String cr with: String lf)
 ]
 
 { #category : 'tests - functions' }
@@ -2195,7 +2195,6 @@ FamixPythonProject1Test >> testReadAccessFromFunction [
 FamixPythonProject1Test >> testReadAccessFromImportedGlobalWithNamespace [
 
 	| global module access |
-	self skip.
 	global := self globalVariableNamed: 'rootPackage2Variable'.
 	module := self moduleNamed: 'moduleAtRoot'.
 

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

@@ -0,0 +1,84 @@
+"
+I am a resolvable to resolve accesses or references to entities that are imported using a simple `import` and not a `from import`. For example
+
+```python
+import moduleAtRoot
+
+print(moduleAtRoot.moduleAtRootVariable)
+```
+"
+Class {
+	#name : 'FamixPythonImportedAccessOrReferenceResolvable',
+	#superclass : 'SRResolvable',
+	#instVars : [
+		'import',
+		'identifier',
+		'entity'
+	],
+	#category : 'Famix-Python-Importer-SymbolResolution',
+	#package : 'Famix-Python-Importer',
+	#tag : 'SymbolResolution'
+}
+
+{ #category : 'instance creation' }
+FamixPythonImportedAccessOrReferenceResolvable class >> identifier: aString import: anImport [
+
+	^ self new
+		  identifier: aString;
+		  import: anImport;
+		  yourself
+]
+
+{ #category : 'hooks' }
+FamixPythonImportedAccessOrReferenceResolvable >> applyReplacementStrategyWithCurrentEntity: aCurrentEntity [
+
+	self entity: (self notFoundReplacementEntity cull: self cull: aCurrentEntity)
+]
+
+{ #category : 'accessing' }
+FamixPythonImportedAccessOrReferenceResolvable >> entity [
+
+	^ entity
+]
+
+{ #category : 'accessing' }
+FamixPythonImportedAccessOrReferenceResolvable >> entity: anObject [
+
+	entity := anObject
+]
+
+{ #category : 'accessing' }
+FamixPythonImportedAccessOrReferenceResolvable >> identifier [
+
+	^ identifier
+]
+
+{ #category : 'accessing' }
+FamixPythonImportedAccessOrReferenceResolvable >> identifier: anObject [
+
+	identifier := anObject
+]
+
+{ #category : 'accessing' }
+FamixPythonImportedAccessOrReferenceResolvable >> import [
+
+	^ import
+]
+
+{ #category : 'accessing' }
+FamixPythonImportedAccessOrReferenceResolvable >> import: anObject [
+
+	import := anObject
+]
+
+{ #category : 'resolution' }
+FamixPythonImportedAccessOrReferenceResolvable >> resolveInScope: aScope currentEntity: currentEntity [
+
+	^ (import importedEntity definedEntitiesNamed: identifier ofKinds: {
+			   FamixPythonClass.
+			   FamixPythonFunction.
+			   FamixPythonLocalVariable.
+			   FamixPythonGlobalVariable.
+			   FamixPythonAttribute.
+			   FamixPythonParameter }) ifEmpty: [ SRNoResolutionPossible signal ] ifNotEmpty: [ :entities | self entity: entities anyOne ]
+]

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

@@ -742,9 +742,28 @@ FamixPythonImporterVisitor >> visitClassDefinition: aClassDef [
 FamixPythonImporterVisitor >> visitFieldAccessExpression: aFieldAccessExpression [
 
 	self flag: #todo. "Manage invocations."
-	aFieldAccessExpression parent isFunctionCallExpression ifTrue: [ ^ aFieldAccessExpression source ].
-
-	aFieldAccessExpression source traceCr.
+	(aFieldAccessExpression parent isFunctionCallExpression and: [ aFieldAccessExpression parent receiver = aFieldAccessExpression ]) ifTrue: [
+		^ aFieldAccessExpression source ].
+
+	(self currentEntity withAllParents flatCollect: [ :entity | (entity query outgoing local dependenciesOfType: FamixPythonImport) reject: #isFromImport ])
+		detect: [ :import |
+			| importPath |
+			importPath := import importPath , '.'.
+
+			(aFieldAccessExpression source beginsWith: importPath) and: [ ((aFieldAccessExpression source withoutPrefix: importPath) includes: $.) not ] ]
+		ifFound: [ :import |
+			self
+				resolve: ((FamixPythonImportedAccessOrReferenceResolvable identifier: aFieldAccessExpression name import: import)
+						 notFoundReplacementEntity: [ :unresolved :currentEntity | self ensureStubUnknownAccessedOrReferencedEntityNamed: unresolved identifier ];
+						 yourself)
+				foundAction: [ :entity :currentEntity |
+					| association |
+					association := entity createAccessOrReferenceFrom: currentEntity node: aFieldAccessExpression.
+					self setSourceAnchor: association from: aFieldAccessExpression ].
+			^ aFieldAccessExpression source ].
+
+	"	aFieldAccessExpression source traceCr.
+"
 	^ aFieldAccessExpression source
 ]