diff --git a/.mps/migration.xml b/.mps/migration.xml index 10fed07b..26e6596a 100644 --- a/.mps/migration.xml +++ b/.mps/migration.xml @@ -7,6 +7,7 @@ + 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 fbedf75b..2d4139d2 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 @@ -2,18 +2,18 @@ - + - + - + - + @@ -350,9 +350,6 @@ - - - @@ -492,7 +489,7 @@ - + @@ -647,11 +644,11 @@ - + - + @@ -659,7 +656,7 @@ - + @@ -6218,8 +6215,8 @@ - - + + 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 bb8b93d0..2a9ff200 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 @@ -25,9 +25,9 @@ 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) - + - + @@ -36,15 +36,15 @@ - + - + - + @@ -98,12 +98,12 @@ 26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime) - + - + @@ -113,28 +113,29 @@ - + - + - + - + - + - + - - + + + @@ -158,6 +159,7 @@ + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps index af2a70c0..2a4e0f4b 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps @@ -2,7 +2,7 @@ - + @@ -35,7 +35,6 @@ - @@ -1453,7 +1452,6 @@ - diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps index 2675f5f8..18fcd890 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps @@ -3,7 +3,7 @@ - + @@ -467,7 +467,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps index 40a92cb7..c552f63e 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps @@ -7,9 +7,9 @@ - - - + + + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps index 32236471..218f6219 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps @@ -2,13 +2,13 @@ - - + + - + - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/plugin.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/plugin.mps index 0ddc9dec..3e377629 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/plugin.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/plugin.mps @@ -4,7 +4,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps index e8b02b31..b772772f 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 @@ - + @@ -596,9 +596,6 @@ - - - @@ -612,9 +609,6 @@ - - - @@ -657,9 +651,6 @@ - - - diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps index 92910d64..75d5b578 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps @@ -242,7 +242,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps index 7e332c35..a0c2ba1d 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps @@ -5,7 +5,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 780389c4..e60d8156 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 @@ -15,17 +15,17 @@ ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) - + - + - + 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 4e41a451..d564e116 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 @@ - - - + + + @@ -93,9 +93,6 @@ - - - @@ -411,7 +408,7 @@ - + @@ -438,9 +435,6 @@ - - - @@ -567,7 +561,6 @@ - @@ -2675,7 +2668,6 @@ - @@ -3151,7 +3143,6 @@ - @@ -3657,7 +3648,6 @@ - @@ -8021,12 +8011,12 @@ - - - + + + - + @@ -9137,7 +9127,6 @@ - @@ -9151,7 +9140,6 @@ - @@ -9173,7 +9161,6 @@ - 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 f84def30..15939362 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 @@ -23,21 +23,21 @@ e45a8b22-94f2-427f-b849-77f254c4eef5(jetbrains.mps.lang.aspect#3274906159125927726) - + - + - + - + @@ -94,29 +94,29 @@ - + - + - + - + - + - - + + diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/models/behavior.mps b/coderules/languages/jetbrains.mps.lang.controlflow/models/behavior.mps index 446246f7..c07e3cef 100644 --- a/coderules/languages/jetbrains.mps.lang.controlflow/models/behavior.mps +++ b/coderules/languages/jetbrains.mps.lang.controlflow/models/behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/models/editor.mps b/coderules/languages/jetbrains.mps.lang.controlflow/models/editor.mps index edf52817..64313c52 100644 --- a/coderules/languages/jetbrains.mps.lang.controlflow/models/editor.mps +++ b/coderules/languages/jetbrains.mps.lang.controlflow/models/editor.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/models/plugin.mps b/coderules/languages/jetbrains.mps.lang.controlflow/models/plugin.mps index 4f1bb3cd..11834d9a 100644 --- a/coderules/languages/jetbrains.mps.lang.controlflow/models/plugin.mps +++ b/coderules/languages/jetbrains.mps.lang.controlflow/models/plugin.mps @@ -4,7 +4,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/models/structure.mps b/coderules/languages/jetbrains.mps.lang.controlflow/models/structure.mps index 5225f7bd..e12f6dd7 100644 --- a/coderules/languages/jetbrains.mps.lang.controlflow/models/structure.mps +++ b/coderules/languages/jetbrains.mps.lang.controlflow/models/structure.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl b/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl index 8a712c05..e1a5f8c3 100644 --- a/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl +++ b/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl @@ -15,21 +15,21 @@ - + - + - + - + @@ -71,25 +71,25 @@ - + - + - + - + - + @@ -97,10 +97,10 @@ - + - - + + diff --git a/coderules/languages/jetbrains.mps.lang.smodel.types/models/behavior.mps b/coderules/languages/jetbrains.mps.lang.smodel.types/models/behavior.mps index b400b19f..2a852a8a 100644 --- a/coderules/languages/jetbrains.mps.lang.smodel.types/models/behavior.mps +++ b/coderules/languages/jetbrains.mps.lang.smodel.types/models/behavior.mps @@ -2,7 +2,7 @@ - + @@ -19,7 +19,6 @@ - @@ -61,7 +60,6 @@ - diff --git a/coderules/languages/jetbrains.mps.lang.smodel.types/models/editor.mps b/coderules/languages/jetbrains.mps.lang.smodel.types/models/editor.mps index 926c0d69..80aa8564 100644 --- a/coderules/languages/jetbrains.mps.lang.smodel.types/models/editor.mps +++ b/coderules/languages/jetbrains.mps.lang.smodel.types/models/editor.mps @@ -2,7 +2,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 5394cf89..bee2baf4 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,11 +2,11 @@ - - + + - - + + @@ -228,7 +228,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 c2dd8e3a..2a93773f 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 @@ -31,21 +31,21 @@ e45a8b22-94f2-427f-b849-77f254c4eef5(jetbrains.mps.lang.aspect#3274906159125927726) - + - + - + - + @@ -105,29 +105,29 @@ - + - + - + - + - + - - + + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps index 858b8824..a1de5fa5 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps @@ -2,8 +2,8 @@ - - + + @@ -20,7 +20,6 @@ - @@ -62,7 +61,6 @@ - diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps index a4851eec..2d6387f0 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/editor.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps index cfd11652..1aef9977 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps index eaf2f0b6..74816e2a 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps @@ -4,9 +4,9 @@ - + - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps index ce9a5f9f..d998b795 100644 --- a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps +++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps index 7512d64c..a3ff3ca8 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.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps index b78bce86..26dcf494 100644 --- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps +++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps @@ -2,15 +2,15 @@ - + - - + + - + @@ -379,11 +379,11 @@ - + - + diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl index 7904185a..03e26c0c 100644 --- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl +++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl @@ -21,20 +21,20 @@ ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template) - + - + - + - - + + @@ -90,10 +90,10 @@ a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime) - + - + @@ -101,28 +101,29 @@ - + - + - + - + - + - + - - + + + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps index 1dee3965..430e9749 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps @@ -2,11 +2,11 @@ - + - - - + + + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps index c5f619bb..7dfe6c2a 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 cf891cf0..c6fef4de 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps @@ -3,10 +3,10 @@ - - - - + + + + @@ -480,7 +480,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps index fe07572d..0119dc28 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 ce36087e..93d6ef86 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/migration.mps @@ -2,8 +2,8 @@ - - + + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps index 0f3ff073..bf97c72e 100644 --- a/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps +++ b/coderules/languages/jetbrains.mps.logic/languageModels/structure.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps index 0f7a9314..e0ea8207 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 010058c0..43f9481d 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 @@ -13,16 +13,16 @@ ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) - + - + - + 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 bcd3e69f..ae5193df 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 @@ - + @@ -54,9 +54,6 @@ - - - @@ -496,7 +493,6 @@ - @@ -674,7 +670,6 @@ - @@ -1360,7 +1355,6 @@ - @@ -1628,7 +1622,6 @@ - @@ -2915,7 +2908,6 @@ - @@ -3277,7 +3269,6 @@ - @@ -3413,7 +3404,6 @@ - @@ -3634,7 +3624,6 @@ - @@ -3698,7 +3687,6 @@ - @@ -3759,7 +3747,6 @@ - @@ -4001,7 +3988,6 @@ - @@ -4070,7 +4056,6 @@ - @@ -4104,7 +4089,6 @@ - @@ -4266,7 +4250,6 @@ - @@ -4276,7 +4259,6 @@ - @@ -4292,7 +4274,6 @@ - @@ -4303,7 +4284,6 @@ - @@ -4317,7 +4297,6 @@ - @@ -4333,7 +4312,6 @@ - @@ -4344,7 +4322,6 @@ - @@ -4365,7 +4342,6 @@ - @@ -4382,7 +4358,6 @@ - @@ -4398,7 +4373,6 @@ - @@ -4414,7 +4388,6 @@ - @@ -4430,7 +4403,6 @@ - @@ -4446,7 +4418,6 @@ - @@ -4468,7 +4439,6 @@ - @@ -4484,7 +4454,6 @@ - @@ -4506,7 +4475,6 @@ - @@ -4827,7 +4795,6 @@ - @@ -5864,7 +5831,6 @@ - @@ -5890,7 +5856,6 @@ - @@ -5902,7 +5867,6 @@ - @@ -5920,7 +5884,6 @@ - @@ -5943,7 +5906,6 @@ - @@ -7916,7 +7878,6 @@ - @@ -8221,7 +8182,6 @@ - @@ -8617,7 +8577,6 @@ - @@ -8861,7 +8820,6 @@ - @@ -9274,7 +9232,6 @@ - @@ -9386,7 +9343,6 @@ - @@ -10802,7 +10758,6 @@ - @@ -11057,7 +11012,6 @@ - @@ -11070,7 +11024,6 @@ - @@ -11300,7 +11253,6 @@ - @@ -11331,7 +11283,6 @@ - @@ -12440,7 +12391,6 @@ - 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 cffee59a..b2223865 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,7 +2,7 @@ - + @@ -44,9 +44,6 @@ - - - @@ -246,7 +243,7 @@ - + @@ -318,7 +315,6 @@ - diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps index 9a04cab6..dd7a5c7f 100644 --- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps +++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps @@ -2,9 +2,9 @@ - + - + @@ -50,9 +50,6 @@ - - - @@ -260,7 +257,7 @@ - + @@ -1224,7 +1221,6 @@ - @@ -2014,7 +2010,6 @@ - @@ -2028,7 +2023,6 @@ - @@ -2042,7 +2036,6 @@ - @@ -2056,7 +2049,6 @@ - @@ -2360,7 +2352,6 @@ - @@ -2372,7 +2363,6 @@ - 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 0aa2e76a..80237a3e 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 @@ -2,7 +2,7 @@ - + @@ -29,9 +29,6 @@ - - - @@ -226,7 +223,6 @@ - @@ -292,7 +288,6 @@ - @@ -508,7 +503,6 @@ - @@ -600,7 +594,6 @@ - @@ -624,7 +617,6 @@ - @@ -658,7 +650,6 @@ - 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 bd00e9a7..2308f25d 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 @@ -12,29 +12,29 @@ 18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor) - + - + - + - + - - + + @@ -50,6 +50,7 @@ + diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps index d9641a8a..8a38347f 100644 --- a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps +++ b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps index 63cde658..360303e4 100644 --- a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps +++ b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/editor.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps index 4cf76c27..68626c5f 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 6dc6c06e..7b1761aa 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 @@ -15,20 +15,20 @@ - + - + - + - + @@ -52,10 +52,10 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) - + - + @@ -63,16 +63,16 @@ - + - + - + @@ -80,11 +80,11 @@ - + - + - + diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/behavior.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/behavior.mps index bcf8db5d..e5cc6a0b 100644 --- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/behavior.mps +++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps index 9edd2102..126c6d91 100644 --- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps +++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps index f81c0d27..682fb266 100644 --- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps +++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/structure.mps @@ -2,7 +2,7 @@ - + diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps index 13b7d1a4..6a9f0b33 100644 --- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps +++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps @@ -4,8 +4,8 @@ - - + + 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 3de19f08..2b184f4b 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 @@ -16,11 +16,11 @@ 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) - + - + @@ -28,9 +28,9 @@ - + - + diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps index 61d8bfea..623ed3c7 100644 --- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps +++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps @@ -2,15 +2,15 @@ - - + + - + - + @@ -188,9 +188,6 @@ - - - @@ -530,7 +527,7 @@ - + @@ -3859,7 +3856,6 @@ - @@ -3874,7 +3870,6 @@ - @@ -3889,7 +3884,6 @@ - @@ -8769,7 +8763,6 @@ - @@ -9401,7 +9394,6 @@ - @@ -10588,7 +10580,6 @@ - @@ -10600,7 +10591,6 @@ - @@ -10608,7 +10598,6 @@ - @@ -10622,7 +10611,6 @@ - @@ -14398,7 +14386,6 @@ - @@ -14413,7 +14400,6 @@ - @@ -14428,7 +14414,6 @@ - @@ -14443,7 +14428,6 @@ - @@ -14458,7 +14442,6 @@ - @@ -14473,7 +14456,6 @@ - @@ -14488,7 +14470,6 @@ - @@ -16596,7 +16577,6 @@ - @@ -16656,7 +16636,6 @@ - @@ -16724,7 +16703,6 @@ - @@ -16792,7 +16770,6 @@ - @@ -16856,7 +16833,6 @@ - @@ -22683,7 +22659,6 @@ - @@ -22701,7 +22676,6 @@ - @@ -22733,7 +22707,6 @@ - @@ -22767,7 +22740,6 @@ - @@ -22823,7 +22795,6 @@ - diff --git a/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd b/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd index 22249689..491c6584 100644 --- a/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd +++ b/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd @@ -24,11 +24,11 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - + - + @@ -36,9 +36,9 @@ - + - + diff --git a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps index 5d6cd99f..0fc8a933 100644 --- a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps +++ b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps @@ -3,10 +3,10 @@ - - + + - + diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps index ae07069c..2b4c91c8 100644 --- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps +++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps @@ -2,11 +2,11 @@ - - + + - + @@ -83,9 +83,6 @@ - - - @@ -3663,8 +3660,6 @@ - - @@ -3675,7 +3670,6 @@ - @@ -3763,7 +3757,6 @@ - @@ -4920,7 +4913,6 @@ - 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 e9cd5aa9..bc760059 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 @@ -19,18 +19,18 @@ ffcd9ef5-e931-4da9-a8d1-eb9bf80d19b4(jetbrains.mps.lang.controlflow.runtime) - + - + - + - + diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps index 4eac99a9..24a5d5bb 100644 --- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps +++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps @@ -3,10 +3,10 @@ - - - - + + + + @@ -107,9 +107,6 @@ - - - @@ -952,7 +949,6 @@ - diff --git a/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd b/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd index be5174ec..d908ee0f 100644 --- a/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd +++ b/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd @@ -12,13 +12,13 @@ 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) - + - + - + diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps index 07b48546..74a0fbac 100644 --- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps +++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps @@ -2,9 +2,9 @@ - - - + + + 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 0093c2c6..a8cb3a8b 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 @@ -15,15 +15,15 @@ bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor) - + - + - + 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 9a24ac7c..ed3f602e 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,9 +2,9 @@ - - - + + + @@ -266,7 +266,6 @@ - @@ -1708,7 +1707,6 @@ - @@ -1718,7 +1716,6 @@ - diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps index 2461be33..43780311 100644 --- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps +++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps @@ -2,9 +2,9 @@ - - - + + + @@ -235,7 +235,6 @@ - @@ -261,7 +260,6 @@ - @@ -455,7 +453,6 @@ - @@ -473,7 +470,6 @@ - @@ -502,7 +498,6 @@ - @@ -543,7 +538,6 @@ - diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps index 1956eee7..649fe8eb 100644 --- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps +++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps @@ -2,11 +2,11 @@ - + - - + + @@ -54,9 +54,6 @@ - - - @@ -1193,7 +1190,6 @@ - @@ -2956,7 +2952,6 @@ - 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 e2f6314b..0829a656 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 @@ -2,11 +2,11 @@ - + - - + + @@ -59,9 +59,6 @@ - - - @@ -699,7 +696,6 @@ - @@ -781,7 +777,6 @@ - @@ -789,7 +784,6 @@ - @@ -797,7 +791,6 @@ - @@ -805,7 +798,6 @@ - @@ -813,7 +805,6 @@ - @@ -823,7 +814,6 @@ - @@ -833,7 +823,6 @@ - @@ -862,7 +851,6 @@ - @@ -870,7 +858,6 @@ - @@ -878,7 +865,6 @@ - @@ -886,7 +872,6 @@ - @@ -901,7 +886,6 @@ - @@ -920,7 +904,6 @@ - @@ -928,7 +911,6 @@ - @@ -941,7 +923,6 @@ - @@ -1018,7 +999,6 @@ - @@ -1038,7 +1018,6 @@ - @@ -1062,7 +1041,6 @@ - @@ -1070,7 +1048,6 @@ - @@ -1078,7 +1055,6 @@ - @@ -1089,7 +1065,6 @@ - @@ -1099,7 +1074,6 @@ - @@ -1118,7 +1092,6 @@ - @@ -1138,7 +1111,6 @@ - @@ -1165,7 +1137,6 @@ - @@ -1186,7 +1157,6 @@ - @@ -1204,7 +1174,6 @@ - @@ -1218,7 +1187,6 @@ - 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 c4964bcc..d6ee483f 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 @@ -13,13 +13,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 f6d5b8a1..c463314f 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 b27be472..53ac75ae 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 @@ -11,13 +11,13 @@ ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template) - + - + - + 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 16166f12..74024b42 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,9 +2,9 @@ - - - + + + 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 060f76a6..ef343f50 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 @@ -22,7 +22,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 89991804..62ba2a9d 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 @@ -18,18 +18,18 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - + - + - + - + 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 8471ca13..461ce0a0 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 @@ -2,11 +2,11 @@ - + - - + + @@ -192,7 +192,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 99f164b9..55203ac4 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 @@ -2,9 +2,9 @@ - + - + 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 a3811f10..ef484207 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 @@ -2,11 +2,11 @@ - + - + - + diff --git a/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd b/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd index 5c66bfae..4114ad88 100644 --- a/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd +++ b/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd @@ -12,13 +12,13 @@ 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - + - + - + diff --git a/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps b/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps index b0887d4b..6d49abd9 100644 --- a/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps +++ b/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps @@ -2,9 +2,9 @@ - - - + + + @@ -56,9 +56,7 @@ - - - + @@ -129,7 +127,6 @@ - @@ -158,7 +155,6 @@ - @@ -180,7 +176,6 @@ - diff --git a/coderules/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd b/coderules/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd index 29b1149a..1c013193 100644 --- a/coderules/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd +++ b/coderules/solutions/jetbrains.mps.typechecking.build/jetbrains.mps.typechecking.build.msd @@ -11,10 +11,10 @@ - + - + diff --git a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps index f5164735..6dbfb847 100644 --- a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps +++ b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps @@ -4,11 +4,11 @@ - + - + @@ -21,7 +21,10 @@ - + + + + @@ -114,7 +117,9 @@ + + @@ -182,9 +187,11 @@ - - - + + + + + @@ -2613,6 +2620,7 @@ + diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.typechecking.test.msd b/coderules/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.typechecking.test.msd index 22aec955..ee23069c 100644 --- a/coderules/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.typechecking.test.msd +++ b/coderules/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.typechecking.test.msd @@ -18,22 +18,22 @@ 3a1f0f04-b5e0-43be-884e-b856bfdeca21(jetbrains.mps.typechecking.testlang) - + - + - + - + - + diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.scheduling@tests.mps b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.scheduling@tests.mps index 410cfba3..e7cfcbce 100644 --- a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.scheduling@tests.mps +++ b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.scheduling@tests.mps @@ -3,11 +3,11 @@ - + - + - + diff --git a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps index 0bd153ca..2341c4d5 100644 --- a/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps +++ b/coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps @@ -3,14 +3,14 @@ - - - + + + - + diff --git a/coderules/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd b/coderules/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd index 44b487ef..b103f23e 100644 --- a/coderules/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd +++ b/coderules/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd @@ -23,11 +23,11 @@ 4d5d9aa1-7b71-4888-9100-1b793e5328a6(jetbrains.mps.coderules.ui) - + - + @@ -35,9 +35,9 @@ - + - + diff --git a/coderules/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps b/coderules/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps index c4273ac5..0e588835 100644 --- a/coderules/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps +++ b/coderules/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps @@ -2,15 +2,15 @@ - + - + - - + + @@ -186,9 +186,6 @@ - - - @@ -994,7 +991,6 @@ - @@ -2730,7 +2726,6 @@ - @@ -3067,7 +3062,6 @@ - diff --git a/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd b/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd index c6d3895b..9f97cc1a 100644 --- a/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd +++ b/coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd @@ -18,11 +18,11 @@ 0b80a2e8-f9f1-47b3-823f-56eb115bca42(jetbrains.mps.typechecking.annotation) - + - + @@ -30,9 +30,9 @@ - + - + diff --git a/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps b/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps index d949ab21..26a1c1a7 100644 --- a/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps +++ b/coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps @@ -2,11 +2,11 @@ - - + + - + diff --git a/coderules/solutions/jetbrains.mps.typechecking/models/plugin.mps b/coderules/solutions/jetbrains.mps.typechecking/models/plugin.mps index 74043755..9193d774 100644 --- a/coderules/solutions/jetbrains.mps.typechecking/models/plugin.mps +++ b/coderules/solutions/jetbrains.mps.typechecking/models/plugin.mps @@ -2,13 +2,13 @@ - + - + - + @@ -1612,7 +1612,6 @@ - diff --git a/coderules/solutions/jetbrains.mps.typechecking/models/service.mps b/coderules/solutions/jetbrains.mps.typechecking/models/service.mps index 1ace1844..d8cb7823 100644 --- a/coderules/solutions/jetbrains.mps.typechecking/models/service.mps +++ b/coderules/solutions/jetbrains.mps.typechecking/models/service.mps @@ -2,10 +2,10 @@ - - + + - + @@ -312,9 +312,6 @@ - - - @@ -338,6 +335,7 @@ + @@ -906,14 +904,14 @@ - - - - + + + + - + @@ -1509,7 +1507,6 @@ - @@ -1523,7 +1520,6 @@ - @@ -1536,7 +1532,6 @@ - diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/behavior.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/behavior.mps index bfb58f08..2c9b290a 100644 --- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/behavior.mps +++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps index aeae6484..a078235f 100644 --- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps +++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.mps index a315a75b..a51ca44a 100644 --- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.mps +++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/structure.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 a7946c6b..39d74b38 100644 --- a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl +++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl @@ -15,20 +15,20 @@ - + - + - + - + @@ -53,26 +53,26 @@ ddb01c98-e78e-4c79-b11a-aeba193668d4(samples.fitch.firstOrderLogic) - + - + - + - + - + @@ -80,10 +80,10 @@ - + - - + + diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/behavior.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/behavior.mps index d27ff578..e37c71d3 100644 --- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/behavior.mps +++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps index dbe6228d..00de236c 100644 --- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps +++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/editor.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps index 94a15227..89666bd8 100644 --- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps +++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/structure.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps index d1384825..36fd8ff5 100644 --- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps +++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps @@ -3,7 +3,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl index bcadfbe6..33683f86 100644 --- a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl +++ b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl @@ -15,20 +15,20 @@ - + - + - + - + @@ -54,10 +54,10 @@ ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) - + - + @@ -65,16 +65,16 @@ - + - + - + @@ -82,10 +82,10 @@ - + - - + + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/behavior.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/behavior.mps index 242d483e..5251ae16 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/behavior.mps +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps index ea7bf740..266fc5b1 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps @@ -3,10 +3,10 @@ - + - - + + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps index 790edc2c..69bd5348 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps @@ -2,10 +2,10 @@ - - - - + + + + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps index 6681f4e9..4677f43d 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/structure.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps index 7e2598ab..6d9942c9 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps @@ -3,10 +3,10 @@ - - + + - + 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 8cc031fe..0b13ad73 100644 --- a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl +++ b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl @@ -15,20 +15,20 @@ - + - + - + - + @@ -50,10 +50,10 @@ daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp) - + - + @@ -61,16 +61,16 @@ - + - + - + @@ -78,10 +78,10 @@ - + - - + + diff --git a/samples/fitch/languages/samples.fitch/models/behavior.mps b/samples/fitch/languages/samples.fitch/models/behavior.mps index 505db52d..8a03bb08 100644 --- a/samples/fitch/languages/samples.fitch/models/behavior.mps +++ b/samples/fitch/languages/samples.fitch/models/behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch/models/editor.mps b/samples/fitch/languages/samples.fitch/models/editor.mps index 7937d7a9..91141bcc 100644 --- a/samples/fitch/languages/samples.fitch/models/editor.mps +++ b/samples/fitch/languages/samples.fitch/models/editor.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch/models/migration.mps b/samples/fitch/languages/samples.fitch/models/migration.mps index 58c02d52..bdf7a0c9 100644 --- a/samples/fitch/languages/samples.fitch/models/migration.mps +++ b/samples/fitch/languages/samples.fitch/models/migration.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch/models/structure.mps b/samples/fitch/languages/samples.fitch/models/structure.mps index d0a67210..4995a78a 100644 --- a/samples/fitch/languages/samples.fitch/models/structure.mps +++ b/samples/fitch/languages/samples.fitch/models/structure.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/fitch/languages/samples.fitch/models/types.mps b/samples/fitch/languages/samples.fitch/models/types.mps index 873757f5..506e93aa 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 91025f22..56856c3c 100644 --- a/samples/fitch/languages/samples.fitch/samples.fitch.mpl +++ b/samples/fitch/languages/samples.fitch/samples.fitch.mpl @@ -15,20 +15,20 @@ - + - + - + - + @@ -52,10 +52,10 @@ 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) - + - + @@ -63,31 +63,32 @@ - + - + - + - + - + - + + - + diff --git a/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps b/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps index a037789f..a2c1dafb 100644 --- a/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps +++ b/samples/fitch/solutions/samples.fitch.build/models/samples.fitch.build.mps @@ -4,11 +4,11 @@ - + - + diff --git a/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd b/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd index 0d471398..6f9082c8 100644 --- a/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd +++ b/samples/fitch/solutions/samples.fitch.build/samples.fitch.build.msd @@ -12,10 +12,10 @@ - + - + diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps index 7c86f5f0..258c2bca 100644 --- a/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps +++ b/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps @@ -2,7 +2,7 @@ - + @@ -20,7 +20,6 @@ - @@ -113,7 +112,6 @@ - @@ -206,7 +204,6 @@ - @@ -232,7 +229,6 @@ - diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps index d4ff4bbb..33653beb 100644 --- a/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps +++ b/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps @@ -231,9 +231,6 @@ - - - @@ -722,28 +719,28 @@ - - - + + + - - - - - - - + + + + + + + - + - + - + diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps index f0b1becf..ab09f75f 100644 --- a/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps +++ b/samples/lambdacalc/languages/samples.lambdacalc/models/editor.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps index 3ac8460a..da97018c 100644 --- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps +++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps @@ -3,11 +3,11 @@ - + - + @@ -236,7 +236,7 @@ - + diff --git a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl index b08c1977..bfc39627 100644 --- a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl +++ b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl @@ -18,12 +18,12 @@ 6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking) - + - + @@ -31,16 +31,16 @@ - + - + - + @@ -48,11 +48,11 @@ - + - + - + diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps index fc76cf75..c32b9df5 100644 --- a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps +++ b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps @@ -4,11 +4,11 @@ - + - + diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd b/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd index 064111a0..dced620d 100644 --- a/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd +++ b/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd @@ -12,10 +12,10 @@ - + - + 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 93d6f8d9..235dc977 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl @@ -19,30 +19,30 @@ 7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem) - + - + - + - + - + - + @@ -63,6 +63,7 @@ + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.behavior.mps index 5e187150..ed209972 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.behavior.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.behavior.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.editor.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.editor.mps index 4138103b..4e1d2b98 100644 --- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.editor.mps +++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.editor.mps @@ -2,7 +2,7 @@ - + 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 ce2ec566..9ef5bd53 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 @@ -4,14 +4,14 @@ - + - - + + @@ -100,9 +100,6 @@ - - - @@ -533,11 +530,11 @@ - + - + @@ -549,7 +546,7 @@ - + @@ -5862,7 +5859,6 @@ - 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 75b45846..571a2e12 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 @@ -16,15 +16,15 @@ a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime) - + - - + + - + 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 e107f048..cc434046 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 @@ -3,11 +3,11 @@ - + - - - + + + diff --git a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps index f35109c2..ec041521 100644 --- a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps +++ b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps @@ -4,11 +4,11 @@ - + - + @@ -21,7 +21,9 @@ + + @@ -369,6 +371,7 @@ + diff --git a/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd b/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd index f1ccc1ac..ad749d8f 100644 --- a/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd +++ b/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd @@ -12,10 +12,10 @@ - + - + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps index db2bc9dc..3e26a8a2 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps @@ -3,9 +3,9 @@ - - - + + + 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 0a8e35cf..887358bf 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps @@ -3,12 +3,12 @@ - - - - + + + + - + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps index efe378f8..e6fe9005 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps @@ -3,12 +3,12 @@ - - + + - + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features.mps index c4c37a21..5b469c83 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features.mps @@ -3,7 +3,7 @@ - + @@ -1704,6 +1704,7 @@ + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps index 709c4935..f92960a6 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps @@ -3,8 +3,8 @@ - - + + 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 1bbe129a..550c7fd0 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps @@ -3,8 +3,8 @@ - - + + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps index d56b9b5b..72199351 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps @@ -3,8 +3,8 @@ - - + + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps index 9e813d10..c447ae03 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps @@ -3,8 +3,8 @@ - - + + 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 57ac41b5..2322eec9 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 @@ - + @@ -14,9 +14,6 @@ - - - @@ -119,7 +116,7 @@ - + @@ -287,7 +284,6 @@ - @@ -723,7 +719,6 @@ - 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 a29fe761..8f3998bb 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 @@ - + @@ -19,9 +19,6 @@ - - - @@ -123,7 +120,7 @@ - + @@ -351,7 +348,6 @@ - @@ -674,7 +670,6 @@ - diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.codeAnal.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.codeAnal.mps index 54448dde..22b1d20e 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.codeAnal.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.codeAnal.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 e36c62f7..b580a5cb 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 @@ - + @@ -150,7 +150,7 @@ - + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.simpleGenerics.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.simpleGenerics.mps index 04e9fc34..0dfb91b7 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.simpleGenerics.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.simpleGenerics.mps @@ -2,7 +2,7 @@ - + diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.slice.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.slice.mps index d2cbe175..b658f8b3 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.slice.mps +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.slice.mps @@ -2,7 +2,7 @@ - + @@ -80,9 +80,7 @@ - - - + @@ -175,7 +173,6 @@ - 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 8ae44c0e..85220ed6 100644 --- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd +++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd @@ -13,19 +13,19 @@ 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - + - + - + - - + +