diff --git a/.mps/migration.xml b/.mps/migration.xml
index e5a56131..ef8763de 100644
--- a/.mps/migration.xml
+++ b/.mps/migration.xml
@@ -32,6 +32,6 @@
-
+
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 59d0cb3b..53488f2d 100644
--- a/build.xml
+++ b/build.xml
@@ -1943,7 +1943,7 @@
Typechecking with Coderules (experimental)
${ci.mps.release}-0.9.9-b${ci.build.num}
JetBrains s.r.o.
- com.intellij.modules.platform
+ com.intellij.modules.mps
jetbrains.mps.core
jetbrains.mps.testing
jetbrains.mps.build
@@ -3504,7 +3504,7 @@
Typechecking with Coderules (experimental)
${ci.mps.release}-0.9.9-b${ci.build.num}
JetBrains s.r.o.
- com.intellij.modules.platform
+ com.intellij.modules.mps
jetbrains.mps.core
jetbrains.mps.testing
jetbrains.mps.build
@@ -3609,7 +3609,6 @@
-
@@ -3663,6 +3662,12 @@
+
+
+
+
+
+
@@ -3687,13 +3692,13 @@
-
-
+
+
@@ -3701,6 +3706,12 @@
+
+
+
+
+
+
@@ -3772,6 +3783,12 @@
+
+
+
+
+
+
@@ -3821,6 +3838,12 @@
+
+
+
+
+
+
@@ -3885,6 +3908,12 @@
+
+
+
+
+
+
@@ -3961,6 +3990,12 @@
+
+
+
+
+
+
@@ -4004,7 +4039,6 @@
-
@@ -4020,19 +4054,26 @@
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4122,6 +4163,12 @@
+
+
+
+
+
+
@@ -4209,6 +4256,12 @@
+
+
+
+
+
+
@@ -4291,6 +4344,12 @@
+
+
+
+
+
+
@@ -4372,6 +4431,12 @@
+
+
+
+
+
+
@@ -4460,6 +4525,12 @@
+
+
+
+
+
+
@@ -4523,14 +4594,13 @@
-
-
-
+
+
@@ -4538,6 +4608,12 @@
+
+
+
+
+
+
@@ -4552,6 +4628,7 @@
+
@@ -4608,14 +4685,13 @@
-
-
-
+
+
@@ -4623,6 +4699,12 @@
+
+
+
+
+
+
@@ -4637,6 +4719,7 @@
+
@@ -4694,6 +4777,12 @@
+
+
+
+
+
+
@@ -4765,7 +4854,6 @@
-
@@ -4780,6 +4868,12 @@
+
+
+
+
+
+
@@ -4795,17 +4889,18 @@
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4872,6 +4967,12 @@
+
+
+
+
+
+
@@ -4938,6 +5039,12 @@
+
+
+
+
+
+
@@ -5012,8 +5119,6 @@
-
-
@@ -5028,6 +5133,12 @@
+
+
+
+
+
+
@@ -5040,17 +5151,19 @@
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5100,6 +5213,12 @@
+
+
+
+
+
+
@@ -5162,6 +5281,12 @@
+
+
+
+
+
+
@@ -5232,6 +5357,12 @@
+
+
+
+
+
+
@@ -5309,6 +5440,12 @@
+
+
+
+
+
+
@@ -5390,6 +5527,12 @@
+
+
+
+
+
+
@@ -5450,8 +5593,6 @@
-
-
@@ -5466,6 +5607,12 @@
+
+
+
+
+
+
@@ -5479,17 +5626,19 @@
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5519,12 +5668,10 @@
-
-
+
-
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
index 5b17fffb..f5771b88 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
+++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
@@ -132,7 +132,7 @@
-
+
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 02301dfe..4240f579 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -3,7 +3,7 @@
-
+
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
index 6daa4439..acc39963 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
@@ -137,7 +137,7 @@
-
+
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
index e906960c..c2eff336 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
@@ -3,7 +3,7 @@
-
+
diff --git a/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl b/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl
index 677d549d..c7baacee 100644
--- a/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl
+++ b/coderules/languages/jetbrains.mps.lang.types/jetbrains.mps.lang.types.mpl
@@ -127,7 +127,7 @@
-
+
diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 0cb87bbd..0126d9c3 100644
--- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -131,7 +131,7 @@
-
+
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
index f838f3e1..08421546 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps
@@ -3,7 +3,7 @@
-
+
diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl b/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
index e59d9a6d..bcefac50 100644
--- a/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
+++ b/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
@@ -43,7 +43,7 @@
-
+
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
index 82bc39ed..752f51b6 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
@@ -94,7 +94,7 @@
-
+
diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd
index 1259449a..a7dae711 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd
@@ -25,7 +25,7 @@
-
+
diff --git a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
index a8453746..4f8a95e1 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models/jetbrains.mps.coderules.ideaplugin.mps
@@ -8,7 +8,7 @@
-
+
diff --git a/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd b/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
index b4105d8f..ded84cd4 100644
--- a/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
@@ -45,7 +45,6 @@
-
diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
index e5d64d50..c5530ef8 100644
--- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
+++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
@@ -22,7 +22,7 @@
-
+
diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.descriptor.aspects.types@genplan.mps b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.descriptor.aspects.types@genplan.mps
index 195a19a1..156f5ca0 100644
--- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.descriptor.aspects.types@genplan.mps
+++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.descriptor.aspects.types@genplan.mps
@@ -3,7 +3,7 @@
-
+
diff --git a/samples/fitch/build.xml b/samples/fitch/build.xml
index 74f9a2d2..850f27ab 100644
--- a/samples/fitch/build.xml
+++ b/samples/fitch/build.xml
@@ -36,9 +36,7 @@
-
-
-
+
@@ -864,7 +862,6 @@
-
@@ -937,7 +934,12 @@
-
+
+
+
+
+
+
@@ -1013,7 +1015,12 @@
-
+
+
+
+
+
+
@@ -1073,7 +1080,12 @@
-
+
+
+
+
+
+
@@ -1165,7 +1177,12 @@
-
+
+
+
+
+
+
@@ -1226,7 +1243,12 @@
-
+
+
+
+
+
+
@@ -1319,7 +1341,12 @@
-
+
+
+
+
+
+
@@ -1381,7 +1408,12 @@
-
+
+
+
+
+
+
@@ -1473,7 +1505,12 @@
-
+
+
+
+
+
+
@@ -1523,8 +1560,6 @@
-
-
@@ -1540,7 +1575,12 @@
-
+
+
+
+
+
+
@@ -1555,17 +1595,19 @@
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -1586,10 +1628,9 @@
-
-
+
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
index 0d3c7aa7..9609e57e 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
@@ -96,7 +96,7 @@
-
+
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
index f0c9a2ae..97ef89d7 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
@@ -97,7 +97,7 @@
-
+
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
index 397e4317..dbb978df 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
@@ -95,7 +95,7 @@
-
+
diff --git a/samples/fitch/languages/samples.fitch/samples.fitch.mpl b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
index f8c42227..351b9938 100644
--- a/samples/fitch/languages/samples.fitch/samples.fitch.mpl
+++ b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
@@ -97,7 +97,7 @@
-
+
diff --git a/samples/lambdacalc/build.xml b/samples/lambdacalc/build.xml
index ff7022b5..794bf426 100644
--- a/samples/lambdacalc/build.xml
+++ b/samples/lambdacalc/build.xml
@@ -36,9 +36,7 @@
-
-
-
+
@@ -289,7 +287,6 @@
-
@@ -352,7 +349,12 @@
-
+
+
+
+
+
+
@@ -414,8 +416,6 @@
-
-
@@ -431,7 +431,12 @@
-
+
+
+
+
+
+
@@ -448,17 +453,19 @@
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -479,10 +486,9 @@
-
-
+
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
index 05f30443..f17c8088 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
+++ b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
@@ -55,7 +55,7 @@
-
+
diff --git a/samples/mpscore/build.xml b/samples/mpscore/build.xml
index b3260fb7..b7e9df95 100644
--- a/samples/mpscore/build.xml
+++ b/samples/mpscore/build.xml
@@ -5550,7 +5550,7 @@
Types for core MPS languages with Coderules (experimental)
${ci.mps.release}-0.9.8-b${ci.build.num}
JetBrains s.r.o.
- com.intellij.modules.platform
+ com.intellij.modules.mps
jetbrains.mps.core
jetbrains.mps.coderules
jetbrains.mps.build
@@ -10862,7 +10862,6 @@
-
@@ -10944,6 +10943,12 @@
+
+
+
+
+
+
@@ -11027,6 +11032,12 @@
+
+
+
+
+
+
@@ -11091,6 +11102,12 @@
+
+
+
+
+
+
@@ -11175,6 +11192,12 @@
+
+
+
+
+
+
@@ -11240,6 +11263,12 @@
+
+
+
+
+
+
@@ -11317,6 +11346,12 @@
+
+
+
+
+
+
@@ -11381,6 +11416,12 @@
+
+
+
+
+
+
@@ -11465,6 +11506,12 @@
+
+
+
+
+
+
@@ -11531,6 +11578,12 @@
+
+
+
+
+
+
@@ -11614,6 +11667,12 @@
+
+
+
+
+
+
@@ -11679,6 +11738,12 @@
+
+
+
+
+
+
@@ -11763,6 +11828,12 @@
+
+
+
+
+
+
@@ -11832,6 +11903,12 @@
+
+
+
+
+
+
@@ -11917,6 +11994,12 @@
+
+
+
+
+
+
@@ -11980,6 +12063,12 @@
+
+
+
+
+
+
@@ -12058,6 +12147,12 @@
+
+
+
+
+
+
@@ -12123,6 +12218,12 @@
+
+
+
+
+
+
@@ -12206,6 +12307,12 @@
+
+
+
+
+
+
@@ -12269,6 +12376,12 @@
+
+
+
+
+
+
@@ -12346,6 +12459,12 @@
+
+
+
+
+
+
@@ -12413,6 +12532,12 @@
+
+
+
+
+
+
@@ -12497,6 +12622,12 @@
+
+
+
+
+
+
@@ -12571,6 +12702,12 @@
+
+
+
+
+
+
@@ -12655,6 +12792,12 @@
+
+
+
+
+
+
@@ -12719,6 +12862,12 @@
+
+
+
+
+
+
@@ -12805,6 +12954,12 @@
+
+
+
+
+
+
@@ -12875,6 +13030,12 @@
+
+
+
+
+
+
@@ -12961,6 +13122,12 @@
+
+
+
+
+
+
@@ -13030,6 +13197,12 @@
+
+
+
+
+
+
@@ -13104,6 +13277,12 @@
+
+
+
+
+
+
@@ -13164,6 +13343,12 @@
+
+
+
+
+
+
@@ -13242,6 +13427,12 @@
+
+
+
+
+
+
@@ -13307,6 +13498,12 @@
+
+
+
+
+
+
@@ -13388,6 +13585,12 @@
+
+
+
+
+
+
@@ -13454,6 +13657,12 @@
+
+
+
+
+
+
@@ -13536,6 +13745,12 @@
+
+
+
+
+
+
@@ -13600,6 +13815,12 @@
+
+
+
+
+
+
@@ -13678,6 +13899,12 @@
+
+
+
+
+
+
@@ -13739,6 +13966,12 @@
+
+
+
+
+
+
@@ -13813,6 +14046,12 @@
+
+
+
+
+
+
@@ -13894,6 +14133,12 @@
+
+
+
+
+
+
@@ -13960,6 +14205,12 @@
+
+
+
+
+
+
@@ -14041,6 +14292,12 @@
+
+
+
+
+
+
@@ -14105,6 +14362,12 @@
+
+
+
+
+
+
@@ -14194,6 +14457,12 @@
+
+
+
+
+
+
@@ -14256,6 +14525,12 @@
+
+
+
+
+
+
@@ -14342,6 +14617,12 @@
+
+
+
+
+
+
@@ -14404,6 +14685,12 @@
+
+
+
+
+
+
@@ -14492,6 +14779,12 @@
+
+
+
+
+
+
@@ -14570,6 +14863,12 @@
+
+
+
+
+
+
@@ -14633,6 +14932,12 @@
+
+
+
+
+
+
@@ -14711,6 +15016,12 @@
+
+
+
+
+
+
@@ -14774,6 +15085,12 @@
+
+
+
+
+
+
@@ -14851,6 +15168,12 @@
+
+
+
+
+
+
@@ -14917,6 +15240,12 @@
+
+
+
+
+
+
@@ -15001,6 +15330,12 @@
+
+
+
+
+
+
@@ -15075,6 +15410,12 @@
+
+
+
+
+
+
@@ -15164,6 +15505,12 @@
+
+
+
+
+
+
@@ -15219,8 +15566,6 @@
-
-
@@ -15235,6 +15580,12 @@
+
+
+
+
+
+
@@ -15251,17 +15602,19 @@
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -15308,8 +15661,6 @@
-
-
@@ -15325,6 +15676,12 @@
+
+
+
+
+
+
@@ -15343,20 +15700,22 @@
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -15406,8 +15765,6 @@
-
-
@@ -15423,6 +15780,12 @@
+
+
+
+
+
+
@@ -15439,17 +15802,19 @@
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -15499,8 +15864,6 @@
-
-
@@ -15516,6 +15879,12 @@
+
+
+
+
+
+
@@ -15533,17 +15902,19 @@
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -15590,8 +15961,6 @@
-
-
@@ -15607,6 +15976,12 @@
+
+
+
+
+
+
@@ -15622,17 +15997,19 @@
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -15679,8 +16056,6 @@
-
-
@@ -15696,6 +16071,12 @@
+
+
+
+
+
+
@@ -15722,20 +16103,22 @@
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -15773,8 +16156,6 @@
-
-
@@ -15789,6 +16170,12 @@
+
+
+
+
+
+
@@ -15804,17 +16191,19 @@
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -15842,12 +16231,10 @@
-
-
+
-
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl
index 575041df..faf9d51b 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/jetbrains.mps.baseLanguage.blTypesExt.mpl
@@ -89,7 +89,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl
index 5652cb32..049810ef 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/jetbrains.mps.baseLanguage.classifiersExt.mpl
@@ -98,7 +98,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl
index e7f8cbf9..606d91d6 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/jetbrains.mps.baseLanguage.closuresExt.mpl
@@ -100,7 +100,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl
index 747ad435..59876b67 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/jetbrains.mps.baseLanguage.collectionsExt.mpl
@@ -101,7 +101,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl
index 7c68dd49..ad4a379d 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/jetbrains.mps.baseLanguage.function.mpl
@@ -97,7 +97,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
index 268b6f31..c3fcb844 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/jetbrains.mps.baseLanguage.javadocExt.mpl
@@ -45,7 +45,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl
index fbbebd9c..4652cbf9 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.kotlinRefsExt/jetbrains.mps.baseLanguage.kotlinRefsExt.mpl
@@ -100,7 +100,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl
index 05b72131..1dd2a89f 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.methodReferencesExt/jetbrains.mps.baseLanguage.methodReferencesExt.mpl
@@ -101,7 +101,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl
index 7c26fa69..ccda4eac 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/jetbrains.mps.baseLanguage.sequence.mpl
@@ -96,7 +96,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
index d8b23d65..e3f76fa6 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl
@@ -100,7 +100,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.varVariableExt/jetbrains.mps.baseLanguage.varVariableExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.varVariableExt/jetbrains.mps.baseLanguage.varVariableExt.mpl
index d680815f..8ae64b96 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.varVariableExt/jetbrains.mps.baseLanguage.varVariableExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.varVariableExt/jetbrains.mps.baseLanguage.varVariableExt.mpl
@@ -97,7 +97,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
index 5d971793..5047b6ea 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
@@ -56,7 +56,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
index 2cd36249..911becfc 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl
@@ -98,7 +98,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl
index 20a9d46e..76513d73 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/jetbrains.mps.lang.behaviorExt.mpl
@@ -97,7 +97,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
index 5124090c..f948544e 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/jetbrains.mps.lang.coderulesExt.mpl
@@ -113,7 +113,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl
index 250a358f..210bd9a6 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/jetbrains.mps.lang.constraintsExt.mpl
@@ -101,7 +101,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl
index f1a7a1af..1f2ddbb2 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/jetbrains.mps.lang.generator.generationContextExt.mpl
@@ -101,7 +101,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl
index ced4a369..b4f02ac5 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/jetbrains.mps.lang.generatorExt.mpl
@@ -101,7 +101,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl
index b30b4781..9587dfaa 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/jetbrains.mps.lang.patternExt.mpl
@@ -104,7 +104,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl
index 4bd648d6..eb0f2541 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/jetbrains.mps.lang.quotationExt.mpl
@@ -103,7 +103,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl
index b37c4e38..39111f74 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/jetbrains.mps.lang.scopesExt.mpl
@@ -95,7 +95,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl
index d2206a9f..b86902ca 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/jetbrains.mps.lang.scriptExt.mpl
@@ -99,7 +99,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl
index 375c60f6..f5f61387 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/jetbrains.mps.lang.smodel.queryExt.mpl
@@ -103,7 +103,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl
index 6929f318..61039a6f 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.mpl
@@ -111,7 +111,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl
index 00c2f758..dd261baa 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.testExt/jetbrains.mps.lang.testExt.mpl
@@ -102,7 +102,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl
index 76db30ce..7d0d3a13 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/jetbrains.mps.lang.typecheckingExt.mpl
@@ -113,7 +113,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl
index 3674c721..fa01c0f9 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/jetbrains.mps.lang.typesystemExt.mpl
@@ -110,7 +110,7 @@
-
+
diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl b/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
index 19de4d27..328914e9 100644
--- a/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl
@@ -101,7 +101,7 @@
-
+