Extract generic support for launching code rules into a separate plugin solution.

.gitignore

@@ -15,5 +15,6 @@ system/*
 logic/solutions/jetbrains.mps.logic.reactor/lib/*
 logic/solutions/jetbrains.mps.logic.test/lib/*
 typechecking/solutions/jetbrains.mps.typechecking/lib/*
+coderules/solutions/jetbrains.mps.coderules/lib/*
 MPS_HOME
 TEST-*

.mps/modules.xml

@@ -4,6 +4,7 @@
     <projectModules>
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl" folder="coderules" />
       <modulePath path="$PROJECT_DIR$/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd" folder="coderules" />
+      <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd" folder="coderules" />
       <modulePath path="$PROJECT_DIR$/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd" folder="coderules" />
       <modulePath path="$PROJECT_DIR$/logic/languages/jetbrains.mps.dataform/jetbrains.mps.dataform.mpl" folder="logic" />
       <modulePath path="$PROJECT_DIR$/logic/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl" folder="logic" />

build.gradle

@@ -66,7 +66,8 @@ def allInitDependencies = [
   'installMps',
   'logic/solutions/jetbrains.mps.logic.reactor:copyDependencies',
   'logic/solutions/jetbrains.mps.logic.test:copyDependencies',
-  'typechecking/solutions/jetbrains.mps.typechecking:copyDependencies' ]
+  'typechecking/solutions/jetbrains.mps.typechecking:copyDependencies',
+  'coderules/solutions/jetbrains.mps.coderules:copyDependencies' ]
 
 task init(dependsOn: allInitDependencies) {
   doLast {

build.xml

@@ -493,9 +493,6 @@
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
-        <library jar="lib/reactive-streams-1.0.0.final.jar" />
-        <library jar="lib/rxjava-2.1.1.jar" />
-        <library jar="lib/rxjava2-swing-0.2.1.jar" />
         <classpath>
           <entry path="." />
         </classpath>
@@ -949,10 +946,10 @@
     <copy todir="${build.layout}/tests/lib">
       <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib" />
     </copy>
-    <mkdir dir="${build.tmp}/default/typechecking-0.4.zip" />
-    <mkdir dir="${build.tmp}/default/typechecking-0.4.zip/typechecking" />
-    <mkdir dir="${build.tmp}/default/typechecking-0.4.zip/typechecking/META-INF" />
-    <echoxml file="${build.tmp}/default/typechecking-0.4.zip/typechecking/META-INF/plugin.xml">
+    <mkdir dir="${build.tmp}/default/typechecking-0.5.zip" />
+    <mkdir dir="${build.tmp}/default/typechecking-0.5.zip/typechecking" />
+    <mkdir dir="${build.tmp}/default/typechecking-0.5.zip/typechecking/META-INF" />
+    <echoxml file="${build.tmp}/default/typechecking-0.5.zip/typechecking/META-INF/plugin.xml">
       <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
         <id>jetbrains.mps.typechecking</id>
         <name>Typechecking with Constraint Rules</name>
@@ -965,7 +962,7 @@
         </extensions>
       </idea-plugin>
     </echoxml>
-    <mkdir dir="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages" />
+    <mkdir dir="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.jar1" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.jar1/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.logic.jar1/META-INF/module.xml">
@@ -996,7 +993,7 @@
         <sources jar="jetbrains.mps.logic-src.jar" descriptor="jetbrains.mps.logic.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.logic.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.logic.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic" />
       <fileset dir="${basedir}/logic/languages/jetbrains.mps.logic" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1024,7 +1021,7 @@
         <sources jar="jetbrains.mps.logic-src.jar" descriptor="jetbrains.mps.logic.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.logic-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.logic-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.logic-generator.jar1" />
     </jar>
@@ -1034,7 +1031,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/logic-languages-jetbrains.mps.logic-languageModels1">
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.logic-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.logic-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1074,7 +1071,7 @@
         <sources jar="jetbrains.mps.dataform-src.jar" descriptor="jetbrains.mps.dataform.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.dataform.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.dataform.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.dataform" />
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.dataform/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.dataform.jar1" />
@@ -1102,7 +1099,7 @@
         <sources jar="jetbrains.mps.dataform-src.jar" descriptor="jetbrains.mps.dataform.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.dataform-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.dataform-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.dataform#01" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.dataform-generator.jar1" />
     </jar>
@@ -1112,7 +1109,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/logic-languages-jetbrains.mps.dataform-models1">
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.dataform/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.dataform-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.dataform-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.dataform/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1146,11 +1143,11 @@
         <sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.logic.reactor.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.logic.reactor.jar" duplicate="preserve">
       <fileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor" includes="icons/**, resources/**" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.logic.reactor.jar1" />
     </jar>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.logic.reactor-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.logic.reactor-src.jar" duplicate="preserve">
       <zipfileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" prefix="module" />
     </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.logic.runtime.jar1" />
@@ -1175,7 +1172,7 @@
         <sources jar="jetbrains.mps.logic.runtime-src.jar" descriptor="jetbrains.mps.logic.runtime.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.logic.runtime.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.logic.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
       <fileset dir="${basedir}/logic/languages/jetbrains.mps.logic/runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1184,7 +1181,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/logic-languages-jetbrains.mps.logic-runtime-models1">
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.logic.runtime-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.logic.runtime-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/runtime/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1194,6 +1191,51 @@
       <zipfileset file="${basedir}/logic/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/logic-languages-jetbrains.mps.logic-runtime-models1" prefix="module/models" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.coderules.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.coderules" type="solution" uuid="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c">
+        <dependencies>
+          <module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
+          <module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
+          <module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
+          <module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
+          <module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
+          <module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
+          <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
+          <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
+          <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <library jar="../lib/reactive-streams-1.0.0.final-0.7.jar" />
+        <library jar="../lib/rxjava-2.1.1.jar" />
+        <library jar="../lib/rxjava2-swing-0.2.1.jar" />
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.coderules-src.jar" descriptor="jetbrains.mps.coderules.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.coderules.jar" duplicate="preserve">
+      <fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules" />
+      <fileset dir="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
+      <fileset dir="${build.tmp}/default/jetbrains.mps.coderules.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules-models">
+      <fileset dir="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.coderules-src.jar" duplicate="preserve">
+      <fileset dir="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/source_gen">
+        <exclude name="**/trace.info" />
+        <exclude name="**/exports" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules-models" prefix="module/models" />
+    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderules.jar1" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.lang.coderules.jar1/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.lang.coderules.jar1/META-INF/module.xml">
@@ -1225,7 +1267,7 @@
         <sources jar="jetbrains.mps.lang.coderules-src.jar" descriptor="jetbrains.mps.lang.coderules.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.lang.coderules.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.coderules.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
       <fileset dir="${basedir}/coderules/languages/jetbrains.mps.lang.coderules" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/coderules/languages/jetbrains.mps.lang.coderules/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1256,7 +1298,7 @@
         <sources jar="jetbrains.mps.lang.coderules-src.jar" descriptor="jetbrains.mps.lang.coderules.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.lang.coderules-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.coderules-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.coderules-generator.jar1" />
     </jar>
@@ -1266,7 +1308,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.coderules-languageModels1">
       <fileset dir="${mps.macro.logic_home}/coderules/languages/jetbrains.mps.lang.coderules/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.lang.coderules-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.coderules-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/coderules/languages/jetbrains.mps.lang.coderules/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1307,7 +1349,7 @@
         <sources jar="jetbrains.mps.lang.coderules.runtime-src.jar" descriptor="jetbrains.mps.lang.coderules.runtime.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.lang.coderules.runtime.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.coderules.runtime.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
       <fileset dir="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/runtime" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1316,7 +1358,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.coderules-runtime-models1">
       <fileset dir="${mps.macro.logic_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.lang.coderules.runtime-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.coderules.runtime-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/coderules/languages/jetbrains.mps.lang.coderules/runtime/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1349,7 +1391,7 @@
         <sources jar="jetbrains.mps.lang.coderules.template-src.jar" descriptor="jetbrains.mps.lang.coderules.template.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.lang.coderules.template.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.coderules.template.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
       <fileset dir="${basedir}/coderules/solutions/jetbrains.mps.lang.coderules.template" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1358,7 +1400,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.lang.coderules.template-models1">
       <fileset dir="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.lang.coderules.template-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.coderules.template-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.lang.coderules.template/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1387,16 +1429,13 @@
           <module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
         </dependencies>
-        <library jar="../lib/reactive-streams-1.0.0.final-0.7.jar" />
-        <library jar="../lib/rxjava-2.1.1.jar" />
-        <library jar="../lib/rxjava2-swing-0.2.1.jar" />
         <classpath>
           <entry path="." />
         </classpath>
         <sources jar="jetbrains.mps.typechecking-src.jar" descriptor="jetbrains.mps.typechecking.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.typechecking.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.typechecking.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking" />
       <fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.typechecking" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1405,7 +1444,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking-models1">
       <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.typechecking-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.typechecking-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1435,7 +1474,7 @@
         <sources jar="jetbrains.mps.typechecking.reporting-src.jar" descriptor="jetbrains.mps.typechecking.reporting.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.typechecking.reporting.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.typechecking.reporting.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
       <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.reporting/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.reporting.jar1" />
@@ -1443,7 +1482,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking.reporting-models1">
       <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.reporting/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.typechecking.reporting-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.typechecking.reporting-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.reporting/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1478,7 +1517,7 @@
         <sources jar="jetbrains.mps.typechecking.ui-src.jar" descriptor="jetbrains.mps.typechecking.ui.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.typechecking.ui.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.typechecking.ui.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
       <fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.ui" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1487,7 +1526,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking.ui-models1">
       <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.typechecking.ui-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.typechecking.ui-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1523,7 +1562,7 @@
         <sources jar="jetbrains.mps.lang.smodel.types-src.jar" descriptor="jetbrains.mps.lang.smodel.types.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.lang.smodel.types.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.smodel.types.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
       <fileset dir="${basedir}/typechecking/languages/jetbrains.mps.lang.smodel.types" includes="icons/**, resources/**" />
       <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -1551,7 +1590,7 @@
         <sources jar="jetbrains.mps.lang.smodel.types-src.jar" descriptor="jetbrains.mps.lang.smodel.types.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.lang.smodel.types-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.smodel.types-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types#7345257067587611144" />
       <fileset dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types-generator.jar1" />
     </jar>
@@ -1561,7 +1600,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.smodel.types-models1">
       <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/typechecking-0.4.zip/typechecking/languages/jetbrains.mps.lang.smodel.types-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.lang.smodel.types-src.jar" duplicate="preserve">
       <fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.lang.smodel.types/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -1578,17 +1617,20 @@
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.smodel.types-generator-template1" prefix="module/generator/template" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.lang.smodel.types-models1" prefix="module/models" />
     </jar>
-    <zip destfile="${build.layout}/typechecking-0.4.zip">
+    <zip destfile="${build.layout}/typechecking-0.5.zip">
       <zipfileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib" prefix="typechecking/lib" />
       <zipfileset dir="${basedir}/typechecking/solutions/jetbrains.mps.typechecking/lib" prefix="typechecking/lib" />
-      <fileset dir="${build.tmp}/default/typechecking-0.4.zip" />
+      <fileset dir="${build.tmp}/default/typechecking-0.5.zip" />
     </zip>
     <echo file="${build.layout}/build.properties">typechecking-plugin.ci.build.num=${ci.build.num}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
   </target>
   
   <target name="buildDependents" />
   
-  <target name="fetchDependencies" />
+  <target name="fetchDependencies">
+    <mkdir dir="${build.tmp}/deps/typechecking-plugin/typechecking-0.5.zip" />
+    <unzip src="${build.layout}/typechecking-0.5.zip" dest="${build.tmp}/deps/typechecking-plugin/typechecking-0.5.zip" />
+  </target>
   
   <target name="build" depends="assemble" />
   
@@ -1597,7 +1639,7 @@
     <delete dir="${build.layout}" />
   </target>
   
-  <target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.dataform#01, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.typechecking.test, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample.test" />
+  <target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.dataform#01, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.typechecking.test, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample.test" />
   
   <target name="processResources" />
   
@@ -1708,6 +1750,7 @@
         <module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.reporting/jetbrains.mps.typechecking.reporting.msd" />
       </chunk>
       <chunk>
+        <module file="${basedir}/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd" />
         <module file="${basedir}/logic/languages/jetbrains.mps.dataform/jetbrains.mps.dataform.mpl" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl" />
         <module file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd" />
@@ -2017,7 +2060,59 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.coderules" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.coderules" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+    <mkdir dir="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.coderules" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.coderules" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" />
+      </src>
+      <classpath>
+        <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
+        <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
+        <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${artifacts.mps}/lib/annotations.jar" />
+        <fileset file="${artifacts.mps}/lib/log4j.jar" />
+        <fileset file="${artifacts.mps}/lib/jdom.jar" />
+        <fileset file="${artifacts.mps}/lib/trove4j.jar" />
+        <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
+        <fileset dir="${artifacts.mps}/lib" includes="*.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+      </classpath>
+    </javac>
+  </target>
+  
+  <target name="java.compile.jetbrains.mps.lang.coderules" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/coderules/languages/jetbrains.mps.lang.coderules/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2042,25 +2137,26 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.dataform" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -2092,7 +2188,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.coderules#4578927328670739933" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.coderules#4578927328670739933" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/coderules/languages/jetbrains.mps.lang.coderules/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2117,6 +2213,9 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.dataform" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
@@ -2124,19 +2223,17 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -2243,7 +2340,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.typechecking" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.typechecking" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2256,17 +2353,13 @@
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
@@ -2274,15 +2367,20 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -2422,7 +2520,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.typechecking.ui" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.typechecking.ui" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2435,16 +2533,13 @@
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
@@ -2452,17 +2547,21 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -2525,7 +2624,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2538,16 +2637,13 @@
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
@@ -2555,17 +2651,21 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -2594,7 +2694,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.typechecking.test" depends="java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.typechecking.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2608,16 +2708,13 @@
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
@@ -2625,19 +2722,23 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
         <fileset file="${artifacts.mps}/lib/junit-4.12.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
@@ -2721,7 +2822,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.typechecking.sample, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.typechecking.sample, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2735,15 +2836,13 @@
         <fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-closures.jar" />
         <fileset file="${artifacts.mps}/lib/mps-collections.jar" />
