Merge remote-tracking branch 'origin/MPS2019.3'

# Conflicts: # .mps/migration.xml # .mps/workspace.xml # build.xml # languages/AWSStateMachine/AWSStateMachine.mpl # languages/AWSStateMachine/classes_gen/AWSStateMachine/Language.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/behavior/Value__BehaviorDescriptor.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/behavior/trace.info # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/BooleanValue_EditorBuilder_a$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/ChoiceRule_EditorBuilder_a$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/ChoiceRule_EditorBuilder_a$2$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/ChoiceRule_EditorBuilder_a$2.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/ChoiceRule_EditorBuilder_a$3.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/ChoiceRule_EditorBuilder_a$Inline_Builder0$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/Comparison_EditorBuilder_a$1$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/Comparison_EditorBuilder_a$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/Comparison_EditorBuilder_a$2.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/Comparison_EditorBuilder_a$3.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/Comparison_EditorBuilder_a$Inline_Builder0$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/IntegerValue_EditorBuilder_a$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/StateMachine_EditorBuilder_a$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/StateMachine_EditorBuilder_a$2.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/StateMachine_EditorBuilder_a$3.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/StateMachine_EditorBuilder_a$4.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/StateMachine_EditorBuilder_a$5$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/StateMachine_EditorBuilder_a$5.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/StateMachine_EditorBuilder_a$6.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/StateMachine_EditorBuilder_a$Inline_Builder0$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/State_EditorBuilder_a$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/State_EditorBuilder_a$2.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/State_EditorBuilder_a$3.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/State_EditorBuilder_a$4.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/State_EditorBuilder_a$5.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/State_EditorBuilder_a$6.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/State_EditorBuilder_a$7.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/State_EditorBuilder_a$8$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/State_EditorBuilder_a$8.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/State_EditorBuilder_a$9.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/State_EditorBuilder_a$Inline_Builder0$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/State_EditorBuilder_a$Inline_Builder0.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/State_EditorBuilder_a.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/StringValue_EditorBuilder_a$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/VariableReference_EditorBuilder_a$1$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/VariableReference_EditorBuilder_a$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/VariableReference_EditorBuilder_a$2.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/VariableReference_EditorBuilder_a$Inline_Builder0$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/Variable_EditorBuilder_a$1.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/editor/trace.info # languages/AWSStateMachine/classes_gen/AWSStateMachine/structure/StructureAspectDescriptor.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/structure/aspectcps-descriptorclasses.mps # languages/AWSStateMachine/classes_gen/AWSStateMachine/structure/trace.info # languages/AWSStateMachine/classes_gen/AWSStateMachine/trace.info # languages/AWSStateMachine/classes_gen/AWSStateMachine/typesystem/CheckState_NonTypesystemRule.class # languages/AWSStateMachine/classes_gen/AWSStateMachine/typesystem/aspectcps-descriptorclasses.mps # languages/AWSStateMachine/classes_gen/AWSStateMachine/typesystem/trace.info # languages/AWSStateMachine/generator/classes_gen/main/QueriesGenerated$IfMC.class # languages/AWSStateMachine/generator/classes_gen/main/QueriesGenerated$PVQ.class # languages/AWSStateMachine/generator/classes_gen/main/QueriesGenerated$RRC.class # languages/AWSStateMachine/generator/classes_gen/main/QueriesGenerated$SNQ.class # languages/AWSStateMachine/generator/classes_gen/main/QueriesGenerated$SNsQ.class # languages/AWSStateMachine/generator/classes_gen/main/QueriesGenerated.class # languages/AWSStateMachine/generator/classes_gen/main/trace.info # languages/AWSStateMachine/generator/source_gen.caches/AWSStateMachine/generated # languages/AWSStateMachine/generator/source_gen.caches/main/dependencies # languages/AWSStateMachine/generator/source_gen.caches/main/generated # languages/AWSStateMachine/generator/source_gen/main/QueriesGenerated.java # languages/AWSStateMachine/generator/source_gen/main/trace.info # languages/AWSStateMachine/generator/template/[email protected] # languages/AWSStateMachine/models/behavior.mps # languages/AWSStateMachine/models/editor.mps # languages/AWSStateMachine/models/typesystem.mps # languages/AWSStateMachine/sandbox/AWSStateMachine.sandbox.msd # languages/AWSStateMachine/sandbox/classes_gen/AWSStateMachine/sandbox/null.json # languages/AWSStateMachine/sandbox/models/AWSStateMachine.sandbox.mps # languages/AWSStateMachine/sandbox/source_gen.caches/AWSStateMachine/sandbox/generated # languages/AWSStateMachine/sandbox/source_gen/AWSStateMachine/sandbox/null.json # languages/AWSStateMachine/source_gen.caches/AWSStateMachine/behavior/generated # languages/AWSStateMachine/source_gen.caches/AWSStateMachine/editor/generated # languages/AWSStateMachine/source_gen.caches/AWSStateMachine/generated # languages/AWSStateMachine/source_gen.caches/AWSStateMachine/structure/dependencies # languages/AWSStateMachine/source_gen.caches/AWSStateMachine/typesystem/dependencies # languages/AWSStateMachine/source_gen.caches/AWSStateMachine/typesystem/generated # languages/AWSStateMachine/source_gen/AWSStateMachine/behavior/Value__BehaviorDescriptor.java # languages/AWSStateMachine/source_gen/AWSStateMachine/behavior/trace.info # languages/AWSStateMachine/source_gen/AWSStateMachine/editor/trace.info # languages/AWSStateMachine/source_gen/AWSStateMachine/structure/aspectcps-descriptorclasses.mps # languages/AWSStateMachine/source_gen/AWSStateMachine/structure/trace.info # languages/AWSStateMachine/source_gen/AWSStateMachine/trace.info # languages/AWSStateMachine/source_gen/AWSStateMachine/typesystem/aspectcps-descriptorclasses.mps # languages/AWSStateMachine/source_gen/AWSStateMachine/typesystem/trace.info # languages/ActionSL/ActionSL.mpl # languages/ActionSL/generator/source_gen.caches/ActionSL/generated # languages/ActionSL/models/behavior.mps # languages/ActionSL/models/constraints.mps # languages/ActionSL/models/editor.mps # languages/ActionSL/models/typesystem.mps # languages/ConstructionSL/ConstructionSL.mpl # languages/ConstructionSL/generator/source_gen.caches/ConstructionSL/generated # languages/ConstructionSL/models/behavior.mps # languages/ConstructionSL/models/editor.mps # languages/ConstructionSL/models/typesystem.mps # languages/DemoSL/DemoSL.mpl # languages/DemoSL/generator/classes_gen/DemoSL/Generator.class # languages/DemoSL/generator/classes_gen/main/QueriesGenerated$10.class # languages/DemoSL/generator/classes_gen/main/QueriesGenerated$13.class # languages/DemoSL/generator/classes_gen/main/QueriesGenerated$7.class # languages/DemoSL/generator/classes_gen/main/QueriesGenerated$8.class # languages/DemoSL/generator/classes_gen/main/QueriesGenerated$9.class # languages/DemoSL/generator/classes_gen/main/QueriesGenerated$PVQ.class # languages/DemoSL/generator/classes_gen/main/QueriesGenerated$RTQ.class # languages/DemoSL/generator/classes_gen/main/QueriesGenerated$SNsQ.class # languages/DemoSL/generator/classes_gen/main/QueriesGenerated.class # languages/DemoSL/generator/classes_gen/main/trace.info # languages/DemoSL/generator/source_gen.caches/DemoSL/generated # languages/DemoSL/generator/source_gen.caches/main/dependencies # languages/DemoSL/generator/source_gen.caches/main/generated # languages/DemoSL/generator/source_gen/main/QueriesGenerated.java # languages/DemoSL/generator/source_gen/main/trace.info # languages/DemoSL/generator/template/[email protected] # languages/DemoSL/models/behavior.mps # languages/DemoSL/models/constraints.mps # languages/DemoSL/models/editor.mps # languages/DemoSL/models/intentions.mps # languages/DemoSL/models/structure.mps # languages/DemoSLToAWS/generator/classes_gen/main/QueriesGenerated$1.class # languages/DemoSLToAWS/generator/classes_gen/main/QueriesGenerated$12.class # languages/DemoSLToAWS/generator/classes_gen/main/QueriesGenerated$19.class # languages/DemoSLToAWS/generator/classes_gen/main/QueriesGenerated$2.class # languages/DemoSLToAWS/generator/classes_gen/main/QueriesGenerated$4.class # languages/DemoSLToAWS/generator/classes_gen/main/QueriesGenerated$6.class # languages/DemoSLToAWS/generator/classes_gen/main/QueriesGenerated$8.class # languages/DemoSLToAWS/generator/classes_gen/main/QueriesGenerated$9.class # languages/DemoSLToXML/generator/classes_gen/main/QueriesGenerated$IfMC.class # languages/FactSL/FactSL.mpl # languages/FactSL/generator/source_gen.caches/FactSL/generated # languages/FactSL/models/editor.mps # languages/FactSL/models/typesystem.mps # languages/GeneralSL/GeneralSL.mpl # languages/GeneralSL/generator/source_gen.caches/GeneralSL/generated # languages/GeneralSL/models/behavior.mps # languages/GeneralSL/models/editor/EventKind.mpsr # languages/GeneralSL/models/editor/Executor.mpsr # languages/GeneralSL/models/editor/TransactionKind.mpsr # languages/GeneralSL/models/editor/TransactionKindPSD.mpsr # languages/ProcessSL/ProcessSL.mpl # languages/ProcessSL/generator/source_gen.caches/ProcessSL/generated # languages/ProcessSL/models/behavior.mps # languages/ProcessSL/models/typesystem.mps # solutions/DemoWB.build/DemoWB.build.msd # solutions/DemoWB.build/models/DemoWB.build.mps # solutions/DemoWB.build/source_gen.caches/DemoWB/build/generated # solutions/DemoWB.build/source_gen/DemoWB/build/DemoWB.xml # solutions/DemoWB.build/source_gen/DemoWB/build/trace.info # solutions/Tests/models/[email protected] # solutions/Tests/test_gen.caches/Tests/TestConstructionSL/generated # solutions/WAA/WAA.msd # solutions/WAA/classes_gen/WAA/specifications/WAA.specifications transactionkind afwijzen van het verzoek.json # solutions/WAA/classes_gen/WAA/specifications/WAA.specifications transactionkind automatisch aanpassing overeenkomstig het verzoek.json # solutions/WAA/classes_gen/WAA/specifications/WAA.specifications transactionkind inwilligen verzoek aanpassing arbeidsduur.json # solutions/WAA/classes_gen/WAA/specifications/WAA.specifications transactionkind vaststellen van de spreiding van de uren.json # solutions/WAA/classes_gen/WAA/specifications/WAA.specifications transactionkind verzoek aanpassing arbeidsduur te bespreken.json # solutions/WAA/classes_gen/WAA/specifications/WAA.specifications transactionkind verzoeken om aanpassing van de arbeidsduur.json # solutions/WAA/classes_gen/WAA/specifications/WAA.specifications transactionkind wijzigen van de spreiding van de uren.json # solutions/WAA/models/specifications.mps # solutions/WAA/source_gen.caches/WAA/specifications/generated # solutions/WAA/source_gen/WAA/specifications/WAA.specifications transactionkind afwijzen van het verzoek.json # solutions/WAA/source_gen/WAA/specifications/WAA.specifications transactionkind automatisch aanpassing overeenkomstig het verzoek.json # solutions/WAA/source_gen/WAA/specifications/WAA.specifications transactionkind inwilligen verzoek aanpassing arbeidsduur.json # solutions/WAA/source_gen/WAA/specifications/WAA.specifications transactionkind vaststellen van de spreiding van de uren.json # solutions/WAA/source_gen/WAA/specifications/WAA.specifications transactionkind verzoek aanpassing arbeidsduur te bespreken.json # solutions/WAA/source_gen/WAA/specifications/WAA.specifications transactionkind verzoeken om aanpassing van de arbeidsduur.json # solutions/WAA/source_gen/WAA/specifications/WAA.specifications transactionkind wijzigen van de spreiding van de uren.json # solutions/sandbox/DemowB.sandbox.msd # solutions/sandbox/models/DemowB.Library.mps # solutions/sandbox/models/DemowB.testARS.mps # solutions/sandbox/source_gen.caches/DemowB/Library/generated # solutions/sandbox/source_gen.caches/DemowB/testARS/generated
diederikd · Mar 26, 2020 · aa75de1 · aa75de1
2 parents 3ebb0c2 + d605d6d
commit aa75de1
Show file tree

