From f730641327443402533a245414c5998e6e728ee1 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 4 Apr 2018 10:52:14 +0200
Subject: [PATCH] Extract "reporting" solution and interface.

---
 .mps/modules.xml                              |   1 +
 build.xml                                     | 139 +++++++++-
 .../jetbrains.mps.typechecking.build.mps      |  65 +++++
 .../jetbrains.mps.typechecking.reporting.msd  |  34 +++
 ...tbrains.mps.lang.typesystem2.reporting.mps | 239 +++++++++++++++++
 .../jetbrains.mps.lang.typechecking.test.msd  |   2 +
 .../generator/template/main@generator.mps     | 240 +++++++++++++++++-
 .../jetbrains.mps.lang.typesystem2.mpl        |   2 +
 ...jetbrains.mps.lang.typesystem2.runtime.msd |   2 +
 ...brains.mps.lang.typesystem2.evaluation.mps |   9 +-
 ...etbrains.mps.lang.typesystem2.template.msd |   2 +
 .../jetbrains.mps.lang.typesystem2.macro.mps  |  29 +++
 12 files changed, 752 insertions(+), 12 deletions(-)
 create mode 100644 typechecking/solutions/jetbrains.mps.typechecking.reporting/jetbrains.mps.typechecking.reporting.msd
 create mode 100644 typechecking/solutions/jetbrains.mps.typechecking.reporting/models/jetbrains.mps.lang.typesystem2.reporting.mps

diff --git a/.mps/modules.xml b/.mps/modules.xml
index 0de28061..42d00285 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -11,6 +11,7 @@
       <modulePath path="$PROJECT_DIR$/typechecking/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl" folder="typechecking.test" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="typechecking.baseLanguageExt" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd" folder="build" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.reporting/jetbrains.mps.typechecking.reporting.msd" folder="typechecking" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd" folder="typechecking.test" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.sample/jetbrains.mps.typechecking.sample.msd" folder="typechecking.test" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd" folder="typechecking.test" />
diff --git a/build.xml b/build.xml
index 5f895ef4..c0dc5c91 100644
--- a/build.xml
+++ b/build.xml
@@ -441,6 +441,44 @@
       <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking-models" prefix="module/models" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.reporting.jar" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.reporting.jar/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.reporting.jar/META-INF/module.xml">
+      <module namespace="jetbrains.mps.typechecking.reporting" type="solution" uuid="da80355b-a098-4248-9ec8-70d10dd7e9af">
+        <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="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <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="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.typechecking.reporting-src.jar" descriptor="jetbrains.mps.typechecking.reporting.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.layout}/tests/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.jar" />
+    </jar>
+    <copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking.reporting-models">
+      <fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.reporting/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
+    </copyModels>
+    <jar destfile="${build.layout}/tests/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" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.reporting/jetbrains.mps.typechecking.reporting.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking.reporting-models" prefix="module/models" />
+    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.ui.jar" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.ui.jar/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.ui.jar/META-INF/module.xml">
@@ -549,6 +587,7 @@
           <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
           <module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+          <module ref="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" />
         </dependencies>
         <classpath>
           <entry path="." />
@@ -1215,6 +1254,44 @@
       <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking-models1" prefix="module/models" />
     </jar>
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.reporting.jar1" />
+    <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.reporting.jar1/META-INF" />
+    <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.reporting.jar1/META-INF/module.xml">
+      <module namespace="jetbrains.mps.typechecking.reporting" type="solution" uuid="da80355b-a098-4248-9ec8-70d10dd7e9af">
+        <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="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
+          <module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
+          <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="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
+        </dependencies>
+        <classpath>
+          <entry path="." />
+        </classpath>
+        <sources jar="jetbrains.mps.typechecking.reporting-src.jar" descriptor="jetbrains.mps.typechecking.reporting.msd" />
+      </module>
+    </echoxml>
+    <jar destfile="${build.tmp}/default/typechecking-0.3.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" />
+    </jar>
+    <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.3.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" />
+        <exclude name="**/checkpoints" />
+        <exclude name="**/*.mps" />
+      </fileset>
+      <zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.reporting/jetbrains.mps.typechecking.reporting.msd" prefix="module" />
+      <zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking.reporting-models1" prefix="module/models" />
+    </jar>
     <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.ui.jar1" />
     <mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.ui.jar1/META-INF" />
     <echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.ui.jar1/META-INF/module.xml">
@@ -1359,7 +1436,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.logic.runtime, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typechecking.test, java.compile.jetbrains.mps.typechecking, 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.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.logic.runtime, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typechecking.test, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, 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.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample.test" />
   
   <target name="processResources" />
   