-        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
         <fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-core.jar" />
         <fileset file="${artifacts.mps}/lib/mps-logging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
@@ -2751,20 +2850,23 @@
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
-        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/ant/lib/ant.jar" />
         <fileset file="${artifacts.mps}/lib/junit-4.12.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
@@ -2874,6 +2976,7 @@
       <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.reporting.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.typechecking.sample.jar" />
+      <pathelement location="${build.tmp}/deps/typechecking-plugin/typechecking-0.5.zip/typechecking/languages/jetbrains.mps.coderules.jar" />
     </path>
     <pathconvert pathsep="${path.separator}" property="mps.libraries.path.string" refid="mps.libraries.path" />
     <path id="mps.plugins.path">
@@ -2946,6 +3049,7 @@
     <delete dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/runtime/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.typechecking.annotation/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.reporting/source_gen" />
+    <delete dir="${mps.macro.logic_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" />
     <delete dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.dataform/source_gen" />
     <delete dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.dataform/generator/source_gen" />
     <delete dir="${mps.macro.logic_home}/coderules/languages/jetbrains.mps.lang.coderules/source_gen" />

coderules/solutions/jetbrains.mps.coderules/build.gradle

@@ -0,0 +1,14 @@
+configurations {
+    codeRules
+}
+
+dependencies {
+    codeRules "io.reactivex.rxjava2:rxjava:${rxjavaRevision}@jar"
+    codeRules "com.github.akarnokd:rxjava2-swing:${rxjavaswingRevision}@jar"
+    codeRules "org.reactivestreams:reactive-streams:${reactivestreamsRevision}@jar"
+}
+
+task copyDependencies (type: Copy) {
+  from configurations.codeRules
+  into 'lib'
+}

coderules/solutions/jetbrains.mps.coderules/gradle.properties

@@ -0,0 +1,3 @@
+rxjavaRevision = 2.1.1
+rxjavaswingRevision = 0.2.1
+reactivestreamsRevision = 1.0.0.final

coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="jetbrains.mps.coderules" uuid="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+    <modelRoot contentPath="${module}/lib" type="java_classes">
+      <sourceRoot location="reactive-streams-1.0.0.final.jar" />
+      <sourceRoot location="rxjava-2.1.1.jar" />
+      <sourceRoot location="rxjava2-swing-0.2.1.jar" />
+    </modelRoot>
+  </models>
+  <stubModelEntries>
+    <stubModelEntry path="${module}/lib/reactive-streams-1.0.0.final.jar" />
+    <stubModelEntry path="${module}/lib/rxjava-2.1.1.jar" />
+    <stubModelEntry path="${module}/lib/rxjava2-swing-0.2.1.jar" />
+  </stubModelEntries>
+  <sourcePath />
+  <dependencies>
+    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
+    <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
+    <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
+    <dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
+  </dependencies>
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
+    <language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
+    <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="0" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
+    <language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="2" />
+    <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="11" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
+    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
+    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
+    <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
+    <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
+  </dependencyVersions>
+</solution>
+

coderules/solutions/jetbrains.mps.coderules/models/plugin.mps