Hide file tree

Showing 316 changed files with 34,343 additions and 42,336 deletions.
diff --git a/.mps/dictionaries/dulfd00.xml b/.mps/dictionaries/dulfd00.xml
@@ -0,0 +1,7 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="dulfd00">
+    <words>
+      <w>declinance</w>
+    </words>
+  </dictionary>
+</component>
diff --git a/.mps/migration.xml b/.mps/migration.xml
@@ -4,5 +4,6 @@
     <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>
diff --git a/.mps/workspace.xml b/.mps/workspace.xml
diff --git a/build.xml b/build.xml
diff --git a/languages/AWSStateMachine/AWSStateMachine.mpl b/languages/AWSStateMachine/AWSStateMachine.mpl
@@ -5,6 +5,11 @@
       <sourceRoot location="models" />
     </modelRoot>
   </models>
+  <facets>
+    <facet type="java">
+      <classes generated="true" path="${module}/classes_gen" />
+    </facet>
+  </facets>
   <accessoryModels />
   <generators>
     <generator alias="main" namespace="AWSStateMachine#01" uuid="6e089e9e-ba0a-471f-9873-153f8bfe1bb7">
@@ -13,23 +18,28 @@
           <sourceRoot location="." />
         </modelRoot>
       </models>
+      <facets>
+        <facet type="java">
+          <classes generated="true" path="${module}/generator/classes_gen" />
+        </facet>
+      </facets>
       <external-templates />
       <languageVersions>
         <language slang="l:b5c0bb04-c583-4b2a-a66e-1eab92d33c68:com.mbeddr.mpsutil.json" version="0" />