@@ -1474,6 +1551,7 @@
         <module file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd" />
         <module file="${basedir}/logic/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd" />
         <module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" />
+        <module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.reporting/jetbrains.mps.typechecking.reporting.msd" />
         <module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd" />
       </chunk>
       <chunk>
@@ -1806,13 +1884,15 @@
     </javac>
   </target>
   
-  <target name="java.compile.java.modules.cycle.1" depends="java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.java.modules.cycle.1" depends="java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
     <mkdir dir="${build.tmp}/java.modules.cycle.1" />
     <javac destdir="${build.tmp}/java.modules.cycle.1" fork="true" encoding="utf8" nowarn="true" includeantruntime="false">
       <compilerarg value="-Xlint:none" />
       <src>
         <path location="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
+        <path location="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
         <path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" />
+        <path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.reporting/source_gen" />
       </src>
       <classpath>
         <fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
@@ -1856,13 +1936,12 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1882,7 +1961,6 @@
         <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.typesystem2.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" />
@@ -1919,7 +1997,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2.template" depends="java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2.template" depends="java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -1953,6 +2031,7 @@
         <fileset file="${artifacts.mps}/lib/ecj-4.7.2.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
+        <pathelement path="${build.tmp}/java.modules.cycle.1" />
       </classpath>
     </javac>
   </target>
@@ -2076,7 +2155,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typechecking.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.ui, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typechecking.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.typechecking.ui, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2109,6 +2188,7 @@
         <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" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
@@ -2145,7 +2225,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.typechecking" depends="java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.typechecking" depends="java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, 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">
@@ -2165,7 +2245,6 @@
         <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.typesystem2.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" />
@@ -2198,6 +2277,43 @@
     </javac>
   </target>
   
+  <target name="java.compile.jetbrains.mps.typechecking.reporting" depends="java.compile.jetbrains.mps.logic.runtime, java.compile.java.modules.cycle.1, fetchDependencies">
+    <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.reporting/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
+    <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.reporting/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.logic.runtime" />
+        <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" />
+        <pathelement path="${build.tmp}/java.modules.cycle.1" />
+      </classpath>
+    </javac>
+  </target>
+  
   <target name="java.compile.jetbrains.mps.typechecking.ui" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, 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" />
@@ -2301,7 +2417,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, 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">
@@ -2324,6 +2440,7 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.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" />
@@ -2580,6 +2697,7 @@
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.reactor.jar" />
       <pathelement location="${build.layout}/tests/jetbrains.mps.logic.runtime.jar" />
       <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.layout}/tests/jetbrains.mps.typechecking.ui.jar" />
     </path>
@@ -2659,6 +2777,7 @@
     <delete dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
     <delete dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" />
+    <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.reporting/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/source_gen" />
     <delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index ce42d0bf..f2e8aa81 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -910,6 +910,9 @@
             <ref role="1Busuk" node="3u5wJtgiSM" resolve="jetbrains.mps.lang.smodel.types" />
           </node>
         </node>
+        <node concept="1E0d5M" id="oI9YrNsk8" role="1E1XAP">
+          <ref role="1E0d5P" node="oI9YrJ7Rx" resolve="jetbrains.mps.typechecking.reporting" />
+        </node>
       </node>
       <node concept="1E1JtA" id="7BVjoXzUxee" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1002,6 +1005,12 @@
             <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
           </node>
         </node>
+        <node concept="1SiIV0" id="oI9YrJ93V" role="3bR37C">
+          <node concept="3bR9La" id="oI9YrJ93W" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="oI9YrJ7Rx" resolve="jetbrains.mps.typechecking.reporting" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7BVjoXzUx9d" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1070,6 +1079,12 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="oI9YrJ949" role="3bR37C">
+          <node concept="3bR9La" id="oI9YrJ94a" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="oI9YrJ7Rx" resolve="jetbrains.mps.typechecking.reporting" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3u5wJtgiSM" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1249,6 +1264,12 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="oI9YrRP7C" role="3bR37C">
+          <node concept="3bR9La" id="oI9YrRP7D" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="oI9YrJ7Rx" resolve="jetbrains.mps.typechecking.reporting" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="65DJywFj0uW" role="3989C9">
@@ -1411,6 +1432,44 @@
           </node>
         </node>
       </node>