@@ -0,0 +1,608 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:0c18ff61-1cb9-4ff0-a899-c949ad03f97c(jetbrains.mps.coderules.plugin)">
+  <persistence version="9" />
+  <languages>
+    <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="2" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+  </languages>
+  <imports>
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
+    <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
+    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+  </imports>
+  <registry>
+    <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
+      <concept id="1204478074808" name="jetbrains.mps.lang.plugin.structure.ConceptFunctionParameter_MPSProject" flags="nn" index="1KvdUw" />
+    </language>
+    <language id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone">
+      <concept id="481983775135178834" name="jetbrains.mps.lang.plugin.standalone.structure.ProjectPluginDeclaration" flags="ng" index="2uRRBy">
+        <child id="481983775135178836" name="initBlock" index="2uRRB$" />
+        <child id="481983775135178837" name="disposeBlock" index="2uRRB_" />
+      </concept>
+      <concept id="481983775135178819" name="jetbrains.mps.lang.plugin.standalone.structure.ProjectPluginDisposeBlock" flags="in" index="2uRRBN" />
+      <concept id="481983775135178825" name="jetbrains.mps.lang.plugin.standalone.structure.ProjectPluginInitBlock" flags="in" index="2uRRBT" />
+      <concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </concept>
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
+        <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
+      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
+      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <child id="1165602531693" name="superclass" index="1zkMxy" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <property id="4276006055363816570" name="isSynchronized" index="od$2w" />
+        <property id="1181808852946" name="isFinal" index="DiZV1" />
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
+        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk">
+        <child id="1212687122400" name="typeParameter" index="1pMfVU" />
+      </concept>
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
+        <property id="6329021646629104958" name="text" index="3SKdUp" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="2DaZZR" id="4QJVaOvIpzs" />
+  <node concept="2uRRBy" id="7WKNeR8VWis">
+    <property role="TrG5h" value="CodeRulesManagerLifecycle" />
+    <property role="3GE5qa" value="lifecycle" />
+    <node concept="2uRRBT" id="7WKNeR8VWiQ" role="2uRRB$">
+      <node concept="3clFbS" id="7WKNeR8VWiR" role="2VODD2">
+        <node concept="3clFbF" id="7WKNeR8VWpv" role="3cqZAp">
+          <node concept="2YIFZM" id="7WKNeR8VW_Q" role="3clFbG">
+            <ref role="37wK5l" node="7WKNeR8VMwW" resolve="get" />
+            <ref role="1Pybhc" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+            <node concept="2OqwBi" id="7WKNeR8VWXq" role="37wK5m">
+              <node concept="1KvdUw" id="7WKNeR8VWAi" role="2Oq$k0" />
+              <node concept="liA8E" id="7WKNeR8VY8y" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2uRRBN" id="7WKNeR8VWjc" role="2uRRB_">
+      <node concept="3clFbS" id="7WKNeR8VWjd" role="2VODD2">
+        <node concept="3clFbF" id="7WKNeR8VYg9" role="3cqZAp">
+          <node concept="2YIFZM" id="7WKNeR8VYgC" role="3clFbG">
+            <ref role="37wK5l" node="7WKNeR8VPWJ" resolve="dispose" />
+            <ref role="1Pybhc" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+            <node concept="2OqwBi" id="7WKNeR8VZ0O" role="37wK5m">
+              <node concept="1KvdUw" id="7WKNeR8VYiU" role="2Oq$k0" />
+              <node concept="liA8E" id="7WKNeR8W0bW" role="2OqNvi">
+                <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="7WKNeR8VLpH">
+    <property role="TrG5h" value="CodeRulesManager" />
+    <node concept="2tJIrI" id="7WKNeR8VM1Q" role="jymVt" />
+    <node concept="2YIFZL" id="7WKNeR8VMwW" role="jymVt">
+      <property role="TrG5h" value="get" />
+      <node concept="37vLTG" id="7WKNeR8VOgK" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="7WKNeR8VOgL" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="7WKNeR8Wxm0" role="3clF45">
+        <ref role="3uigEE" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+      </node>
+      <node concept="3Tm1VV" id="7WKNeR8VMwZ" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR8VMx0" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR8VNq$" role="3cqZAp">
+          <node concept="2OqwBi" id="7WKNeR8VNq_" role="3clFbG">
+            <node concept="10M0yZ" id="7WKNeR8VPqA" role="2Oq$k0">
+              <ref role="3cqZAo" node="7WKNeR8VMzY" resolve="ourInstances" />
+              <ref role="1PxDUh" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+            </node>
+            <node concept="liA8E" id="7WKNeR8VNqA" role="2OqNvi">
+              <ref role="37wK5l" to="5zyv:~ConcurrentMap.computeIfAbsent(java.lang.Object,java.util.function.Function):java.lang.Object" resolve="computeIfAbsent" />
+              <node concept="37vLTw" id="7WKNeR8VNqB" role="37wK5m">
+                <ref role="3cqZAo" node="7WKNeR8VOgK" resolve="repository" />
+              </node>
+              <node concept="1bVj0M" id="7WKNeR8VNqC" role="37wK5m">
+                <node concept="37vLTG" id="7WKNeR8VNqD" role="1bW2Oz">
+                  <property role="TrG5h" value="repo" />
+                  <node concept="3uibUv" id="7WKNeR8VNqE" role="1tU5fm">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="7WKNeR8VNqF" role="1bW5cS">
+                  <node concept="3clFbF" id="7WKNeR8VNqG" role="3cqZAp">
+                    <node concept="2ShNRf" id="7WKNeR8VNqH" role="3clFbG">
+                      <node concept="1pGfFk" id="7WKNeR8W2EB" role="2ShVmc">
+                        <ref role="37wK5l" node="7WKNeR8VU5d" resolve="CodeRulesManager" />
+                        <node concept="37vLTw" id="7WKNeR8W2Lr" role="37wK5m">
+                          <ref role="3cqZAo" node="7WKNeR8VNqD" resolve="repo" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR8VM1S" role="jymVt" />
+    <node concept="2YIFZL" id="7WKNeR8VPWJ" role="jymVt">
+      <property role="TrG5h" value="dispose" />
+      <node concept="37vLTG" id="7WKNeR8VQgj" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="7WKNeR8VQgk" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7WKNeR8VPWL" role="3clF45" />
+      <node concept="3Tm1VV" id="7WKNeR8VPWM" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR8VPWN" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR8VQAZ" role="3cqZAp">
+          <node concept="2OqwBi" id="7WKNeR8VQB0" role="3clFbG">
+            <node concept="10M0yZ" id="7WKNeR8VTEZ" role="2Oq$k0">
+              <ref role="3cqZAo" node="7WKNeR8VMzY" resolve="ourInstances" />
+              <ref role="1PxDUh" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+            </node>
+            <node concept="liA8E" id="7WKNeR8VQB1" role="2OqNvi">
+              <ref role="37wK5l" to="5zyv:~ConcurrentMap.computeIfPresent(java.lang.Object,java.util.function.BiFunction):java.lang.Object" resolve="computeIfPresent" />
+              <node concept="37vLTw" id="7WKNeR8VQB2" role="37wK5m">
+                <ref role="3cqZAo" node="7WKNeR8VQgj" resolve="repository" />
+              </node>
+              <node concept="1bVj0M" id="7WKNeR8VQB3" role="37wK5m">
+                <node concept="3clFbS" id="7WKNeR8VQB4" role="1bW5cS">
+                  <node concept="3clFbF" id="7WKNeR8VQB5" role="3cqZAp">
+                    <node concept="2OqwBi" id="7WKNeR8VQB6" role="3clFbG">
+                      <node concept="37vLTw" id="7WKNeR8VQB7" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7WKNeR8VQBf" resolve="instance" />
+                      </node>
+                      <node concept="liA8E" id="7WKNeR8VQB8" role="2OqNvi">
+                        <ref role="37wK5l" node="7WKNeR8VSa4" resolve="dispose" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3SKdUt" id="7WKNeR8VQB9" role="3cqZAp">
+                    <node concept="3SKdUq" id="7WKNeR8VQBa" role="3SKWNk">
+                      <property role="3SKdUp" value="remove the mapping" />
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="7WKNeR8VQBb" role="3cqZAp">
+                    <node concept="10Nm6u" id="7WKNeR8VQBc" role="3clFbG" />
+                  </node>
+                </node>
+                <node concept="37vLTG" id="7WKNeR8VQBd" role="1bW2Oz">
+                  <property role="TrG5h" value="repos" />
+                  <node concept="3uibUv" id="7WKNeR8VQBe" role="1tU5fm">
+                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+                  </node>
+                </node>
+                <node concept="37vLTG" id="7WKNeR8VQBf" role="1bW2Oz">
+                  <property role="TrG5h" value="instance" />
+                  <node concept="3uibUv" id="7WKNeR8VR_j" role="1tU5fm">
+                    <ref role="3uigEE" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR8VROu" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR8W8qn" role="jymVt">
+      <property role="TrG5h" value="getSession" />
+      <node concept="37vLTG" id="7WKNeR8W9Me" role="3clF46">
+        <property role="TrG5h" value="model" />
+        <node concept="H_c77" id="7WKNeR8Wa8g" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="7WKNeR8W8ON" role="3clF45">
+        <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+      </node>
+      <node concept="3Tm1VV" id="7WKNeR8W8qq" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR8W8qr" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR8Wiyc" role="3cqZAp">
+          <node concept="2OqwBi" id="7WKNeR8WmN6" role="3clFbG">
+            <node concept="37vLTw" id="7WKNeR8Wiya" role="2Oq$k0">
+              <ref role="3cqZAo" node="7WKNeR8Wgb9" resolve="sessionCache" />
+            </node>
+            <node concept="liA8E" id="7WKNeR8Wnrs" role="2OqNvi">
+              <ref role="37wK5l" to="5zyv:~ConcurrentMap.putIfAbsent(java.lang.Object,java.lang.Object):java.lang.Object" resolve="putIfAbsent" />
+              <node concept="2OqwBi" id="7WKNeR8Wqkq" role="37wK5m">
+                <node concept="2JrnkZ" id="7WKNeR8Wqkr" role="2Oq$k0">
+                  <node concept="37vLTw" id="7WKNeR8Wqks" role="2JrQYb">
+                    <ref role="3cqZAo" node="7WKNeR8W9Me" resolve="model" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="7WKNeR8Wqkt" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SModel.getReference():org.jetbrains.mps.openapi.model.SModelReference" resolve="getReference" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="7WKNeR8Wpbu" role="37wK5m">
+                <ref role="1Pybhc" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+                <ref role="37wK5l" to="hano:7DvO2M9p276" resolve="newSession" />
+                <node concept="37vLTw" id="7WKNeR8Wpbv" role="37wK5m">
+                  <ref role="3cqZAo" node="7WKNeR8W19_" resolve="repository" />
+                </node>
+                <node concept="37vLTw" id="7WKNeR8Wpbw" role="37wK5m">
+                  <ref role="3cqZAo" node="7WKNeR8W9Me" resolve="model" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7WKNeR93utq" role="3cqZAp">
+          <node concept="2OqwBi" id="7WKNeR93uOU" role="3clFbG">
+            <node concept="37vLTw" id="7WKNeR93uto" role="2Oq$k0">
+              <ref role="3cqZAo" node="7WKNeR8Wgb9" resolve="sessionCache" />
+            </node>
+            <node concept="liA8E" id="7WKNeR93w2g" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
+              <node concept="2OqwBi" id="7WKNeR93wkI" role="37wK5m">
+                <node concept="2JrnkZ" id="7WKNeR93wkJ" role="2Oq$k0">
+                  <node concept="37vLTw" id="7WKNeR93wkK" role="2JrQYb">
+                    <ref role="3cqZAo" node="7WKNeR8W9Me" resolve="model" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="7WKNeR93wkL" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SModel.getReference():org.jetbrains.mps.openapi.model.SModelReference" resolve="getReference" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR8WcYf" role="jymVt" />
+    <node concept="3clFbW" id="7WKNeR8VU5d" role="jymVt">
+      <node concept="37vLTG" id="7WKNeR8W0I5" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="7WKNeR8W0QJ" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7WKNeR8VU5f" role="3clF45" />
+      <node concept="3Tm6S6" id="7WKNeR8VUhp" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR8VU5h" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR8W19D" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR8W19F" role="3clFbG">
+            <node concept="2OqwBi" id="7WKNeR8W1Cb" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR8W1Dm" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR8W1OT" role="2OqNvi">
+                <ref role="2Oxat5" node="7WKNeR8W19_" resolve="repository" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="7WKNeR8W19J" role="37vLTx">
+              <ref role="3cqZAo" node="7WKNeR8W0I5" resolve="repository" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="12QmIoyQS8L" role="3cqZAp">
+          <node concept="2OqwBi" id="12QmIoyQSer" role="3clFbG">
+            <node concept="37vLTw" id="12QmIoyQS8J" role="2Oq$k0">
+              <ref role="3cqZAo" node="7WKNeR8W0I5" resolve="repository" />
+            </node>
+            <node concept="liA8E" id="12QmIoyQSs9" role="2OqNvi">
+              <ref role="37wK5l" to="lui2:~SRepository.addRepositoryListener(org.jetbrains.mps.openapi.module.SRepositoryListener):void" resolve="addRepositoryListener" />
+              <node concept="2ShNRf" id="12QmIoyQStf" role="37wK5m">
+                <node concept="1pGfFk" id="12QmIoyQUz1" role="2ShVmc">
+                  <ref role="37wK5l" node="12QmIoyQPTu" resolve="CodeRulesManager.DisposeListener" />
+                  <node concept="37vLTw" id="12QmIoyQUBu" role="37wK5m">
+                    <ref role="3cqZAo" node="7WKNeR8W0I5" resolve="repository" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="12QmIoyQXLS" role="jymVt" />
+    <node concept="3clFb_" id="7WKNeR8VSa4" role="jymVt">
+      <property role="TrG5h" value="dispose" />
+      <node concept="3cqZAl" id="7WKNeR8VSa6" role="3clF45" />
+      <node concept="3Tm6S6" id="7WKNeR8VUi4" role="1B3o_S" />
+      <node concept="3clFbS" id="7WKNeR8VSa8" role="3clF47">
+        <node concept="3clFbF" id="7WKNeR8Wr9j" role="3cqZAp">
+          <node concept="2OqwBi" id="7WKNeR8Wrvc" role="3clFbG">
+            <node concept="37vLTw" id="7WKNeR8Wr9h" role="2Oq$k0">
+              <ref role="3cqZAo" node="7WKNeR8Wgb9" resolve="sessionCache" />
+            </node>
+            <node concept="liA8E" id="7WKNeR8Ws6G" role="2OqNvi">
+              <ref role="37wK5l" to="33ny:~Map.clear():void" resolve="clear" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7WKNeR8W1Tz" role="3cqZAp">
+          <node concept="37vLTI" id="7WKNeR8W2nY" role="3clFbG">
+            <node concept="10Nm6u" id="7WKNeR8W2pI" role="37vLTx" />
+            <node concept="2OqwBi" id="7WKNeR8W1XX" role="37vLTJ">
+              <node concept="Xjq3P" id="7WKNeR8W1Ty" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7WKNeR8W2bE" role="2OqNvi">
+                <ref role="2Oxat5" node="7WKNeR8W19_" resolve="repository" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR8VM1V" role="jymVt" />
+    <node concept="Wx3nA" id="7WKNeR8VMzY" role="jymVt">
+      <property role="TrG5h" value="ourInstances" />
+      <node concept="3Tm6S6" id="7WKNeR8VMzZ" role="1B3o_S" />
+      <node concept="3uibUv" id="7WKNeR8VM$0" role="1tU5fm">
+        <ref role="3uigEE" to="5zyv:~ConcurrentMap" resolve="ConcurrentMap" />
+        <node concept="3uibUv" id="7WKNeR8VM$1" role="11_B2D">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+        <node concept="3uibUv" id="7WKNeR8VN2d" role="11_B2D">
+          <ref role="3uigEE" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7WKNeR8VM$3" role="33vP2m">
+        <node concept="1pGfFk" id="7WKNeR8VM$4" role="2ShVmc">
+          <ref role="37wK5l" to="5zyv:~ConcurrentHashMap.&lt;init&gt;()" resolve="ConcurrentHashMap" />
+          <node concept="3uibUv" id="7WKNeR8VM$5" role="1pMfVU">
+            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+          </node>
+          <node concept="3uibUv" id="7WKNeR8VNg3" role="1pMfVU">
+            <ref role="3uigEE" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7WKNeR8VM1Z" role="jymVt" />
+    <node concept="312cEu" id="12QmIoyQPie" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="DisposeListener" />
+      <node concept="3clFbW" id="12QmIoyQPTu" role="jymVt">
+        <node concept="37vLTG" id="12QmIoyQPVg" role="3clF46">
+          <property role="TrG5h" value="repository" />
+          <node concept="3uibUv" id="12QmIoyQQ2H" role="1tU5fm">
+            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="12QmIoyQPTw" role="3clF45" />
+        <node concept="3Tm1VV" id="12QmIoyQPTx" role="1B3o_S" />
+        <node concept="3clFbS" id="12QmIoyQPTy" role="3clF47">
+          <node concept="3clFbF" id="12QmIoyQQQg" role="3cqZAp">
+            <node concept="37vLTI" id="12QmIoyQQQi" role="3clFbG">
+              <node concept="2OqwBi" id="12QmIoyQQV6" role="37vLTJ">
+                <node concept="Xjq3P" id="12QmIoyQQX2" role="2Oq$k0" />
+                <node concept="2OwXpG" id="12QmIoyQQV9" role="2OqNvi">
+                  <ref role="2Oxat5" node="12QmIoyQQQc" resolve="repository" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="12QmIoyQQQm" role="37vLTx">
+                <ref role="3cqZAo" node="12QmIoyQPVg" resolve="repository" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="12QmIoyQUQ4" role="1B3o_S" />
+      <node concept="3uibUv" id="12QmIoyQPDM" role="1zkMxy">
+        <ref role="3uigEE" to="lui2:~SRepositoryListenerBase" resolve="SRepositoryListenerBase" />
+      </node>
+      <node concept="3clFb_" id="12QmIoyQPE0" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="moduleRemoved" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="3Tm1VV" id="12QmIoyQPE1" role="1B3o_S" />
+        <node concept="3cqZAl" id="12QmIoyQPE3" role="3clF45" />
+        <node concept="37vLTG" id="12QmIoyQPE4" role="3clF46">
+          <property role="TrG5h" value="module" />
+          <node concept="3uibUv" id="12QmIoyQPE5" role="1tU5fm">
+            <ref role="3uigEE" to="lui2:~SModuleReference" resolve="SModuleReference" />
+          </node>
+          <node concept="2AHcQZ" id="12QmIoyQPE6" role="2AJF6D">
+            <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="12QmIoyQPE7" role="3clF47">
+          <node concept="3SKdUt" id="12QmIoyU_fU" role="3cqZAp">
+            <node concept="3SKdUq" id="12QmIoyU_fW" role="3SKWNk">
+              <property role="3SKdUp" value="make sure we don't keep stale classes" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="12QmIoyQR7e" role="3cqZAp">
+            <node concept="2YIFZM" id="12QmIoyQR8D" role="3clFbG">
+              <ref role="37wK5l" node="7WKNeR8VPWJ" resolve="dispose" />
+              <ref role="1Pybhc" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
+              <node concept="37vLTw" id="12QmIoyQRau" role="37wK5m">
+                <ref role="3cqZAo" node="12QmIoyQQQc" resolve="repository" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="12QmIoyU$zz" role="3cqZAp">
+            <node concept="2OqwBi" id="12QmIoyU$JU" role="3clFbG">
+              <node concept="37vLTw" id="12QmIoyU$zx" role="2Oq$k0">
+                <ref role="3cqZAo" node="12QmIoyQQQc" resolve="repository" />
+              </node>
+              <node concept="liA8E" id="12QmIoyU_0b" role="2OqNvi">
+                <ref role="37wK5l" to="lui2:~SRepository.removeRepositoryListener(org.jetbrains.mps.openapi.module.SRepositoryListener):void" resolve="removeRepositoryListener" />
+                <node concept="Xjq3P" id="12QmIoyU_3M" role="37wK5m" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="12QmIoyQPE8" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="312cEg" id="12QmIoyQQQc" role="jymVt">
+        <property role="TrG5h" value="repository" />
+        <node concept="3Tm6S6" id="12QmIoyQQQd" role="1B3o_S" />
+        <node concept="3uibUv" id="12QmIoyQQQf" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="12QmIoyQVMn" role="jymVt" />
+    <node concept="312cEg" id="7WKNeR8Wgb9" role="jymVt">
+      <property role="TrG5h" value="sessionCache" />
+      <node concept="3Tm6S6" id="7WKNeR8Wgba" role="1B3o_S" />
+      <node concept="3uibUv" id="7WKNeR8WiEd" role="1tU5fm">
+        <ref role="3uigEE" to="5zyv:~ConcurrentMap" resolve="ConcurrentMap" />
+        <node concept="3uibUv" id="7WKNeR8Wlc6" role="11_B2D">
+          <ref role="3uigEE" to="mhbf:~SModelReference" resolve="SModelReference" />
+        </node>
+        <node concept="3uibUv" id="7WKNeR8Wq2D" role="11_B2D">
+          <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7WKNeR8Win4" role="33vP2m">
+        <node concept="1pGfFk" id="7WKNeR8WkaM" role="2ShVmc">
+          <ref role="37wK5l" to="5zyv:~ConcurrentHashMap.&lt;init&gt;()" resolve="ConcurrentHashMap" />
+          <node concept="3uibUv" id="7WKNeR8WkAs" role="1pMfVU">
+            <ref role="3uigEE" to="mhbf:~SModelReference" resolve="SModelReference" />
+          </node>
+          <node concept="3uibUv" id="7WKNeR8WpL7" role="1pMfVU">
+            <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="7WKNeR8VLpI" role="1B3o_S" />
+    <node concept="3UR2Jj" id="7WKNeR8VMqz" role="lGtFl">
+      <node concept="TZ5HA" id="7WKNeR8VMq$" role="TZ5H$">
+        <node concept="1dT_AC" id="7WKNeR8VMq_" role="1dT_Ay">
+          <property role="1dT_AB" value="A per-repository cache of code rule indices." />
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="7WKNeR8W19_" role="jymVt">
+      <property role="TrG5h" value="repository" />
+      <node concept="3Tm6S6" id="7WKNeR8W19A" role="1B3o_S" />
+      <node concept="3uibUv" id="7WKNeR8W19C" role="1tU5fm">
+        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+      </node>
+    </node>
+  </node>
+</model>
+

settings.gradle

@@ -1,3 +1,4 @@
 include 'logic/solutions/jetbrains.mps.logic.reactor'
 include 'logic/solutions/jetbrains.mps.logic.test'
 include 'typechecking/solutions/jetbrains.mps.typechecking'
+include 'coderules/solutions/jetbrains.mps.coderules'

typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps

@@ -758,6 +758,122 @@
     </node>
     <node concept="2G$12M" id="7BVjoXzUx6$" role="3989C9">
       <property role="TrG5h" value="coderules" />
+      <node concept="1E1JtA" id="NKt6yn9_8p" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.coderules" />
+        <property role="3LESm3" value="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c" />
+        <property role="2GAjPV" value="false" />
+        <node concept="55IIr" id="NKt6yn9_8s" role="3LF7KH">
+          <node concept="2Ry0Ak" id="NKt6yn9_kF" role="iGT6I">
+            <property role="2Ry0Am" value="coderules" />
+            <node concept="2Ry0Ak" id="NKt6yn9_uG" role="2Ry0An">
+              <property role="2Ry0Am" value="solutions" />
+              <node concept="2Ry0Ak" id="NKt6yn9_CH" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.coderules" />
+                <node concept="2Ry0Ak" id="NKt6yn9_MI" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.coderules.msd" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="NKt6yn9_Ug" role="3bR37C">
+          <node concept="3bR9La" id="NKt6yn9_Uh" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="NKt6yn9_Ui" role="3bR37C">
+          <node concept="3bR9La" id="NKt6yn9_Uj" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="NKt6yn9_Uk" role="3bR37C">
+          <node concept="3bR9La" id="NKt6yn9_Ul" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="NKt6yn9_Um" role="3bR37C">
+          <node concept="3bR9La" id="NKt6yn9_Un" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="NKt6yn9_Uo" role="3bR37C">
+          <node concept="3bR9La" id="NKt6yn9_Up" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="NKt6yn9_UA" role="3bR37C">
+          <node concept="1BurEX" id="NKt6yn9_UB" role="1SiIV1">
+            <node concept="398BVA" id="NKt6yn9_Uq" role="1BurEY">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
+              <node concept="2Ry0Ak" id="NKt6yn9_Ur" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="NKt6yn9_Us" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="NKt6yn9_Ut" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules" />
+                    <node concept="2Ry0Ak" id="NKt6yn9_Uu" role="2Ry0An">
+                      <property role="2Ry0Am" value="lib" />
+                      <node concept="2Ry0Ak" id="NKt6yn9_Uv" role="2Ry0An">
+                        <property role="2Ry0Am" value="reactive-streams-1.0.0.final.jar" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="NKt6yn9_UO" role="3bR37C">
+          <node concept="1BurEX" id="NKt6yn9_UP" role="1SiIV1">
+            <node concept="398BVA" id="NKt6yn9_UC" role="1BurEY">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
+              <node concept="2Ry0Ak" id="NKt6yn9_UD" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="NKt6yn9_UE" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="NKt6yn9_UF" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules" />
+                    <node concept="2Ry0Ak" id="NKt6yn9_UG" role="2Ry0An">
+                      <property role="2Ry0Am" value="lib" />
+                      <node concept="2Ry0Ak" id="NKt6yn9_UH" role="2Ry0An">
+                        <property role="2Ry0Am" value="rxjava-2.1.1.jar" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="NKt6yn9_V2" role="3bR37C">
+          <node concept="1BurEX" id="NKt6yn9_V3" role="1SiIV1">
+            <node concept="398BVA" id="NKt6yn9_UQ" role="1BurEY">
+              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
+              <node concept="2Ry0Ak" id="NKt6yn9_UR" role="iGT6I">
+                <property role="2Ry0Am" value="coderules" />
+                <node concept="2Ry0Ak" id="NKt6yn9_US" role="2Ry0An">
+                  <property role="2Ry0Am" value="solutions" />
+                  <node concept="2Ry0Ak" id="NKt6yn9_UT" role="2Ry0An">
+                    <property role="2Ry0Am" value="jetbrains.mps.coderules" />
+                    <node concept="2Ry0Ak" id="NKt6yn9_UU" role="2Ry0An">
+                      <property role="2Ry0Am" value="lib" />
+                      <node concept="2Ry0Ak" id="NKt6yn9_UV" role="2Ry0An">
+                        <property role="2Ry0Am" value="rxjava2-swing-0.2.1.jar" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="1E1JtD" id="7BVjoXzUx6U" role="2G$12L">
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="jetbrains.mps.lang.coderules" />
@@ -1231,72 +1347,6 @@
             <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
           </node>
         </node>
-        <node concept="1SiIV0" id="1Ss4_iXRmTp" role="3bR37C">
-          <node concept="1BurEX" id="1Ss4_iXRmTq" role="1SiIV1">
-            <node concept="398BVA" id="1Ss4_iXRmTd" role="1BurEY">
-              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
-              <node concept="2Ry0Ak" id="1Ss4_iXRmTe" role="iGT6I">
-                <property role="2Ry0Am" value="typechecking" />
-                <node concept="2Ry0Ak" id="1Ss4_iXRmTf" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="1Ss4_iXRmTg" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.typechecking" />
-                    <node concept="2Ry0Ak" id="1Ss4_iXRmTh" role="2Ry0An">
-                      <property role="2Ry0Am" value="lib" />
-                      <node concept="2Ry0Ak" id="1Ss4_iXRmTi" role="2Ry0An">
-                        <property role="2Ry0Am" value="reactive-streams-1.0.0.final.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1Ss4_iXRmTB" role="3bR37C">
-          <node concept="1BurEX" id="1Ss4_iXRmTC" role="1SiIV1">
-            <node concept="398BVA" id="1Ss4_iXRmTr" role="1BurEY">
-              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
-              <node concept="2Ry0Ak" id="1Ss4_iXRmTs" role="iGT6I">
-                <property role="2Ry0Am" value="typechecking" />
-                <node concept="2Ry0Ak" id="1Ss4_iXRmTt" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="1Ss4_iXRmTu" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.typechecking" />
-                    <node concept="2Ry0Ak" id="1Ss4_iXRmTv" role="2Ry0An">
-                      <property role="2Ry0Am" value="lib" />
-                      <node concept="2Ry0Ak" id="1Ss4_iXRmTw" role="2Ry0An">
-                        <property role="2Ry0Am" value="rxjava-2.1.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="1Ss4_iXRmTP" role="3bR37C">
-          <node concept="1BurEX" id="1Ss4_iXRmTQ" role="1SiIV1">
-            <node concept="398BVA" id="1Ss4_iXRmTD" role="1BurEY">
-              <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
-              <node concept="2Ry0Ak" id="1Ss4_iXRmTE" role="iGT6I">
-                <property role="2Ry0Am" value="typechecking" />
-                <node concept="2Ry0Ak" id="1Ss4_iXRmTF" role="2Ry0An">
-                  <property role="2Ry0Am" value="solutions" />
-                  <node concept="2Ry0Ak" id="1Ss4_iXRmTG" role="2Ry0An">
-                    <property role="2Ry0Am" value="jetbrains.mps.typechecking" />
-                    <node concept="2Ry0Ak" id="1Ss4_iXRmTH" role="2Ry0An">
-                      <property role="2Ry0Am" value="lib" />
-                      <node concept="2Ry0Ak" id="1Ss4_iXRmTI" role="2Ry0An">
-                        <property role="2Ry0Am" value="rxjava2-swing-0.2.1.jar" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="1Ss4_iXXglt" role="3bR37C">
           <node concept="3bR9La" id="1Ss4_iXXglu" role="1SiIV1">
             <property role="3bR36h" value="false" />
@@ -1333,6 +1383,12 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="NKt6yn9B9x" role="3bR37C">
+          <node concept="3bR9La" id="NKt6yn9B9y" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" node="NKt6yn9_8p" resolve="jetbrains.mps.coderules" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="oI9YrJ7Rx" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1535,6 +1591,12 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="NKt6yn9Bad" role="3bR37C">
+          <node concept="3bR9La" id="NKt6yn9Bae" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="NKt6yn9_8p" resolve="jetbrains.mps.coderules" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="46o4wsH5PJF" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2097,7 +2159,7 @@
       <node concept="3981dG" id="65DJywFjdtY" role="39821P">
         <node concept="3_J27D" id="65DJywFjdtZ" role="Nbhlr">
           <node concept="3Mxwew" id="65DJywFjdwr" role="3MwsjC">
-            <property role="3MwjfP" value="typechecking-0.4.zip" />
+            <property role="3MwjfP" value="typechecking-0.5.zip" />
           </node>
         </node>
         <node concept="m$_wl" id="65DJywFjdwt" role="39821P">
@@ -2226,6 +2288,72 @@
             <node concept="L2wRC" id="65DJywFk8NI" role="39821P">
               <ref role="L2wRA" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
             </node>
+            <node concept="L2wRC" id="NKt6yn9AaW" role="39821P">
+              <ref role="L2wRA" node="NKt6yn9_8p" resolve="jetbrains.mps.coderules" />
+              <node concept="3yLZsm" id="NKt6yn9Anr" role="3yL2VB">
+                <property role="3yLZsk" value="../lib/reactive-streams-1.0.0.final-0.7.jar" />
+                <node concept="398BVA" id="NKt6yn9Ans" role="3yLZsn">
+                  <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
+                  <node concept="2Ry0Ak" id="NKt6yn9Ant" role="iGT6I">
+                    <property role="2Ry0Am" value="coderules" />
+                    <node concept="2Ry0Ak" id="NKt6yn9Anu" role="2Ry0An">
+                      <property role="2Ry0Am" value="solutions" />
+                      <node concept="2Ry0Ak" id="NKt6yn9Anv" role="2Ry0An">
+                        <property role="2Ry0Am" value="jetbrains.mps.coderules" />
+                        <node concept="2Ry0Ak" id="NKt6yn9Anw" role="2Ry0An">
+                          <property role="2Ry0Am" value="lib" />
+                          <node concept="2Ry0Ak" id="NKt6yn9Anx" role="2Ry0An">
+                            <property role="2Ry0Am" value="reactive-streams-1.0.0.final.jar" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3yLZsm" id="NKt6yn9Any" role="3yL2VB">
+                <property role="3yLZsk" value="../lib/rxjava-2.1.1.jar" />
+                <node concept="398BVA" id="NKt6yn9Anz" role="3yLZsn">
+                  <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
+                  <node concept="2Ry0Ak" id="NKt6yn9An$" role="iGT6I">
+                    <property role="2Ry0Am" value="coderules" />
+                    <node concept="2Ry0Ak" id="NKt6yn9An_" role="2Ry0An">
+                      <property role="2Ry0Am" value="solutions" />
+                      <node concept="2Ry0Ak" id="NKt6yn9AnA" role="2Ry0An">
+                        <property role="2Ry0Am" value="jetbrains.mps.coderules" />
+                        <node concept="2Ry0Ak" id="NKt6yn9AnB" role="2Ry0An">
+                          <property role="2Ry0Am" value="lib" />
+                          <node concept="2Ry0Ak" id="NKt6yn9AnC" role="2Ry0An">
+                            <property role="2Ry0Am" value="rxjava-2.1.1.jar" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3yLZsm" id="NKt6yn9AnD" role="3yL2VB">
+                <property role="3yLZsk" value="../lib/rxjava2-swing-0.2.1.jar" />
+                <node concept="398BVA" id="NKt6yn9AnE" role="3yLZsn">
+                  <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
+                  <node concept="2Ry0Ak" id="NKt6yn9AnF" role="iGT6I">
+                    <property role="2Ry0Am" value="coderules" />
+                    <node concept="2Ry0Ak" id="NKt6yn9AnG" role="2Ry0An">
+                      <property role="2Ry0Am" value="solutions" />
+                      <node concept="2Ry0Ak" id="NKt6yn9AnH" role="2Ry0An">
+                        <property role="2Ry0Am" value="jetbrains.mps.coderules" />
+                        <node concept="2Ry0Ak" id="NKt6yn9AnI" role="2Ry0An">
+                          <property role="2Ry0Am" value="lib" />
+                          <node concept="2Ry0Ak" id="NKt6yn9AnJ" role="2Ry0An">
+                            <property role="2Ry0Am" value="rxjava2-swing-0.2.1.jar" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="L2wRC" id="65DJywFk8jS" role="39821P">
               <ref role="L2wRA" node="7BVjoXzUx6U" resolve="jetbrains.mps.lang.coderules" />
             </node>
@@ -2237,69 +2365,6 @@
             </node>
             <node concept="L2wRC" id="65DJywFj_1R" role="39821P">
               <ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
-              <node concept="3yLZsm" id="3NqN4u$_rT6" role="3yL2VB">
-                <property role="3yLZsk" value="../lib/reactive-streams-1.0.0.final-0.7.jar" />
-                <node concept="398BVA" id="3NqN4u$_rT7" role="3yLZsn">
-                  <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
-                  <node concept="2Ry0Ak" id="3NqN4u$_rT8" role="iGT6I">
-                    <property role="2Ry0Am" value="typechecking" />
-                    <node concept="2Ry0Ak" id="3NqN4u$_rT9" role="2Ry0An">
-                      <property role="2Ry0Am" value="solutions" />
-                      <node concept="2Ry0Ak" id="3NqN4u$_rTa" role="2Ry0An">
-                        <property role="2Ry0Am" value="jetbrains.mps.typechecking" />
-                        <node concept="2Ry0Ak" id="3NqN4u$_rTb" role="2Ry0An">
-                          <property role="2Ry0Am" value="lib" />
-                          <node concept="2Ry0Ak" id="3NqN4u$_s8k" role="2Ry0An">
-                            <property role="2Ry0Am" value="reactive-streams-1.0.0.final.jar" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3yLZsm" id="3NqN4u$_sim" role="3yL2VB">
-                <property role="3yLZsk" value="../lib/rxjava-2.1.1.jar" />
-                <node concept="398BVA" id="3NqN4u$_sin" role="3yLZsn">
-                  <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
-                  <node concept="2Ry0Ak" id="3NqN4u$_sio" role="iGT6I">
-                    <property role="2Ry0Am" value="typechecking" />
-                    <node concept="2Ry0Ak" id="3NqN4u$_sip" role="2Ry0An">
-                      <property role="2Ry0Am" value="solutions" />
-                      <node concept="2Ry0Ak" id="3NqN4u$_siq" role="2Ry0An">
-                        <property role="2Ry0Am" value="jetbrains.mps.typechecking" />
-                        <node concept="2Ry0Ak" id="3NqN4u$_sir" role="2Ry0An">
-                          <property role="2Ry0Am" value="lib" />
-                          <node concept="2Ry0Ak" id="3NqN4u$_snF" role="2Ry0An">
-                            <property role="2Ry0Am" value="rxjava-2.1.1.jar" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3yLZsm" id="3NqN4u$_sxH" role="3yL2VB">
-                <property role="3yLZsk" value="../lib/rxjava2-swing-0.2.1.jar" />
-                <node concept="398BVA" id="3NqN4u$_sxI" role="3yLZsn">
-                  <ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.logic_home" />
-                  <node concept="2Ry0Ak" id="3NqN4u$_sxJ" role="iGT6I">
-                    <property role="2Ry0Am" value="typechecking" />
-                    <node concept="2Ry0Ak" id="3NqN4u$_sxK" role="2Ry0An">
-                      <property role="2Ry0Am" value="solutions" />
-                      <node concept="2Ry0Ak" id="3NqN4u$_sxL" role="2Ry0An">
-                        <property role="2Ry0Am" value="jetbrains.mps.typechecking" />
-                        <node concept="2Ry0Ak" id="3NqN4u$_sxM" role="2Ry0An">
-                          <property role="2Ry0Am" value="lib" />
-                          <node concept="2Ry0Ak" id="3NqN4u$_sB9" role="2Ry0An">
-                            <property role="2Ry0Am" value="rxjava2-swing-0.2.1.jar" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
             </node>
             <node concept="L2wRC" id="oI9YrJbsm" role="39821P">
               <ref role="L2wRA" node="oI9YrJ7Rx" resolve="jetbrains.mps.typechecking.reporting" />

typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.typechecking.test.msd

@@ -45,6 +45,7 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
     <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />

typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.scheduling@tests.mps

@@ -7,16 +7,18 @@
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
   </languages>
   <imports>
-    <import index="unkn" ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d/java:io.reactivex(jetbrains.mps.typechecking/)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="m4y7" ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d/java:io.reactivex.schedulers(jetbrains.mps.typechecking/)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
-    <import index="f4yq" ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d/java:hu.akarnokd.rxjava2.swing(jetbrains.mps.typechecking/)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
+    <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" />
+    <import index="f4yq" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:hu.akarnokd.rxjava2.swing(jetbrains.mps.coderules/)" />
+    <import index="m4y7" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.schedulers(jetbrains.mps.coderules/)" />
+    <import index="1yqb" ref="r:bd76f794-cfad-45dd-9c1c-e3203d1c5c7a(jetbrains.mps.coderules.service)" />
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
   </imports>
   <registry>
