diff --git a/.mps/migration.xml b/.mps/migration.xml index 0d85883b..397f7dc9 100644 --- a/.mps/migration.xml +++ b/.mps/migration.xml @@ -16,6 +16,8 @@ + + @@ -24,5 +26,6 @@ + \ No newline at end of file diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps index 2778424c..058e4133 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps @@ -8,9 +8,9 @@ - + - + @@ -5822,7 +5822,7 @@ - + @@ -5881,7 +5881,7 @@ - + @@ -6028,7 +6028,7 @@ - + @@ -14111,7 +14111,7 @@ - + @@ -15114,7 +15114,7 @@ - + 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 274c7e81..aee369bb 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 @@ -35,7 +35,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - + @@ -48,7 +48,7 @@ - + @@ -103,7 +103,7 @@ 528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime) - + @@ -144,7 +144,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps index 6400bd2a..04ce8292 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps @@ -5,9 +5,9 @@ - + - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps index 5726fca1..76812b33 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps @@ -7,8 +7,8 @@ - - + + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps index b1148318..9ab03b33 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps @@ -5,8 +5,8 @@ - - + + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps index c9eb5d59..f60af08a 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps @@ -8,8 +8,8 @@ - - + + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps index 62070697..98e67ae8 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/jetbrains.mps.lang.coderules.analysis.mps @@ -6,8 +6,8 @@ - - + + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps index 9010e3e8..7413da11 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps @@ -6,7 +6,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps index 80e4e848..7d4a387a 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps index a87de36d..c15ad531 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps @@ -4,7 +4,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd index 33ce107a..967834ec 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd +++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd @@ -21,7 +21,7 @@ f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime) - + @@ -30,7 +30,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps index a588cfcf..61e3cb27 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps @@ -2,9 +2,9 @@ - + - + @@ -520,11 +520,11 @@ - + - + @@ -1908,7 +1908,7 @@ - + @@ -1960,7 +1960,7 @@ - + @@ -2014,7 +2014,7 @@ - + @@ -2087,7 +2087,7 @@ - + @@ -2146,7 +2146,7 @@ - + @@ -2155,7 +2155,7 @@ - + @@ -2283,7 +2283,7 @@ - + @@ -2299,7 +2299,7 @@ - + @@ -2342,7 +2342,7 @@ - + @@ -2373,7 +2373,7 @@ - + @@ -2390,7 +2390,7 @@ - + @@ -2416,7 +2416,7 @@ - + @@ -2433,7 +2433,7 @@ - + @@ -3541,7 +3541,7 @@ - + @@ -3567,11 +3567,11 @@ - + - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps index 1949a7c7..a736acda 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.analysis.mps @@ -2,9 +2,9 @@ - + - + @@ -640,7 +640,7 @@ - + @@ -982,7 +982,7 @@ - + @@ -1119,7 +1119,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps index dd16a01e..feff04f0 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps @@ -2,9 +2,9 @@ - + - + @@ -6161,7 +6161,7 @@ - + @@ -6849,7 +6849,7 @@ - + @@ -7163,7 +7163,7 @@ - + @@ -8051,14 +8051,14 @@ - + - + @@ -8116,7 +8116,7 @@ - + @@ -8127,7 +8127,7 @@ - + @@ -9292,7 +9292,7 @@ - + @@ -9324,7 +9324,7 @@ - + @@ -11815,7 +11815,7 @@ - + @@ -11951,7 +11951,7 @@ - + @@ -12053,7 +12053,7 @@ - + @@ -12078,7 +12078,7 @@ - + @@ -12143,7 +12143,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.terms.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.terms.mps index 5c3ec93b..9d992c08 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.terms.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.terms.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps index 05bff872..f483c0e1 100644 --- a/coderules/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps +++ b/coderules/languages/jetbrains.mps.lang.controlflow/generator/template/main@generator.mps @@ -252,7 +252,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl b/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl index 3cabaaeb..5b2ed471 100644 --- a/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl +++ b/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl @@ -40,7 +40,7 @@ c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules) - + @@ -54,7 +54,7 @@ - + @@ -71,7 +71,6 @@ - @@ -120,18 +119,16 @@ - + - - @@ -149,7 +146,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps index 6564d022..278a0505 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps @@ -2,10 +2,10 @@ - + - + @@ -1114,7 +1114,7 @@ - + @@ -1137,7 +1137,7 @@ - + @@ -1205,7 +1205,7 @@ - + @@ -1245,7 +1245,7 @@ - + @@ -1268,7 +1268,7 @@ - + @@ -1497,7 +1497,7 @@ - + @@ -1741,7 +1741,7 @@ - + @@ -3082,7 +3082,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 bbd90ebb..3493b1e9 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 @@ -32,7 +32,7 @@ 35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic) - + @@ -48,7 +48,7 @@ - + @@ -60,7 +60,10 @@ + + + @@ -69,9 +72,11 @@ + + @@ -114,7 +119,7 @@ c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules) - + @@ -135,7 +140,6 @@ - @@ -146,7 +150,7 @@ - + @@ -168,6 +172,7 @@ + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps index 336d43f0..e94fafab 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps @@ -3,7 +3,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps index b66f24bc..56b3bc11 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps @@ -3,7 +3,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.migration.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.migration.mps index 6560d45a..26aa3abb 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.migration.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/jetbrains.mps.lang.typechecking.migration.mps @@ -4,7 +4,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps index 3047a91c..75341cdc 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps @@ -6,7 +6,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps index 8eebf645..bc014092 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps @@ -3,9 +3,9 @@ - + - + diff --git a/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps b/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps index 43c49ccc..f80fbdea 100644 --- a/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps +++ b/coderules/languages/jetbrains.mps.lang.types/generator/templates/jetbrains.mps.lang.types.generator.templates@generator.mps @@ -3,9 +3,9 @@ - + - + @@ -254,7 +254,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 7a5ad157..70ad5286 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 @@ -34,7 +34,7 @@ 21d5540d-cd6b-44dd-b6ab-6835bf032803(jetbrains.mps.lang.coderules#4578927328670739933) - + @@ -48,7 +48,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -149,7 +149,6 @@ - diff --git a/coderules/languages/jetbrains.mps.lang.types/models/jetbrains.mps.lang.types.behavior.mps b/coderules/languages/jetbrains.mps.lang.types/models/jetbrains.mps.lang.types.behavior.mps index ab3549f7..eb58d869 100644 --- a/coderules/languages/jetbrains.mps.lang.types/models/jetbrains.mps.lang.types.behavior.mps +++ b/coderules/languages/jetbrains.mps.lang.types/models/jetbrains.mps.lang.types.behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps index 4ac3a156..17607ab1 100644 --- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps +++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps @@ -6,8 +6,8 @@ - - + + diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl index 16326eb5..fea021d2 100644 --- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl +++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl @@ -30,7 +30,7 @@ 5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197) - + @@ -41,12 +41,11 @@ - + - @@ -55,6 +54,7 @@ + @@ -62,6 +62,7 @@ + @@ -96,7 +97,7 @@ c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules) - + @@ -134,7 +135,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps index d26f4684..042e51ff 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps @@ -4,8 +4,8 @@ - - + + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps index ca9e710a..a8aa6b80 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps @@ -4,8 +4,8 @@ - - + + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps index fc6aa41d..19bf69fc 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps @@ -4,8 +4,8 @@ - - + + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps index 356cb289..9b6fcae8 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps @@ -3,7 +3,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps index 10bcf64b..13e1bbaf 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps @@ -6,7 +6,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps index dbc86b47..174058e2 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps @@ -3,9 +3,9 @@ - + - + diff --git a/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd b/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd index ed1619a6..e9f89668 100644 --- a/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd +++ b/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd @@ -20,7 +20,7 @@ 26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime) - + @@ -30,7 +30,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps index 3273030b..94b29729 100644 --- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps +++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps @@ -3,7 +3,7 @@ - + @@ -10407,7 +10407,7 @@ - + @@ -11134,12 +11134,12 @@ - + - + @@ -11233,12 +11233,12 @@ - + - + @@ -11306,12 +11306,12 @@ - + - + @@ -11351,12 +11351,12 @@ - + - + @@ -12755,7 +12755,7 @@ - + @@ -12764,7 +12764,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps index 3843dbb4..69b61bb9 100644 --- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps +++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps @@ -2,13 +2,13 @@ - + - + diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps index c5fcdb07..48c8bc72 100644 --- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps +++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps @@ -4,7 +4,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 6e2c9643..cb8d5e55 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 @@ -17,7 +17,7 @@ 18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor) - + @@ -47,7 +47,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps index a6605dd7..83583118 100644 --- a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps +++ b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps @@ -6,7 +6,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 a3eb8a98..24b9d842 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 @@ -25,7 +25,7 @@ - + @@ -38,33 +38,16 @@ - + - - - - - - - - - - - - - - - - - @@ -80,7 +63,7 @@ afc17aaf-3a3d-4d69-a38d-db90d5e858c6(jetbrains.mps.lang.types) - + @@ -118,7 +101,7 @@ - + @@ -140,8 +123,10 @@ + + diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps index a0e9936b..ed719fac 100644 --- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps +++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps @@ -3,8 +3,8 @@ - - + + 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 2823e8d1..734031ba 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 @@ -375,7 +375,7 @@ - + @@ -385,7 +385,7 @@ - + @@ -435,7 +435,7 @@ - + @@ -445,7 +445,7 @@ - + @@ -495,7 +495,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -555,7 +555,7 @@ - + @@ -565,7 +565,7 @@ - + @@ -615,7 +615,7 @@ - + @@ -625,7 +625,7 @@ - + @@ -810,7 +810,7 @@ - + @@ -956,7 +956,7 @@ - + @@ -1056,7 +1056,7 @@ - + @@ -1245,7 +1245,7 @@ - + @@ -1255,7 +1255,7 @@ - + @@ -1280,7 +1280,7 @@ - + @@ -1307,7 +1307,7 @@ - + @@ -1317,10 +1317,10 @@ - + - - + + @@ -1495,7 +1495,7 @@ - + @@ -1614,7 +1614,7 @@ - + @@ -1667,7 +1667,7 @@ - + @@ -1715,7 +1715,7 @@ - + @@ -1725,7 +1725,7 @@ - + @@ -1772,7 +1772,7 @@ - + @@ -1857,7 +1857,7 @@ - + @@ -1901,7 +1901,7 @@ - + @@ -1925,7 +1925,7 @@ - + @@ -1952,7 +1952,7 @@ - + @@ -2021,7 +2021,7 @@ - + @@ -2030,12 +2030,12 @@ - + - + @@ -2069,7 +2069,7 @@ - + @@ -2085,12 +2085,12 @@ - + - + @@ -2121,7 +2121,7 @@ - + @@ -2134,7 +2134,7 @@ - + @@ -2190,7 +2190,7 @@ - + @@ -2209,10 +2209,10 @@ - + - + @@ -2239,7 +2239,7 @@ - + @@ -2248,11 +2248,11 @@ - + - + @@ -2263,7 +2263,7 @@ - + @@ -2276,10 +2276,10 @@ - + - + @@ -2329,14 +2329,14 @@ - + - + @@ -2393,7 +2393,7 @@ - + @@ -2432,12 +2432,12 @@ - + - + @@ -2465,7 +2465,7 @@ - + @@ -2494,11 +2494,11 @@ - + - + @@ -2510,11 +2510,11 @@ - + - + @@ -2523,7 +2523,7 @@ - + @@ -2533,7 +2533,7 @@ - + @@ -2542,12 +2542,12 @@ - + - + @@ -2601,7 +2601,7 @@ - + @@ -2610,7 +2610,7 @@ - + @@ -2623,12 +2623,12 @@ - + - + @@ -2679,7 +2679,7 @@ - + @@ -2832,10 +2832,10 @@ - + - + @@ -2859,7 +2859,7 @@ - + @@ -2921,12 +2921,12 @@ - + - + @@ -2987,7 +2987,7 @@ - + @@ -3010,7 +3010,7 @@ - + @@ -3020,7 +3020,7 @@ - + @@ -3030,7 +3030,7 @@ - + @@ -3041,7 +3041,7 @@ - + @@ -3063,7 +3063,7 @@ - + @@ -3097,7 +3097,7 @@ - + @@ -3142,7 +3142,7 @@ - + @@ -3187,7 +3187,7 @@ - + @@ -3232,7 +3232,7 @@ - + @@ -3360,14 +3360,14 @@ - + - + @@ -3389,7 +3389,7 @@ - + @@ -3407,7 +3407,7 @@ - + @@ -3556,7 +3556,7 @@ - + @@ -3661,7 +3661,7 @@ - + @@ -3763,7 +3763,7 @@ - + @@ -4090,7 +4090,7 @@ - + @@ -4280,7 +4280,7 @@ - + @@ -4470,7 +4470,7 @@ - + @@ -4560,7 +4560,7 @@ - + @@ -4665,7 +4665,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.runtime/jetbrains.mps.coderules.runtime.msd b/coderules/solutions/jetbrains.mps.coderules.runtime/jetbrains.mps.coderules.runtime.msd index e3cb4d66..6aec19bc 100644 --- a/coderules/solutions/jetbrains.mps.coderules.runtime/jetbrains.mps.coderules.runtime.msd +++ b/coderules/solutions/jetbrains.mps.coderules.runtime/jetbrains.mps.coderules.runtime.msd @@ -16,7 +16,7 @@ 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - + diff --git a/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.memoizer.mps b/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.memoizer.mps index bbe65691..48e72eca 100644 --- a/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.memoizer.mps +++ b/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.memoizer.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps b/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps index 670e3658..967cf2c1 100644 --- a/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps +++ b/coderules/solutions/jetbrains.mps.coderules.runtime/models/jetbrains.mps.coderules.runtime.result.mps @@ -2,7 +2,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 5e148483..5af61b58 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 @@ -24,7 +24,7 @@ 66887915-4d9e-4e24-bd35-19eb55fb75c2(jetbrains.mps.coderules.ideaplugin) - + @@ -38,8 +38,8 @@ - - + + @@ -64,6 +64,7 @@ + diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps index 8bb6841c..222a62e3 100644 --- a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps +++ b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps @@ -2,9 +2,9 @@ - + - + diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.plugin@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.plugin@tests.mps index e7a21a1c..6a9e6015 100644 --- a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.plugin@tests.mps +++ b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.plugin@tests.mps @@ -2,9 +2,9 @@ - + - + diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps index 92511ffd..afb9d5e4 100644 --- a/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps +++ b/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps @@ -2,17 +2,17 @@ - + - + - + diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd b/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd index c8b49237..4490eb8e 100644 --- a/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd +++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/jetbrains.mps.coderules.testhelper.msd @@ -28,7 +28,7 @@ f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime) - + @@ -36,7 +36,7 @@ - + @@ -44,7 +44,10 @@ + + + @@ -52,9 +55,11 @@ + + diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps index 4e80b845..498dc084 100644 --- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps +++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps @@ -3,8 +3,8 @@ - - + + @@ -1087,7 +1087,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd index 6b235e43..1ac3f938 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd @@ -35,7 +35,7 @@ 66887915-4d9e-4e24-bd35-19eb55fb75c2(jetbrains.mps.coderules.ideaplugin) - + @@ -50,8 +50,8 @@ - - + + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps index eddfca2e..bd911992 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.incrementality@tests.mps @@ -2,10 +2,10 @@ - + - - + + @@ -42,6 +42,7 @@ + @@ -370,6 +371,7 @@ + @@ -2707,6 +2709,7 @@ + @@ -3684,6 +3687,7 @@ + @@ -4009,6 +4013,7 @@ + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps index 1817bdfa..90d6f967 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps @@ -2,10 +2,10 @@ - + - + @@ -30,6 +30,7 @@ + @@ -228,6 +229,7 @@ + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps index 42be40ca..5fa98700 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps @@ -2,10 +2,10 @@ - + - - + + @@ -60,6 +60,7 @@ + @@ -458,6 +459,7 @@ + @@ -2681,6 +2683,7 @@ + @@ -3063,6 +3066,7 @@ + @@ -3562,7 +3566,7 @@ - + @@ -4325,7 +4329,7 @@ - + @@ -4563,6 +4567,7 @@ + @@ -4667,7 +4672,7 @@ - + @@ -4747,7 +4752,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd index f6e1a16c..e06750b1 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd @@ -34,7 +34,7 @@ bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime) - + @@ -47,7 +47,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps index aa2e3c35..4f30fcc0 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps @@ -2,8 +2,8 @@ - - + + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps index ba1422af..027cc183 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps @@ -2,11 +2,11 @@ - + - + @@ -563,7 +563,7 @@ - + @@ -571,7 +571,7 @@ - + @@ -757,7 +757,7 @@ - + @@ -1665,7 +1665,7 @@ - + @@ -1779,7 +1779,7 @@ - + @@ -2435,7 +2435,7 @@ - + @@ -2461,7 +2461,7 @@ - + @@ -4221,7 +4221,7 @@ - + @@ -5436,21 +5436,21 @@ - + - + - + @@ -5536,8 +5536,8 @@ - - + + @@ -5584,7 +5584,7 @@ - + @@ -5594,7 +5594,7 @@ - + @@ -5604,8 +5604,8 @@ - - + + @@ -5634,7 +5634,7 @@ - + @@ -5903,7 +5903,7 @@ - + @@ -5967,7 +5967,7 @@ - + @@ -6015,7 +6015,7 @@ - + @@ -6052,7 +6052,7 @@ - + @@ -6286,14 +6286,14 @@ - + - + @@ -6339,14 +6339,14 @@ - + - + @@ -6437,7 +6437,7 @@ - + @@ -6467,7 +6467,7 @@ - + @@ -6520,7 +6520,7 @@ - + @@ -6622,7 +6622,7 @@ - + @@ -6657,7 +6657,7 @@ - + @@ -7200,7 +7200,7 @@ - + @@ -7219,7 +7219,7 @@ - + @@ -7256,7 +7256,7 @@ - + @@ -7452,12 +7452,12 @@ - + - + @@ -7690,7 +7690,7 @@ - + @@ -8351,7 +8351,7 @@ - + @@ -9329,10 +9329,10 @@ - + - + @@ -9354,7 +9354,7 @@ - + @@ -9649,7 +9649,7 @@ - + @@ -9682,7 +9682,7 @@ - + @@ -9736,7 +9736,7 @@ - + @@ -9779,7 +9779,7 @@ - + @@ -9965,7 +9965,7 @@ - + @@ -10158,7 +10158,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps index 300f6953..84b8cc4d 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps @@ -3,10 +3,10 @@ - + - + @@ -965,7 +965,7 @@ - + @@ -985,7 +985,7 @@ - + @@ -2284,7 +2284,7 @@ - + @@ -5420,7 +5420,7 @@ - + @@ -6505,7 +6505,7 @@ - + @@ -6806,7 +6806,7 @@ - + @@ -6874,7 +6874,7 @@ - + @@ -8543,7 +8543,7 @@ - + @@ -8602,7 +8602,7 @@ - + @@ -11430,7 +11430,7 @@ - + @@ -11466,8 +11466,8 @@ - - + + @@ -11547,7 +11547,7 @@ - + @@ -11635,7 +11635,7 @@ - + @@ -11662,7 +11662,7 @@ - + @@ -11787,7 +11787,7 @@ - + @@ -11951,7 +11951,7 @@ - + @@ -12108,7 +12108,7 @@ - + @@ -12409,7 +12409,7 @@ - + @@ -12425,7 +12425,7 @@ - + @@ -12767,7 +12767,7 @@ - + @@ -12809,7 +12809,7 @@ - + @@ -12822,7 +12822,7 @@ - + @@ -13424,7 +13424,7 @@ - + @@ -13433,7 +13433,7 @@ - + @@ -13513,7 +13513,7 @@ - + @@ -13553,7 +13553,7 @@ - + @@ -13841,7 +13841,7 @@ - + @@ -13849,7 +13849,7 @@ - + @@ -13953,7 +13953,7 @@ - + @@ -14460,7 +14460,7 @@ - + @@ -14468,7 +14468,7 @@ - + @@ -14595,7 +14595,7 @@ - + @@ -14628,7 +14628,7 @@ - + @@ -15119,7 +15119,7 @@ - + @@ -15127,7 +15127,7 @@ - + @@ -15224,7 +15224,7 @@ - + @@ -15236,7 +15236,7 @@ - + @@ -15318,7 +15318,7 @@ - + @@ -15331,7 +15331,7 @@ - + @@ -16229,7 +16229,7 @@ - + @@ -16388,7 +16388,7 @@ - + @@ -16710,7 +16710,7 @@ - + @@ -16752,7 +16752,7 @@ - + @@ -17205,7 +17205,7 @@ - + @@ -17443,7 +17443,7 @@ - + @@ -17488,7 +17488,7 @@ - + @@ -17537,7 +17537,7 @@ - + @@ -17574,7 +17574,7 @@ - + @@ -17776,7 +17776,7 @@ - + @@ -17803,7 +17803,7 @@ - + @@ -18234,7 +18234,7 @@ - + @@ -18344,7 +18344,7 @@ - + @@ -18634,7 +18634,7 @@ - + @@ -18666,7 +18666,7 @@ - + @@ -18799,7 +18799,7 @@ - + @@ -19018,11 +19018,11 @@ - + - + @@ -19150,7 +19150,7 @@ - + @@ -19521,11 +19521,11 @@ - + - + @@ -19653,7 +19653,7 @@ - + @@ -20020,11 +20020,11 @@ - + - + @@ -20203,7 +20203,7 @@ - + @@ -20330,11 +20330,11 @@ - + - + @@ -20548,7 +20548,7 @@ - + @@ -20559,7 +20559,7 @@ - + @@ -20605,7 +20605,7 @@ - + @@ -20782,7 +20782,7 @@ - + @@ -20836,7 +20836,7 @@ - + @@ -20925,7 +20925,7 @@ - + @@ -20957,7 +20957,7 @@ - + @@ -21081,7 +21081,7 @@ - + @@ -21139,7 +21139,7 @@ - + @@ -21173,7 +21173,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd index 748f6818..d7aca5e4 100644 --- a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd +++ b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd @@ -22,7 +22,7 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) - + @@ -36,7 +36,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps index 60ad02a2..0ab8448d 100644 --- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps +++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps @@ -2,10 +2,10 @@ - + - + @@ -12927,7 +12927,7 @@ - + @@ -13019,7 +13019,7 @@ - + @@ -13044,7 +13044,7 @@ - + @@ -13061,7 +13061,7 @@ - + @@ -13102,7 +13102,7 @@ - + @@ -13224,7 +13224,7 @@ - + @@ -13317,7 +13317,7 @@ - + @@ -13342,7 +13342,7 @@ - + @@ -13359,7 +13359,7 @@ - + @@ -13400,7 +13400,7 @@ - + @@ -13673,13 +13673,13 @@ - + - + @@ -13698,7 +13698,7 @@ - + @@ -13714,7 +13714,7 @@ - + @@ -13762,7 +13762,7 @@ - + @@ -13777,7 +13777,7 @@ - + @@ -13792,7 +13792,7 @@ - + @@ -13804,7 +13804,7 @@ - + @@ -20946,7 +20946,7 @@ - + @@ -22325,7 +22325,7 @@ - + @@ -22420,7 +22420,7 @@ - + @@ -22686,7 +22686,7 @@ - + @@ -22704,7 +22704,7 @@ - + @@ -22749,7 +22749,7 @@ - + @@ -22768,7 +22768,7 @@ - + @@ -22787,7 +22787,7 @@ - + @@ -22806,7 +22806,7 @@ - + @@ -22825,7 +22825,7 @@ - + @@ -22844,7 +22844,7 @@ - + @@ -22862,7 +22862,7 @@ - + @@ -22881,7 +22881,7 @@ - + @@ -22905,7 +22905,7 @@ - + @@ -24190,7 +24190,7 @@ - + @@ -24214,7 +24214,7 @@ - + @@ -24223,7 +24223,7 @@ - + @@ -24282,7 +24282,7 @@ - + @@ -24291,7 +24291,7 @@ - + @@ -24314,7 +24314,7 @@ - + @@ -24357,20 +24357,20 @@ - + - + - + @@ -24394,7 +24394,7 @@ - + @@ -24437,7 +24437,7 @@ - + @@ -24460,7 +24460,7 @@ - + @@ -24961,7 +24961,7 @@ - + @@ -31391,7 +31391,7 @@ - + @@ -31400,7 +31400,7 @@ - + @@ -31454,11 +31454,11 @@ - + - + @@ -31517,7 +31517,7 @@ - + @@ -31787,7 +31787,7 @@ - + @@ -31864,7 +31864,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd b/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd index 50341a96..86d94daa 100644 --- a/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd +++ b/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd @@ -32,7 +32,7 @@ 66887915-4d9e-4e24-bd35-19eb55fb75c2(jetbrains.mps.coderules.ideaplugin) - + @@ -45,7 +45,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps index 824957c2..c86dabb5 100644 --- a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps +++ b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps @@ -3,10 +3,10 @@ - + - + @@ -1721,7 +1721,7 @@ - + @@ -1756,7 +1756,7 @@ - + @@ -1790,7 +1790,7 @@ - + @@ -2240,7 +2240,7 @@ - + @@ -2309,7 +2309,7 @@ - + @@ -3293,7 +3293,7 @@ - + @@ -3685,7 +3685,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps index 4e0864ca..713b24b5 100644 --- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps +++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps @@ -2,8 +2,8 @@ - - + + @@ -853,7 +853,7 @@ - + @@ -1270,7 +1270,7 @@ - + @@ -1859,7 +1859,7 @@ - + @@ -2824,7 +2824,7 @@ - + @@ -3133,7 +3133,7 @@ - + @@ -8182,7 +8182,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd b/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd index 23bd4a60..a2e75416 100644 --- a/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd +++ b/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd @@ -25,18 +25,17 @@ f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime) - + - - + diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps index 2e5bbfb6..4b512004 100644 --- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps +++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps @@ -4,8 +4,8 @@ - - + + diff --git a/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd b/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd index f804e896..1ef87874 100644 --- a/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd +++ b/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd @@ -19,14 +19,14 @@ 760a0a8c-eabb-4521-8bfd-65db761a9ba3(jetbrains.mps.baseLanguage.logging) - + - + diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps index 9dbfcd78..ffbed0cf 100644 --- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps +++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps @@ -2,8 +2,8 @@ - - + + @@ -200,7 +200,7 @@ - + @@ -234,7 +234,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd index 80cab176..ab5a90d1 100644 --- a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd +++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd @@ -21,7 +21,7 @@ 3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations) - + @@ -30,7 +30,7 @@ - + @@ -44,7 +44,6 @@ - diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps index c4b5429d..4d475107 100644 --- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps +++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps @@ -2,8 +2,8 @@ - - + + @@ -1355,7 +1355,7 @@ - + @@ -1365,7 +1365,7 @@ - + @@ -1388,7 +1388,7 @@ - + @@ -1416,7 +1416,7 @@ - + @@ -1428,7 +1428,7 @@ - + @@ -1482,7 +1482,7 @@ - + @@ -1599,7 +1599,7 @@ - + @@ -1714,7 +1714,7 @@ - + @@ -3013,7 +3013,7 @@ - + @@ -3028,7 +3028,7 @@ - + @@ -3146,7 +3146,7 @@ - + @@ -3162,7 +3162,7 @@ - + @@ -3178,7 +3178,7 @@ - + @@ -3777,7 +3777,7 @@ - + @@ -3877,7 +3877,7 @@ - + @@ -3949,9 +3949,9 @@ - + - + @@ -4234,11 +4234,11 @@ - + - + @@ -5031,7 +5031,7 @@ - + @@ -5046,7 +5046,7 @@ - + @@ -5072,7 +5072,7 @@ - + @@ -5085,7 +5085,7 @@ - + @@ -5097,7 +5097,7 @@ - + @@ -5692,7 +5692,7 @@ - + @@ -5716,7 +5716,7 @@ - + @@ -5824,7 +5824,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps index ee8e95ca..7baa5e95 100644 --- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps +++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps @@ -5,8 +5,8 @@ - - + + @@ -738,7 +738,7 @@ - + @@ -1049,7 +1049,7 @@ - + @@ -1106,7 +1106,7 @@ - + @@ -2540,7 +2540,7 @@ - + @@ -2587,7 +2587,7 @@ - + @@ -2770,7 +2770,7 @@ - + @@ -2817,7 +2817,7 @@ - + @@ -2873,7 +2873,7 @@ - + @@ -2927,11 +2927,11 @@ - + - + @@ -2974,7 +2974,7 @@ - + @@ -7977,7 +7977,7 @@ - + @@ -7987,7 +7987,7 @@ - + @@ -8034,12 +8034,12 @@ - + - + @@ -8261,7 +8261,7 @@ - + @@ -8379,7 +8379,7 @@ - + @@ -8651,7 +8651,7 @@ - + @@ -8785,7 +8785,7 @@ - + @@ -8813,7 +8813,7 @@ - + @@ -8894,7 +8894,7 @@ - + @@ -8922,7 +8922,7 @@ - + @@ -8959,7 +8959,7 @@ - + @@ -9129,7 +9129,7 @@ - + @@ -9522,7 +9522,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd index 7d1e52f7..179603b0 100644 --- a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd +++ b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd @@ -18,13 +18,13 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - + - + diff --git a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps index 73fb07b6..da15e4d7 100644 --- a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps +++ b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps @@ -2,10 +2,10 @@ - + - + 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 83dbdd58..9f036510 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 @@ -17,14 +17,14 @@ a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects) - + - + 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 11c2abf4..4f1a3ccb 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 @@ -2,7 +2,7 @@ - + @@ -71,12 +71,12 @@ - + - + diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps index 0a4acf25..c6e6e592 100644 --- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps +++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps @@ -2,8 +2,8 @@ - - + + diff --git a/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd b/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd index b16502d2..05156ccb 100644 --- a/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd +++ b/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd @@ -23,7 +23,7 @@ 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) - + diff --git a/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd b/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd index f1288f6c..098b0b21 100644 --- a/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd +++ b/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd @@ -20,7 +20,7 @@ 26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime) - + @@ -31,7 +31,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps index 5f127faa..6b3bd395 100644 --- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps +++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps @@ -5,7 +5,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps index 0eaec486..f103c2a7 100644 --- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps +++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps @@ -4,7 +4,7 @@ - + diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps index 8506e12e..1f77e2d4 100644 --- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps +++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps @@ -4,7 +4,7 @@ - + diff --git a/samples/controlflow/jetbrains.mps.baseLanguageExt2/jetbrains.mps.baseLanguageExt2.mpl b/samples/controlflow/jetbrains.mps.baseLanguageExt2/jetbrains.mps.baseLanguageExt2.mpl index 92f8bc2e..8d78ca79 100644 --- a/samples/controlflow/jetbrains.mps.baseLanguageExt2/jetbrains.mps.baseLanguageExt2.mpl +++ b/samples/controlflow/jetbrains.mps.baseLanguageExt2/jetbrains.mps.baseLanguageExt2.mpl @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -61,7 +61,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - + @@ -90,7 +90,7 @@ - + @@ -106,6 +106,7 @@ + diff --git a/samples/controlflow/jetbrains.mps.baseLanguageExt2/models/jetbrains.mps.baseLanguageExt2.behavior.mps b/samples/controlflow/jetbrains.mps.baseLanguageExt2/models/jetbrains.mps.baseLanguageExt2.behavior.mps index 7fa03458..5a2e258f 100644 --- a/samples/controlflow/jetbrains.mps.baseLanguageExt2/models/jetbrains.mps.baseLanguageExt2.behavior.mps +++ b/samples/controlflow/jetbrains.mps.baseLanguageExt2/models/jetbrains.mps.baseLanguageExt2.behavior.mps @@ -2,7 +2,7 @@ - + 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 1ddeee42..e44b087f 100644 --- a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl +++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -65,7 +65,7 @@ 6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking) - + @@ -75,8 +75,8 @@ + - @@ -102,27 +102,36 @@ - + + + + + + + + + + @@ -137,6 +146,8 @@ + + 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 06cf6387..db32a58d 100644 --- a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl +++ b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -65,7 +65,7 @@ 6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking) - + @@ -76,8 +76,8 @@ + - @@ -103,28 +103,37 @@ - + + + + + + + + + + @@ -139,6 +148,8 @@ + + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps index 79f92731..323c02ff 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps @@ -3,9 +3,9 @@ - + - + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps index 0500a73b..a3b3acbb 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps @@ -3,8 +3,8 @@ - - + + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps index 25741deb..f0d87c88 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps @@ -3,8 +3,8 @@ - - + + 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 f313af7f..313ac7e8 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -63,7 +63,7 @@ 6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking) - + @@ -74,8 +74,8 @@ + - @@ -101,28 +101,37 @@ - + + + + + + + + + + @@ -137,6 +146,8 @@ + + diff --git a/samples/fitch/languages/samples.fitch/models/types.mps b/samples/fitch/languages/samples.fitch/models/types.mps index 16106a47..a8eebb35 100644 --- a/samples/fitch/languages/samples.fitch/models/types.mps +++ b/samples/fitch/languages/samples.fitch/models/types.mps @@ -3,7 +3,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch/samples.fitch.mpl b/samples/fitch/languages/samples.fitch/samples.fitch.mpl index ba9cf1ad..0507f14b 100644 --- a/samples/fitch/languages/samples.fitch/samples.fitch.mpl +++ b/samples/fitch/languages/samples.fitch/samples.fitch.mpl @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -63,7 +63,7 @@ 4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking) - + @@ -104,7 +104,7 @@ - + @@ -119,14 +119,19 @@ + + + + + diff --git a/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps index a2a37665..4d06b1c8 100644 --- a/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps +++ b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps @@ -2,9 +2,9 @@ - + - + @@ -20,6 +20,7 @@ + @@ -136,6 +137,7 @@ + diff --git a/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps index 4cf76add..123ddf36 100644 --- a/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps +++ b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps @@ -2,9 +2,9 @@ - + - + @@ -20,6 +20,7 @@ + @@ -133,6 +134,7 @@ + diff --git a/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps index efd75a8e..0c4f1d9f 100644 --- a/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps +++ b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps @@ -2,9 +2,9 @@ - + - + @@ -20,6 +20,7 @@ + @@ -133,6 +134,7 @@ + diff --git a/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd b/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd index 3ca187d9..a9303a6b 100644 --- a/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd +++ b/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd @@ -20,7 +20,7 @@ ddb01c98-e78e-4c79-b11a-aeba193668d4(samples.fitch.firstOrderLogic) - + @@ -28,8 +28,8 @@ - - + + @@ -40,9 +40,15 @@ + + + + + + diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps index 832bf708..92f5d04c 100644 --- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps +++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps @@ -3,7 +3,7 @@ - + diff --git a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl index 0ffd35db..b30aa473 100644 --- a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl +++ b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl @@ -24,7 +24,7 @@ f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime) - + @@ -37,8 +37,8 @@ + - @@ -64,13 +64,15 @@ - + + + @@ -78,11 +80,15 @@ + + + + diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps index 52e3c6ab..767f3fc7 100644 --- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps +++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps @@ -2,9 +2,9 @@ - + - + @@ -25,6 +25,7 @@ + @@ -189,6 +190,7 @@ + @@ -249,6 +251,7 @@ + @@ -951,8 +954,11 @@ - - + + + + + diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.incremental@tests.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.incremental@tests.mps index aa7c8ba0..28bd7a8b 100644 --- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.incremental@tests.mps +++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.incremental@tests.mps @@ -3,9 +3,9 @@ - + - + @@ -27,6 +27,7 @@ + @@ -210,6 +211,7 @@ + @@ -318,6 +320,7 @@ + @@ -1720,8 +1723,11 @@ - - + + + + + diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd b/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd index 5ebbe7d6..d2801bb1 100644 --- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd +++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd @@ -19,7 +19,7 @@ 02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper) - + @@ -29,8 +29,8 @@ - - + + @@ -40,11 +40,17 @@ + + + + + + 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 cab0b662..2d207b31 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -67,8 +67,8 @@ + - @@ -95,13 +95,15 @@ - + + + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/models/jetbrains.mps.baseLanguage.blTypesExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/models/jetbrains.mps.baseLanguage.blTypesExt.behavior.mps index 4b9ae9f6..ca6cbda6 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/models/jetbrains.mps.baseLanguage.blTypesExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.blTypesExt/models/jetbrains.mps.baseLanguage.blTypesExt.behavior.mps @@ -2,7 +2,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 e724c32f..07af9d1e 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -69,7 +69,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - + @@ -79,8 +79,8 @@ + - @@ -107,13 +107,15 @@ - + + + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.behavior.mps index 4df50bc8..7abfcc7a 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.classifiersExt/models/jetbrains.mps.baseLanguage.classifiersExt.behavior.mps @@ -2,7 +2,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 2de9250b..cbb6bd6a 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -72,7 +72,7 @@ 4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime) - + @@ -82,8 +82,8 @@ + - @@ -110,13 +110,15 @@ - + + + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.behavior.mps index 6a22aea7..4d0d321d 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps index fd29526b..78b49465 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps @@ -15563,7 +15563,7 @@ - + @@ -15571,14 +15571,14 @@ - + - + @@ -15767,7 +15767,7 @@ - + @@ -15777,7 +15777,7 @@ - + @@ -16243,7 +16243,7 @@ - + @@ -16459,7 +16459,7 @@ - + @@ -16648,7 +16648,7 @@ - + @@ -16863,7 +16863,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 60afbadc..a57840bf 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -109,7 +109,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.behavior.mps index 32d3423b..e9212a6e 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.collectionsExt/models/jetbrains.mps.baseLanguage.collectionsExt.behavior.mps @@ -2,7 +2,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 60e85f8e..fc59f710 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -68,7 +68,7 @@ fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures) - + @@ -106,7 +106,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/models/jetbrains.mps.baseLanguage.function.behavior.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/models/jetbrains.mps.baseLanguage.function.behavior.mps index 6e0a9407..cd2e9735 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/models/jetbrains.mps.baseLanguage.function.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/models/jetbrains.mps.baseLanguage.function.behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/models/jetbrains.mps.baseLanguage.function.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/models/jetbrains.mps.baseLanguage.function.types.mps index 2b831fa7..49f92816 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/models/jetbrains.mps.baseLanguage.function.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.function/models/jetbrains.mps.baseLanguage.function.types.mps @@ -690,7 +690,7 @@ - + @@ -781,7 +781,7 @@ - + @@ -890,7 +890,7 @@ - + @@ -1015,7 +1015,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 0b46d855..bbd20b64 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 @@ -23,7 +23,7 @@ f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime) - + @@ -51,7 +51,7 @@ - + @@ -71,6 +71,7 @@ + @@ -85,6 +86,8 @@ + + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/models/jetbrains.mps.baseLanguage.javadocExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/models/jetbrains.mps.baseLanguage.javadocExt.behavior.mps index 5523ae36..742b3c1c 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/models/jetbrains.mps.baseLanguage.javadocExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadocExt/models/jetbrains.mps.baseLanguage.javadocExt.behavior.mps @@ -2,7 +2,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 b9cf5f81..3733cc0e 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -67,7 +67,7 @@ 4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking) - + @@ -77,8 +77,8 @@ + - @@ -105,13 +105,15 @@ - + + + @@ -126,6 +128,7 @@ + @@ -139,6 +142,8 @@ + + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/models/jetbrains.mps.baseLanguage.sequence.behavior.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/models/jetbrains.mps.baseLanguage.sequence.behavior.mps index 973dd93c..0e182ba6 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/models/jetbrains.mps.baseLanguage.sequence.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.sequence/models/jetbrains.mps.baseLanguage.sequence.behavior.mps @@ -2,7 +2,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 eb4b6759..cdc58634 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -72,7 +72,7 @@ 7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem) - + @@ -110,7 +110,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.behavior.mps index 38c074aa..136b599d 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.behavior.mps @@ -2,7 +2,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 ad1b31a6..e1f5e08c 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl @@ -28,7 +28,7 @@ 7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem) - + @@ -65,7 +65,7 @@ - + @@ -80,8 +80,10 @@ + + @@ -91,8 +93,10 @@ + + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps index 06d7c03e..866d9216 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps @@ -10,8 +10,8 @@ - - + + @@ -4262,7 +4262,7 @@ - + @@ -12355,7 +12355,7 @@ - + @@ -12397,7 +12397,7 @@ - + @@ -29372,7 +29372,7 @@ - + @@ -29438,7 +29438,7 @@ - + @@ -29496,7 +29496,7 @@ - + @@ -29516,7 +29516,7 @@ - + @@ -29558,7 +29558,7 @@ - + @@ -29571,7 +29571,7 @@ - + @@ -29630,7 +29630,7 @@ - + @@ -29651,7 +29651,7 @@ - + @@ -29678,7 +29678,7 @@ - + @@ -29706,7 +29706,7 @@ - + @@ -29737,7 +29737,7 @@ - + @@ -29759,7 +29759,7 @@ - + @@ -29796,7 +29796,7 @@ - + @@ -29804,7 +29804,7 @@ - + @@ -29823,7 +29823,7 @@ - + @@ -29865,7 +29865,7 @@ - + @@ -29880,7 +29880,7 @@ - + @@ -37994,7 +37994,7 @@ - + @@ -38703,7 +38703,7 @@ - + @@ -38715,7 +38715,7 @@ - + @@ -53447,7 +53447,7 @@ - + @@ -57544,7 +57544,7 @@ - + @@ -57693,7 +57693,7 @@ - + @@ -57911,7 +57911,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 035c6b5d..45fd426f 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/jetbrains.mps.baseLanguageInternalExt.mpl @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -75,8 +75,8 @@ + - @@ -103,13 +103,15 @@ - + + + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.behavior.mps index adc923b5..81cc018e 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageInternalExt/models/jetbrains.mps.baseLanguageInternalExt.behavior.mps @@ -2,7 +2,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 e0541231..3333858f 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,8 +47,6 @@ - - @@ -60,12 +58,9 @@ - - - @@ -75,7 +70,7 @@ 65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt) - + @@ -85,8 +80,8 @@ + - @@ -113,13 +108,15 @@ - + + + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.behavior.mps index 6b7bdd22..da5f66fe 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps index e5a6e38a..63bb77c8 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.behaviorExt/models/jetbrains.mps.lang.behaviorExt.types.mps @@ -4,9 +4,9 @@ - + - + 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 6a4f8166..e37c2927 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -54,7 +54,6 @@ - @@ -88,7 +87,7 @@ c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) - + @@ -98,8 +97,8 @@ + - @@ -126,13 +125,15 @@ - + + + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.behavior.mps index ee8f158e..1945461a 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.coderulesExt/models/jetbrains.mps.lang.coderulesExt.behavior.mps @@ -2,7 +2,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 b9991c97..cf445fa0 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,26 +47,19 @@ - - - - - - - @@ -78,7 +71,7 @@ c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) - + @@ -88,8 +81,8 @@ + - @@ -116,13 +109,15 @@ - + + + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.behavior.mps index f74ad30f..fc93ea3e 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.constraintsExt/models/jetbrains.mps.lang.constraintsExt.behavior.mps @@ -2,7 +2,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 65f15855..21fe0336 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -46,16 +46,13 @@ + - - - - @@ -64,7 +61,6 @@ - @@ -77,7 +73,7 @@ 215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator) - + @@ -115,7 +111,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.behavior.mps index fc993fec..09988b65 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.behavior.mps @@ -2,7 +2,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 649e21c1..57368074 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -46,16 +46,13 @@ + - - - - @@ -63,7 +60,6 @@ - @@ -77,7 +73,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - + @@ -87,8 +83,8 @@ + - @@ -115,13 +111,15 @@ - + + + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.behavior.mps index 867a8e31..92a759fa 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.generatorExt/models/jetbrains.mps.lang.generatorExt.behavior.mps @@ -2,7 +2,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 d9e20ab7..b994680f 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,15 +47,11 @@ - - - - @@ -64,7 +60,6 @@ - @@ -80,7 +75,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - + @@ -90,8 +85,8 @@ + - @@ -118,13 +113,15 @@ - + + + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/models/jetbrains.mps.lang.patternExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/models/jetbrains.mps.lang.patternExt.behavior.mps index 5f986fe0..ccfd1755 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.patternExt/models/jetbrains.mps.lang.patternExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.patternExt/models/jetbrains.mps.lang.patternExt.behavior.mps @@ -2,7 +2,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 46f0d919..c6fc832a 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,15 +47,11 @@ - - - - @@ -63,7 +59,6 @@ - @@ -79,7 +74,7 @@ c1f5ad88-21f4-4e0e-927c-48b1ca0c2334(jetbrains.mps.baseLanguage.collectionsExt) - + @@ -89,8 +84,8 @@ + - @@ -117,13 +112,15 @@ - + + + @@ -133,6 +130,7 @@ + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.behavior.mps index bb8cb7f3..f3c94a26 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.quotationExt/models/jetbrains.mps.lang.quotationExt.behavior.mps @@ -2,7 +2,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 459883c9..8949a89f 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,15 +47,11 @@ - - - - @@ -64,14 +60,13 @@ - - + @@ -81,8 +76,8 @@ + - @@ -109,13 +104,15 @@ - + + + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/models/jetbrains.mps.lang.scopesExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/models/jetbrains.mps.lang.scopesExt.behavior.mps index 9436115f..5429efdf 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/models/jetbrains.mps.lang.scopesExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.scopesExt/models/jetbrains.mps.lang.scopesExt.behavior.mps @@ -2,7 +2,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 119fed54..eca470a8 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,15 +47,11 @@ - - - - @@ -63,7 +59,6 @@ - @@ -75,7 +70,7 @@ 65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt) - + @@ -85,8 +80,8 @@ + - @@ -113,13 +108,15 @@ - + + + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/models/jetbrains.mps.lang.scriptExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/models/jetbrains.mps.lang.scriptExt.behavior.mps index f374ac17..af007afb 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/models/jetbrains.mps.lang.scriptExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.scriptExt/models/jetbrains.mps.lang.scriptExt.behavior.mps @@ -2,7 +2,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 888203f6..0ba2501a 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -48,10 +48,12 @@ + + @@ -71,7 +73,7 @@ 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) - + @@ -83,8 +85,7 @@ - - + @@ -110,12 +111,12 @@ - + - + @@ -128,6 +129,7 @@ + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.behavior.mps index e2c302de..93dccd12 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.types.mps index c04c8478..ad8c266e 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.smodel.queryExt/models/jetbrains.mps.lang.smodel.queryExt.types.mps @@ -2,8 +2,8 @@ - - + + @@ -79,9 +79,6 @@ - - - @@ -114,7 +111,7 @@ - + @@ -225,14 +222,16 @@ - - - - + + + + + + + + + - - - @@ -299,24 +298,20 @@ - - - - - - - + + + + + - - - - - - - - - - + + + + + + + + @@ -387,15 +382,15 @@ - - - - - - - - - + + + + + + + + + @@ -408,31 +403,31 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -510,14 +505,16 @@ - - - - + + + + + + + + + - - - @@ -584,24 +581,20 @@ - - - - - - - + + + + + - - - - - - - - - - + + + + + + + + @@ -672,15 +665,15 @@ - - - - - - - - - + + + + + + + + + @@ -693,31 +686,31 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -811,54 +804,48 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + - - - - - - + + + + + + + + @@ -871,38 +858,40 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + @@ -915,12 +904,14 @@ - - - - - - + + + + + + + + @@ -1003,10 +994,8 @@ - - - - + + @@ -1042,16 +1031,12 @@ - - - - - - - - - - + + + + + + @@ -1136,12 +1121,12 @@ - - - - - - + + + + + + @@ -1197,10 +1182,8 @@ - - - - + + @@ -1249,10 +1232,8 @@ - - - - + + @@ -1301,10 +1282,8 @@ - - - - + + @@ -1353,10 +1332,8 @@ - - - - + + @@ -1429,10 +1406,8 @@ - - - - + + 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 15ac5ab2..e281d23d 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -87,7 +87,7 @@ af65afd8-f0dd-4942-87d9-63a55f2a9db1(jetbrains.mps.lang.behavior) - + @@ -97,8 +97,8 @@ + - @@ -125,14 +125,16 @@ - + + + @@ -142,6 +144,7 @@ + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.behavior.mps index 9ef7ecfc..0a83a1a2 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps index 666b9b3d..3a3c6312 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.types.mps @@ -299,6 +299,7 @@ + @@ -5373,10 +5374,13 @@ - - - + + + + + + @@ -5575,10 +5579,13 @@ - - - + + + + + + @@ -14986,8 +14993,11 @@ - - + + + + + @@ -18627,7 +18637,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 65a2687f..22d4e0f4 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -53,8 +53,6 @@ - - @@ -62,8 +60,6 @@ - - @@ -71,7 +67,6 @@ - @@ -85,7 +80,7 @@ 65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt) - + @@ -95,8 +90,8 @@ + - @@ -123,13 +118,15 @@ - + + + @@ -150,7 +147,6 @@ - diff --git a/samples/mpscore/languages/jetbrains.mps.lang.testExt/models/jetbrains.mps.lang.testExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.testExt/models/jetbrains.mps.lang.testExt.behavior.mps index 6e881781..5e82e280 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.testExt/models/jetbrains.mps.lang.testExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.testExt/models/jetbrains.mps.lang.testExt.behavior.mps @@ -2,7 +2,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 4e1bd970..13279eb5 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -54,8 +54,8 @@ - + @@ -73,6 +73,8 @@ + + @@ -87,7 +89,7 @@ c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules) - + @@ -97,8 +99,8 @@ + - @@ -125,13 +127,15 @@ - + + + @@ -145,6 +149,7 @@ + @@ -160,6 +165,8 @@ + + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/models/jetbrains.mps.lang.typecheckingExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/models/jetbrains.mps.lang.typecheckingExt.behavior.mps index ab02143f..c9881ff1 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/models/jetbrains.mps.lang.typecheckingExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.typecheckingExt/models/jetbrains.mps.lang.typecheckingExt.behavior.mps @@ -2,7 +2,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 45e3e23e..e2233d1a 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 @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -84,7 +84,7 @@ c1f5ad88-21f4-4e0e-927c-48b1ca0c2334(jetbrains.mps.baseLanguage.collectionsExt) - + @@ -94,8 +94,8 @@ + - @@ -122,13 +122,15 @@ - + + + @@ -138,6 +140,7 @@ + diff --git a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.behavior.mps index ff246121..05636073 100644 --- a/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.lang.typesystemExt/models/jetbrains.mps.lang.typesystemExt.behavior.mps @@ -2,7 +2,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 5ce533dc..8cf7b665 100644 --- a/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.logicExt/jetbrains.mps.logicExt.mpl @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -69,7 +69,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - + @@ -79,8 +79,8 @@ + - @@ -107,13 +107,15 @@ - + + + diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.behavior.mps index e06f68f3..91fb0947 100644 --- a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps index 75d98c19..5410ff10 100644 --- a/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps +++ b/samples/mpscore/languages/jetbrains.mps.logicExt/models/jetbrains.mps.logicExt.types.mps @@ -4,9 +4,9 @@ - + - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/jetbrains.mps.baseLanguage.closuresExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/jetbrains.mps.baseLanguage.closuresExt.test.msd index 048db504..827f785d 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/jetbrains.mps.baseLanguage.closuresExt.test.msd +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/jetbrains.mps.baseLanguage.closuresExt.test.msd @@ -22,7 +22,7 @@ c1f5ad88-21f4-4e0e-927c-48b1ca0c2334(jetbrains.mps.baseLanguage.collectionsExt) - + @@ -35,8 +35,8 @@ - - + + @@ -45,7 +45,10 @@ + + + @@ -57,7 +60,10 @@ + + + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures.mps index 2562ff95..3331990b 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures.mps @@ -4,7 +4,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures@tests.mps index f6f63d4a..80060532 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.closures@tests.mps @@ -2,9 +2,9 @@ - + - + @@ -21,6 +21,7 @@ + @@ -134,6 +135,7 @@ + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps index 725429dd..ec94111a 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps @@ -5,7 +5,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps index 32d5b2b6..082b021b 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps @@ -2,9 +2,9 @@ - + - + @@ -22,6 +22,7 @@ + @@ -146,6 +147,7 @@ + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/jetbrains.mps.baseLanguage.collectionsExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/jetbrains.mps.baseLanguage.collectionsExt.test.msd index 940b5d03..9a52f545 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/jetbrains.mps.baseLanguage.collectionsExt.test.msd +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/jetbrains.mps.baseLanguage.collectionsExt.test.msd @@ -25,9 +25,10 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - + + @@ -38,8 +39,8 @@ - - + + @@ -48,7 +49,10 @@ + + + @@ -61,8 +65,11 @@ + + + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps index dcfe132e..86fef4c1 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.collections.mps @@ -4,7 +4,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps index b0147f67..e819ee47 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.containers@tests.mps @@ -3,9 +3,9 @@ - + - + @@ -23,6 +23,7 @@ + @@ -150,6 +151,7 @@ + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps index 0d11ff31..c17c0834 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.incremental@tests.mps @@ -2,11 +2,11 @@ - + - + - + @@ -28,6 +28,7 @@ + @@ -281,6 +282,7 @@ + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence.mps index d1c1f926..35a8ed59 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence.mps @@ -4,7 +4,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence@tests.mps index 2f41a34c..d40050bc 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.collectionsExt.test/models/jetbrains.mps.baseLanguage.collectionsExt.test.sequence@tests.mps @@ -2,9 +2,9 @@ - + - + @@ -20,6 +20,7 @@ + @@ -136,6 +137,7 @@ + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd index bf77515e..097cd898 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd @@ -21,7 +21,7 @@ d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime) - + @@ -32,8 +32,8 @@ - - + + @@ -41,7 +41,10 @@ + + + @@ -50,7 +53,10 @@ + + + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps index ee5d4a35..64683ac7 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps @@ -5,7 +5,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps index 21612d8e..07f3b841 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps @@ -2,9 +2,9 @@ - + - + @@ -21,6 +21,7 @@ + @@ -134,6 +135,7 @@ + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd index 655bf584..e87362aa 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd @@ -29,7 +29,7 @@ 02473356-2f59-4de1-ba87-e88f9d606180(jetbrains.mps.coderules.testhelper) - + @@ -49,8 +49,8 @@ - - + + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps index 76d33ea4..51f9a6c5 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.features.mps @@ -4,7 +4,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps index 377555b3..cd83d5a4 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps @@ -3,7 +3,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.staging.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.staging.mps index 140654dd..78d8d2cf 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.staging.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.staging.mps @@ -3,7 +3,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.thinlet.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.thinlet.mps index 37396cf6..3dfcfefb 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.thinlet.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.thinlet.mps @@ -3,7 +3,7 @@ - + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps index 515f4ec2..64902778 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.features@tests.mps @@ -2,9 +2,9 @@ - + - + @@ -21,6 +21,7 @@ + @@ -150,6 +151,7 @@ + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps index b4ebd4cc..f830421c 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.generics@tests.mps @@ -2,9 +2,9 @@ - + - + @@ -22,6 +22,7 @@ + @@ -155,6 +156,7 @@ + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps index 54af0f50..b25eca1f 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps @@ -2,11 +2,11 @@ - + - + - + @@ -43,6 +43,7 @@ + @@ -410,6 +411,7 @@ + @@ -2748,6 +2750,7 @@ + @@ -4239,6 +4242,7 @@ + @@ -6260,6 +6264,7 @@ + @@ -7618,6 +7623,7 @@ + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.staging@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.staging@tests.mps index bfa2ddbb..ed4d8476 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.staging@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.staging@tests.mps @@ -2,9 +2,9 @@ - + - + @@ -22,6 +22,7 @@ + @@ -142,6 +143,7 @@ + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps index 2a539382..86d702f6 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.thinlet@tests.mps @@ -2,13 +2,13 @@ - + - + - + @@ -26,6 +26,7 @@ + @@ -182,6 +183,7 @@ + diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps index 93ce3a04..fabe1b2b 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps @@ -2,12 +2,12 @@ - + - + - + @@ -51,6 +51,7 @@ + @@ -295,6 +296,7 @@ + @@ -400,6 +402,7 @@ + @@ -613,8 +616,11 @@ - - + + + + + @@ -959,6 +965,7 @@ + @@ -1329,8 +1336,11 @@ - - + + + + + @@ -4180,6 +4190,7 @@ + @@ -4814,8 +4825,11 @@ - - + + + + + diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd index 39d8c989..2ea156be 100644 --- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd +++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/jetbrains.mps.lang.smodelExt.test.msd @@ -25,7 +25,7 @@ 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) - + @@ -38,9 +38,9 @@ - + - + @@ -50,14 +50,20 @@ + + + + + + diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps index c4856346..75400288 100644 --- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.code@tests.mps @@ -2,10 +2,10 @@ - + - + @@ -25,6 +25,7 @@ + @@ -141,6 +142,7 @@ + diff --git a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps index 6f6b9b11..d7c6e2f6 100644 --- a/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps +++ b/samples/mpscore/solutions/jetbrains.mps.lang.smodelExt/models/jetbrains.mps.lang.smodelExt.test.types@tests.mps @@ -2,9 +2,9 @@ - + - + @@ -34,6 +34,7 @@ + @@ -221,6 +222,7 @@ + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps index 35332f06..84bc0365 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps @@ -2,10 +2,10 @@ - + - - + + @@ -25,6 +25,7 @@ + @@ -144,6 +145,7 @@ + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps index d937d0bb..8cb72313 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps @@ -2,9 +2,9 @@ - + - + @@ -22,6 +22,7 @@ + @@ -155,6 +156,7 @@ + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.bad.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.bad.mps index f0c70af9..ba903746 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.bad.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.bad.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.mps index 81b23911..b48a76a5 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.bounds.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps index a23fbd6e..8a9e4db4 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps @@ -3,7 +3,7 @@ - + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd b/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd index 951552d6..532ef9d1 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd @@ -24,7 +24,7 @@ e44e7802-2e40-482b-9b1c-6d42660a6a11(jetbrains.mps.baseLanguageExt.test) - + @@ -34,13 +34,12 @@ - - - + + @@ -49,7 +48,10 @@ + + + @@ -57,7 +59,10 @@ + + +