+      <node concept="1E1JtA" id="oI9YrJ7Rx" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="jetbrains.mps.typechecking.reporting" />
+        <property role="3LESm3" value="da80355b-a098-4248-9ec8-70d10dd7e9af" />
+        <property role="2GAjPV" value="false" />
+        <node concept="55IIr" id="oI9YrJ7R$" role="3LF7KH">
+          <node concept="2Ry0Ak" id="oI9YrJ898" role="iGT6I">
+            <property role="2Ry0Am" value="typechecking" />
+            <node concept="2Ry0Ak" id="oI9YrJ8jh" role="2Ry0An">
+              <property role="2Ry0Am" value="solutions" />
+              <node concept="2Ry0Ak" id="oI9YrJ8tq" role="2Ry0An">
+                <property role="2Ry0Am" value="jetbrains.mps.typechecking.reporting" />
+                <node concept="2Ry0Ak" id="oI9YrJ8LB" role="2Ry0An">
+                  <property role="2Ry0Am" value="jetbrains.mps.typechecking.reporting.msd" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="oI9YrJ8Td" role="3bR37C">
+          <node concept="3bR9La" id="oI9YrJ8Te" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.typesystem2.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="oI9YrJ8Tf" role="3bR37C">
+          <node concept="3bR9La" id="oI9YrJ8Tg" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="oI9YrJ8Th" role="3bR37C">
+          <node concept="3bR9La" id="oI9YrJ8Ti" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.typesystem2.template" />
+          </node>
+        </node>
+      </node>
       <node concept="1E1JtA" id="55Q$YFtvwQY" role="2G$12L">
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="jetbrains.mps.typechecking.ui" />
@@ -1898,6 +1957,9 @@
         <node concept="L2wRC" id="7Ant4WkHLmq" role="39821P">
           <ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
         </node>
+        <node concept="L2wRC" id="oI9YrJbb6" role="39821P">
+          <ref role="L2wRA" node="oI9YrJ7Rx" resolve="jetbrains.mps.typechecking.reporting" />
+        </node>
         <node concept="L2wRC" id="55Q$YFtv_$M" role="39821P">
           <ref role="L2wRA" node="55Q$YFtvwQY" resolve="jetbrains.mps.typechecking.ui" />
         </node>
@@ -2190,6 +2252,9 @@
                 </node>
               </node>
             </node>
+            <node concept="L2wRC" id="oI9YrJbsm" role="39821P">
+              <ref role="L2wRA" node="oI9YrJ7Rx" resolve="jetbrains.mps.typechecking.reporting" />
+            </node>
             <node concept="L2wRC" id="55Q$YFtwDpa" role="39821P">
               <ref role="L2wRA" node="55Q$YFtvwQY" resolve="jetbrains.mps.typechecking.ui" />
             </node>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.reporting/jetbrains.mps.typechecking.reporting.msd b/typechecking/solutions/jetbrains.mps.typechecking.reporting/jetbrains.mps.typechecking.reporting.msd