@@ -533,9 +535,9 @@
                     <node concept="2WthIp" id="3KwBCAA$II1" role="2Oq$k0" />
                     <node concept="2XshWL" id="3KwBCAA$II2" role="2OqNvi">
                       <ref role="2WH_rO" node="3KwBCAAvk20" resolve="scheduleRead" />
-                      <node concept="2YIFZM" id="3KwBCAAAr_E" role="2XxRq1">
-                        <ref role="37wK5l" to="tj24:3KwBCAA_erO" resolve="blocking" />
-                        <ref role="1Pybhc" to="tj24:3KwBCAA_ela" resolve="TypecheckingSchedulers" />
+                      <node concept="2YIFZM" id="NKt6yn9kxY" role="2XxRq1">
+                        <ref role="37wK5l" to="1yqb:3KwBCAA_erO" resolve="blocking" />
+                        <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
                       </node>
                       <node concept="37vLTw" id="3KwBCAA$II4" role="2XxRq1">
                         <ref role="3cqZAo" node="3KwBCAA$IH_" resolve="start" />
@@ -554,9 +556,9 @@
                             <node concept="2WthIp" id="3KwBCAA$IIb" role="2Oq$k0" />
                             <node concept="2XshWL" id="3KwBCAA$IIc" role="2OqNvi">
                               <ref role="2WH_rO" node="3KwBCAAvofQ" resolve="scheduleCommand" />
-                              <node concept="2YIFZM" id="3KwBCAAAtj1" role="2XxRq1">
-                                <ref role="37wK5l" to="tj24:3KwBCAA_eqP" resolve="requireEDT" />
-                                <ref role="1Pybhc" to="tj24:3KwBCAA_ela" resolve="TypecheckingSchedulers" />
+                              <node concept="2YIFZM" id="NKt6yn9ky5" role="2XxRq1">
+                                <ref role="37wK5l" to="1yqb:3KwBCAA_eqP" resolve="requireEDT" />
+                                <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
                               </node>
                               <node concept="37vLTw" id="3KwBCAA$IIe" role="2XxRq1">
                                 <ref role="3cqZAo" node="3KwBCAA$IIh" resolve="from" />
@@ -764,9 +766,9 @@
                               <node concept="2WthIp" id="3KwBCAAwrc7" role="2Oq$k0" />
                               <node concept="2XshWL" id="3KwBCAAwrc8" role="2OqNvi">
                                 <ref role="2WH_rO" node="3KwBCAAvk20" resolve="scheduleRead" />
-                                <node concept="2YIFZM" id="3KwBCAAAu8X" role="2XxRq1">
-                                  <ref role="37wK5l" to="tj24:3KwBCAA_erO" resolve="blocking" />
-                                  <ref role="1Pybhc" to="tj24:3KwBCAA_ela" resolve="TypecheckingSchedulers" />
+                                <node concept="2YIFZM" id="NKt6yn9ky4" role="2XxRq1">
+                                  <ref role="37wK5l" to="1yqb:3KwBCAA_erO" resolve="blocking" />
+                                  <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
                                 </node>
                                 <node concept="37vLTw" id="3KwBCAAwrca" role="2XxRq1">
                                   <ref role="3cqZAo" node="3KwBCAAwrbR" resolve="start" />
@@ -785,9 +787,9 @@
                                       <node concept="2WthIp" id="3KwBCAA$ctJ" role="2Oq$k0" />
                                       <node concept="2XshWL" id="3KwBCAA$ctK" role="2OqNvi">
                                         <ref role="2WH_rO" node="3KwBCAAvofQ" resolve="scheduleCommand" />
-                                        <node concept="2YIFZM" id="3KwBCAAAuO_" role="2XxRq1">
-                                          <ref role="37wK5l" to="tj24:3KwBCAA_erO" resolve="blocking" />
-                                          <ref role="1Pybhc" to="tj24:3KwBCAA_ela" resolve="TypecheckingSchedulers" />
+                                        <node concept="2YIFZM" id="NKt6yn9ky2" role="2XxRq1">
+                                          <ref role="37wK5l" to="1yqb:3KwBCAA_erO" resolve="blocking" />
+                                          <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
                                         </node>
                                         <node concept="37vLTw" id="3KwBCAA$j0F" role="2XxRq1">
                                           <ref role="3cqZAo" node="3KwBCAA$36O" resolve="from" />

typechecking/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd

@@ -21,6 +21,7 @@
     <dependency reexport="true">bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)</dependency>
     <dependency reexport="true">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
+    <dependency reexport="false">f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -48,6 +49,7 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
     <module reference="bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime)" version="0" />
     <module reference="5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />

typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps

@@ -82,17 +82,11 @@
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.coderules.eval)" />
     <import index="ni5j" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.regex(JDK/)" />
     <import index="jkny" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm(MPS.IDEA/)" />
-    <import index="m4y7" ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d/java:io.reactivex.schedulers(jetbrains.mps.typechecking/)" />
-    <import index="unkn" ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d/java:io.reactivex(jetbrains.mps.typechecking/)" />
-    <import index="f4yq" ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d/java:hu.akarnokd.rxjava2.swing(jetbrains.mps.typechecking/)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
     <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.coderules.program)" />
-    <import index="iljd" ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d/java:io.reactivex.plugins(jetbrains.mps.typechecking/)" />
-    <import index="5tvg" ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d/java:io.reactivex.disposables(jetbrains.mps.typechecking/)" />
     <import index="al1t" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.diagnostic(MPS.IDEA/)" />
     <import index="uzhr" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.diagnostic(MPS.IDEA/)" />
-    <import index="7ce3" ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d/java:io.reactivex.exceptions(jetbrains.mps.typechecking/)" />
     <import index="439w" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.codeInsight.hint(MPS.IDEA/)" />
     <import index="vmdq" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.awt(MPS.IDEA/)" />
     <import index="gspm" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui.popup(MPS.IDEA/)" />
@@ -103,6 +97,13 @@
     <import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
     <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
