Skip to content

Commit

Permalink
Merge pull request #760 from moosetechnology/fix-import-error
Browse files Browse the repository at this point in the history
Fix importer error.
Fix moosetechnology/MooseIDE#1056
  • Loading branch information
ClotildeToullec authored Apr 19, 2024
2 parents 43ec039 + f8a1042 commit f89f49c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ImportStubMethodSpecialTest >> setUp [
model: FamixStModel new;
addFromPackageNamed: #'Moose-TestResources-LAN';
yourself.
importingTask importingContext importSmalltalkStubMethod.
importingTask importingContext importStubMethod.
importingTask run.
model := importingTask model
]
Expand Down
10 changes: 5 additions & 5 deletions src/Moose-SmalltalkImporter/FamixStImporterContext.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ FamixStImporterContext class >> defineEntityDependencies [
with: self importingLocalVariable
with: self importingAccess
with: self importingArgument);
at: self importingSmalltalkStubMethod put: (Set with: self importingMethod with: self importingSmalltalkStubMethod)
at: self importingStubMethod put: (Set with: self importingMethod with: self importingStubMethod)
]

{ #category : #initialize }
Expand Down Expand Up @@ -150,7 +150,7 @@ FamixStImporterContext class >> importingPackage [
]

{ #category : #'basic representation' }
FamixStImporterContext class >> importingSmalltalkStubMethod [
FamixStImporterContext class >> importingStubMethod [

^#StubMethod
]
Expand Down Expand Up @@ -312,10 +312,10 @@ FamixStImporterContext >> importPackage [
]

{ #category : #'importing-filters' }
FamixStImporterContext >> importSmalltalkStubMethod [
FamixStImporterContext >> importStubMethod [
"Kind of a hack to import stub-methods in smalltalk"

self entityKindsToBeExtracted addAll: (self allDependentsOf: self class importingSmalltalkStubMethod)
self entityKindsToBeExtracted addAll: (self allDependentsOf: self class importingStubMethod)
]

{ #category : #'import options' }
Expand Down Expand Up @@ -456,7 +456,7 @@ FamixStImporterContext >> shouldImportPackage [
{ #category : #'importing queries' }
FamixStImporterContext >> shouldImportSmalltalkStubMethod [

^self shouldImport: self class importingSmalltalkStubMethod
^self shouldImport: self class importingStubMethod
]

{ #category : #'importing queries' }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ FamixStPharoImporterTask >> defaultImportingContext [

| context |
context := FamixStImporterContext new importMaximum.
context entityKindsToBeExtracted remove: context class importingSmalltalkStubMethod.
context entityKindsToBeExtracted remove: context class importingStubMethod.
^ context
]

Expand Down

0 comments on commit f89f49c

Please sign in to comment.