new file mode 100644
index 00000000..9680439e
--- /dev/null
+++ b/typechecking/solutions/jetbrains.mps.typechecking.reporting/jetbrains.mps.typechecking.reporting.msd
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="jetbrains.mps.typechecking.reporting" uuid="da80355b-a098-4248-9ec8-70d10dd7e9af" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <sourcePath />
+  <dependencies>
+    <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
+    <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
+    <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
+  </dependencies>
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
+    <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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
+    <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="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)" version="0" />
+    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" 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>
+
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.reporting/models/jetbrains.mps.lang.typesystem2.reporting.mps b/typechecking/solutions/jetbrains.mps.typechecking.reporting/models/jetbrains.mps.lang.typesystem2.reporting.mps
new file mode 100644
index 00000000..b8016e5e
--- /dev/null
+++ b/typechecking/solutions/jetbrains.mps.typechecking.reporting/models/jetbrains.mps.lang.typesystem2.reporting.mps
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)">
+  <persistence version="9" />
+  <languages>
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="8" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+  </languages>
+  <imports>
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.evaluation)" />
+    <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.typesystem2.macro)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
+        <child id="1164991057263" name="throwable" index="YScLw" />
+      </concept>
+      <concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
+        <child id="1081256993305" name="classType" index="2ZW6by" />
+        <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
+      </concept>
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <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="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">
+        <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="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </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="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
+      <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" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <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" />
+      </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="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
+      <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" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <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="3HP615" id="oI9YrIZeS">
+    <property role="TrG5h" value="Reporting" />
+    <node concept="2tJIrI" id="oI9YrIZfa" role="jymVt" />
+    <node concept="3clFb_" id="oI9YrIZnU" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="TrG5h" value="assignType" />
+      <node concept="37vLTG" id="oI9YrIZq4" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="3Tqbb2" id="oI9YrIZrX" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="oI9YrIZqr" role="3clF46">
+        <property role="TrG5h" value="nodeType" />
+        <node concept="3Tqbb2" id="oI9YrIZxJ" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="oI9YrIZpM" role="3clF45" />
+      <node concept="3Tm1VV" id="oI9YrIZnX" role="1B3o_S" />
+      <node concept="3clFbS" id="oI9YrIZnY" role="3clF47" />
+    </node>
+    <node concept="2tJIrI" id="oI9YrIZfj" role="jymVt" />
+    <node concept="3Tm1VV" id="oI9YrIZeT" role="1B3o_S" />
+  </node>
+  <node concept="312cEu" id="oI9YrIZTG">
+    <property role="TrG5h" value="ReportingFrom" />
+    <node concept="2tJIrI" id="oI9YrIZUi" role="jymVt" />
+    <node concept="2YIFZL" id="oI9YrIZUA" role="jymVt">
+      <property role="TrG5h" value="solver" />
+      <node concept="37vLTG" id="oI9YrIZVw" role="3clF46">
+        <property role="TrG5h" value="sessionSolver" />
+        <node concept="3uibUv" id="oI9YrIZWj" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="oI9YrIZV1" role="3clF45">
+        <ref role="3uigEE" node="oI9YrIZeS" resolve="Reporting" />
+      </node>
+      <node concept="3Tm1VV" id="oI9YrIZUD" role="1B3o_S" />
+      <node concept="3clFbS" id="oI9YrIZUE" role="3clF47">
+        <node concept="3SKdUt" id="oI9YrJ1AH" role="3cqZAp">
+          <node concept="3SKdUq" id="oI9YrJ1AJ" role="3SKWNk">
+            <property role="3SKdUp" value="TODO: pluggable components" />
+          </node>
+        </node>
+        <node concept="3clFbJ" id="oI9YrIZWS" role="3cqZAp">
+          <node concept="2ZW3vV" id="oI9YrJ0$6" role="3clFbw">
+            <node concept="3uibUv" id="oI9YrJ1rT" role="2ZW6by">
+              <ref role="3uigEE" node="oI9YrIZeS" resolve="Reporting" />
+            </node>
+            <node concept="37vLTw" id="oI9YrIZX$" role="2ZW6bz">
+              <ref role="3cqZAo" node="oI9YrIZVw" resolve="sessionSolver" />
+            </node>
+          </node>
+          <node concept="3clFbS" id="oI9YrIZWU" role="3clFbx">
+            <node concept="3cpWs6" id="oI9YrJ0ER" role="3cqZAp">
+              <node concept="1eOMI4" id="oI9YrJ0FP" role="3cqZAk">
+                <node concept="10QFUN" id="oI9YrJ0FM" role="1eOMHV">
+                  <node concept="3uibUv" id="oI9YrJ1tE" role="10QFUM">
+                    <ref role="3uigEE" node="oI9YrIZeS" resolve="Reporting" />
+                  </node>
+                  <node concept="37vLTw" id="oI9YrJ0FS" role="10QFUP">
+                    <ref role="3cqZAo" node="oI9YrIZVw" resolve="sessionSolver" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="oI9YrJ0HG" role="3cqZAp" />
+        <node concept="YS8fn" id="oI9YrJ0LG" role="3cqZAp">
+          <node concept="2ShNRf" id="oI9YrJ0NY" role="YScLw">
+            <node concept="1pGfFk" id="oI9YrJ0WL" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
+              <node concept="Xl_RD" id="oI9YrJ0X1" role="37wK5m">
+                <property role="Xl_RC" value="reporting not available" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="oI9YrJ1mF" role="jymVt" />
+    <node concept="2YIFZL" id="oI9YrJ1oq" role="jymVt">
+      <property role="TrG5h" value="application" />
+      <node concept="37vLTG" id="oI9YrJ1qv" role="3clF46">
+        <property role="TrG5h" value="appSession" />
+        <node concept="3uibUv" id="oI9YrJ1qP" role="1tU5fm">
+          <ref role="3uigEE" to="psr6:18kNIl1vDPZ" resolve="AbstractMacroProcessing" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="oI9YrJ1pY" role="3clF45">
+        <ref role="3uigEE" node="oI9YrIZeS" resolve="Reporting" />
+      </node>
+      <node concept="3Tm1VV" id="oI9YrJ1ot" role="1B3o_S" />
+      <node concept="3clFbS" id="oI9YrJ1ou" role="3clF47">
+        <node concept="3SKdUt" id="oI9YrJ1Ck" role="3cqZAp">
+          <node concept="3SKdUq" id="oI9YrJ1Cm" role="3SKWNk">
+            <property role="3SKdUp" value="TODO: pluggable components" />
+          </node>
+        </node>
+        <node concept="3clFbJ" id="oI9YrJ1CK" role="3cqZAp">
+          <node concept="3clFbS" id="oI9YrJ1CM" role="3clFbx">
+            <node concept="3cpWs6" id="oI9YrJ1VU" role="3cqZAp">
+              <node concept="1eOMI4" id="oI9YrJ1WT" role="3cqZAk">
+                <node concept="10QFUN" id="oI9YrJ1WQ" role="1eOMHV">
+                  <node concept="3uibUv" id="oI9YrJ1WV" role="10QFUM">
+                    <ref role="3uigEE" node="oI9YrIZeS" resolve="Reporting" />
+                  </node>
+                  <node concept="37vLTw" id="oI9YrJ1WW" role="10QFUP">
+                    <ref role="3cqZAo" node="oI9YrJ1qv" resolve="appSession" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2ZW3vV" id="oI9YrJ1Sh" role="3clFbw">
+            <node concept="3uibUv" id="oI9YrJ1Ve" role="2ZW6by">
+              <ref role="3uigEE" node="oI9YrIZeS" resolve="Reporting" />
+            </node>
+            <node concept="37vLTw" id="oI9YrJ1Dx" role="2ZW6bz">
+              <ref role="3cqZAo" node="oI9YrJ1qv" resolve="appSession" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="oI9YrJ1XR" role="3cqZAp" />
+        <node concept="YS8fn" id="oI9YrJ1XS" role="3cqZAp">
+          <node concept="2ShNRf" id="oI9YrJ1XT" role="YScLw">
+            <node concept="1pGfFk" id="oI9YrJ1XU" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
+              <node concept="Xl_RD" id="oI9YrJ1XV" role="37wK5m">
+                <property role="Xl_RC" value="reporting not available" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="oI9YrIZUn" role="jymVt" />
+    <node concept="3Tm1VV" id="oI9YrIZTH" role="1B3o_S" />
+  </node>
+</model>
+
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd b/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
index 675d597a..abcb9420 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
+++ b/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd
@@ -19,6 +19,7 @@
     <dependency reexport="false">35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.typechecking.ui)</dependency>
     <dependency reexport="false">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">da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
