feat(model-api-gen): added enum support to generator

Co-authored-by: Sascha Lisson <[email protected]>

Author: mhuster23

metamodel-export/.mps/migration.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="MigrationProperties">
+    <entry key="jetbrains.mps.ide.mpsmigration.v182.ReapplyPatternMigration" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v191.SaveAllJavaStubMethodRefsToShortForeignFormat" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v191.UpdateJavaStubMethodRefs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2019_3.DefaultFacetExplicitPersistence" value="executed" />
   </component>
 </project>

metamodel-export/org.modelix.metamodel.export/models/org.modelix.metamodel.export.mps

@@ -5,8 +5,6 @@
       <sourceRoot location="models" />
     </modelRoot>
     <modelRoot contentPath="${module}/lib" type="java_classes">
-      <sourceRoot location="metamodel-generator.jar" />
-      <sourceRoot location="metamodel-runtime-jvm.jar" />
       <sourceRoot location="model-api-jvm.jar" />
       <sourceRoot location="kaml-jvm.jar" />
       <sourceRoot location="kotlin-logging-jvm.jar" />
@@ -20,6 +18,9 @@
       <sourceRoot location="kotlinx-serialization-core-jvm.jar" />
       <sourceRoot location="kotlinx-serialization-json-jvm.jar" />
       <sourceRoot location="snakeyaml-engine.jar" />
+      <sourceRoot location="model-api-gen-runtime-jvm.jar" />
+      <sourceRoot location="model-api-gen.jar" />
+      <sourceRoot location="slf4j-api.jar" />
     </modelRoot>
   </models>
   <facets>
@@ -28,8 +29,6 @@
     </facet>
   </facets>
   <stubModelEntries>
-    <stubModelEntry path="${module}/lib/metamodel-generator.jar" />
-    <stubModelEntry path="${module}/lib/metamodel-runtime-jvm.jar" />
     <stubModelEntry path="${module}/lib/model-api-jvm.jar" />
     <stubModelEntry path="${module}/lib/kaml-jvm.jar" />
     <stubModelEntry path="${module}/lib/kotlin-logging-jvm.jar" />
@@ -43,6 +42,9 @@
     <stubModelEntry path="${module}/lib/kotlinx-serialization-core-jvm.jar" />
     <stubModelEntry path="${module}/lib/kotlinx-serialization-json-jvm.jar" />
     <stubModelEntry path="${module}/lib/snakeyaml-engine.jar" />
+    <stubModelEntry path="${module}/lib/model-api-gen-runtime-jvm.jar" />
+    <stubModelEntry path="${module}/lib/model-api-gen.jar" />
+    <stubModelEntry path="${module}/lib/slf4j-api.jar" />
   </stubModelEntries>
   <sourcePath />
   <dependencies>
@@ -62,7 +64,7 @@
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="18" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
@@ -73,7 +75,6 @@
     <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
-    <module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
     <module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
     <module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
     <module reference="e52a4421-48a2-4de1-8327-d9414e799c67(org.modelix.metamodel.export)" version="0" />

metamodel-export/org.modelix.metamodel.export/org.modelix.metamodel.export.msd

@@ -3,13 +3,13 @@
  */
 package org.modelix.metamodel.gradle
 
-import java.io.File
 import org.gradle.testkit.runner.GradleRunner
 import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
 import org.modelix.model.data.LanguageData