-        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="8" />
+        <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="9" />
         <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
         <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
         <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
         <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
-        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
-        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
+        <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+        <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="4" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
@@ -41,6 +51,7 @@
         <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" 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" />
       </dependencyVersions>
       <mapping-priorities />
     </generator>
@@ -51,7 +62,7 @@
     <dependency reexport="false" scope="generate-into">b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)</dependency>
   </dependencies>
   <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="8" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="9" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
@@ -60,19 +71,29 @@
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
-    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="4" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
+    <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
+    <language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />
+    <language slang="l:5dae8159-ab99-46bb-a40d-0cee30ee7018:jetbrains.mps.lang.constraints.rules.kinds" version="0" />
+    <language slang="l:134c38d4-e3af-4d9e-b069-1c7df0a4005d:jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
+    <language slang="l:3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7:jetbrains.mps.lang.context" version="0" />
+    <language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
-    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
+    <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="4" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
-    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
+    <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
+    <language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
+    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="1" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
   </languageVersions>
   <dependencyVersions>
     <module reference="ad34076b-b44b-4b8e-9aa6-566fa22fe764(AWSStateMachine)" version="0" />
@@ -86,6 +107,7 @@
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
+    <module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
     <module reference="b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>

diff --git a/languages/AWSStateMachine/classes_gen/AWSStateMachine/Language.class b/languages/AWSStateMachine/classes_gen/AWSStateMachine/Language.class
diff --git a/...uages/AWSStateMachine/classes_gen/AWSStateMachine/behavior/BehaviorAspectDescriptor.class b/...uages/AWSStateMachine/classes_gen/AWSStateMachine/behavior/BehaviorAspectDescriptor.class
diff --git a/...SStateMachine/classes_gen/AWSStateMachine/behavior/BooleanValue__BehaviorDescriptor.class b/...SStateMachine/classes_gen/AWSStateMachine/behavior/BooleanValue__BehaviorDescriptor.class
diff --git a/...SStateMachine/classes_gen/AWSStateMachine/behavior/IntegerValue__BehaviorDescriptor.class b/...SStateMachine/classes_gen/AWSStateMachine/behavior/IntegerValue__BehaviorDescriptor.class
diff --git a/...WSStateMachine/classes_gen/AWSStateMachine/behavior/StringValue__BehaviorDescriptor.class b/...WSStateMachine/classes_gen/AWSStateMachine/behavior/StringValue__BehaviorDescriptor.class
diff --git a/...ages/AWSStateMachine/classes_gen/AWSStateMachine/behavior/Value__BehaviorDescriptor.class b/...ages/AWSStateMachine/classes_gen/AWSStateMachine/behavior/Value__BehaviorDescriptor.class