@@ -62,6 +63,7 @@
     <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="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
+    <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
     <module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.typechecking.ui)" version="0" />
   </dependencyVersions>
 </solution>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 09e60ff9..d34690f0 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -52,6 +52,7 @@
     <import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" />
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.evaluation)" />
     <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.typesystem2.program)" />
+    <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
     <import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" implicit="true" />
     <import index="z8tp" ref="r:5bfbd177-208e-4d27-b74c-2ebd2a92eb80(jetbrains.mps.lang.smodel.types.structure)" implicit="true" />
@@ -20649,7 +20650,7 @@
     </node>
   </node>
   <node concept="bUwia" id="oI9YrdoXd">
-    <property role="TrG5h" value="node" />
+    <property role="TrG5h" value="reporting" />
     <node concept="3aamgX" id="oI9YrDh3R" role="3acgRq">
       <ref role="30HIoZ" to="z8tp:6nJA6bpveD5" resolve="SNodeTypeOperation" />
       <node concept="b5Tf3" id="oI9YrDhNx" role="1lVwrX" />
@@ -20762,6 +20763,243 @@
         </node>
       </node>
     </node>
+    <node concept="3aamgX" id="oI9YrWegi" role="3acgRq">
+      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
+      <node concept="14YyZ8" id="oI9YrWeEj" role="1lVwrX">
+        <node concept="14ZrTv" id="oI9YrWeRH" role="14ZwWg">
+          <node concept="30G5F_" id="oI9YrWeRI" role="150hEN">
+            <node concept="3clFbS" id="oI9YrWeRJ" role="2VODD2">
+              <node concept="3clFbF" id="oI9YrWgo$" role="3cqZAp">
+                <node concept="2OqwBi" id="oI9YrWhEN" role="3clFbG">
+                  <node concept="2OqwBi" id="oI9YrWgB7" role="2Oq$k0">
+                    <node concept="30H73N" id="oI9YrWgoz" role="2Oq$k0" />
+                    <node concept="2Xjw5R" id="oI9YrWh21" role="2OqNvi">
+                      <node concept="3gmYPX" id="oI9YrWhba" role="1xVPHs">
+                        <node concept="3gn64h" id="oI9YrWhnj" role="3gmYPZ">
+                          <ref role="3gnhBz" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3x8VRR" id="oI9YrWi3M" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1Koe21" id="oI9YrWf2l" role="150oIE">
+            <node concept="3clFb_" id="oI9YrWf2m" role="1Koe22">
+              <property role="TrG5h" value="context" />
+              <node concept="3Tm6S6" id="oI9YrWf2n" role="1B3o_S" />
+              <node concept="3cqZAl" id="oI9YrWf2o" role="3clF45" />
+              <node concept="3clFbS" id="oI9YrWf2p" role="3clF47">
+                <node concept="3clFbF" id="oI9YrWf2q" role="3cqZAp">
+                  <node concept="2OqwBi" id="oI9YrWf2r" role="3clFbG">
+                    <node concept="2YIFZM" id="oI9YrWfNN" role="2Oq$k0">
+                      <ref role="37wK5l" to="9x2e:oI9YrIZUA" resolve="solver" />
+                      <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
+                      <node concept="2OqwBi" id="oI9YrWf2v" role="37wK5m">
+                        <node concept="2YIFZM" id="oI9YrWf2w" role="2Oq$k0">
+                          <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                          <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
+                        </node>
+                        <node concept="liA8E" id="oI9YrWf2x" role="2OqNvi">
+                          <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="oI9YrWf2y" role="2OqNvi">
+                      <ref role="37wK5l" to="9x2e:oI9YrIZnU" resolve="assignType" />
+                      <node concept="10Nm6u" id="oI9YrWf2z" role="37wK5m">
+                        <node concept="29HgVG" id="oI9YrWf2$" role="lGtFl">
+                          <node concept="3NFfHV" id="oI9YrWf2_" role="3NFExx">
+                            <node concept="3clFbS" id="oI9YrWf2A" role="2VODD2">
+                              <node concept="3clFbF" id="oI9YrWf2B" role="3cqZAp">
+                                <node concept="2OqwBi" id="oI9YrWf2C" role="3clFbG">
+                                  <node concept="1PxgMI" id="oI9YrWf2D" role="2Oq$k0">
+                                    <property role="1BlNFB" value="true" />
+                                    <node concept="chp4Y" id="oI9YrWf2E" role="3oSUPX">
+                                      <ref role="cht4Q" to="tpee:hqOqwz4" resolve="DotExpression" />
+                                    </node>
+                                    <node concept="2OqwBi" id="oI9YrWf2F" role="1m5AlR">
+                                      <node concept="30H73N" id="oI9YrWf2G" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="oI9YrWf2H" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3TrEf2" id="oI9YrWf2I" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="10Nm6u" id="oI9YrWf2J" role="37wK5m">
+                        <node concept="29HgVG" id="oI9YrWf2K" role="lGtFl">
+                          <node concept="3NFfHV" id="oI9YrWf2L" role="3NFExx">
+                            <node concept="3clFbS" id="oI9YrWf2M" role="2VODD2">
+                              <node concept="3clFbF" id="oI9YrWf2N" role="3cqZAp">
+                                <node concept="2OqwBi" id="oI9YrWf2O" role="3clFbG">
+                                  <node concept="1PxgMI" id="oI9YrWf2P" role="2Oq$k0">
+                                    <node concept="chp4Y" id="oI9YrWf2Q" role="3oSUPX">
+                                      <ref role="cht4Q" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
+                                    </node>
+                                    <node concept="2OqwBi" id="oI9YrWf2R" role="1m5AlR">
+                                      <node concept="30H73N" id="oI9YrWf2S" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="oI9YrWf2T" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3TrEf2" id="oI9YrWf2U" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="wq2x:oI9Yrc9Ch" resolve="typeExpr" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="raruj" id="oI9YrWf2V" role="lGtFl" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1Koe21" id="oI9YrWidk" role="14YRTM">
+          <node concept="3clFb_" id="oI9YrWidl" role="1Koe22">
+            <property role="TrG5h" value="context" />
+            <node concept="37vLTG" id="oI9YrWqaC" role="3clF46">
+              <property role="TrG5h" value="session" />
+              <node concept="3uibUv" id="oI9YrWqaD" role="1tU5fm">
+                <ref role="3uigEE" to="psr6:18kNIl1vDPZ" resolve="AbstractMacroProcessing" />
+              </node>
+            </node>
+            <node concept="3Tm6S6" id="oI9YrWidm" role="1B3o_S" />
+            <node concept="3cqZAl" id="oI9YrWidn" role="3clF45" />
+            <node concept="3clFbS" id="oI9YrWido" role="3clF47">
+              <node concept="3clFbF" id="oI9YrWidp" role="3cqZAp">
+                <node concept="2OqwBi" id="oI9YrWidq" role="3clFbG">
+                  <node concept="2YIFZM" id="oI9YrWiD0" role="2Oq$k0">
+                    <ref role="37wK5l" to="9x2e:oI9YrJ1oq" resolve="application" />
+                    <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
+                    <node concept="37vLTw" id="oI9YrWqx1" role="37wK5m">
+                      <ref role="3cqZAo" node="oI9YrWqaC" resolve="session" />
+                      <node concept="1ZhdrF" id="oI9YrWqGh" role="lGtFl">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                        <property role="2qtEX8" value="variableDeclaration" />
+                        <node concept="3$xsQk" id="oI9YrWqGi" role="3$ytzL">
+                          <node concept="3clFbS" id="oI9YrWqGj" role="2VODD2">
+                            <node concept="3clFbF" id="oI9YrWsWU" role="3cqZAp">
+                              <node concept="2OqwBi" id="oI9YrWsWV" role="3clFbG">
+                                <node concept="1iwH7S" id="oI9YrWsWW" role="2Oq$k0" />
+                                <node concept="1iwH70" id="oI9YrWsWX" role="2OqNvi">
+                                  <ref role="1iwH77" node="429xoypVg6q" resolve="apply_session_parameter" />
+                                  <node concept="2OqwBi" id="oI9YrWsWY" role="1iwH7V">
+                                    <node concept="30H73N" id="oI9YrWsWZ" role="2Oq$k0" />
+                                    <node concept="2Xjw5R" id="oI9YrWsX0" role="2OqNvi">
+                                      <node concept="1xMEDy" id="oI9YrWsX1" role="1xVPHs">
+                                        <node concept="chp4Y" id="oI9YrWsX2" role="ri$Ld">
+                                          <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="oI9YrWidv" role="2OqNvi">
+                    <ref role="37wK5l" to="9x2e:oI9YrIZnU" resolve="assignType" />
+                    <node concept="10Nm6u" id="oI9YrWidw" role="37wK5m">
+                      <node concept="29HgVG" id="oI9YrWidx" role="lGtFl">
+                        <node concept="3NFfHV" id="oI9YrWidy" role="3NFExx">
+                          <node concept="3clFbS" id="oI9YrWidz" role="2VODD2">
+                            <node concept="3clFbF" id="oI9YrWid$" role="3cqZAp">
+                              <node concept="2OqwBi" id="oI9YrWid_" role="3clFbG">
+                                <node concept="1PxgMI" id="oI9YrWidA" role="2Oq$k0">
+                                  <property role="1BlNFB" value="true" />
+                                  <node concept="chp4Y" id="oI9YrWidB" role="3oSUPX">
+                                    <ref role="cht4Q" to="tpee:hqOqwz4" resolve="DotExpression" />
+                                  </node>
+                                  <node concept="2OqwBi" id="oI9YrWidC" role="1m5AlR">
+                                    <node concept="30H73N" id="oI9YrWidD" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="oI9YrWidE" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3TrEf2" id="oI9YrWidF" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="10Nm6u" id="oI9YrWidG" role="37wK5m">
+                      <node concept="29HgVG" id="oI9YrWidH" role="lGtFl">
+                        <node concept="3NFfHV" id="oI9YrWidI" role="3NFExx">
+                          <node concept="3clFbS" id="oI9YrWidJ" role="2VODD2">
+                            <node concept="3clFbF" id="oI9YrWidK" role="3cqZAp">
+                              <node concept="2OqwBi" id="oI9YrWidL" role="3clFbG">
+                                <node concept="1PxgMI" id="oI9YrWidM" role="2Oq$k0">
+                                  <node concept="chp4Y" id="oI9YrWidN" role="3oSUPX">
+                                    <ref role="cht4Q" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
+                                  </node>
+                                  <node concept="2OqwBi" id="oI9YrWidO" role="1m5AlR">
+                                    <node concept="30H73N" id="oI9YrWidP" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="oI9YrWidQ" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3TrEf2" id="oI9YrWidR" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:oI9Yrc9Ch" resolve="typeExpr" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="raruj" id="oI9YrWidS" role="lGtFl" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="oI9YrWegU" role="30HLyM">
+        <node concept="3clFbS" id="oI9YrWegV" role="2VODD2">
+          <node concept="3clFbF" id="oI9YrWegW" role="3cqZAp">
+            <node concept="2OqwBi" id="oI9YrWegX" role="3clFbG">
+              <node concept="2OqwBi" id="oI9YrWegY" role="2Oq$k0">
+                <node concept="30H73N" id="oI9YrWegZ" role="2Oq$k0" />
+                <node concept="3TrEf2" id="oI9YrWeh0" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="oI9YrWeh1" role="2OqNvi">
+                <node concept="chp4Y" id="oI9YrWeh2" role="cj9EA">
+                  <ref role="cht4Q" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
index 34803bb5..95a9cfe5 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
@@ -83,6 +83,7 @@
         <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" 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>
       <mapping-priorities />
     </generator>