+import java.io.File
 
 /**
  * A simple functional test for the 'org.modelix.model-api-gen' plugin.

model-api-gen-gradle/src/functionalTest/kotlin/org/modelix/metamodel/gradle/MetaModelGradlePluginFunctionalTest.kt

@@ -43,5 +43,7 @@
                 "jetbrains.mps.lang.core.InterfacePart"
             ]
         }
+    ],
+    "enums": [
     ]
 }

model-api-gen-gradle/src/functionalTest/resources/json/jetbrains.mps.baseLanguage.blTypes.json

@@ -514,5 +514,7 @@
                 "jetbrains.mps.baseLanguage.builders.BaseSimpleBuilderDeclaration"
             ]
         }
+    ],
+    "enums": [
     ]
 }

model-api-gen-gradle/src/functionalTest/resources/json/jetbrains.mps.baseLanguage.builders.json

@@ -15,5 +15,7 @@
                 "jetbrains.mps.baseLanguage.DotExpression"
             ]
         }
+    ],
+    "enums": [
     ]
 }

model-api-gen-gradle/src/functionalTest/resources/json/jetbrains.mps.baseLanguage.checkedDots.json

@@ -218,5 +218,7 @@
                 "jetbrains.mps.baseLanguage.classifiers.IClassifier"
             ]
         }
+    ],
+    "enums": [
     ]
 }

model-api-gen-gradle/src/functionalTest/resources/json/jetbrains.mps.baseLanguage.classifiers.json

@@ -117,7 +117,8 @@
             "references": [
             ],
             "extends": [
-                "jetbrains.mps.baseLanguage.Expression"
+                "jetbrains.mps.baseLanguage.Expression",
+                "jetbrains.mps.baseLanguage.closures.IIncompatibleWithJavaLambda"
             ]
         },
         {
@@ -136,7 +137,8 @@
             "references": [
             ],
             "extends": [
-                "jetbrains.mps.baseLanguage.Statement"
+                "jetbrains.mps.baseLanguage.Statement",
+                "jetbrains.mps.baseLanguage.closures.IIncompatibleWithJavaLambda"
             ]
         },
         {
@@ -229,7 +231,8 @@
             "references": [
             ],
             "extends": [
-                "jetbrains.mps.baseLanguage.Statement"
+                "jetbrains.mps.baseLanguage.Statement",
+                "jetbrains.mps.baseLanguage.closures.IIncompatibleWithJavaLambda"
             ]
         },
         {
@@ -372,8 +375,51 @@
             ],
             "extends": [
                 "jetbrains.mps.baseLanguage.closures.FunctionType",
-                "jetbrains.mps.baseLanguage.IInternalType"
+                "jetbrains.mps.baseLanguage.IInternalType",
+                "jetbrains.mps.baseLanguage.IInferredType"
+            ]
+        },
+        {
+            "uid": "mps:fd392034-7849-419d-9071-12563d152375/2524418899405758586",
+            "name": "InferredClosureParameterDeclaration",
+            "properties": [
+            ],
+            "children": [
+            ],
+            "references": [
+            ],
+            "extends": [
+                "jetbrains.mps.baseLanguage.closures.UnboundClosureParameterDeclaration",
+                "jetbrains.mps.baseLanguage.IInferredExpression"
+            ]
+        },
+        {
+            "uid": "mps:fd392034-7849-419d-9071-12563d152375/8992394414545679616",
+            "name": "ClosureVarType",
+            "properties": [
+            ],
+            "children": [
+            ],
+            "references": [
+            ],
+            "extends": [
+                "jetbrains.mps.baseLanguage.UndefinedType"
+            ]
+        },
+        {
+            "uid": "mps:fd392034-7849-419d-9071-12563d152375/8621757076157993699",
+            "name": "IIncompatibleWithJavaLambda",
+            "abstract": true,
+            "properties": [
+            ],
+            "children": [
+            ],
+            "references": [
+            ],
+            "extends": [
             ]
         }
+    ],
+    "enums": [
     ]
 }

model-api-gen-gradle/src/functionalTest/resources/json/jetbrains.mps.baseLanguage.closures.json

@@ -808,7 +808,8 @@
             "references": [
             ],
             "extends": [
-                "jetbrains.mps.baseLanguage.collections.SequenceOperation"
+                "jetbrains.mps.baseLanguage.collections.SequenceOperation",
+                "jetbrains.mps.baseLanguage.IInferenceContextProvider"
             ]
         },
         {
@@ -1661,7 +1662,8 @@
             "properties": [
                 {
                     "uid": "83888646-71ce-4f1c-9c53-c54016f6ad4f/1240216724530/1240219919705",
-                    "name": "order"
+                    "name": "order",
+                    "type": "jetbrains.mps.baseLanguage.collections.LinkedHashMapOrder"
                 }
             ],
             "children": [
@@ -2872,5 +2874,22 @@
                 "jetbrains.mps.baseLanguage.collections.NoArgumentsSequenceOperation"
             ]
         }
+    ],
+    "enums": [
+        {
+            "uid": "83888646-71ce-4f1c-9c53-c54016f6ad4f/1240219850850",
+            "name": "jetbrains.mps.baseLanguage.collections.LinkedHashMapOrder",
+            "members": [
+                {
+                    "uid": "83888646-71ce-4f1c-9c53-c54016f6ad4f/1240219850850/1240219850851",
+                    "name": "insertion_order"
+                },
+                {
+                    "uid": "83888646-71ce-4f1c-9c53-c54016f6ad4f/1240219850850/1240219896671",
+                    "name": "access_order"
+                }
+            ],
+            "defaultIndex": 0
+        }
     ]
 }