From 93aab196391ff1f250d260fb91cffba7a9877dee Mon Sep 17 00:00:00 2001
From: Gabriel Darbord <gabriel.darbord@inria.fr>
Date: Mon, 29 Apr 2024 10:38:01 +0200
Subject: [PATCH 1/2] Add `FamixStModel>>#newModelAddingAll:` to create a new
 expanded model

---
 .../FamixStModel.extension.st                 | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 src/Moose-SmalltalkImporter/FamixStModel.extension.st

diff --git a/src/Moose-SmalltalkImporter/FamixStModel.extension.st b/src/Moose-SmalltalkImporter/FamixStModel.extension.st
new file mode 100644
index 000000000..2f9d1880f
--- /dev/null
+++ b/src/Moose-SmalltalkImporter/FamixStModel.extension.st
@@ -0,0 +1,25 @@
+Extension { #name : #FamixStModel }
+
+{ #category : #'*Moose-SmalltalkImporter' }
+FamixStModel >> newModelAddingAll: classesAndPackages [
+	"Returns a new model with all current entities plus the requested classes and packages."
+
+	| model task request |
+	task := FamixStPharoImporterTask new
+		        model: (model := self class named: name);
+		        importingContext:
+			        FamixStImporterContext new mergeClassAndMetaclass
+				        importMaximum.
+
+	request := (self entityStorage selectAllWithType: FamixStPackage)
+		           collect: [ :famixPackage | famixPackage name asPackage ]
+		           as: Set.
+	request addAll: classesAndPackages.
+	request do: [ :packageOrClass |
+		packageOrClass isClass
+			ifTrue: [ task addClass: packageOrClass ]
+			ifFalse: [ task addFromPackage: packageOrClass ] ].
+
+	task runWithProgress.
+	^ model "no install: not added to root and groups not cached"
+]

From 4130fcd7fadfdd41e8cfe9ac158f52b0aa095544 Mon Sep 17 00:00:00 2001
From: Gabriel Darbord <gabriel.darbord@inria.fr>
Date: Mon, 29 Apr 2024 10:49:32 +0200
Subject: [PATCH 2/2] Rename variable

---
 src/Moose-SmalltalkImporter/FamixStModel.extension.st | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Moose-SmalltalkImporter/FamixStModel.extension.st b/src/Moose-SmalltalkImporter/FamixStModel.extension.st
index 2f9d1880f..6d20347db 100644
--- a/src/Moose-SmalltalkImporter/FamixStModel.extension.st
+++ b/src/Moose-SmalltalkImporter/FamixStModel.extension.st
@@ -15,10 +15,10 @@ FamixStModel >> newModelAddingAll: classesAndPackages [
 		           collect: [ :famixPackage | famixPackage name asPackage ]
 		           as: Set.
 	request addAll: classesAndPackages.
-	request do: [ :packageOrClass |
-		packageOrClass isClass
-			ifTrue: [ task addClass: packageOrClass ]
-			ifFalse: [ task addFromPackage: packageOrClass ] ].
+	request do: [ :classOrPackage |
+		classOrPackage isClass
+			ifTrue: [ task addClass: classOrPackage ]
+			ifFalse: [ task addFromPackage: classOrPackage ] ].
 
 	task runWithProgress.
 	^ model "no install: not added to root and groups not cached"