@@ -182,6 +183,7 @@
   <runtime>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
+    <dependency reexport="false">da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)</dependency>
   </runtime>
   <extendedLanguages>
     <extendedLanguage>cba985fe-1e96-4f16-9f8d-b07434405d4f(jetbrains.mps.lang.smodel.types)</extendedLanguage>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
index 5c773c11..c5183c90 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd
@@ -15,6 +15,7 @@
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
+    <dependency reexport="false">da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
@@ -48,6 +49,7 @@
     <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="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
+    <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
index f7f395c0..db0a7742 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
@@ -45,6 +45,7 @@
     <import index="tpcp" ref="r:00000000-0000-4000-0000-011c89590285(jetbrains.mps.lang.core.intentions)" />
     <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
+    <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -11605,7 +11606,7 @@
         <node concept="3Tqbb2" id="7lt0LtQ_T26" role="1tU5fm" />
       </node>
       <node concept="37vLTG" id="7lt0LtQ_T29" role="3clF46">
-        <property role="TrG5h" value="type" />
+        <property role="TrG5h" value="nodeType" />
         <node concept="3Tqbb2" id="7lt0LtQ_T3R" role="1tU5fm" />
       </node>
       <node concept="10P_77" id="oI9YrbUH2" role="3clF45" />
@@ -11617,12 +11618,18 @@
           </node>
         </node>
       </node>