+    <import index="1yqb" ref="r:bd76f794-cfad-45dd-9c1c-e3203d1c5c7a(jetbrains.mps.coderules.service)" />
+    <import index="f4yq" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:hu.akarnokd.rxjava2.swing(jetbrains.mps.coderules/)" />
+    <import index="7ce3" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.exceptions(jetbrains.mps.coderules/)" />
+    <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" />
+    <import index="5tvg" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.disposables(jetbrains.mps.coderules/)" />
+    <import index="iljd" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.plugins(jetbrains.mps.coderules/)" />
+    <import index="m4y7" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.schedulers(jetbrains.mps.coderules/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -16873,7 +16874,7 @@
         <node concept="3clFbF" id="YGS68MHur1" role="3cqZAp">
           <node concept="2ShNRf" id="YGS68MHuqZ" role="3clFbG">
             <node concept="1pGfFk" id="YGS68MHwq3" role="2ShVmc">
-              <ref role="37wK5l" to="tj24:7nPD14NbIzp" resolve="MultiTrace" />
+              <ref role="37wK5l" to="1yqb:7nPD14NbIzp" resolve="MultiTrace" />
               <node concept="37vLTw" id="YGS68MHyay" role="37wK5m">
                 <ref role="3cqZAo" node="YGS68MGEqX" resolve="storeSink" />
               </node>
@@ -26241,11 +26242,11 @@
             <property role="TrG5h" value="applyTemplatesStep" />
             <property role="3TUv4t" value="true" />
             <node concept="3uibUv" id="6kREIVkWRFk" role="1tU5fm">
-              <ref role="3uigEE" to="tj24:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+              <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
             </node>
             <node concept="2ShNRf" id="6kREIVkWRFr" role="33vP2m">
               <node concept="1pGfFk" id="6kREIVkWRFs" role="2ShVmc">
-                <ref role="37wK5l" to="tj24:7kTeLbPt4na" resolve="ApplyTemplatesStep" />
+                <ref role="37wK5l" to="1yqb:7kTeLbPt4na" resolve="ApplyTemplatesStep" />
                 <node concept="2ShNRf" id="3IIf9O_rLCc" role="37wK5m">
                   <node concept="Tc6Ow" id="3IIf9O_rNYG" role="2ShVmc">
                     <node concept="3Tqbb2" id="3IIf9O_rQv1" role="HW$YZ" />
@@ -26308,7 +26309,7 @@
                                       <ref role="3cqZAo" node="6kREIVkWRFq" resolve="applyTemplatesStep" />
                                     </node>
                                     <node concept="liA8E" id="6kREIVkXHO4" role="2OqNvi">
-                                      <ref role="37wK5l" to="tj24:20Ay2VeR9qk" resolve="ruleTemplates" />
+                                      <ref role="37wK5l" to="1yqb:20Ay2VeR9qk" resolve="ruleTemplates" />
                                     </node>
                                   </node>
                                   <node concept="2OqwBi" id="6kREIVkXHO5" role="37wK5m">
@@ -29065,7 +29066,7 @@
     <node concept="2tJIrI" id="Hg6EncbjnH" role="jymVt" />
     <node concept="3Tm1VV" id="3F6vMxq_2US" role="1B3o_S" />
     <node concept="3uibUv" id="1pPth$lC2Ed" role="1zkMxy">
-      <ref role="3uigEE" to="tj24:1pPth$lAzAx" resolve="Step" />
+      <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
       <node concept="3uibUv" id="6IQb_RxDhRE" role="11_B2D">
         <ref role="3uigEE" to="tj24:6IQb_RxlB9v" resolve="CollectTypesStep" />
       </node>
@@ -29087,7 +29088,7 @@
   </node>
   <node concept="312cEu" id="55Q$YFtIVEP">
     <property role="3GE5qa" value="launch.step" />
-    <property role="TrG5h" value="EvaluateRulesWithTraceStep" />
+    <property role="TrG5h" value="TypecheckingEvaluateRulesWithTraceStep" />
     <node concept="2tJIrI" id="55Q$YFtIVLz" role="jymVt" />
     <node concept="3clFbW" id="55Q$YFtIVZ9" role="jymVt">
       <node concept="37vLTG" id="6IQb_Rxsk$b" role="3clF46">
@@ -29106,7 +29107,7 @@
       <node concept="3Tm1VV" id="55Q$YFtIVZc" role="1B3o_S" />
       <node concept="3clFbS" id="55Q$YFtIVZd" role="3clF47">
         <node concept="XkiVB" id="55Q$YFtIXBZ" role="3cqZAp">
-          <ref role="37wK5l" to="tj24:1pPth$lHpLU" resolve="EvaluateRulesStep" />
+          <ref role="37wK5l" to="tj24:NKt6yn84NI" resolve="TypecheckingEvaluateRulesStep" />
           <node concept="2OqwBi" id="443LGHBSD_r" role="37wK5m">
             <node concept="37vLTw" id="55Q$YFtIYbT" role="2Oq$k0">
               <ref role="3cqZAo" node="55Q$YFtIX9v" resolve="mpsProject" />
@@ -29175,7 +29176,7 @@
         <node concept="3uibUv" id="Hg6Enc6phc" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
           <node concept="3uibUv" id="Hg6Enc6phj" role="11_B2D">
-            <ref role="3uigEE" to="tj24:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+            <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
           </node>
         </node>
       </node>
@@ -29188,7 +29189,7 @@
       <node concept="3uibUv" id="Hg6Enc6phe" role="3clF45">
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
         <node concept="3uibUv" id="Hg6Enc6wvA" role="11_B2D">
-          <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+          <ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
         </node>
       </node>
       <node concept="3Tmbuc" id="Hg6EncFIBw" role="1B3o_S" />
@@ -29200,7 +29201,7 @@
               <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
               <node concept="1LlUBW" id="Hg6EncXnsT" role="11_B2D">
                 <node concept="3uibUv" id="Hg6EncXnsU" role="1Lm7xW">
-                  <ref role="3uigEE" to="tj24:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                  <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
                 </node>
                 <node concept="3uibUv" id="6tPOoeTcJfS" role="1Lm7xW">
                   <ref role="3uigEE" to="yg8f:qubcdtxBiR" resolve="EvaluationTraceExt" />
@@ -29226,7 +29227,7 @@
                   <node concept="37vLTG" id="Hg6EncXntZ" role="1bW2Oz">
                     <property role="TrG5h" value="prev" />
                     <node concept="3uibUv" id="Hg6EncXnu0" role="1tU5fm">
-                      <ref role="3uigEE" to="tj24:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                      <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
                     </node>
                   </node>
                   <node concept="3clFbS" id="Hg6EncXnu1" role="1bW5cS">
@@ -29239,7 +29240,7 @@
                         </node>
                         <node concept="2OqwBi" id="Hg6EncXnub" role="33vP2m">
                           <node concept="liA8E" id="6kREIVl1TxS" role="2OqNvi">
-                            <ref role="37wK5l" to="tj24:6kREIVl0HhM" resolve="getProgram" />
+                            <ref role="37wK5l" to="1yqb:6kREIVl0HhM" resolve="getProgram" />
                           </node>
                           <node concept="37vLTw" id="Hg6EncXnud" role="2Oq$k0">
                             <ref role="3cqZAo" node="Hg6EncXntZ" resolve="prev" />
@@ -29367,7 +29368,7 @@
                             </node>
                             <node concept="2ShNRf" id="6tPOoeTcTIS" role="10QFUP">
                               <node concept="1pGfFk" id="6tPOoeTcTIT" role="2ShVmc">
-                                <ref role="37wK5l" to="tj24:7nPD14NbIzp" resolve="MultiTrace" />
+                                <ref role="37wK5l" to="1yqb:7nPD14NbIzp" resolve="MultiTrace" />
                                 <node concept="2OqwBi" id="6tPOoeTcTIU" role="37wK5m">
                                   <node concept="37vLTw" id="6tPOoeTcTIV" role="2Oq$k0">
                                     <ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openedTab" />
@@ -29396,7 +29397,7 @@
         <node concept="3clFbF" id="55Q$YFtItJ0" role="3cqZAp">
           <node concept="2OqwBi" id="6IQb_Rxsnrv" role="3clFbG">
             <node concept="1rXfSq" id="55Q$YFtItIY" role="2Oq$k0">
-              <ref role="37wK5l" to="tj24:55Q$YFtHM07" resolve="scheduleWithTrace" />
+              <ref role="37wK5l" to="1yqb:55Q$YFtHM07" resolve="scheduleWithTrace" />
               <node concept="37vLTw" id="55Q$YFtIv91" role="37wK5m">
                 <ref role="3cqZAo" node="Hg6EncXntT" resolve="withTrace" />
               </node>
@@ -29571,8 +29572,8 @@
       </node>
     </node>
     <node concept="3Tm1VV" id="55Q$YFtIVEQ" role="1B3o_S" />
-    <node concept="3uibUv" id="55Q$YFtIVLc" role="1zkMxy">
-      <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+    <node concept="3uibUv" id="NKt6yn8c2j" role="1zkMxy">
+      <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingEvaluateRulesStep" />
     </node>
   </node>
   <node concept="312cEu" id="6IQb_RxxWnM">
@@ -29610,8 +29611,8 @@
         <property role="TrG5h" value="prevStep" />
         <node concept="3uibUv" id="6IQb_Rxy0na" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="6IQb_Rxy0nb" role="11_B2D">
-            <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+          <node concept="3uibUv" id="NKt6yndGtf" role="11_B2D">
+            <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingEvaluateRulesStep" />
           </node>
         </node>
       </node>
@@ -29625,7 +29626,7 @@
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
         <node concept="3qUE_q" id="6IQb_Rxy0nf" role="11_B2D">
           <node concept="3uibUv" id="6IQb_Rxy0ng" role="3qUE_r">
-            <ref role="3uigEE" to="tj24:1pPth$lAzAx" resolve="Step" />
+            <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
             <node concept="3qTvmN" id="6IQb_Rxy0nh" role="11_B2D" />
           </node>
         </node>
@@ -29647,8 +29648,8 @@
                 <node concept="1bVj0M" id="6IQb_Rxy6ZJ" role="37wK5m">
                   <node concept="37vLTG" id="6IQb_Rxy7xS" role="1bW2Oz">
                     <property role="TrG5h" value="prev" />
-                    <node concept="3uibUv" id="6IQb_RxyaYM" role="1tU5fm">
-                      <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+                    <node concept="3uibUv" id="NKt6yndGZ8" role="1tU5fm">
+                      <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingEvaluateRulesStep" />
                     </node>
                   </node>
                   <node concept="3clFbS" id="6IQb_Rxy6ZK" role="1bW5cS">
@@ -29662,7 +29663,7 @@
                               <node concept="1eOMI4" id="6IQb_RxSCQF" role="2Oq$k0">
                                 <node concept="10QFUN" id="6IQb_RxSCQG" role="1eOMHV">
                                   <node concept="3uibUv" id="6IQb_RxSCQH" role="10QFUM">
-                                    <ref role="3uigEE" node="55Q$YFtIVEP" resolve="EvaluateRulesWithTraceStep" />
+                                    <ref role="3uigEE" node="55Q$YFtIVEP" resolve="TypecheckingEvaluateRulesWithTraceStep" />
                                   </node>
                                   <node concept="37vLTw" id="6IQb_RxSCQI" role="10QFUP">
                                     <ref role="3cqZAo" node="6IQb_Rxy7xS" resolve="prev" />
@@ -29678,7 +29679,7 @@
                       </node>
                       <node concept="2ZW3vV" id="6IQb_Rxyacm" role="3clFbw">
                         <node concept="3uibUv" id="6IQb_RxybJK" role="2ZW6by">
-                          <ref role="3uigEE" node="55Q$YFtIVEP" resolve="EvaluateRulesWithTraceStep" />
+                          <ref role="3uigEE" node="55Q$YFtIVEP" resolve="TypecheckingEvaluateRulesWithTraceStep" />
                         </node>
                         <node concept="37vLTw" id="6IQb_Rxyiwr" role="2ZW6bz">
                           <ref role="3cqZAo" node="6IQb_Rxy7xS" resolve="prev" />
@@ -30768,11 +30769,11 @@
             <node concept="3cpWsn" id="4vBwiiVz_We" role="3cpWs9">
               <property role="TrG5h" value="applyTemplatesStep" />
               <node concept="3uibUv" id="4vBwiiVz_Wf" role="1tU5fm">
-                <ref role="3uigEE" to="tj24:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
               </node>
               <node concept="2ShNRf" id="3IIf9O_lG7h" role="33vP2m">
                 <node concept="1pGfFk" id="3IIf9O_lG7i" role="2ShVmc">
-                  <ref role="37wK5l" to="tj24:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
+                  <ref role="37wK5l" to="1yqb:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
                   <node concept="2OqwBi" id="3IIf9O_lG7k" role="37wK5m">
                     <node concept="Xjq3P" id="3IIf9O_lG7l" role="2Oq$k0" />
                     <node concept="2OwXpG" id="3IIf9O_lG7m" role="2OqNvi">
@@ -30793,8 +30794,8 @@
           <node concept="3cpWs8" id="4vBwiiVz_Ww" role="3cqZAp">
             <node concept="3cpWsn" id="4vBwiiVz_Wx" role="3cpWs9">
               <property role="TrG5h" value="evaluateRulesStep" />
-              <node concept="3uibUv" id="4vBwiiVz_Wy" role="1tU5fm">
-                <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+              <node concept="3uibUv" id="NKt6yn90WK" role="1tU5fm">
+                <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingEvaluateRulesStep" />
               </node>
               <node concept="3K4zz7" id="4vBwiiVz_Wz" role="33vP2m">
                 <node concept="37vLTw" id="4vBwiiVz_W$" role="3K4Cdx">
@@ -30802,7 +30803,7 @@
                 </node>
                 <node concept="2ShNRf" id="4vBwiiVz_W_" role="3K4GZi">
                   <node concept="1pGfFk" id="4vBwiiVz_WA" role="2ShVmc">
-                    <ref role="37wK5l" to="tj24:1pPth$lHpLU" resolve="EvaluateRulesStep" />
+                    <ref role="37wK5l" to="tj24:NKt6yn84NI" resolve="TypecheckingEvaluateRulesStep" />
                     <node concept="37vLTw" id="4vBwiiVz_WB" role="37wK5m">
                       <ref role="3cqZAo" node="4vBwiiVz_W6" resolve="repository" />
                     </node>
@@ -30810,7 +30811,7 @@
                 </node>
                 <node concept="2ShNRf" id="4vBwiiVz_WC" role="3K4E3e">
                   <node concept="1pGfFk" id="4vBwiiVz_WD" role="2ShVmc">
-                    <ref role="37wK5l" node="55Q$YFtIVZ9" resolve="EvaluateRulesWithTraceStep" />
+                    <ref role="37wK5l" node="55Q$YFtIVZ9" resolve="TypecheckingEvaluateRulesWithTraceStep" />
                     <node concept="37vLTw" id="4vBwiiVz_WE" role="37wK5m">
                       <ref role="3cqZAo" node="6hqFpWnfwwm" resolve="editorComponent" />
                     </node>
@@ -31131,13 +31132,13 @@
               <property role="TrG5h" value="steps" />
               <node concept="_YKpA" id="7WKNeR8TcXt" role="1tU5fm">
                 <node concept="3uibUv" id="7WKNeR8TcXu" role="_ZDj9">
-                  <ref role="3uigEE" to="tj24:1pPth$lAzAx" resolve="Step" />
+                  <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
                 </node>
               </node>
               <node concept="2ShNRf" id="7WKNeR8TcXv" role="33vP2m">
                 <node concept="Tc6Ow" id="7WKNeR8TcXw" role="2ShVmc">
                   <node concept="3uibUv" id="7WKNeR8TcXx" role="HW$YZ">
-                    <ref role="3uigEE" to="tj24:1pPth$lAzAx" resolve="Step" />
+                    <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
                   </node>
                 </node>
               </node>
@@ -31151,7 +31152,7 @@
               <node concept="TSZUe" id="7WKNeR8TcX_" role="2OqNvi">
                 <node concept="2ShNRf" id="7WKNeR8TcXE" role="25WWJ7">
                   <node concept="1pGfFk" id="7WKNeR8TcXF" role="2ShVmc">
-                    <ref role="37wK5l" to="tj24:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
+                    <ref role="37wK5l" to="1yqb:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
                     <node concept="2OqwBi" id="7WKNeR8TcXG" role="37wK5m">
                       <node concept="Xjq3P" id="7WKNeR8TcXH" role="2Oq$k0" />
                       <node concept="2OwXpG" id="7WKNeR8TcXI" role="2OqNvi">
@@ -31181,7 +31182,7 @@
                   </node>
                   <node concept="2ShNRf" id="7WKNeR8TcYe" role="3K4GZi">
                     <node concept="1pGfFk" id="7WKNeR8TcYf" role="2ShVmc">
-                      <ref role="37wK5l" to="tj24:1pPth$lHpLU" resolve="EvaluateRulesStep" />
+                      <ref role="37wK5l" to="tj24:NKt6yn84NI" resolve="TypecheckingEvaluateRulesStep" />
                       <node concept="37vLTw" id="7WKNeR8TiOp" role="37wK5m">
                         <ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
                       </node>
@@ -31189,7 +31190,7 @@
                   </node>
                   <node concept="2ShNRf" id="7WKNeR8TcYh" role="3K4E3e">
                     <node concept="1pGfFk" id="7WKNeR8TcYi" role="2ShVmc">
-                      <ref role="37wK5l" node="55Q$YFtIVZ9" resolve="EvaluateRulesWithTraceStep" />
+                      <ref role="37wK5l" node="55Q$YFtIVZ9" resolve="TypecheckingEvaluateRulesWithTraceStep" />
                       <node concept="37vLTw" id="7WKNeR8Ti$q" role="37wK5m">
                         <ref role="3cqZAo" node="6hqFpWnfwwm" resolve="editorComponent" />
                       </node>
@@ -32115,7 +32116,7 @@
       <property role="TrG5h" value="info" />
       <property role="1EzhhJ" value="false" />
       <node concept="17QB3L" id="4vBwiiV$97_" role="3clF45" />
-      <node concept="3Tmbuc" id="4vBwiiV$97A" role="1B3o_S" />
+      <node concept="3Tm1VV" id="NKt6yndP17" role="1B3o_S" />
       <node concept="3clFbS" id="4vBwiiV$97C" role="3clF47">
         <node concept="3clFbF" id="4vBwiiV$9TT" role="3cqZAp">
           <node concept="Xl_RD" id="4vBwiiV$9TS" role="3clFbG">
@@ -32150,7 +32151,7 @@
         <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
         <node concept="3qUE_q" id="4vBwiiV$adD" role="11_B2D">
           <node concept="3uibUv" id="4vBwiiV$adE" role="3qUE_r">
-            <ref role="3uigEE" to="tj24:1pPth$lAzAx" resolve="Step" />
+            <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
             <node concept="3qTvmN" id="4vBwiiV$adF" role="11_B2D" />
           </node>
         </node>
@@ -32522,7 +32523,7 @@
     <node concept="2tJIrI" id="4vBwiiV$1jU" role="jymVt" />
     <node concept="3Tm1VV" id="4vBwiiV$0x0" role="1B3o_S" />
     <node concept="3uibUv" id="4vBwiiV$0A3" role="1zkMxy">
-      <ref role="3uigEE" to="tj24:1pPth$lAzAx" resolve="Step" />
+      <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
       <node concept="3uibUv" id="4vBwiiV$19j" role="11_B2D">
         <ref role="3uigEE" to="tj24:6IQb_RxlB9v" resolve="CollectTypesStep" />
       </node>

typechecking/solutions/jetbrains.mps.typechecking/build.gradle

@@ -3,9 +3,6 @@ configurations {
 }
 
 dependencies {
-    typeChecking "io.reactivex.rxjava2:rxjava:${rxjavaRevision}@jar"
-    typeChecking "com.github.akarnokd:rxjava2-swing:${rxjavaswingRevision}@jar"
-    typeChecking "org.reactivestreams:reactive-streams:${reactivestreamsRevision}@jar"
 }
 
 task copyDependencies (type: Copy) {

typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd

@@ -4,17 +4,7 @@
     <modelRoot contentPath="${module}" type="default">
       <sourceRoot location="models" />
     </modelRoot>
-    <modelRoot contentPath="${module}" type="java_classes">
-      <sourceRoot location="lib/reactive-streams-1.0.0.final.jar" />
-      <sourceRoot location="lib/rxjava-2.1.1.jar" />
-      <sourceRoot location="lib/rxjava2-swing-0.2.1.jar" />
-    </modelRoot>
   </models>
-  <stubModelEntries>
-    <stubModelEntry path="${module}/lib/reactive-streams-1.0.0.final.jar" />
-    <stubModelEntry path="${module}/lib/rxjava-2.1.1.jar" />
-    <stubModelEntry path="${module}/lib/rxjava2-swing-0.2.1.jar" />
-  </stubModelEntries>
   <sourcePath />
   <dependencies>
     <dependency reexport="true">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
@@ -26,6 +16,7 @@
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="true">f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -53,6 +44,7 @@
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
     <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />

typechecking/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps

@@ -16,10 +16,12 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="qox2" ref="r:7ff0776c-aea4-4df2-88a3-2efb6b568dc3(jetbrains.mps.typechecking.plugin)" />
     <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
-    <import index="unkn" ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d/java:io.reactivex(jetbrains.mps.typechecking/)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
     <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
+    <import index="1yqb" ref="r:bd76f794-cfad-45dd-9c1c-e3203d1c5c7a(jetbrains.mps.coderules.service)" />
+    <import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -735,11 +737,11 @@
           <node concept="3cpWsn" id="3IIf9OAgt3F" role="3cpWs9">
             <property role="TrG5h" value="applyTemplatesStep" />
             <node concept="3uibUv" id="3IIf9OAgt3G" role="1tU5fm">
-              <ref role="3uigEE" to="tj24:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+              <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
             </node>
             <node concept="2ShNRf" id="3IIf9OAgt3H" role="33vP2m">
               <node concept="1pGfFk" id="3IIf9OAgt3I" role="2ShVmc">
-                <ref role="37wK5l" to="tj24:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
+                <ref role="37wK5l" to="1yqb:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
                 <node concept="37vLTw" id="3IIf9OAm07q" role="37wK5m">
                   <ref role="3cqZAo" node="3IIf9OAm07k" resolve="nodes" />
                 </node>
@@ -764,12 +766,12 @@
           <node concept="3cpWsn" id="3IIf9OAgt3N" role="3cpWs9">
             <property role="TrG5h" value="evaluateRulesStep" />
             <property role="3TUv4t" value="false" />
-            <node concept="3uibUv" id="3IIf9OAgt3O" role="1tU5fm">
-              <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+            <node concept="3uibUv" id="NKt6yn93w6" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingEvaluateRulesStep" />
             </node>
             <node concept="2ShNRf" id="3IIf9OAgt3P" role="33vP2m">
-              <node concept="1pGfFk" id="3IIf9OAgt3Q" role="2ShVmc">
-                <ref role="37wK5l" to="tj24:3IIf9OAgFCl" resolve="EvaluateRulesStep" />
+              <node concept="1pGfFk" id="NKt6yn93VV" role="2ShVmc">
+                <ref role="37wK5l" to="tj24:NKt6yn87iq" resolve="TypecheckingEvaluateRulesStep" />
                 <node concept="37vLTw" id="3IIf9OAgt3R" role="37wK5m">
                   <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
                 </node>
@@ -807,7 +809,7 @@
               <node concept="3cpWsn" id="3IIf9OAgx7U" role="3cpWs9">
                 <property role="TrG5h" value="lastStep" />
                 <node concept="3uibUv" id="3IIf9OAgx74" role="1tU5fm">
-                  <ref role="3uigEE" to="tj24:1pPth$lAzAx" resolve="Step" />
+                  <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
                   <node concept="3qTvmN" id="3IIf9OAgx77" role="11_B2D" />
                 </node>
                 <node concept="2OqwBi" id="3IIf9OAgx7V" role="33vP2m">
@@ -817,9 +819,9 @@
                     </node>
                     <node concept="liA8E" id="3IIf9OAgx7Y" role="2OqNvi">
                       <ref role="37wK5l" to="tj24:2mbQB8J5m$l" resolve="scheduleExecute" />
-                      <node concept="2YIFZM" id="3IIf9OAgx7Z" role="37wK5m">
-                        <ref role="1Pybhc" to="tj24:3KwBCAA_ela" resolve="TypecheckingSchedulers" />
-                        <ref role="37wK5l" to="tj24:3KwBCAA_erO" resolve="blocking" />
+                      <node concept="2YIFZM" id="NKt6yn9ky3" role="37wK5m">
+                        <ref role="37wK5l" to="1yqb:3KwBCAA_erO" resolve="blocking" />
+                        <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
                       </node>
                     </node>
                   </node>
@@ -933,11 +935,11 @@
           <node concept="3cpWsn" id="3IIf9O_qVtH" role="3cpWs9">
             <property role="TrG5h" value="applyTemplatesStep" />
             <node concept="3uibUv" id="3IIf9O_qVtI" role="1tU5fm">
-              <ref role="3uigEE" to="tj24:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+              <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
             </node>
             <node concept="2ShNRf" id="3IIf9O_qVtJ" role="33vP2m">
               <node concept="1pGfFk" id="3IIf9O_qVtK" role="2ShVmc">
-                <ref role="37wK5l" to="tj24:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
+                <ref role="37wK5l" to="1yqb:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
                 <node concept="37vLTw" id="3IIf9O_qVvh" role="37wK5m">
                   <ref role="3cqZAo" node="3IIf9O_qVvd" resolve="nodes" />
                 </node>
@@ -955,12 +957,12 @@
           <node concept="3cpWsn" id="3IIf9O_qVtO" role="3cpWs9">
             <property role="TrG5h" value="evaluateRulesStep" />
             <property role="3TUv4t" value="false" />
-            <node concept="3uibUv" id="3IIf9O_qVtP" role="1tU5fm">
-              <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+            <node concept="3uibUv" id="NKt6yn8yik" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingEvaluateRulesStep" />
             </node>
             <node concept="2ShNRf" id="3IIf9O_qVtQ" role="33vP2m">
-              <node concept="1pGfFk" id="3IIf9O_qVtR" role="2ShVmc">
-                <ref role="37wK5l" to="tj24:1pPth$lHpLU" resolve="EvaluateRulesStep" />
+              <node concept="1pGfFk" id="NKt6yn8wC2" role="2ShVmc">
+                <ref role="37wK5l" to="tj24:NKt6yn84NI" resolve="TypecheckingEvaluateRulesStep" />
                 <node concept="37vLTw" id="3IIf9O_qVvg" role="37wK5m">
                   <ref role="3cqZAo" node="3IIf9O_qVvb" resolve="repository" />
                 </node>
@@ -1013,7 +1015,7 @@
               <node concept="3cpWsn" id="3IIf9O_qVu9" role="3cpWs9">
                 <property role="TrG5h" value="lastStep" />
                 <node concept="3uibUv" id="3IIf9O_qVua" role="1tU5fm">
-                  <ref role="3uigEE" to="tj24:1pPth$lAzAx" resolve="Step" />
+                  <ref role="3uigEE" to="1yqb:1pPth$lAzAx" resolve="Step" />
                   <node concept="3qTvmN" id="3IIf9O_qVub" role="11_B2D" />
                 </node>
                 <node concept="2OqwBi" id="3IIf9O_qVuc" role="33vP2m">
@@ -1023,9 +1025,9 @@
                     </node>
                     <node concept="liA8E" id="3IIf9O_qVuf" role="2OqNvi">
                       <ref role="37wK5l" to="tj24:2mbQB8J5m$l" resolve="scheduleExecute" />
-                      <node concept="2YIFZM" id="3IIf9O_qVug" role="37wK5m">
-                        <ref role="1Pybhc" to="tj24:3KwBCAA_ela" resolve="TypecheckingSchedulers" />
-                        <ref role="37wK5l" to="tj24:3KwBCAA_erO" resolve="blocking" />
+                      <node concept="2YIFZM" id="NKt6yn9ky1" role="37wK5m">
+                        <ref role="37wK5l" to="1yqb:3KwBCAA_erO" resolve="blocking" />
+                        <ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
                       </node>
                     </node>
                   </node>

typechecking/solutions/jetbrains.mps.typechecking/models/plugin.mps

@@ -88,9 +88,6 @@
       <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
         <child id="1164991057263" name="throwable" index="YScLw" />
       </concept>
-      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
-        <reference id="1144433057691" name="classifier" index="1PxDUh" />
-      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
@@ -2871,446 +2868,5 @@
       </node>
     </node>
   </node>
-  <node concept="312cEu" id="7WKNeR8VLpH">
-    <property role="TrG5h" value="CodeRulesManager" />
-    <node concept="2tJIrI" id="7WKNeR8VM1Q" role="jymVt" />
-    <node concept="2YIFZL" id="7WKNeR8VMwW" role="jymVt">
-      <property role="TrG5h" value="get" />
-      <node concept="37vLTG" id="7WKNeR8VOgK" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="7WKNeR8VOgL" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="7WKNeR8Wxm0" role="3clF45">
-        <ref role="3uigEE" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
-      </node>
-      <node concept="3Tm1VV" id="7WKNeR8VMwZ" role="1B3o_S" />
-      <node concept="3clFbS" id="7WKNeR8VMx0" role="3clF47">
-        <node concept="3clFbF" id="7WKNeR8VNq$" role="3cqZAp">
-          <node concept="2OqwBi" id="7WKNeR8VNq_" role="3clFbG">
-            <node concept="10M0yZ" id="7WKNeR8VPqA" role="2Oq$k0">
-              <ref role="3cqZAo" node="7WKNeR8VMzY" resolve="ourInstances" />
-              <ref role="1PxDUh" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
-            </node>
-            <node concept="liA8E" id="7WKNeR8VNqA" role="2OqNvi">
-              <ref role="37wK5l" to="5zyv:~ConcurrentMap.computeIfAbsent(java.lang.Object,java.util.function.Function):java.lang.Object" resolve="computeIfAbsent" />
-              <node concept="37vLTw" id="7WKNeR8VNqB" role="37wK5m">
-                <ref role="3cqZAo" node="7WKNeR8VOgK" resolve="repository" />
-              </node>
-              <node concept="1bVj0M" id="7WKNeR8VNqC" role="37wK5m">
-                <node concept="37vLTG" id="7WKNeR8VNqD" role="1bW2Oz">
-                  <property role="TrG5h" value="repo" />
-                  <node concept="3uibUv" id="7WKNeR8VNqE" role="1tU5fm">
-                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="7WKNeR8VNqF" role="1bW5cS">
-                  <node concept="3clFbF" id="7WKNeR8VNqG" role="3cqZAp">
-                    <node concept="2ShNRf" id="7WKNeR8VNqH" role="3clFbG">
-                      <node concept="1pGfFk" id="7WKNeR8W2EB" role="2ShVmc">
-                        <ref role="37wK5l" node="7WKNeR8VU5d" resolve="CodeRulesManager" />
-                        <node concept="37vLTw" id="7WKNeR8W2Lr" role="37wK5m">
-                          <ref role="3cqZAo" node="7WKNeR8VNqD" resolve="repo" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7WKNeR8VM1S" role="jymVt" />
-    <node concept="2YIFZL" id="7WKNeR8VPWJ" role="jymVt">
-      <property role="TrG5h" value="dispose" />
-      <node concept="37vLTG" id="7WKNeR8VQgj" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="7WKNeR8VQgk" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7WKNeR8VPWL" role="3clF45" />
-      <node concept="3Tm1VV" id="7WKNeR8VPWM" role="1B3o_S" />
-      <node concept="3clFbS" id="7WKNeR8VPWN" role="3clF47">
-        <node concept="3clFbF" id="7WKNeR8VQAZ" role="3cqZAp">
-          <node concept="2OqwBi" id="7WKNeR8VQB0" role="3clFbG">
-            <node concept="10M0yZ" id="7WKNeR8VTEZ" role="2Oq$k0">
-              <ref role="3cqZAo" node="7WKNeR8VMzY" resolve="ourInstances" />
-              <ref role="1PxDUh" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
-            </node>
-            <node concept="liA8E" id="7WKNeR8VQB1" role="2OqNvi">
-              <ref role="37wK5l" to="5zyv:~ConcurrentMap.computeIfPresent(java.lang.Object,java.util.function.BiFunction):java.lang.Object" resolve="computeIfPresent" />
-              <node concept="37vLTw" id="7WKNeR8VQB2" role="37wK5m">
-                <ref role="3cqZAo" node="7WKNeR8VQgj" resolve="repository" />
-              </node>
-              <node concept="1bVj0M" id="7WKNeR8VQB3" role="37wK5m">
-                <node concept="3clFbS" id="7WKNeR8VQB4" role="1bW5cS">
-                  <node concept="3clFbF" id="7WKNeR8VQB5" role="3cqZAp">
-                    <node concept="2OqwBi" id="7WKNeR8VQB6" role="3clFbG">
-                      <node concept="37vLTw" id="7WKNeR8VQB7" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7WKNeR8VQBf" resolve="instance" />
-                      </node>
-                      <node concept="liA8E" id="7WKNeR8VQB8" role="2OqNvi">
-                        <ref role="37wK5l" node="7WKNeR8VSa4" resolve="dispose" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3SKdUt" id="7WKNeR8VQB9" role="3cqZAp">
-                    <node concept="3SKdUq" id="7WKNeR8VQBa" role="3SKWNk">
-                      <property role="3SKdUp" value="remove the mapping" />
-                    </node>
-                  </node>
-                  <node concept="3clFbF" id="7WKNeR8VQBb" role="3cqZAp">
-                    <node concept="10Nm6u" id="7WKNeR8VQBc" role="3clFbG" />
-                  </node>
-                </node>
-                <node concept="37vLTG" id="7WKNeR8VQBd" role="1bW2Oz">
-                  <property role="TrG5h" value="repos" />
-                  <node concept="3uibUv" id="7WKNeR8VQBe" role="1tU5fm">
-                    <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-                  </node>
-                </node>
-                <node concept="37vLTG" id="7WKNeR8VQBf" role="1bW2Oz">
-                  <property role="TrG5h" value="instance" />
-                  <node concept="3uibUv" id="7WKNeR8VR_j" role="1tU5fm">
-                    <ref role="3uigEE" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7WKNeR8VROu" role="jymVt" />
-    <node concept="3clFb_" id="7WKNeR8W8qn" role="jymVt">
-      <property role="TrG5h" value="getSession" />
-      <node concept="37vLTG" id="7WKNeR8W9Me" role="3clF46">
-        <property role="TrG5h" value="model" />
-        <node concept="H_c77" id="7WKNeR8Wa8g" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="7WKNeR8W8ON" role="3clF45">
-        <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
-      </node>
-      <node concept="3Tm1VV" id="7WKNeR8W8qq" role="1B3o_S" />
-      <node concept="3clFbS" id="7WKNeR8W8qr" role="3clF47">
-        <node concept="3clFbF" id="7WKNeR8Wiyc" role="3cqZAp">
-          <node concept="2OqwBi" id="7WKNeR8WmN6" role="3clFbG">
-            <node concept="37vLTw" id="7WKNeR8Wiya" role="2Oq$k0">
-              <ref role="3cqZAo" node="7WKNeR8Wgb9" resolve="sessionCache" />
-            </node>
-            <node concept="liA8E" id="7WKNeR8Wnrs" role="2OqNvi">
-              <ref role="37wK5l" to="5zyv:~ConcurrentMap.putIfAbsent(java.lang.Object,java.lang.Object):java.lang.Object" resolve="putIfAbsent" />
-              <node concept="2OqwBi" id="7WKNeR8Wqkq" role="37wK5m">
-                <node concept="2JrnkZ" id="7WKNeR8Wqkr" role="2Oq$k0">
-                  <node concept="37vLTw" id="7WKNeR8Wqks" role="2JrQYb">
-                    <ref role="3cqZAo" node="7WKNeR8W9Me" resolve="model" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="7WKNeR8Wqkt" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SModel.getReference():org.jetbrains.mps.openapi.model.SModelReference" resolve="getReference" />
-                </node>
-              </node>
-              <node concept="2YIFZM" id="7WKNeR8Wpbu" role="37wK5m">
-                <ref role="1Pybhc" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
-                <ref role="37wK5l" to="hano:7DvO2M9p276" resolve="newSession" />
-                <node concept="37vLTw" id="7WKNeR8Wpbv" role="37wK5m">
-                  <ref role="3cqZAo" node="7WKNeR8W19_" resolve="repository" />
-                </node>
-                <node concept="37vLTw" id="7WKNeR8Wpbw" role="37wK5m">
-                  <ref role="3cqZAo" node="7WKNeR8W9Me" resolve="model" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7WKNeR93utq" role="3cqZAp">
-          <node concept="2OqwBi" id="7WKNeR93uOU" role="3clFbG">
-            <node concept="37vLTw" id="7WKNeR93uto" role="2Oq$k0">
-              <ref role="3cqZAo" node="7WKNeR8Wgb9" resolve="sessionCache" />
-            </node>
-            <node concept="liA8E" id="7WKNeR93w2g" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
-              <node concept="2OqwBi" id="7WKNeR93wkI" role="37wK5m">
-                <node concept="2JrnkZ" id="7WKNeR93wkJ" role="2Oq$k0">
-                  <node concept="37vLTw" id="7WKNeR93wkK" role="2JrQYb">
-                    <ref role="3cqZAo" node="7WKNeR8W9Me" resolve="model" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="7WKNeR93wkL" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SModel.getReference():org.jetbrains.mps.openapi.model.SModelReference" resolve="getReference" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7WKNeR8WcYf" role="jymVt" />
-    <node concept="3clFbW" id="7WKNeR8VU5d" role="jymVt">
-      <node concept="37vLTG" id="7WKNeR8W0I5" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="7WKNeR8W0QJ" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7WKNeR8VU5f" role="3clF45" />
-      <node concept="3Tm6S6" id="7WKNeR8VUhp" role="1B3o_S" />
-      <node concept="3clFbS" id="7WKNeR8VU5h" role="3clF47">
-        <node concept="3clFbF" id="7WKNeR8W19D" role="3cqZAp">
-          <node concept="37vLTI" id="7WKNeR8W19F" role="3clFbG">
-            <node concept="2OqwBi" id="7WKNeR8W1Cb" role="37vLTJ">
-              <node concept="Xjq3P" id="7WKNeR8W1Dm" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7WKNeR8W1OT" role="2OqNvi">
-                <ref role="2Oxat5" node="7WKNeR8W19_" resolve="repository" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="7WKNeR8W19J" role="37vLTx">
-              <ref role="3cqZAo" node="7WKNeR8W0I5" resolve="repository" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="12QmIoyQS8L" role="3cqZAp">
-          <node concept="2OqwBi" id="12QmIoyQSer" role="3clFbG">
-            <node concept="37vLTw" id="12QmIoyQS8J" role="2Oq$k0">
-              <ref role="3cqZAo" node="7WKNeR8W0I5" resolve="repository" />
-            </node>
-            <node concept="liA8E" id="12QmIoyQSs9" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~SRepository.addRepositoryListener(org.jetbrains.mps.openapi.module.SRepositoryListener):void" resolve="addRepositoryListener" />
-              <node concept="2ShNRf" id="12QmIoyQStf" role="37wK5m">
-                <node concept="1pGfFk" id="12QmIoyQUz1" role="2ShVmc">
-                  <ref role="37wK5l" node="12QmIoyQPTu" resolve="CodeRulesManager.DisposeListener" />
-                  <node concept="37vLTw" id="12QmIoyQUBu" role="37wK5m">
-                    <ref role="3cqZAo" node="7WKNeR8W0I5" resolve="repository" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="12QmIoyQXLS" role="jymVt" />
-    <node concept="3clFb_" id="7WKNeR8VSa4" role="jymVt">
-      <property role="TrG5h" value="dispose" />
-      <node concept="3cqZAl" id="7WKNeR8VSa6" role="3clF45" />
-      <node concept="3Tm6S6" id="7WKNeR8VUi4" role="1B3o_S" />
-      <node concept="3clFbS" id="7WKNeR8VSa8" role="3clF47">
-        <node concept="3clFbF" id="7WKNeR8Wr9j" role="3cqZAp">
-          <node concept="2OqwBi" id="7WKNeR8Wrvc" role="3clFbG">
-            <node concept="37vLTw" id="7WKNeR8Wr9h" role="2Oq$k0">
-              <ref role="3cqZAo" node="7WKNeR8Wgb9" resolve="sessionCache" />
-            </node>
-            <node concept="liA8E" id="7WKNeR8Ws6G" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.clear():void" resolve="clear" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7WKNeR8W1Tz" role="3cqZAp">
-          <node concept="37vLTI" id="7WKNeR8W2nY" role="3clFbG">
-            <node concept="10Nm6u" id="7WKNeR8W2pI" role="37vLTx" />
-            <node concept="2OqwBi" id="7WKNeR8W1XX" role="37vLTJ">
-              <node concept="Xjq3P" id="7WKNeR8W1Ty" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7WKNeR8W2bE" role="2OqNvi">
-                <ref role="2Oxat5" node="7WKNeR8W19_" resolve="repository" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7WKNeR8VM1V" role="jymVt" />
-    <node concept="Wx3nA" id="7WKNeR8VMzY" role="jymVt">
-      <property role="TrG5h" value="ourInstances" />
-      <node concept="3Tm6S6" id="7WKNeR8VMzZ" role="1B3o_S" />
-      <node concept="3uibUv" id="7WKNeR8VM$0" role="1tU5fm">
-        <ref role="3uigEE" to="5zyv:~ConcurrentMap" resolve="ConcurrentMap" />
-        <node concept="3uibUv" id="7WKNeR8VM$1" role="11_B2D">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-        <node concept="3uibUv" id="7WKNeR8VN2d" role="11_B2D">
-          <ref role="3uigEE" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="7WKNeR8VM$3" role="33vP2m">
-        <node concept="1pGfFk" id="7WKNeR8VM$4" role="2ShVmc">
-          <ref role="37wK5l" to="5zyv:~ConcurrentHashMap.&lt;init&gt;()" resolve="ConcurrentHashMap" />
-          <node concept="3uibUv" id="7WKNeR8VM$5" role="1pMfVU">
-            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-          </node>
-          <node concept="3uibUv" id="7WKNeR8VNg3" role="1pMfVU">
-            <ref role="3uigEE" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7WKNeR8VM1Z" role="jymVt" />
-    <node concept="312cEu" id="12QmIoyQPie" role="jymVt">
-      <property role="2bfB8j" value="false" />
-      <property role="TrG5h" value="DisposeListener" />
-      <node concept="3clFbW" id="12QmIoyQPTu" role="jymVt">
-        <node concept="37vLTG" id="12QmIoyQPVg" role="3clF46">
-          <property role="TrG5h" value="repository" />
-          <node concept="3uibUv" id="12QmIoyQQ2H" role="1tU5fm">
-            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="12QmIoyQPTw" role="3clF45" />
-        <node concept="3Tm1VV" id="12QmIoyQPTx" role="1B3o_S" />
-        <node concept="3clFbS" id="12QmIoyQPTy" role="3clF47">
-          <node concept="3clFbF" id="12QmIoyQQQg" role="3cqZAp">
-            <node concept="37vLTI" id="12QmIoyQQQi" role="3clFbG">
-              <node concept="2OqwBi" id="12QmIoyQQV6" role="37vLTJ">
-                <node concept="Xjq3P" id="12QmIoyQQX2" role="2Oq$k0" />
-                <node concept="2OwXpG" id="12QmIoyQQV9" role="2OqNvi">
-                  <ref role="2Oxat5" node="12QmIoyQQQc" resolve="repository" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="12QmIoyQQQm" role="37vLTx">
-                <ref role="3cqZAo" node="12QmIoyQPVg" resolve="repository" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="12QmIoyQUQ4" role="1B3o_S" />
-      <node concept="3uibUv" id="12QmIoyQPDM" role="1zkMxy">
-        <ref role="3uigEE" to="lui2:~SRepositoryListenerBase" resolve="SRepositoryListenerBase" />
-      </node>
-      <node concept="3clFb_" id="12QmIoyQPE0" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="moduleRemoved" />
-        <property role="DiZV1" value="false" />
-        <property role="od$2w" value="false" />
-        <node concept="3Tm1VV" id="12QmIoyQPE1" role="1B3o_S" />
-        <node concept="3cqZAl" id="12QmIoyQPE3" role="3clF45" />
-        <node concept="37vLTG" id="12QmIoyQPE4" role="3clF46">
-          <property role="TrG5h" value="module" />
-          <node concept="3uibUv" id="12QmIoyQPE5" role="1tU5fm">
-            <ref role="3uigEE" to="lui2:~SModuleReference" resolve="SModuleReference" />
-          </node>
-          <node concept="2AHcQZ" id="12QmIoyQPE6" role="2AJF6D">
-            <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="12QmIoyQPE7" role="3clF47">
-          <node concept="3SKdUt" id="12QmIoyU_fU" role="3cqZAp">
-            <node concept="3SKdUq" id="12QmIoyU_fW" role="3SKWNk">
-              <property role="3SKdUp" value="make sure we don't keep stale classes" />
-            </node>
-          </node>
-          <node concept="3clFbF" id="12QmIoyQR7e" role="3cqZAp">
-            <node concept="2YIFZM" id="12QmIoyQR8D" role="3clFbG">
-              <ref role="37wK5l" node="7WKNeR8VPWJ" resolve="dispose" />
-              <ref role="1Pybhc" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
-              <node concept="37vLTw" id="12QmIoyQRau" role="37wK5m">
-                <ref role="3cqZAo" node="12QmIoyQQQc" resolve="repository" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="12QmIoyU$zz" role="3cqZAp">
-            <node concept="2OqwBi" id="12QmIoyU$JU" role="3clFbG">
-              <node concept="37vLTw" id="12QmIoyU$zx" role="2Oq$k0">
-                <ref role="3cqZAo" node="12QmIoyQQQc" resolve="repository" />
-              </node>
-              <node concept="liA8E" id="12QmIoyU_0b" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~SRepository.removeRepositoryListener(org.jetbrains.mps.openapi.module.SRepositoryListener):void" resolve="removeRepositoryListener" />
-                <node concept="Xjq3P" id="12QmIoyU_3M" role="37wK5m" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="12QmIoyQPE8" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="312cEg" id="12QmIoyQQQc" role="jymVt">
-        <property role="TrG5h" value="repository" />
-        <node concept="3Tm6S6" id="12QmIoyQQQd" role="1B3o_S" />
-        <node concept="3uibUv" id="12QmIoyQQQf" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="12QmIoyQVMn" role="jymVt" />
-    <node concept="312cEg" id="7WKNeR8Wgb9" role="jymVt">
-      <property role="TrG5h" value="sessionCache" />
-      <node concept="3Tm6S6" id="7WKNeR8Wgba" role="1B3o_S" />
-      <node concept="3uibUv" id="7WKNeR8WiEd" role="1tU5fm">
-        <ref role="3uigEE" to="5zyv:~ConcurrentMap" resolve="ConcurrentMap" />
-        <node concept="3uibUv" id="7WKNeR8Wlc6" role="11_B2D">
-          <ref role="3uigEE" to="mhbf:~SModelReference" resolve="SModelReference" />
-        </node>
-        <node concept="3uibUv" id="7WKNeR8Wq2D" role="11_B2D">
-          <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="7WKNeR8Win4" role="33vP2m">
-        <node concept="1pGfFk" id="7WKNeR8WkaM" role="2ShVmc">
-          <ref role="37wK5l" to="5zyv:~ConcurrentHashMap.&lt;init&gt;()" resolve="ConcurrentHashMap" />
-          <node concept="3uibUv" id="7WKNeR8WkAs" role="1pMfVU">
-            <ref role="3uigEE" to="mhbf:~SModelReference" resolve="SModelReference" />
-          </node>
-          <node concept="3uibUv" id="7WKNeR8WpL7" role="1pMfVU">
-            <ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3Tm1VV" id="7WKNeR8VLpI" role="1B3o_S" />
-    <node concept="3UR2Jj" id="7WKNeR8VMqz" role="lGtFl">
-      <node concept="TZ5HA" id="7WKNeR8VMq$" role="TZ5H$">
-        <node concept="1dT_AC" id="7WKNeR8VMq_" role="1dT_Ay">
-          <property role="1dT_AB" value="A per-repository cache of code rule indices." />
-        </node>
-      </node>
-    </node>
-    <node concept="312cEg" id="7WKNeR8W19_" role="jymVt">
-      <property role="TrG5h" value="repository" />
-      <node concept="3Tm6S6" id="7WKNeR8W19A" role="1B3o_S" />
-      <node concept="3uibUv" id="7WKNeR8W19C" role="1tU5fm">
-        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-      </node>
-    </node>
-  </node>
-  <node concept="2uRRBy" id="7WKNeR8VWis">
-    <property role="TrG5h" value="CodeRulesManagerLifecycle" />
-    <property role="3GE5qa" value="lifecycle" />
-    <node concept="2uRRBT" id="7WKNeR8VWiQ" role="2uRRB$">
-      <node concept="3clFbS" id="7WKNeR8VWiR" role="2VODD2">
-        <node concept="3clFbF" id="7WKNeR8VWpv" role="3cqZAp">
-          <node concept="2YIFZM" id="7WKNeR8VW_Q" role="3clFbG">
-            <ref role="37wK5l" node="7WKNeR8VMwW" resolve="get" />
-            <ref role="1Pybhc" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
-            <node concept="2OqwBi" id="7WKNeR8VWXq" role="37wK5m">
-              <node concept="1KvdUw" id="7WKNeR8VWAi" role="2Oq$k0" />
-              <node concept="liA8E" id="7WKNeR8VY8y" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2uRRBN" id="7WKNeR8VWjc" role="2uRRB_">
-      <node concept="3clFbS" id="7WKNeR8VWjd" role="2VODD2">
-        <node concept="3clFbF" id="7WKNeR8VYg9" role="3cqZAp">
-          <node concept="2YIFZM" id="7WKNeR8VYgC" role="3clFbG">
-            <ref role="37wK5l" node="7WKNeR8VPWJ" resolve="dispose" />
-            <ref role="1Pybhc" node="7WKNeR8VLpH" resolve="CodeRulesManager" />
-            <node concept="2OqwBi" id="7WKNeR8VZ0O" role="37wK5m">
-              <node concept="1KvdUw" id="7WKNeR8VYiU" role="2Oq$k0" />
-              <node concept="liA8E" id="7WKNeR8W0bW" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
 </model>