+      <node concept="2AHcQZ" id="oI9YrIZQO" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
     </node>
     <node concept="2tJIrI" id="7lt0LtQ_OM3" role="jymVt" />
     <node concept="3Tm1VV" id="7lt0LtQ_OIT" role="1B3o_S" />
     <node concept="3uibUv" id="7lt0LtQ_OLT" role="1zkMxy">
       <ref role="3uigEE" to="cxk7:3F6vMxqo13Y" resolve="DefaultSessionSolver" />
     </node>
+    <node concept="3uibUv" id="oI9YrIZn4" role="EKbjA">
+      <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
+    </node>
   </node>
 </model>
 
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
index 4c04b45c..06dc5d8f 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd
@@ -12,6 +12,7 @@
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+    <dependency reexport="false">da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
@@ -33,6 +34,7 @@
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" 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>
 
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.macro.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.macro.mps
index b1cedfca..03ea1829 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.macro.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.macro.mps
@@ -17,6 +17,7 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
+    <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -47,6 +48,7 @@
       </concept>
       <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="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
         <child id="1070534934091" name="type" index="10QFUM" />
         <child id="1070534934092" name="expression" index="10QFUP" />
@@ -94,6 +96,7 @@
       <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="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
       <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">
@@ -746,6 +749,29 @@
       <node concept="3clFbS" id="4MEOIDFgV3k" role="3clF47" />
     </node>
     <node concept="2tJIrI" id="1L74NXEx6$J" role="jymVt" />
+    <node concept="3clFb_" id="oI9YrJ4SU" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="assignType" />
+      <node concept="37vLTG" id="oI9YrJ4SV" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="3Tqbb2" id="oI9YrJ4SW" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="oI9YrJ4SX" role="3clF46">
+        <property role="TrG5h" value="nodeType" />
+        <node concept="3Tqbb2" id="oI9YrJ4SY" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="oI9YrJ4SZ" role="3clF45" />
+      <node concept="3Tm1VV" id="oI9YrJ4T0" role="1B3o_S" />
+      <node concept="3clFbS" id="oI9YrJ4T2" role="3clF47">
+        <node concept="3clFbF" id="oI9YrJ4T5" role="3cqZAp">
+          <node concept="3clFbT" id="oI9YrJ4T4" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="oI9YrJ4T3" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="oI9YrJ5uv" role="jymVt" />
     <node concept="3clFb_" id="7DvO2M9IiMh" role="jymVt">
       <property role="TrG5h" value="putParameter" />
       <node concept="37vLTG" id="7DvO2M9IiMi" role="3clF46">
@@ -956,6 +982,9 @@
     </node>
     <node concept="2tJIrI" id="4vBwiiV6bol" role="jymVt" />
     <node concept="3Tm1VV" id="18kNIl1vDQ0" role="1B3o_S" />
+    <node concept="3uibUv" id="oI9YrJ3X_" role="EKbjA">
+      <ref role="3uigEE" to="9x2e:oI9YrIZeS" resolve="Reporting" />
+    </node>
   </node>
 </model>