diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..8855cdd0
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+ and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+ overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+ advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+ address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+mps-support@itemis.de.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
diff --git a/build.gradle b/build.gradle
index 02ec60db..b7b8b3a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ plugins {
id 'de.itemis.mps.gradle.launcher' version '2.2.0.+'
}
-ext.jbrVers = '17.0.6-b653.34'
+ext.jbrVers = '17.0.8.1-b1000.32'
downloadJbr {
jbrVersion = jbrVers
@@ -36,7 +36,7 @@ if (ext.has('java11_home')) {
jdk_home = System.getenv('JB_JAVA11_HOME')
} else {
def expected = JavaVersion.VERSION_11
- if (JavaVersion.current() != expected) {
+ if (JavaVersion.current() < expected) {
throw new GradleException("This build script requires Java 11 but you are currently using ${JavaVersion.current()}.\nWhat you can do:\n"
+ " * Use project property java11_home to point to the Java 11 JDK.\n"
+ " * Use environment variable JB_JAVA11_HOME to point to the Java 11 JDK\n"
@@ -60,11 +60,11 @@ ext.dependencyRepositories = [
]
// Dependency versions
-ext.mpsVersion = '2022.3.2'
+ext.mpsVersion = '2023.2.1'
// Project versions
-ext.major = '2022'
-ext.minor = '3'
+ext.major = '2023'
+ext.minor = '2'
if (ciBuild) {
String branch = GitBasedVersioning.gitBranch
diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
index 54a38bfc..b4652cd7 100644
--- a/build/scripts/build_all_scripts.xml
+++ b/build/scripts/build_all_scripts.xml
@@ -26,7 +26,7 @@
-
+
@@ -137,6 +137,7 @@
+
diff --git a/code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml b/code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml
+++ b/code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml
@@ -9,6 +9,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/code/applications/org.mpsqa.clones.demo/code/.mps/vcs.xml b/code/applications/org.mpsqa.clones.demo/code/.mps/vcs.xml
index e25a9f81..4fce1d86 100644
--- a/code/applications/org.mpsqa.clones.demo/code/.mps/vcs.xml
+++ b/code/applications/org.mpsqa.clones.demo/code/.mps/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps
index 5b723a8a..fa00f2d1 100644
--- a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps
+++ b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps
@@ -9,6 +9,8 @@
+
+
@@ -60,7 +62,7 @@
-
+
@@ -73,7 +75,7 @@
-
+
@@ -109,6 +111,12 @@
+
+
+
+
+
+
@@ -152,7 +160,7 @@
-
+
@@ -166,7 +174,7 @@
-
+
@@ -203,7 +211,7 @@
-
+
@@ -218,7 +226,32 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -230,39 +263,16 @@
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/org.mpsqa.clones.demo.build.msd b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/org.mpsqa.clones.demo.build.msd
index f42a4659..7b9507e6 100644
--- a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/org.mpsqa.clones.demo.build.msd
+++ b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/org.mpsqa.clones.demo.build.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,10 +10,10 @@
-
cf9e90bb-6263-4505-b1d0-f6a2339ece89(org.mpsqa.clones.build)
422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)
+ 11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)
@@ -23,6 +23,7 @@
+
diff --git a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_clones_detection_config.mps b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_clones_detection_config.mps
index f72cdd29..15ce0c70 100644
--- a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_clones_detection_config.mps
+++ b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_clones_detection_config.mps
@@ -27,7 +27,7 @@
-
+
diff --git a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_headless_runner@tests.mps b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_headless_runner@tests.mps
index 5fd7cd62..a902a8c6 100644
--- a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_headless_runner@tests.mps
+++ b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_headless_runner@tests.mps
@@ -5,7 +5,7 @@
-
+
@@ -68,7 +68,7 @@
-
+
@@ -106,7 +106,7 @@
-
+
diff --git a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/org.mpsqa.clones.demo.config.msd b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/org.mpsqa.clones.demo.config.msd
index fffb5f99..10c524fc 100644
--- a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/org.mpsqa.clones.demo.config.msd
+++ b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.config/org.mpsqa.clones.demo.config.msd
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,6 @@
-
c444eed9-4c7b-48e8-a62c-124f7b6b1712(org.mpsqa.clones.config.pluginSolution)
48b1eeb1-bf01-4e84-8d12-d2fc8bf60fb7(org.mpsqa.clones.core)
@@ -22,7 +21,7 @@
-
+
diff --git a/code/languages/org.mpsqa.arch/.mps/migration.xml b/code/languages/org.mpsqa.arch/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.arch/.mps/migration.xml
+++ b/code/languages/org.mpsqa.arch/.mps/migration.xml
@@ -9,6 +9,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.behavior.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.behavior.mps
index 292facce..40a3770d 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.behavior.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.behavior.mps
@@ -1,6 +1,7 @@
+
@@ -112,7 +113,7 @@
-
+
@@ -128,7 +129,7 @@
-
+
@@ -137,6 +138,7 @@
+
@@ -207,7 +209,7 @@
-
+
@@ -249,7 +251,6 @@
-
@@ -320,7 +321,7 @@
-
+
@@ -332,9 +333,9 @@
-
+
-
+
@@ -391,7 +392,7 @@
-
+
@@ -401,9 +402,9 @@
-
+
-
+
@@ -449,7 +450,7 @@
-
+
@@ -461,9 +462,9 @@
-
+
-
+
@@ -570,7 +571,7 @@
-
+
@@ -578,9 +579,9 @@
-
+
-
+
@@ -657,7 +658,7 @@
-
+
@@ -667,9 +668,9 @@
-
+
-
+
@@ -810,29 +811,29 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
-
+
+
+
+
@@ -1075,7 +1076,7 @@
-
+
@@ -1083,9 +1084,9 @@
-
+
-
+
@@ -1249,18 +1250,18 @@
-
-
-
+
+
+
-
+
-
+
@@ -1609,12 +1610,12 @@
-
-
-
+
+
+
@@ -1686,19 +1687,12 @@
-
-
-
-
-
-
-
@@ -1713,16 +1707,23 @@
+
+
+
-
+
-
+
+
+
+
+
@@ -1761,12 +1762,12 @@
-
-
-
+
+
+
@@ -1809,7 +1810,7 @@
-
+
@@ -1828,9 +1829,9 @@
-
+
-
+
@@ -1921,7 +1922,7 @@
-
+
@@ -1931,9 +1932,9 @@
-
+
-
+
@@ -1971,7 +1972,7 @@
-
+
@@ -1984,9 +1985,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.constraints.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.constraints.mps
index 82664109..4b23aadd 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.constraints.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.constraints.mps
@@ -229,12 +229,12 @@
-
-
-
+
+
+
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps
index fb8192e0..8094b99d 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps
@@ -9,8 +9,8 @@
-
+
@@ -204,6 +204,7 @@
+
@@ -259,7 +260,6 @@
-
@@ -755,6 +755,7 @@
+
@@ -769,7 +770,6 @@
-
@@ -985,7 +985,7 @@
-
+
@@ -999,7 +999,7 @@
-
+
@@ -1018,18 +1018,18 @@
-
+
-
+
-
+
-
+
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps
index c4a64b83..2ba9f1b2 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps
@@ -99,6 +99,7 @@
+
@@ -173,7 +174,6 @@
-
@@ -256,7 +256,7 @@
-
+
@@ -275,9 +275,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.typesystem.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.typesystem.mps
index b37e806e..cdb6acbe 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.typesystem.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.typesystem.mps
@@ -138,6 +138,7 @@
+
@@ -324,7 +325,6 @@
-
@@ -513,7 +513,7 @@
-
+
@@ -525,9 +525,9 @@
-
+
-
+
@@ -870,15 +870,15 @@
-
+
-
+
-
+
@@ -1032,7 +1032,7 @@
-
+
@@ -1047,9 +1047,9 @@
-
+
-
+
@@ -1156,7 +1156,7 @@
-
+
@@ -1171,9 +1171,9 @@
-
+
-
+
@@ -1329,7 +1329,7 @@
-
+
@@ -1337,9 +1337,9 @@
-
+
-
+
@@ -1493,7 +1493,7 @@
-
+
@@ -1512,9 +1512,9 @@
-
+
-
+
@@ -1923,7 +1923,7 @@
-
+
@@ -1931,9 +1931,9 @@
-
+
-
+
@@ -2068,7 +2068,7 @@
-
+
@@ -2080,9 +2080,9 @@
-
+
-
+
@@ -2138,7 +2138,7 @@
-
+
@@ -2150,7 +2150,7 @@
-
+
@@ -2164,9 +2164,9 @@
-
+
-
+
@@ -2223,7 +2223,7 @@
-
+
@@ -2245,7 +2245,7 @@
-
+
@@ -2260,7 +2260,7 @@
-
+
@@ -2276,9 +2276,9 @@
-
+
-
+
@@ -2460,7 +2460,7 @@
-
+
@@ -2468,9 +2468,9 @@
-
+
-
+
@@ -2496,16 +2496,16 @@
-
+
-
+
-
+
@@ -2574,7 +2574,7 @@
-
+
@@ -2585,9 +2585,9 @@
-
+
-
+
@@ -2660,7 +2660,7 @@
-
+
@@ -2670,9 +2670,9 @@
-
+
-
+
@@ -2712,15 +2712,15 @@
-
+
-
+
-
+
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.util.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.util.mps
index 3749d851..29a651d9 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.util.mps
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.util.mps
@@ -1,6 +1,7 @@
+
@@ -99,7 +100,7 @@
-
+
@@ -115,7 +116,7 @@
-
+
@@ -126,6 +127,7 @@
+
@@ -170,7 +172,7 @@
-
+
@@ -204,11 +206,9 @@
-
-
@@ -265,7 +265,7 @@
-
+
@@ -284,9 +284,9 @@
-
+
-
+
@@ -624,44 +624,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
@@ -693,7 +673,7 @@
-
+
@@ -702,9 +682,9 @@
-
+
-
+
@@ -887,15 +867,15 @@
-
+
-
+
-
+
@@ -958,15 +938,15 @@
-
+
-
+
-
+
@@ -1153,7 +1133,7 @@
-
+
@@ -1164,7 +1144,7 @@
-
+
@@ -1175,9 +1155,9 @@
-
+
-
+
@@ -1223,7 +1203,7 @@
-
+
@@ -1232,9 +1212,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/org.mpsqa.arch.mpl b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/org.mpsqa.arch.mpl
index 4309d95a..b7a9f378 100644
--- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/org.mpsqa.arch.mpl
+++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/org.mpsqa.arch.mpl
@@ -11,7 +11,6 @@
-
446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)
7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)
@@ -26,7 +25,7 @@
-
+
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/generator/templates/test.org.mpsqa.arch.baselang.generator.templates@generator.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/generator/templates/test.org.mpsqa.arch.baselang.generator.templates@generator.mps
deleted file mode 100644
index 25da45f9..00000000
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/generator/templates/test.org.mpsqa.arch.baselang.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/models/test.org.mpsqa.arch.baselang.structure.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/models/test.org.mpsqa.arch.baselang.structure.mps
index 949915f7..c96821ba 100644
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/models/test.org.mpsqa.arch.baselang.structure.mps
+++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/models/test.org.mpsqa.arch.baselang.structure.mps
@@ -19,7 +19,7 @@
-
+
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/test.org.mpsqa.arch.baselang.mpl b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/test.org.mpsqa.arch.baselang.mpl
index a39df801..5a958a53 100644
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/test.org.mpsqa.arch.baselang.mpl
+++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/test.org.mpsqa.arch.baselang.mpl
@@ -11,55 +11,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/generator/templates/test.org.mpsqa.arch.ext.ext.generator.templates@generator.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/generator/templates/test.org.mpsqa.arch.ext.ext.generator.templates@generator.mps
deleted file mode 100644
index 44e6fb15..00000000
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/generator/templates/test.org.mpsqa.arch.ext.ext.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/test.org.mpsqa.arch.ext.ext.mpl b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/test.org.mpsqa.arch.ext.ext.mpl
index 17e91cc7..f4e257c7 100644
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/test.org.mpsqa.arch.ext.ext.mpl
+++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/test.org.mpsqa.arch.ext.ext.mpl
@@ -11,55 +11,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/generator/templates/test.org.mpsqa.arch.ext.generator.templates@generator.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/generator/templates/test.org.mpsqa.arch.ext.generator.templates@generator.mps
deleted file mode 100644
index 24dfcf8c..00000000
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/generator/templates/test.org.mpsqa.arch.ext.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/models/test.org.mpsqa.arch.ext.structure.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/models/test.org.mpsqa.arch.ext.structure.mps
index 17bb6239..73d21599 100644
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/models/test.org.mpsqa.arch.ext.structure.mps
+++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/models/test.org.mpsqa.arch.ext.structure.mps
@@ -18,7 +18,7 @@
-
+
diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/test.org.mpsqa.arch.ext.mpl b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/test.org.mpsqa.arch.ext.mpl
index 996b9238..1f018d3f 100644
--- a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/test.org.mpsqa.arch.ext.mpl
+++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/test.org.mpsqa.arch.ext.mpl
@@ -11,51 +11,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
bcaa03af-4226-4b43-a0ed-7ecc5d6748d9(test.org.mpsqa.arch.baselang)
@@ -63,7 +18,7 @@
-
+
diff --git a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/models/org.mpsqa.arch.pluginSolution.plugin.mps b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/models/org.mpsqa.arch.pluginSolution.plugin.mps
index ba0e6201..02d71df7 100644
--- a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/models/org.mpsqa.arch.pluginSolution.plugin.mps
+++ b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/models/org.mpsqa.arch.pluginSolution.plugin.mps
@@ -1,6 +1,7 @@
+
@@ -27,11 +28,9 @@
-
-
-
-
+
+
@@ -78,6 +77,7 @@
+
@@ -97,6 +97,7 @@
+
@@ -114,7 +115,7 @@
-
+
@@ -145,7 +146,7 @@
-
+
@@ -193,7 +194,7 @@
-
+
@@ -256,7 +257,7 @@
-
+
@@ -280,7 +281,7 @@
-
+
@@ -314,6 +315,7 @@
+
@@ -325,7 +327,7 @@
-
+
@@ -393,7 +395,7 @@
-
+
@@ -432,7 +434,6 @@
-
@@ -446,6 +447,7 @@
+
@@ -510,26 +512,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
@@ -547,11 +564,6 @@
-
-
-
-
-
@@ -563,6 +575,11 @@
+
+
+
+
+
@@ -1081,6 +1098,7 @@
+
@@ -1577,39 +1595,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1697,11 +1682,15 @@
-
-
-
-
+
+
+
+
+
+
+
+
@@ -1709,12 +1698,8 @@
-
-
-
-
-
-
+
+
@@ -1729,6 +1714,13 @@
+
+
+
+
+
+
+
@@ -1815,6 +1807,9 @@
+
+
+
@@ -1823,9 +1818,6 @@
-
-
-
@@ -1851,6 +1843,7 @@
+
@@ -1860,7 +1853,6 @@
-
@@ -1934,12 +1926,6 @@
-
-
-
-
-
-
@@ -2028,7 +2014,7 @@
-
+
@@ -2041,9 +2027,9 @@
-
+
-
+
@@ -2154,6 +2140,12 @@
+
+
+
+
+
+
@@ -2504,13 +2496,13 @@
+
-
@@ -2779,7 +2771,7 @@
-
+
@@ -2787,9 +2779,9 @@
-
+
-
+
@@ -2811,7 +2803,7 @@
-
+
@@ -2819,9 +2811,9 @@
-
+
-
+
@@ -3303,13 +3295,13 @@
+
+
+
-
-
-
@@ -3541,6 +3533,7 @@
+
@@ -3606,26 +3599,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
@@ -3643,11 +3651,6 @@
-
-
-
-
-
@@ -3659,6 +3662,11 @@
+
+
+
+
+
diff --git a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd
index 6c5dfd22..1a84be52 100644
--- a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd
+++ b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd
@@ -1,5 +1,5 @@
-
+
@@ -11,20 +11,14 @@
+
-
-
-
-
6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)
6c101563-ba1f-458d-b298-a75634941e0c(org.mpsqa.arch)
498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)
742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)
- 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)
- 446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)
- 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)
ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)
86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)
@@ -32,14 +26,14 @@
-
+
-
+
@@ -54,18 +48,8 @@
-
-
-
-
-
-
+
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/models/org.mpsqa.arch.sandbox.smoke.mps b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/models/org.mpsqa.arch.sandbox.smoke.mps
index ae65782a..1434f469 100644
--- a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/models/org.mpsqa.arch.sandbox.smoke.mps
+++ b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/models/org.mpsqa.arch.sandbox.smoke.mps
@@ -54,7 +54,7 @@
-
+
diff --git a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/org.mpsqa.arch.sandbox.msd b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/org.mpsqa.arch.sandbox.msd
index 08a9e2b9..cf3c8caa 100644
--- a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/org.mpsqa.arch.sandbox.msd
+++ b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.sandbox/org.mpsqa.arch.sandbox.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
diff --git a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch.testdata/test.org.mpsqa.arch.testdata.msd b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch.testdata/test.org.mpsqa.arch.testdata.msd
index c02d168a..3fb773c6 100644
--- a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch.testdata/test.org.mpsqa.arch.testdata.msd
+++ b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch.testdata/test.org.mpsqa.arch.testdata.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
diff --git a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/models/test.org.mpsqa.arch._010_simple_dependencies@tests.mps b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/models/test.org.mpsqa.arch._010_simple_dependencies@tests.mps
index f9b0529f..7a7515b5 100644
--- a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/models/test.org.mpsqa.arch._010_simple_dependencies@tests.mps
+++ b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/models/test.org.mpsqa.arch._010_simple_dependencies@tests.mps
@@ -272,11 +272,6 @@
-
-
-
-
-
@@ -323,6 +318,11 @@
+
+
+
+
+
diff --git a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
index 5d565132..d665e541 100644
--- a/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
+++ b/code/languages/org.mpsqa.arch/solutions/test.org.mpsqa.arch/test.org.mpsqa.arch.msd
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,6 @@
-
6c101563-ba1f-458d-b298-a75634941e0c(org.mpsqa.arch)
diff --git a/code/languages/org.mpsqa.base/.mps/migration.xml b/code/languages/org.mpsqa.base/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.base/.mps/migration.xml
+++ b/code/languages/org.mpsqa.base/.mps/migration.xml
@@ -9,6 +9,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor.demolan/models/org.mpsqa.base.errors_suppressor.demolan.structure.mps b/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor.demolan/models/org.mpsqa.base.errors_suppressor.demolan.structure.mps
index 9ad38832..140a9c5c 100644
--- a/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor.demolan/models/org.mpsqa.base.errors_suppressor.demolan.structure.mps
+++ b/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor.demolan/models/org.mpsqa.base.errors_suppressor.demolan.structure.mps
@@ -22,7 +22,7 @@
-
+
diff --git a/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor.demolan/models/org.mpsqa.base.errors_suppressor.demolan.typesystem.mps b/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor.demolan/models/org.mpsqa.base.errors_suppressor.demolan.typesystem.mps
index 88829375..18d7de1f 100644
--- a/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor.demolan/models/org.mpsqa.base.errors_suppressor.demolan.typesystem.mps
+++ b/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor.demolan/models/org.mpsqa.base.errors_suppressor.demolan.typesystem.mps
@@ -54,7 +54,7 @@
-
+
diff --git a/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor.demolan/org.mpsqa.base.errors_suppressor.demolan.mpl b/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor.demolan/org.mpsqa.base.errors_suppressor.demolan.mpl
index 7e893dd1..d4703573 100644
--- a/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor.demolan/org.mpsqa.base.errors_suppressor.demolan.mpl
+++ b/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor.demolan/org.mpsqa.base.errors_suppressor.demolan.mpl
@@ -11,12 +11,11 @@
-
-
+
diff --git a/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor/models/org.mpsqa.base.errors_suppressor.editor.mps b/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor/models/org.mpsqa.base.errors_suppressor.editor.mps
index bdc4f207..38a969ab 100644
--- a/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor/models/org.mpsqa.base.errors_suppressor.editor.mps
+++ b/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor/models/org.mpsqa.base.errors_suppressor.editor.mps
@@ -42,7 +42,7 @@
-
+
diff --git a/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor/models/org.mpsqa.base.errors_suppressor.structure.mps b/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor/models/org.mpsqa.base.errors_suppressor.structure.mps
index 6d1e8d43..c8baa11f 100644
--- a/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor/models/org.mpsqa.base.errors_suppressor.structure.mps
+++ b/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor/models/org.mpsqa.base.errors_suppressor.structure.mps
@@ -46,7 +46,7 @@
-
+
diff --git a/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor/org.mpsqa.base.errors_suppressor.mpl b/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor/org.mpsqa.base.errors_suppressor.mpl
index 8b5f088d..a87bb861 100644
--- a/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor/org.mpsqa.base.errors_suppressor.mpl
+++ b/code/languages/org.mpsqa.base/languages/org.mpsqa.base.errors_suppressor/org.mpsqa.base.errors_suppressor.mpl
@@ -11,7 +11,6 @@
-
c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)
@@ -19,7 +18,7 @@
-
+
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/models/org.mpsqa.base.build.mps b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/models/org.mpsqa.base.build.mps
index f044413d..3f5c2576 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/models/org.mpsqa.base.build.mps
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/models/org.mpsqa.base.build.mps
@@ -53,7 +53,7 @@
-
+
@@ -66,7 +66,7 @@
-
+
@@ -95,7 +95,6 @@
-
@@ -135,20 +134,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -483,7 +468,6 @@
-
@@ -618,6 +602,7 @@
+
@@ -797,6 +782,7 @@
+
@@ -1020,7 +1006,6 @@
-
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/org.mpsqa.base.build.msd b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/org.mpsqa.base.build.msd
index 1cc7d6ce..853ae12a 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/org.mpsqa.base.build.msd
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/org.mpsqa.base.build.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.democonfig/models/org.mpsqa.base.errors_suppressor.democonfig._010_model_with_warnings_to_suppress.mps b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.democonfig/models/org.mpsqa.base.errors_suppressor.democonfig._010_model_with_warnings_to_suppress.mps
index 1e101616..5dae297f 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.democonfig/models/org.mpsqa.base.errors_suppressor.democonfig._010_model_with_warnings_to_suppress.mps
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.democonfig/models/org.mpsqa.base.errors_suppressor.democonfig._010_model_with_warnings_to_suppress.mps
@@ -7,7 +7,7 @@
-
+
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.democonfig/models/org.mpsqa.base.errors_suppressor.democonfig.checking_results_suppressor.mps b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.democonfig/models/org.mpsqa.base.errors_suppressor.democonfig.checking_results_suppressor.mps
index 1e7ba3b4..b76e7801 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.democonfig/models/org.mpsqa.base.errors_suppressor.democonfig.checking_results_suppressor.mps
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.democonfig/models/org.mpsqa.base.errors_suppressor.democonfig.checking_results_suppressor.mps
@@ -7,7 +7,7 @@
-
+
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.democonfig/org.mpsqa.base.errors_suppressor.democonfig.msd b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.democonfig/org.mpsqa.base.errors_suppressor.democonfig.msd
index ece48025..c29d3689 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.democonfig/org.mpsqa.base.errors_suppressor.democonfig.msd
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.democonfig/org.mpsqa.base.errors_suppressor.democonfig.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.custom@genplan.mps b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.custom@genplan.mps
index 62560427..e5a73024 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.custom@genplan.mps
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.custom@genplan.mps
@@ -3,7 +3,7 @@
-
+
@@ -16,11 +16,14 @@
+
+
+
-
+
@@ -45,7 +48,7 @@
-
+
@@ -53,23 +56,31 @@
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
@@ -78,9 +89,11 @@
-
-
-
+
+
+
+
+
@@ -94,59 +107,83 @@
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.plugin.mps b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.plugin.mps
index b8b9b908..31788186 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.plugin.mps
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.plugin.mps
@@ -1,22 +1,21 @@
-
-
+
-
+
-
-
+
+
@@ -29,11 +28,11 @@
-
+
@@ -874,43 +873,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1043,9 +1005,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1280,13 +1286,155 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1566,154 +1714,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/org.mpsqa.base.errors_suppressor.pluginSolution.msd b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/org.mpsqa.base.errors_suppressor.pluginSolution.msd
index f0615dd0..9e9b4f41 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/org.mpsqa.base.errors_suppressor.pluginSolution.msd
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/org.mpsqa.base.errors_suppressor.pluginSolution.msd
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,6 @@
-
a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)
8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)
@@ -28,15 +27,15 @@
-
+
-
+
-
+
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/org.mpsqa.base.lib.msd b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/org.mpsqa.base.lib.msd
index e71aa046..0687d017 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/org.mpsqa.base.lib.msd
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/org.mpsqa.base.lib.msd
@@ -1,5 +1,5 @@
-
+
@@ -13,15 +13,12 @@
+
+
+
+
-
-
-
-
-
-
-
6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/models/org.mpsqa.base.utils.notifications.mps b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/models/org.mpsqa.base.utils.notifications.mps
index 1eb37c03..5fe0e5c4 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/models/org.mpsqa.base.utils.notifications.mps
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/models/org.mpsqa.base.utils.notifications.mps
@@ -32,7 +32,6 @@
-
@@ -63,7 +62,7 @@
-
+
@@ -74,7 +73,7 @@
-
+
@@ -87,7 +86,7 @@
-
+
@@ -145,7 +144,7 @@
-
+
@@ -163,7 +162,6 @@
-
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/org.mpsqa.base.utils.msd b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/org.mpsqa.base.utils.msd
index a8354f1f..161e7e0f 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/org.mpsqa.base.utils.msd
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.utils/org.mpsqa.base.utils.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)
diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/org.mpsqa.treemap.lib.msd b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/org.mpsqa.treemap.lib.msd
index d0d984c1..bdded7d7 100644
--- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/org.mpsqa.treemap.lib.msd
+++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/org.mpsqa.treemap.lib.msd
@@ -1,10 +1,10 @@
-
+
-
+
-
+
@@ -14,17 +14,14 @@
+
+
+
+
-
-
-
-
-
-
-
- 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)
+ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)
diff --git a/code/languages/org.mpsqa.build/.mps/migration.xml b/code/languages/org.mpsqa.build/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.build/.mps/migration.xml
+++ b/code/languages/org.mpsqa.build/.mps/migration.xml
@@ -9,6 +9,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps
index 506be056..7301112a 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/models/org.mpsqa.build.allScripts.mps
@@ -7,7 +7,6 @@
-
@@ -50,7 +49,7 @@
-
+
@@ -59,7 +58,7 @@
-
+
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/org.mpsqa.build.allScripts.msd b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/org.mpsqa.build.allScripts.msd
index f2e5ca8b..e529fe97 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/org.mpsqa.build.allScripts.msd
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.allScripts/org.mpsqa.build.allScripts.msd
@@ -1,7 +1,7 @@
-
+
-
+
@@ -10,10 +10,8 @@
-
422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)
- 11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)
@@ -22,7 +20,6 @@
-
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps
index 023abfef..ef1d65f7 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps
@@ -48,7 +48,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
@@ -73,16 +73,13 @@
-
-
-
-
+
@@ -178,38 +175,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -405,38 +370,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/org.mpsqa.build.sandboxes.msd b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/org.mpsqa.build.sandboxes.msd
index 44f45acf..31eac252 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/org.mpsqa.build.sandboxes.msd
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/org.mpsqa.build.sandboxes.msd
@@ -1,7 +1,7 @@
-
+
-
+
@@ -10,7 +10,6 @@
-
11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)
422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
index 4e1bf0cb..a2c44308 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._030_clones_build.mps
@@ -51,7 +51,7 @@
-
+
@@ -64,7 +64,7 @@
-
+
@@ -102,7 +102,6 @@
-
@@ -110,9 +109,7 @@
-
-
-
+
@@ -142,20 +139,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -593,35 +576,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps
index 13d262ca..0c4d444d 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps
@@ -7,7 +7,7 @@
-
+
@@ -52,7 +52,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -106,7 +106,6 @@
-
@@ -114,9 +113,7 @@
-
-
-
+
@@ -161,20 +158,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -427,35 +410,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps
index 9a5d73e9..78980404 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps
@@ -8,7 +8,7 @@
-
+
@@ -53,7 +53,7 @@
-
+
@@ -66,7 +66,7 @@
-
+
@@ -161,20 +161,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps
index 5698e796..f338cbb7 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps
@@ -110,7 +110,6 @@
-
@@ -124,9 +123,7 @@
-
-
-
+
@@ -171,20 +168,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -255,14 +238,14 @@
-
-
-
+
+
+
@@ -372,11 +355,6 @@
-
-
-
-
-
@@ -387,11 +365,6 @@
-
-
-
-
-
@@ -402,11 +375,6 @@
-
-
-
-
-
@@ -576,35 +544,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -670,35 +609,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -754,35 +664,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._070_deprecated_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._070_deprecated_build.mps
index 303732a8..d57b4a19 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._070_deprecated_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._070_deprecated_build.mps
@@ -8,7 +8,7 @@
-
+
@@ -53,7 +53,7 @@
-
+
@@ -66,7 +66,7 @@
-
+
@@ -158,20 +158,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
index eec60830..091b978a 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
@@ -172,20 +172,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -253,6 +239,9 @@
+
+
+
@@ -857,6 +846,11 @@
+
+
+
+
+
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._090_profile_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._090_profile_build.mps
index af0573ff..03dd5155 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._090_profile_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._090_profile_build.mps
@@ -52,7 +52,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps
index 9de4defc..85eaae40 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps
@@ -55,7 +55,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
@@ -226,20 +226,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/org.mpsqa.build.msd b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/org.mpsqa.build.msd
index 4fd0f7af..1d19922f 100644
--- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/org.mpsqa.build.msd
+++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/org.mpsqa.build.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)
5e8cea6b-997f-49b1-a8d8-dc2a7a6fa657(org.mpsqa.base.build)
diff --git a/code/languages/org.mpsqa.clones/.mps/migration.xml b/code/languages/org.mpsqa.clones/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.clones/.mps/migration.xml
+++ b/code/languages/org.mpsqa.clones/.mps/migration.xml
@@ -9,6 +9,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/generator/template/main@generator.mps b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/generator/template/main@generator.mps
deleted file mode 100644
index a6415af2..00000000
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/generator/template/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.behavior.mps b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.behavior.mps
index 9e8bc6a0..f5bf9731 100644
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.behavior.mps
+++ b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.behavior.mps
@@ -61,7 +61,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -92,7 +92,7 @@
-
+
diff --git a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.editor.mps b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.editor.mps
index 2ea9b39e..45ce1c32 100644
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.editor.mps
+++ b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.editor.mps
@@ -65,7 +65,7 @@
-
+
@@ -104,7 +104,7 @@
-
+
@@ -131,7 +131,7 @@
-
+
diff --git a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.intentions.mps b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.intentions.mps
index f88017e3..cdc4a86f 100644
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.intentions.mps
+++ b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.intentions.mps
@@ -46,7 +46,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
diff --git a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.structure.mps b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.structure.mps
index f517dd10..ac490bf4 100644
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.structure.mps
+++ b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/models/org.mpsqa.clones.config.structure.mps
@@ -57,7 +57,7 @@
-
+
diff --git a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/org.mpsqa.clones.config.mpl b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/org.mpsqa.clones.config.mpl
index 6c5ae70c..dd533043 100644
--- a/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/org.mpsqa.clones.config.mpl
+++ b/code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/org.mpsqa.clones.config.mpl
@@ -11,50 +11,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
56cfcf05-92e4-4822-8126-2ea0e0cece6b(org.mpsqa.clones.config)
1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)
@@ -64,7 +20,7 @@
-
+
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps
index a11dc265..f10138be 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/models/org.mpsqa.clones.build.mps
@@ -8,8 +8,8 @@
+
-
@@ -62,7 +62,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
@@ -144,23 +144,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/org.mpsqa.clones.build.msd b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/org.mpsqa.clones.build.msd
index dd6c3d46..6fa9caaa 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/org.mpsqa.clones.build.msd
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.build/org.mpsqa.clones.build.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)
11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps
index 55f54054..c5239e69 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/org.mpsqa.clones.config.pluginSolution.plugin.mps
@@ -2,7 +2,7 @@
-
+
@@ -34,6 +34,7 @@
+
@@ -56,7 +57,7 @@
-
+
@@ -68,7 +69,7 @@
-
+
@@ -128,7 +129,7 @@
-
+
@@ -144,7 +145,7 @@
-
+
@@ -155,7 +156,7 @@
-
+
@@ -166,13 +167,12 @@
-
-
+
@@ -181,12 +181,7 @@
-
-
-
-
-
-
+
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/utils.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/utils.mps
index 26da313d..4a64dab3 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/utils.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/models/utils.mps
@@ -4,7 +4,7 @@
-
+
@@ -100,7 +100,7 @@
-
+
@@ -115,12 +115,13 @@
-
+
+
@@ -164,7 +165,7 @@
-
+
@@ -179,7 +180,6 @@
-
@@ -585,7 +585,7 @@
-
+
@@ -595,9 +595,9 @@
-
+
-
+
@@ -636,7 +636,7 @@
-
+
@@ -646,9 +646,9 @@
-
+
-
+
@@ -687,7 +687,7 @@
-
+
@@ -697,9 +697,9 @@
-
+
-
+
@@ -738,7 +738,7 @@
-
+
@@ -748,9 +748,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/org.mpsqa.clones.config.pluginSolution.msd b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/org.mpsqa.clones.config.pluginSolution.msd
index 4c40a4c4..bd697310 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/org.mpsqa.clones.config.pluginSolution.msd
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.config.pluginSolution/org.mpsqa.clones.config.pluginSolution.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)
742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)
@@ -24,11 +23,11 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/algo.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/algo.mps
index 34015b84..8821d2ae 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/algo.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/algo.mps
@@ -5,7 +5,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
@@ -146,7 +146,7 @@
-
+
@@ -170,7 +170,7 @@
-
+
@@ -197,6 +197,7 @@
+
@@ -244,7 +245,7 @@
-
+
@@ -282,7 +283,6 @@
-
@@ -2129,15 +2129,15 @@
-
+
-
+
-
+
@@ -2186,15 +2186,15 @@
-
+
-
+
-
+
@@ -2228,15 +2228,15 @@
-
+
-
+
-
+
@@ -2270,15 +2270,15 @@
-
+
-
+
-
+
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/hashcode.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/hashcode.mps
index aef11413..c98218fd 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/hashcode.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/hashcode.mps
@@ -4,7 +4,7 @@
-
+
@@ -101,7 +101,7 @@
-
+
@@ -122,7 +122,7 @@
-
+
@@ -163,10 +163,10 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/management.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/management.mps
index a445ecc5..6e9c5acc 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/management.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/management.mps
@@ -3,7 +3,7 @@
-
+
@@ -43,7 +43,7 @@
-
+
@@ -121,7 +121,7 @@
-
+
@@ -144,7 +144,7 @@
-
+
@@ -176,6 +176,7 @@
+
@@ -220,7 +221,7 @@
-
+
@@ -251,7 +252,6 @@
-
@@ -2463,16 +2463,16 @@
-
+
-
+
-
+
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/utils.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/utils.mps
index 8db55eef..0a111eff 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/utils.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/models/utils.mps
@@ -3,7 +3,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -76,7 +76,7 @@
-
+
@@ -85,7 +85,7 @@
-
+
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/org.mpsqa.clones.core.msd b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/org.mpsqa.clones.core.msd
index 1e5f9485..2a4fd57f 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/org.mpsqa.clones.core.msd
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.core/org.mpsqa.clones.core.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)
6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)
@@ -22,7 +21,7 @@
-
+
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/models/plugin.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/models/plugin.mps
index 7c7afb1b..1a37642d 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/models/plugin.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/models/plugin.mps
@@ -2,7 +2,7 @@
-
+
@@ -31,7 +31,7 @@
-
+
@@ -46,7 +46,7 @@
-
+
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/org.mpsqa.clones.java.pluginSolution.msd b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/org.mpsqa.clones.java.pluginSolution.msd
index 66782d4f..25cbe5ce 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/org.mpsqa.clones.java.pluginSolution.msd
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.java.pluginSolution/org.mpsqa.clones.java.pluginSolution.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
48b1eeb1-bf01-4e84-8d12-d2fc8bf60fb7(org.mpsqa.clones.core)
f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)
@@ -19,10 +18,10 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/plugin.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/plugin.mps
index 8480cef9..64efd157 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/plugin.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/plugin.mps
@@ -2,10 +2,10 @@
-
+
-
+
@@ -48,6 +48,7 @@
+
@@ -87,7 +88,7 @@
-
+
@@ -110,7 +111,7 @@
-
+
@@ -197,7 +198,7 @@
-
+
@@ -215,7 +216,7 @@
-
+
@@ -228,7 +229,7 @@
-
+
@@ -251,7 +252,7 @@
-
+
@@ -376,6 +377,7 @@
+
@@ -489,6 +491,7 @@
+
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/ui.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/ui.mps
index 7eb86e58..292f10d7 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/ui.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/ui.mps
@@ -3,7 +3,7 @@
-
+
@@ -45,7 +45,7 @@
-
+
@@ -141,7 +141,7 @@
-
+
@@ -163,7 +163,7 @@
-
+
@@ -202,6 +202,7 @@
+
@@ -252,7 +253,7 @@
-
+
@@ -280,7 +281,6 @@
-
@@ -1459,16 +1459,16 @@
-
+
-
+
-
+
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps
index 9ad75b5b..e4a82ad4 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps
@@ -4,7 +4,7 @@
-
+
@@ -45,7 +45,7 @@
-
+
@@ -137,7 +137,7 @@
-
+
@@ -156,7 +156,7 @@
-
+
@@ -192,6 +192,7 @@
+
@@ -244,7 +245,7 @@
-
+
@@ -272,7 +273,6 @@
-
@@ -471,7 +471,7 @@
-
+
@@ -482,9 +482,9 @@
-
+
-
+
@@ -1314,7 +1314,7 @@
-
+
@@ -1325,9 +1325,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/org.mpsqa.clones.pluginSolution.msd b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/org.mpsqa.clones.pluginSolution.msd
index 1c70b378..6c242124 100644
--- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/org.mpsqa.clones.pluginSolution.msd
+++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/org.mpsqa.clones.pluginSolution.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)
742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)
@@ -26,14 +25,14 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/models/org.mpsqa.clones.config.sandbox.simple_clones_config.mps b/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/models/org.mpsqa.clones.config.sandbox.simple_clones_config.mps
index 6dacee06..80a80ed7 100644
--- a/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/models/org.mpsqa.clones.config.sandbox.simple_clones_config.mps
+++ b/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/models/org.mpsqa.clones.config.sandbox.simple_clones_config.mps
@@ -33,7 +33,7 @@
-
+
diff --git a/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd b/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd
index 435b9cfa..6c268fef 100644
--- a/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd
+++ b/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd
@@ -1,16 +1,15 @@
-
+
-
+
-
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/_010_headless_runner_1@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/_010_headless_runner_1@tests.mps
index 1a0a3b12..759bde27 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/_010_headless_runner_1@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/_010_headless_runner_1@tests.mps
@@ -5,7 +5,7 @@
-
+
@@ -77,7 +77,7 @@
-
+
@@ -112,7 +112,7 @@
-
+
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/clone_config_headless_01.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/clone_config_headless_01.mps
index a7a6658a..fa7cdc18 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/clone_config_headless_01.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/models/clone_config_headless_01.mps
@@ -25,7 +25,7 @@
-
+
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/test.org.mpsqa.clones.headless.msd b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/test.org.mpsqa.clones.headless.msd
index 45aa765f..6ae85422 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/test.org.mpsqa.clones.headless.msd
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones.headless/test.org.mpsqa.clones.headless.msd
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,6 @@
-
6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)
c444eed9-4c7b-48e8-a62c-124f7b6b1712(org.mpsqa.clones.config.pluginSolution)
@@ -25,11 +24,11 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps
index 09225feb..72e5711d 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps
@@ -5,7 +5,7 @@
-
+
@@ -101,7 +101,7 @@
-
+
@@ -113,7 +113,7 @@
-
+
@@ -145,9 +145,13 @@
-
+
+
+
+
+
@@ -335,6 +339,10 @@
+
+
+
+
@@ -345,6 +353,10 @@
+
+
+
+
@@ -360,6 +372,10 @@
+
+
+
+
@@ -509,6 +525,10 @@
+
+
+
+
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_010_identical_java_statements@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_010_identical_java_statements@tests.mps
index a035d0e9..05a2b35b 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_010_identical_java_statements@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_010_identical_java_statements@tests.mps
@@ -58,7 +58,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_020_overlapping_clones@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_020_overlapping_clones@tests.mps
index 6de6533e..52a03e98 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_020_overlapping_clones@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_020_overlapping_clones@tests.mps
@@ -58,7 +58,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_200_save_load_filter_clones@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_200_save_load_filter_clones@tests.mps
index e4e08ef0..916c2b5a 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_200_save_load_filter_clones@tests.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_200_save_load_filter_clones@tests.mps
@@ -78,7 +78,7 @@
-
+
@@ -121,7 +121,7 @@
-
+
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps
index e511377f..2a57fab9 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._010_identical_java_statements.mps
@@ -57,7 +57,7 @@
-
+
@@ -68,15 +68,22 @@
-
+
-
+
+
+
+
+
+
+
+
@@ -93,6 +100,14 @@
+
+
+
+
+
+
+
+
@@ -152,6 +167,14 @@
+
+
+
+
+
+
+
+
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._020_overlapping_clones.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._020_overlapping_clones.mps
index 976eb85e..4b8ad8f3 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._020_overlapping_clones.mps
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/testcode._020_overlapping_clones.mps
@@ -39,20 +39,20 @@
-
+
-
+
-
+
diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/test.org.mpsqa.clones.msd b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/test.org.mpsqa.clones.msd
index 9fb6329b..4e2fd213 100644
--- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/test.org.mpsqa.clones.msd
+++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/test.org.mpsqa.clones.msd
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,6 @@
-
6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)
48b1eeb1-bf01-4e84-8d12-d2fc8bf60fb7(org.mpsqa.clones.core)
@@ -22,7 +21,7 @@
-
+
diff --git a/code/languages/org.mpsqa.deprecated/.mps/migration.xml b/code/languages/org.mpsqa.deprecated/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.deprecated/.mps/migration.xml
+++ b/code/languages/org.mpsqa.deprecated/.mps/migration.xml
@@ -9,6 +9,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/generator/templates/org.mpsqa.deprecated.example_lan.generator.templates@generator.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/generator/templates/org.mpsqa.deprecated.example_lan.generator.templates@generator.mps
deleted file mode 100644
index c5617de9..00000000
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/generator/templates/org.mpsqa.deprecated.example_lan.generator.templates@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.editor.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.editor.mps
index 0936841a..a7ef0499 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.editor.mps
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.editor.mps
@@ -36,7 +36,7 @@
-
+
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.structure.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.structure.mps
index 9f376f55..7001230d 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.structure.mps
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/models/org.mpsqa.deprecated.example_lan.structure.mps
@@ -51,7 +51,7 @@
-
+
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/org.mpsqa.deprecated.example_lan.mpl b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/org.mpsqa.deprecated.example_lan.mpl
index c9e53540..512c7dd9 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/org.mpsqa.deprecated.example_lan.mpl
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/org.mpsqa.deprecated.example_lan.mpl
@@ -11,55 +11,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.editor.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.editor.mps
index 04477959..bafd6bd4 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.editor.mps
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.editor.mps
@@ -57,7 +57,7 @@
-
+
@@ -99,7 +99,7 @@
-
+
@@ -122,12 +122,17 @@
+
+
+
+
+
@@ -145,8 +150,23 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -188,7 +208,7 @@
-
+
@@ -319,9 +339,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -529,5 +556,112 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.intentions.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.intentions.mps
index a146c2fa..72019f89 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.intentions.mps
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.intentions.mps
@@ -46,7 +46,7 @@
-
+
@@ -84,7 +84,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
@@ -156,16 +156,13 @@
-
+
-
-
-
@@ -174,6 +171,7 @@
+
@@ -277,7 +275,7 @@
-
+
@@ -288,14 +286,6 @@
-
-
-
-
-
-
-
-
@@ -314,10 +304,6 @@
-
-
-
-
@@ -339,7 +325,6 @@
-
@@ -370,7 +355,7 @@
-
+
@@ -541,20 +526,31 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
-
+
-
+
@@ -619,7 +615,7 @@
-
+
@@ -635,76 +631,184 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -713,20 +817,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -737,7 +837,7 @@
-
+
@@ -745,66 +845,11 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -814,18 +859,11 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -838,7 +876,7 @@
-
+
@@ -846,9 +884,9 @@
-
+
-
+
@@ -865,7 +903,7 @@
-
+
@@ -885,15 +923,110 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -915,10 +1048,18 @@
-
+
-
+
+
+
+
+
+
+
+
+
@@ -928,11 +1069,19 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -1132,6 +1281,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1402,16 +1711,16 @@
-
+
-
+
-
+
@@ -1810,7 +2119,7 @@
-
+
@@ -1819,7 +2128,7 @@
-
+
@@ -1830,9 +2139,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.structure.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.structure.mps
index 62d98930..e1e9a7d2 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.structure.mps
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.structure.mps
@@ -38,7 +38,7 @@
-
+
@@ -98,10 +98,17 @@
-
+
+
+
+
+
+
+
+
@@ -157,5 +164,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps
index c44792c1..c13b9332 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps
@@ -4,14 +4,15 @@
-
-
-
+
+
+
+
@@ -25,7 +26,6 @@
-
@@ -103,7 +103,7 @@
-
+
@@ -167,7 +167,7 @@
-
+
@@ -232,6 +232,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -474,102 +571,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.util.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.util.mps
index 19d718de..6a7d0a68 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.util.mps
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.util.mps
@@ -6,7 +6,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -80,7 +80,7 @@
-
+
@@ -104,7 +104,7 @@
-
+
diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/org.mpsqa.deprecated.mpl b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/org.mpsqa.deprecated.mpl
index cf27dafe..4fcceeca 100644
--- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/org.mpsqa.deprecated.mpl
+++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/org.mpsqa.deprecated.mpl
@@ -11,7 +11,6 @@
-
6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)
1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)
@@ -26,7 +25,7 @@
-
+
diff --git a/code/languages/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/models/org.mpsqa.deprecated.sandbox._010_deprecated_nodes.mps b/code/languages/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/models/org.mpsqa.deprecated.sandbox._010_deprecated_nodes.mps
index b9b189e2..b5388fca 100644
--- a/code/languages/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/models/org.mpsqa.deprecated.sandbox._010_deprecated_nodes.mps
+++ b/code/languages/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/models/org.mpsqa.deprecated.sandbox._010_deprecated_nodes.mps
@@ -34,7 +34,7 @@
-
+
diff --git a/code/languages/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/org.mpsqa.deprecated.sandbox.msd b/code/languages/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/org.mpsqa.deprecated.sandbox.msd
index f1803900..8194fc6e 100644
--- a/code/languages/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/org.mpsqa.deprecated.sandbox.msd
+++ b/code/languages/org.mpsqa.deprecated/solutions/org.mpsqa.deprecated.sandbox/org.mpsqa.deprecated.sandbox.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
diff --git a/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/models/test.org.mpsqa.deprecated._010_deprecation_tests@tests.mps b/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/models/test.org.mpsqa.deprecated._010_deprecation_tests@tests.mps
index 47cf1b9e..4c0489ae 100644
--- a/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/models/test.org.mpsqa.deprecated._010_deprecation_tests@tests.mps
+++ b/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/models/test.org.mpsqa.deprecated._010_deprecation_tests@tests.mps
@@ -6,7 +6,7 @@
-
+
@@ -26,7 +26,7 @@
-
+
@@ -90,7 +90,7 @@
-
+
@@ -109,6 +109,7 @@
+
@@ -162,7 +163,7 @@
-
+
@@ -173,7 +174,6 @@
-
@@ -290,7 +290,7 @@
-
+
@@ -299,15 +299,15 @@
-
+
-
+
-
+
diff --git a/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/test.org.mpsqa.deprecated.msd b/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/test.org.mpsqa.deprecated.msd
index c5c9fa6b..dcf14077 100644
--- a/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/test.org.mpsqa.deprecated.msd
+++ b/code/languages/org.mpsqa.deprecated/tests/test.org.mpsqa.deprecated/test.org.mpsqa.deprecated.msd
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,6 @@
-
6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)
b73ca93f-6762-4398-b251-df0d708b305b(org.mpsqa.deprecated)
@@ -21,7 +20,7 @@
-
+
diff --git a/code/languages/org.mpsqa.lint/.mps/migration.xml b/code/languages/org.mpsqa.lint/.mps/migration.xml
index 8ca43043..0946a125 100644
--- a/code/languages/org.mpsqa.lint/.mps/migration.xml
+++ b/code/languages/org.mpsqa.lint/.mps/migration.xml
@@ -5,7 +5,9 @@
+
+
-
+
\ No newline at end of file
diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic.linters_library.quickfixes/models/org.mpsqa.lint.generic.linters_library.quickfixes.structure.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic.linters_library.quickfixes/models/org.mpsqa.lint.generic.linters_library.quickfixes.structure.mps
index 5c456f7a..caed435c 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic.linters_library.quickfixes/models/org.mpsqa.lint.generic.linters_library.quickfixes.structure.mps
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic.linters_library.quickfixes/models/org.mpsqa.lint.generic.linters_library.quickfixes.structure.mps
@@ -2,7 +2,6 @@
-
diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic.linters_library.quickfixes/models/org.mpsqa.lint.generic.linters_library.quickfixes.typesystem.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic.linters_library.quickfixes/models/org.mpsqa.lint.generic.linters_library.quickfixes.typesystem.mps
index 881f9bad..49fad290 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic.linters_library.quickfixes/models/org.mpsqa.lint.generic.linters_library.quickfixes.typesystem.mps
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic.linters_library.quickfixes/models/org.mpsqa.lint.generic.linters_library.quickfixes.typesystem.mps
@@ -3,7 +3,6 @@
-
@@ -89,7 +88,7 @@
-
+
@@ -107,7 +106,7 @@
-
+
@@ -145,7 +144,7 @@
-
+
diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic.linters_library.quickfixes/org.mpsqa.lint.generic.linters_library.quickfixes.mpl b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic.linters_library.quickfixes/org.mpsqa.lint.generic.linters_library.quickfixes.mpl
index fee4b7ed..64a8076f 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic.linters_library.quickfixes/org.mpsqa.lint.generic.linters_library.quickfixes.mpl
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic.linters_library.quickfixes/org.mpsqa.lint.generic.linters_library.quickfixes.mpl
@@ -11,7 +11,6 @@
-
2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)
8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)
@@ -21,7 +20,7 @@
-
+
@@ -37,7 +36,6 @@
-
diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/generator/templates/org.mpsqa.lint.generic.generator.templates@generator.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/generator/templates/org.mpsqa.lint.generic.generator.templates@generator.mps
index 3b4c4835..1bd4cc9b 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/generator/templates/org.mpsqa.lint.generic.generator.templates@generator.mps
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/generator/templates/org.mpsqa.lint.generic.generator.templates@generator.mps
@@ -10,13 +10,13 @@
+
-
-
-
+
+
@@ -36,7 +36,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
@@ -123,7 +123,7 @@
-
+
@@ -137,7 +137,7 @@
-
+
@@ -170,7 +170,7 @@
-
+
@@ -300,7 +300,7 @@
-
+
@@ -518,6 +518,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -605,36 +635,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1323,153 +1323,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1649,5 +1502,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.behavior.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.behavior.mps
index 64a0fd9e..965c596a 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.behavior.mps
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.behavior.mps
@@ -6,7 +6,6 @@
-
@@ -114,7 +113,7 @@
-
+
@@ -168,7 +167,7 @@
-
+
@@ -189,7 +188,7 @@
-
+
@@ -208,13 +207,14 @@
+
-
+
@@ -313,7 +313,7 @@
-
+
@@ -361,7 +361,6 @@
-
@@ -667,7 +666,7 @@
-
+
@@ -675,9 +674,9 @@
-
+
-
+
@@ -722,12 +721,12 @@
-
+
-
+
@@ -740,9 +739,9 @@
-
+
-
+
@@ -999,7 +998,7 @@
-
+
@@ -1007,9 +1006,9 @@
-
+
-
+
@@ -1076,7 +1075,7 @@
-
+
@@ -1086,7 +1085,7 @@
-
+
@@ -1096,13 +1095,13 @@
-
+
-
+
-
+
-
+
@@ -1222,15 +1221,15 @@
-
+
-
+
-
+
@@ -1254,15 +1253,15 @@
-
+
-
+
-
+
@@ -1351,7 +1350,7 @@
-
+
@@ -1364,7 +1363,7 @@
-
+
@@ -1380,9 +1379,9 @@
-
+
-
+
@@ -1528,7 +1527,7 @@
-
+
@@ -1548,9 +1547,9 @@
-
+
-
+
@@ -1863,8 +1862,8 @@
-
-
+
+
@@ -1878,6 +1877,9 @@
+
+
+
@@ -2637,9 +2639,6 @@
-
-
-
diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.constraints.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.constraints.mps
index 41db3aee..7747b1ba 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.constraints.mps
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.constraints.mps
@@ -43,7 +43,7 @@
-
+
@@ -125,7 +125,7 @@
-
+
diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.editor.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.editor.mps
index 1e9089c0..b4cd431a 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.editor.mps
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.editor.mps
@@ -8,9 +8,7 @@
-
-
@@ -779,16 +777,16 @@
-
-
-
-
+
+
+
+
@@ -1288,7 +1286,6 @@
-
@@ -1317,6 +1314,7 @@
+
@@ -1775,16 +1773,16 @@
-
-
-
-
+
+
+
+
diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.migration.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.migration.mps
index 159bf199..ec076b93 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.migration.mps
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.migration.mps
@@ -25,7 +25,7 @@
-
+
diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.typesystem.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.typesystem.mps
index 6481e4ba..ea74b9c4 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.typesystem.mps
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.typesystem.mps
@@ -7,7 +7,6 @@
-
@@ -92,7 +91,7 @@
-
+
@@ -146,7 +145,7 @@
-
+
@@ -205,7 +204,7 @@
-
+
@@ -237,7 +236,7 @@
-
+
@@ -271,6 +270,7 @@
+
@@ -432,7 +432,7 @@
-
+
@@ -467,7 +467,6 @@
-
@@ -1391,6 +1390,9 @@
+
+
+
@@ -1406,9 +1408,6 @@
-
-
-
@@ -1562,16 +1561,31 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
@@ -3765,48 +3779,48 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
@@ -3815,9 +3829,9 @@
-
+
-
+
@@ -3850,25 +3864,25 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
+
+
+
@@ -3881,7 +3895,7 @@
-
+
@@ -3896,7 +3910,7 @@
-
+
@@ -3914,9 +3928,9 @@
-
+
-
+
@@ -3936,27 +3950,27 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
+
+
+
@@ -3975,7 +3989,7 @@
-
+
@@ -3986,7 +4000,7 @@
-
+
@@ -4004,9 +4018,9 @@
-
+
-
+
@@ -4016,25 +4030,25 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
+
+
+
@@ -4052,11 +4066,14 @@
+
+
+
-
+
@@ -4067,16 +4084,13 @@
-
-
-
-
+
@@ -4094,9 +4108,9 @@
-
+
-
+
@@ -4117,27 +4131,27 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
+
+
+
@@ -4158,7 +4172,7 @@
-
+
@@ -4177,7 +4191,7 @@
-
+
@@ -4195,9 +4209,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/org.mpsqa.lint.generic.mpl b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/org.mpsqa.lint.generic.mpl
index c68764ba..f12aaa45 100644
--- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/org.mpsqa.lint.generic.mpl
+++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/org.mpsqa.lint.generic.mpl
@@ -33,7 +33,7 @@
-
+
@@ -81,7 +81,6 @@
-
f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)
6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)
@@ -95,14 +94,13 @@
20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)
ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)
c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)
- 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query)
b15468d9-435b-45b2-bf51-3f984f734cc4(org.mpsqa.lint.generic.runtime)
-
+
@@ -155,7 +153,6 @@
-
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/models/org.mpsqa.lint.build.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/models/org.mpsqa.lint.build.mps
index 0e9d0660..b945ae1f 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/models/org.mpsqa.lint.build.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/models/org.mpsqa.lint.build.mps
@@ -61,7 +61,7 @@
-
+
@@ -73,7 +73,7 @@
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/org.mpsqa.lint.build.msd b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/org.mpsqa.lint.build.msd
index 6f23d29f..8c41c212 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/org.mpsqa.lint.build.msd
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.build/org.mpsqa.lint.build.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)
422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.filesystem.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.filesystem.mps
index 76035fb7..23f0b468 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.filesystem.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.filesystem.mps
@@ -5,13 +5,8 @@
-
-
+
-
-
-
-
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.meta.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.meta.mps
index dc140b15..37f92773 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.meta.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.meta.mps
@@ -5,13 +5,12 @@
-
+
-
@@ -104,6 +103,7 @@
+
@@ -193,7 +193,6 @@
-
@@ -285,7 +284,7 @@
-
+
@@ -293,9 +292,9 @@
-
+
-
+
@@ -344,16 +343,16 @@
-
+
-
+
-
+
@@ -638,7 +637,7 @@
-
+
@@ -646,9 +645,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps
index 3c74fb1e..19d7643d 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps
@@ -5,7 +5,7 @@
-
+
@@ -246,6 +246,7 @@
+
@@ -342,7 +343,6 @@
-
@@ -1093,7 +1093,7 @@
-
+
@@ -1104,9 +1104,9 @@
-
+
-
+
@@ -1244,7 +1244,7 @@
-
+
@@ -1255,9 +1255,9 @@
-
+
-
+
@@ -1292,14 +1292,14 @@
-
+
-
+
-
+
@@ -1325,7 +1325,7 @@
-
+
@@ -1337,9 +1337,9 @@
-
+
-
+
@@ -1362,24 +1362,24 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2095,7 +2095,7 @@
-
+
@@ -2103,9 +2103,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.modules.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.modules.mps
index 08d1af90..ecc349ca 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.modules.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.modules.mps
@@ -8,7 +8,6 @@
-
@@ -62,7 +61,7 @@
-
+
@@ -115,7 +114,7 @@
-
+
@@ -175,7 +174,7 @@
-
+
@@ -203,7 +202,7 @@
-
+
@@ -236,7 +235,7 @@
-
+
@@ -251,7 +250,16 @@
-
+
+
+
+
+
+
+
+
+
+
@@ -264,6 +272,7 @@
+
@@ -328,7 +337,7 @@
-
+
@@ -399,7 +408,6 @@
-
@@ -1277,12 +1285,12 @@
-
-
-
+
+
+
@@ -1391,19 +1399,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
@@ -1435,6 +1472,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1461,6 +1527,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1476,8 +1576,13 @@
-
-
+
+
+
+
+
+
+
@@ -1488,7 +1593,7 @@
-
+
@@ -1507,6 +1612,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1830,7 +1983,7 @@
-
+
@@ -1841,9 +1994,9 @@
-
+
-
+
@@ -1855,14 +2008,14 @@
-
+
-
+
-
+
@@ -1873,7 +2026,7 @@
-
+
@@ -1881,9 +2034,9 @@
-
+
-
+
@@ -2144,7 +2297,7 @@
-
+
@@ -2152,9 +2305,9 @@
-
+
-
+
@@ -2177,24 +2330,24 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3083,12 +3236,12 @@
-
-
-
+
+
+
@@ -3166,12 +3319,12 @@
-
-
-
+
+
+
@@ -3814,7 +3967,7 @@
-
+
@@ -3822,9 +3975,9 @@
-
+
-
+
@@ -4252,7 +4405,7 @@
-
+
@@ -4260,9 +4413,9 @@
-
+
-
+
@@ -5415,7 +5568,7 @@
-
+
@@ -5424,7 +5577,7 @@
-
+
@@ -5435,9 +5588,9 @@
-
+
-
+
@@ -7412,7 +7565,7 @@
-
+
@@ -7420,9 +7573,9 @@
-
+
-
+
@@ -7775,7 +7928,7 @@
-
+
@@ -7786,9 +7939,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.nodes.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.nodes.mps
index 9b301540..bd48387f 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.nodes.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.nodes.mps
@@ -5,11 +5,10 @@
-
+
-
@@ -25,6 +24,7 @@
+
@@ -167,6 +167,7 @@
+
@@ -179,6 +180,7 @@
+
@@ -214,6 +216,9 @@
+
+
+
@@ -288,7 +293,6 @@
-
@@ -303,6 +307,7 @@
+
@@ -580,7 +585,7 @@
-
+
@@ -595,9 +600,9 @@
-
+
-
+
@@ -2662,5 +2667,168 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/org.mpsqa.lint.generic.linters_library.msd b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/org.mpsqa.lint.generic.linters_library.msd
index b8cadae1..76123e8d 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/org.mpsqa.lint.generic.linters_library.msd
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/org.mpsqa.lint.generic.linters_library.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)
8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)
@@ -30,10 +29,8 @@
-
+
-
-
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.runtime/models/org.mpsqa.lint.generic.runtime.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.runtime/models/org.mpsqa.lint.generic.runtime.mps
index 80086ffe..be0be81a 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.runtime/models/org.mpsqa.lint.generic.runtime.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.runtime/models/org.mpsqa.lint.generic.runtime.mps
@@ -31,7 +31,7 @@
-
+
@@ -91,7 +91,7 @@
-
+
@@ -112,7 +112,7 @@
-
+
@@ -146,7 +146,7 @@
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.runtime/org.mpsqa.lint.generic.runtime.msd b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.runtime/org.mpsqa.lint.generic.runtime.msd
index 47fca930..a7a4b53d 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.runtime/org.mpsqa.lint.generic.runtime.msd
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.runtime/org.mpsqa.lint.generic.runtime.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)
7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)
@@ -18,7 +17,7 @@
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._010_smoke_user_defined_linters.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._010_smoke_user_defined_linters.mps
index 72ad90da..2386f0fb 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._010_smoke_user_defined_linters.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._010_smoke_user_defined_linters.mps
@@ -1,13 +1,12 @@
+
-
-
@@ -63,7 +62,7 @@
-
+
@@ -104,7 +103,7 @@
-
+
@@ -131,7 +130,7 @@
-
+
@@ -146,6 +145,15 @@
+
+
+
+
+
+
+
+
+
@@ -161,7 +169,7 @@
-
+
@@ -743,8 +751,13 @@
-
-
+
+
+
+
+
+
+
@@ -837,6 +850,12 @@
+
+
+
+
+
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._020_smoke_referenced_linters_from_library.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._020_smoke_referenced_linters_from_library.mps
index 2c355695..281867b9 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._020_smoke_referenced_linters_from_library.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._020_smoke_referenced_linters_from_library.mps
@@ -15,7 +15,7 @@
-
+
@@ -25,7 +25,7 @@
-
+
@@ -33,7 +33,7 @@
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._500_other_scripts.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._500_other_scripts.mps
index ac91031d..62e25f5a 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._500_other_scripts.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.generic.sandbox._500_other_scripts.mps
@@ -66,7 +66,7 @@
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.mps_lang.linters_library.performance_generator.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.mps_lang.linters_library.performance_generator.mps
index ba08cfac..45a223ab 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.mps_lang.linters_library.performance_generator.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.mps_lang.linters_library.performance_generator.mps
@@ -3,7 +3,7 @@
-
+
@@ -43,7 +43,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
@@ -187,7 +187,7 @@
-
+
@@ -672,7 +672,7 @@
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd
index aefd060d..af9ea3ef 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)
6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)
@@ -25,7 +24,7 @@
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.behavior_aspect.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.behavior_aspect.mps
index 33cfa864..2aff1282 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.behavior_aspect.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.behavior_aspect.mps
@@ -4,17 +4,22 @@
-
+
-
+
+
+
+
+
+
@@ -22,6 +27,8 @@
+
+
@@ -42,11 +49,15 @@
+
+
+
+
@@ -88,9 +99,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -102,10 +130,20 @@
+
+
+
+
+
+
+
+
+
+
@@ -118,6 +156,7 @@
+
@@ -125,6 +164,10 @@
+
+
+
+
@@ -159,13 +202,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -182,6 +246,7 @@
+
@@ -191,6 +256,7 @@
+
@@ -765,9 +831,6 @@
-
-
-
@@ -790,6 +853,9 @@
+
+
+
@@ -1062,5 +1128,664 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.build_scripts.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.build_scripts.mps
index d5cda7a4..597d1ad1 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.build_scripts.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.build_scripts.mps
@@ -4,11 +4,8 @@
-
+
-
-
-
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.constraint_aspect.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.constraint_aspect.mps
index 2c85d97d..bcf9e249 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.constraint_aspect.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.constraint_aspect.mps
@@ -4,9 +4,8 @@
-
+
-
@@ -58,7 +57,7 @@
-
+
@@ -73,7 +72,7 @@
-
+
@@ -96,7 +95,7 @@
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.expressions.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.expressions.mps
index b5968037..a5916fe8 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.expressions.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.expressions.mps
@@ -5,7 +5,7 @@
-
+
@@ -46,7 +46,7 @@
-
+
@@ -82,7 +82,7 @@
-
+
@@ -101,7 +101,7 @@
-
+
@@ -121,6 +121,7 @@
+
@@ -165,7 +166,7 @@
-
+
@@ -204,7 +205,6 @@
-
@@ -741,14 +741,14 @@
-
+
-
+
-
+
@@ -767,19 +767,19 @@
-
+
-
+
-
+
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.generator_aspect.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.generator_aspect.mps
index 960608c0..7641e026 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.generator_aspect.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.generator_aspect.mps
@@ -5,8 +5,7 @@
-
-
+
@@ -32,7 +31,7 @@
-
+
@@ -61,7 +60,7 @@
-
+
@@ -76,10 +75,10 @@
-
+
-
+
@@ -112,7 +111,7 @@
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_editor.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_editor.mps
index 9a38f97d..31b528a8 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_editor.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_editor.mps
@@ -5,12 +5,11 @@
-
+
-
@@ -1009,12 +1008,17 @@
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
@@ -2096,9 +2100,6 @@
-
-
-
@@ -2109,6 +2110,9 @@
+
+
+
@@ -2254,12 +2258,12 @@
-
-
-
+
+
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem.mps
index c197097c..bc6c136a 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem.mps
@@ -4,11 +4,10 @@
-
+
-
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps
index 4ab7af0a..3bc18a41 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps
@@ -5,11 +5,10 @@
-
+
-
@@ -93,11 +92,14 @@
-
+
+
+
+
@@ -112,7 +114,7 @@
-
+
@@ -122,7 +124,7 @@
-
+
@@ -156,13 +158,13 @@
-
+
-
+
@@ -601,7 +603,9 @@
-
+
+
+
@@ -1505,11 +1509,13 @@
-
+
+
+
-
-
-
+
+
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_utils.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_utils.mps
index e921acc5..a2d3c437 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_utils.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_utils.mps
@@ -4,12 +4,10 @@
-
-
+
-
@@ -25,12 +23,14 @@
-
+
+
+
@@ -1698,45 +1698,143 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.structure_aspect.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.structure_aspect.mps
index 10a7c4a9..53df526a 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.structure_aspect.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.structure_aspect.mps
@@ -4,21 +4,25 @@
-
+
-
+
+
-
-
+
+
+
+
+
@@ -39,10 +43,14 @@
+
+
+
+
@@ -58,6 +66,7 @@
+
@@ -65,6 +74,9 @@
+
+
+
@@ -81,16 +93,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -100,9 +144,20 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -112,6 +167,12 @@
+
+
+
+
+
+
@@ -135,17 +196,27 @@
+
+
+
+
+
+
+
+
+
+
@@ -154,12 +225,21 @@
+
+
+
+
+
+
+
+
+
@@ -447,5 +527,679 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.tests.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.tests.mps
index 7231e192..33268426 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.tests.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.tests.mps
@@ -4,7 +4,7 @@
-
+
@@ -91,6 +91,7 @@
+
@@ -163,7 +164,6 @@
-
@@ -235,7 +235,7 @@
-
+
@@ -265,9 +265,9 @@
-
+
-
+
@@ -278,7 +278,7 @@
-
+
@@ -286,9 +286,9 @@
-
+
-
+
@@ -331,7 +331,7 @@
-
+
@@ -339,9 +339,9 @@
-
+
-
+
@@ -384,7 +384,7 @@
-
+
@@ -392,9 +392,9 @@
-
+
-
+
@@ -405,7 +405,7 @@
-
+
@@ -413,9 +413,9 @@
-
+
-
+
@@ -426,7 +426,7 @@
-
+
@@ -434,9 +434,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.typesystem_aspect.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.typesystem_aspect.mps
index c7a126ab..156964b0 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.typesystem_aspect.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.typesystem_aspect.mps
@@ -4,13 +4,12 @@
-
+
-
@@ -351,6 +350,11 @@
+
+
+
+
+
@@ -511,11 +515,6 @@
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/org.mpsqa.lint.mps_lang.linters_library.msd b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/org.mpsqa.lint.mps_lang.linters_library.msd
index f7a5bbb0..28f8ba2b 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/org.mpsqa.lint.mps_lang.linters_library.msd
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/org.mpsqa.lint.mps_lang.linters_library.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)
ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)
@@ -32,15 +31,15 @@
a381759b-acec-4e2e-8745-7bf905520fca(jetbrains.mps.ide.modelchecker.platform)
9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)
0cf935df-4699-4e9c-a132-fa109541cba3(jetbrains.mps.build.mps)
+ 8e98f4e2-decf-4e97-bf80-9109e8b759ee(jetbrains.mps.lang.constraints.rules.runtime)
8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)
-
+
-
@@ -74,6 +73,7 @@
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.generic_linters_test@tests.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.generic_linters_test@tests.mps
index 380edb4c..c09b8e30 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.generic_linters_test@tests.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.generic_linters_test@tests.mps
@@ -5,15 +5,10 @@
-
-
-
-
-
@@ -40,6 +35,7 @@
+
@@ -89,19 +85,20 @@
-
+
-
+
+
@@ -109,7 +106,7 @@
-
+
@@ -156,7 +153,7 @@
-
+
@@ -171,7 +168,6 @@
-
@@ -180,6 +176,7 @@
+
@@ -223,7 +220,7 @@
-
+
@@ -238,9 +235,9 @@
-
+
-
+
@@ -303,7 +300,7 @@
-
+
@@ -318,9 +315,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.test.linter_definitions.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.test.linter_definitions.mps
index 05032a82..3d7ac978 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.test.linter_definitions.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.test.linter_definitions.mps
@@ -3,7 +3,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
@@ -38,7 +38,7 @@
-
+
@@ -48,7 +48,7 @@
-
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.test@tests.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.test@tests.mps
index 4751e628..394afd6a 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.test@tests.mps
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/models/org.mpsqa.lint.test@tests.mps
@@ -17,6 +17,7 @@
+
@@ -62,14 +63,14 @@
-
+
-
+
@@ -91,13 +92,14 @@
-
+
+
diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/org.mpsqa.lint.test.msd b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/org.mpsqa.lint.test.msd
index 4f81031c..c336bf7c 100644
--- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/org.mpsqa.lint.test.msd
+++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.test/org.mpsqa.lint.test.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
12a40499-ed72-4b23-9437-358c4217c97b(org.mpsqa.lint.mps_lang.linters_library)
8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)
@@ -22,8 +21,7 @@
-
-
+
diff --git a/code/languages/org.mpsqa.mutant/.mps/migration.xml b/code/languages/org.mpsqa.mutant/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.mutant/.mps/migration.xml
+++ b/code/languages/org.mpsqa.mutant/.mps/migration.xml
@@ -9,6 +9,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/generator/templates/main@generator.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/generator/templates/main@generator.mps
deleted file mode 100644
index 9f12f5f9..00000000
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/generator/templates/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.editor.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.editor.mps
index f28e0cb5..995c12fb 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.editor.mps
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.editor.mps
@@ -38,7 +38,7 @@
-
+
@@ -70,7 +70,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.structure.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.structure.mps
index 2cd9d303..d443ef9d 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.structure.mps
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/models/org.mpsqa.mutant.demolang.structure.mps
@@ -36,7 +36,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/org.mpsqa.mutant.demolang.mpl b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/org.mpsqa.mutant.demolang.mpl
index 275dc9e9..22767f04 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/org.mpsqa.mutant.demolang.mpl
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/org.mpsqa.mutant.demolang.mpl
@@ -11,55 +11,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/generator/templates/main@generator.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/generator/templates/main@generator.mps
deleted file mode 100644
index 2dc74aae..00000000
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/generator/templates/main@generator.mps
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.behavior.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.behavior.mps
index 8e5b5a27..2c4697b0 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.behavior.mps
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.behavior.mps
@@ -73,7 +73,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -99,7 +99,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.editor.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.editor.mps
index dc521aca..ad731f15 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.editor.mps
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.editor.mps
@@ -49,7 +49,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.intentions.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.intentions.mps
index 06b731f9..4fda79ee 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.intentions.mps
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.intentions.mps
@@ -74,7 +74,7 @@
-
+
@@ -84,6 +84,7 @@
+
@@ -139,7 +140,7 @@
-
+
@@ -151,7 +152,6 @@
-
@@ -316,7 +316,7 @@
-
+
@@ -329,9 +329,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.structure.mps b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.structure.mps
index 880fa2cb..d99a3ee5 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.structure.mps
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/models/org.mpsqa.mutant.structure.mps
@@ -50,7 +50,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/org.mpsqa.mutant.mpl b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/org.mpsqa.mutant.mpl
index 557a1a15..ab1725d2 100644
--- a/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/org.mpsqa.mutant.mpl
+++ b/code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/org.mpsqa.mutant.mpl
@@ -11,50 +11,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
434ae70d-b732-4ce4-82f0-942388529867(org.mpsqa.mutant.base)
7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)
@@ -66,7 +22,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.core.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.core.mps
index bb377480..5962a14f 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.core.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.core.mps
@@ -3,7 +3,7 @@
-
+
@@ -53,7 +53,7 @@
-
+
@@ -167,7 +167,7 @@
-
+
@@ -194,7 +194,7 @@
-
+
@@ -282,7 +282,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.filter.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.filter.mps
index cf53e22d..cc78fe67 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.filter.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.filter.mps
@@ -3,7 +3,7 @@
-
+
@@ -12,24 +12,14 @@
-
-
-
-
-
-
-
-
-
-
@@ -53,7 +43,7 @@
-
+
@@ -145,7 +135,7 @@
-
+
@@ -167,7 +157,7 @@
-
+
@@ -196,6 +186,7 @@
+
@@ -227,7 +218,7 @@
-
+
@@ -266,7 +257,6 @@
-
@@ -438,7 +428,7 @@
-
+
@@ -454,7 +444,7 @@
-
+
@@ -468,7 +458,7 @@
-
+
@@ -487,9 +477,9 @@
-
+
-
+
@@ -775,7 +765,7 @@
-
+
@@ -784,9 +774,9 @@
-
+
-
+
@@ -921,7 +911,7 @@
-
+
@@ -930,9 +920,9 @@
-
+
-
+
@@ -993,7 +983,7 @@
-
+
@@ -1002,9 +992,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.model_checkers.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.model_checkers.mps
index cfa93a25..ff1a8736 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.model_checkers.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.model_checkers.mps
@@ -3,7 +3,7 @@
-
+
@@ -13,10 +13,8 @@
-
-
-
+
@@ -77,7 +75,7 @@
-
+
@@ -88,7 +86,7 @@
-
+
@@ -120,7 +118,7 @@
-
+
@@ -173,8 +171,8 @@
-
-
+
+
@@ -207,8 +205,8 @@
-
-
+
+
@@ -295,8 +293,8 @@
-
-
+
+
@@ -416,8 +414,8 @@
-
-
+
+
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.next_concept_chooser.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.next_concept_chooser.mps
index 555d18e6..cf2c1612 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.next_concept_chooser.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.next_concept_chooser.mps
@@ -18,7 +18,7 @@
-
+
@@ -66,7 +66,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -92,7 +92,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.postprocessor.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.postprocessor.mps
index 02a33e1f..d2fd3d82 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.postprocessor.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.postprocessor.mps
@@ -3,7 +3,7 @@
-
+
@@ -26,7 +26,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.references_synthethiser.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.references_synthethiser.mps
index 0818cf32..51e0f6c1 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.references_synthethiser.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.references_synthethiser.mps
@@ -4,7 +4,7 @@
-
+
@@ -26,7 +26,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -92,13 +92,14 @@
-
+
+
@@ -119,7 +120,7 @@
-
+
@@ -134,7 +135,6 @@
-
@@ -300,7 +300,7 @@
-
+
@@ -308,9 +308,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.seed_chooser.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.seed_chooser.mps
index 3ded8be2..18173724 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.seed_chooser.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.seed_chooser.mps
@@ -3,7 +3,7 @@
-
+
@@ -28,7 +28,7 @@
-
+
@@ -83,7 +83,7 @@
-
+
@@ -98,7 +98,7 @@
-
+
@@ -114,6 +114,7 @@
+
@@ -143,7 +144,7 @@
-
+
@@ -154,7 +155,6 @@
-
@@ -273,7 +273,7 @@
-
+
@@ -285,9 +285,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.utils.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.utils.mps
index 7fcbd75c..cc3c4d23 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.utils.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/models/org.mpsqa.mutant.base.utils.mps
@@ -3,14 +3,13 @@
-
+
-
@@ -100,7 +99,7 @@
-
+
@@ -119,7 +118,7 @@
-
+
@@ -133,6 +132,7 @@
+
@@ -180,7 +180,7 @@
-
+
@@ -202,7 +202,6 @@
-
@@ -256,7 +255,7 @@
-
+
@@ -271,9 +270,9 @@
-
+
-
+
@@ -306,7 +305,7 @@
-
+
@@ -318,9 +317,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/org.mpsqa.mutant.base.msd b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/org.mpsqa.mutant.base.msd
index 03f0964a..848c6582 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/org.mpsqa.mutant.base.msd
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.base/org.mpsqa.mutant.base.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)
ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)
@@ -28,7 +27,7 @@
-
+
@@ -54,6 +53,7 @@
+
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/models/org.mpsqa.mutant.pluginSolution.plugin.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/models/org.mpsqa.mutant.pluginSolution.plugin.mps
index 55706309..e25813ac 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/models/org.mpsqa.mutant.pluginSolution.plugin.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/models/org.mpsqa.mutant.pluginSolution.plugin.mps
@@ -2,7 +2,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/org.mpsqa.mutant.pluginSolution.msd b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/org.mpsqa.mutant.pluginSolution.msd
index e0a15b6c..81874e36 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/org.mpsqa.mutant.pluginSolution.msd
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.pluginSolution/org.mpsqa.mutant.pluginSolution.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,13 +10,12 @@
-
-
+
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/models/org.mpsqa.mutant.sandbox.java_baseLanguage.mps b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/models/org.mpsqa.mutant.sandbox.java_baseLanguage.mps
index e156bfb4..a7f0316d 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/models/org.mpsqa.mutant.sandbox.java_baseLanguage.mps
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/models/org.mpsqa.mutant.sandbox.java_baseLanguage.mps
@@ -26,7 +26,7 @@
-
+
@@ -75,7 +75,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/org.mpsqa.mutant.sandbox.msd b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/org.mpsqa.mutant.sandbox.msd
index 4801ffc3..99cbc118 100644
--- a/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/org.mpsqa.mutant.sandbox.msd
+++ b/code/languages/org.mpsqa.mutant/solutions/org.mpsqa.mutant.sandbox/org.mpsqa.mutant.sandbox.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,11 +10,10 @@
-
-
+
diff --git a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode.mps
index a45065c0..8bb27868 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode.mps
@@ -75,7 +75,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_010_depth_1_mutants.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_010_depth_1_mutants.mps
index 1c61f193..faabcde0 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_010_depth_1_mutants.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_010_depth_1_mutants.mps
@@ -36,7 +36,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_020_depth_2_mutants.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_020_depth_2_mutants.mps
index 3941f1e1..1c629a7e 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_020_depth_2_mutants.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_020_depth_2_mutants.mps
@@ -37,7 +37,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_030_depth_3_mutants.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_030_depth_3_mutants.mps
index 5e5cfa52..3388438c 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_030_depth_3_mutants.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_030_depth_3_mutants.mps
@@ -39,7 +39,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_040_concept_with_two_children_depth_2_mutants.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_040_concept_with_two_children_depth_2_mutants.mps
index 6f6e4c46..dec64819 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_040_concept_with_two_children_depth_2_mutants.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_testcode_040_concept_with_two_children_depth_2_mutants.mps
@@ -37,7 +37,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_tests@tests.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_tests@tests.mps
index 79d73c5b..f247ee7f 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_tests@tests.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._010_smoke_tests@tests.mps
@@ -70,7 +70,7 @@
-
+
@@ -96,7 +96,7 @@
-
+
@@ -120,7 +120,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_testcode.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_testcode.mps
index 8ed2566c..b5d7742f 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_testcode.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_testcode.mps
@@ -59,7 +59,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_tests@tests.mps b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_tests@tests.mps
index 03557b53..f1e15319 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_tests@tests.mps
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/models/test.org.mpsqa.mutant.demolang._020_smoke_constraints_tests@tests.mps
@@ -69,7 +69,7 @@
-
+
@@ -115,7 +115,7 @@
-
+
diff --git a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/test.org.mpsqa.mutant.demolang.msd b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/test.org.mpsqa.mutant.demolang.msd
index 598d8287..c2735943 100644
--- a/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/test.org.mpsqa.mutant.demolang.msd
+++ b/code/languages/org.mpsqa.mutant/tests/test.org.mpsqa.mutant.demolang/test.org.mpsqa.mutant.demolang.msd
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,6 @@
-
3313ed27-e24e-4f1d-81b0-b1b57775ffac(org.mpsqa.mutant.demolang)
434ae70d-b732-4ce4-82f0-942388529867(org.mpsqa.mutant.base)
@@ -22,7 +21,7 @@
-
+
diff --git a/code/languages/org.mpsqa.profile/.mps/migration.xml b/code/languages/org.mpsqa.profile/.mps/migration.xml
index 8ca43043..0946a125 100644
--- a/code/languages/org.mpsqa.profile/.mps/migration.xml
+++ b/code/languages/org.mpsqa.profile/.mps/migration.xml
@@ -5,7 +5,9 @@
+
+
-
+
\ No newline at end of file
diff --git a/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/models/org.mpsqa.profile.generator.behavior.mps b/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/models/org.mpsqa.profile.generator.behavior.mps
index 8602036d..45c89805 100644
--- a/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/models/org.mpsqa.profile.generator.behavior.mps
+++ b/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/models/org.mpsqa.profile.generator.behavior.mps
@@ -73,7 +73,7 @@
-
+
@@ -84,7 +84,7 @@
-
+
@@ -111,7 +111,7 @@
-
+
diff --git a/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/models/org.mpsqa.profile.generator.editor.mps b/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/models/org.mpsqa.profile.generator.editor.mps
index 5c9ef75e..06752e98 100644
--- a/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/models/org.mpsqa.profile.generator.editor.mps
+++ b/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/models/org.mpsqa.profile.generator.editor.mps
@@ -35,7 +35,7 @@
-
+
diff --git a/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/models/org.mpsqa.profile.generator.structure.mps b/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/models/org.mpsqa.profile.generator.structure.mps
index 6611aa03..42bda8b9 100644
--- a/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/models/org.mpsqa.profile.generator.structure.mps
+++ b/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/models/org.mpsqa.profile.generator.structure.mps
@@ -28,7 +28,7 @@
-
+
diff --git a/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/org.mpsqa.profile.generator.mpl b/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/org.mpsqa.profile.generator.mpl
index 1f5c1efe..0a45f737 100644
--- a/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/org.mpsqa.profile.generator.mpl
+++ b/code/languages/org.mpsqa.profile/languages/org.mpsqa.profile.generator/org.mpsqa.profile.generator.mpl
@@ -11,13 +11,12 @@
-
-
+
diff --git a/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.pluginSolution/models/org.mpsqa.profile.generator.pluginSolution.plugin.mps b/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.pluginSolution/models/org.mpsqa.profile.generator.pluginSolution.plugin.mps
index 03d29343..44d52faf 100644
--- a/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.pluginSolution/models/org.mpsqa.profile.generator.pluginSolution.plugin.mps
+++ b/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.pluginSolution/models/org.mpsqa.profile.generator.pluginSolution.plugin.mps
@@ -1,13 +1,14 @@
+
-
+
@@ -55,6 +56,7 @@
+
@@ -76,7 +78,7 @@
-
+
@@ -101,7 +103,7 @@
-
+
@@ -147,7 +149,7 @@
-
+
@@ -198,7 +200,7 @@
-
+
@@ -219,7 +221,7 @@
-
+
@@ -244,6 +246,7 @@
+
@@ -253,7 +256,7 @@
-
+
@@ -292,7 +295,7 @@
-
+
@@ -332,7 +335,6 @@
-
@@ -363,6 +365,7 @@
+
@@ -469,9 +472,6 @@
-
-
-
@@ -480,6 +480,9 @@
+
+
+
@@ -1087,7 +1090,7 @@
-
+
@@ -1095,9 +1098,9 @@
-
+
-
+
@@ -1334,12 +1337,12 @@
-
-
-
+
+
+
@@ -1437,14 +1440,14 @@
-
-
-
+
+
+
@@ -1622,7 +1625,7 @@
-
+
@@ -1686,7 +1689,7 @@
-
+
@@ -1696,7 +1699,7 @@
-
+
@@ -1713,9 +1716,9 @@
-
+
-
+
@@ -2058,7 +2061,7 @@
-
+
@@ -2068,9 +2071,9 @@
-
+
-
+
@@ -2285,6 +2288,7 @@
+
diff --git a/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.pluginSolution/org.mpsqa.profile.generator.pluginSolution.msd b/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.pluginSolution/org.mpsqa.profile.generator.pluginSolution.msd
index 9d0d702a..e234b76b 100644
--- a/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.pluginSolution/org.mpsqa.profile.generator.pluginSolution.msd
+++ b/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.pluginSolution/org.mpsqa.profile.generator.pluginSolution.msd
@@ -1,16 +1,15 @@
-
+
-
+
-
019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide)
6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)
@@ -27,13 +26,13 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.sandbox/models/org.mpsqa.profile.generator.sandbox._010_smoke.mps b/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.sandbox/models/org.mpsqa.profile.generator.sandbox._010_smoke.mps
index e7043a55..fc1d092f 100644
--- a/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.sandbox/models/org.mpsqa.profile.generator.sandbox._010_smoke.mps
+++ b/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.sandbox/models/org.mpsqa.profile.generator.sandbox._010_smoke.mps
@@ -13,7 +13,7 @@
-
+
diff --git a/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.sandbox/org.mpsqa.profile.generator.sandbox.msd b/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.sandbox/org.mpsqa.profile.generator.sandbox.msd
index 79f855f5..97d8543e 100644
--- a/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.sandbox/org.mpsqa.profile.generator.sandbox.msd
+++ b/code/languages/org.mpsqa.profile/solutions/org.mpsqa.profile.generator.sandbox/org.mpsqa.profile.generator.sandbox.msd
@@ -1,5 +1,5 @@
-
+
@@ -10,7 +10,6 @@
-
diff --git a/code/languages/org.mpsqa.testing/.mps/migration.xml b/code/languages/org.mpsqa.testing/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/languages/org.mpsqa.testing/.mps/migration.xml
+++ b/code/languages/org.mpsqa.testing/.mps/migration.xml
@@ -9,6 +9,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.generator.templates@generator.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.generator.templates@generator.mps
index 4c9d9db3..8422fac6 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.generator.templates@generator.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.generator.templates@generator.mps
@@ -67,7 +67,7 @@
-
+
@@ -96,7 +96,7 @@
-
+
@@ -113,6 +113,7 @@
+
@@ -130,7 +131,7 @@
-
+
@@ -151,7 +152,7 @@
-
+
@@ -159,7 +160,6 @@
-
@@ -312,7 +312,7 @@
-
+
@@ -320,9 +320,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.generator.util.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.generator.util.mps
index b3dbf38f..ed3c676a 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.generator.util.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.generator.util.mps
@@ -5,7 +5,7 @@
-
+
@@ -61,7 +61,7 @@
-
+
@@ -109,7 +109,7 @@
-
+
@@ -166,7 +166,7 @@
-
+
@@ -183,7 +183,7 @@
-
+
@@ -213,6 +213,7 @@
+
@@ -287,7 +288,7 @@
-
+
@@ -329,7 +330,6 @@
-
@@ -1028,7 +1028,7 @@
-
+
@@ -1042,7 +1042,7 @@
-
+
@@ -1056,7 +1056,7 @@
-
+
@@ -1064,9 +1064,9 @@
-
+
-
+
@@ -1077,9 +1077,9 @@
-
+
-
+
@@ -1097,23 +1097,23 @@
-
+
-
+
-
+
-
+
@@ -1127,14 +1127,14 @@
-
+
-
+
-
+
@@ -1201,7 +1201,7 @@
-
+
@@ -1209,9 +1209,9 @@
-
+
-
+
@@ -1221,13 +1221,13 @@
-
+
-
+
-
+
@@ -1867,7 +1867,7 @@
-
+
@@ -1888,9 +1888,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.behavior.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.behavior.mps
index 9a7030b5..32443172 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.behavior.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.behavior.mps
@@ -5,7 +5,7 @@
-
+
@@ -52,15 +52,16 @@
-
+
-
+
+
@@ -76,7 +77,7 @@
-
+
@@ -87,7 +88,6 @@
-
@@ -115,7 +115,7 @@
-
+
@@ -123,9 +123,9 @@
-
+
-
+
diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.editor.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.editor.mps
index 70c5baa6..4839e765 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.editor.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.editor.mps
@@ -42,7 +42,7 @@
-
+
diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.structure.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.structure.mps
index 37aa059a..da286a9e 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.structure.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.structure.mps
@@ -33,7 +33,7 @@
-
+
diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.mpl b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.mpl
index 44523e04..3f92015a 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.mpl
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco.codeowners/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.mpl
@@ -34,7 +34,7 @@
-
+
@@ -72,7 +72,6 @@
-
bf73e6d8-133f-42d0-a056-6fd1d29d022f(org.mpsqa.testcov.buildIntegration.jacoco)
0cf935df-4699-4e9c-a132-fa109541cba3(jetbrains.mps.build.mps)
@@ -81,7 +80,7 @@
-
+
diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps
index 2403eb11..ddcef48e 100644
--- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps
+++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps
@@ -28,6 +28,7 @@
+
@@ -71,7 +72,6 @@
-
@@ -111,10 +111,11 @@
+
-
+
@@ -127,12 +128,23 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -154,7 +166,6 @@
-
@@ -166,9 +177,6 @@
-
-
-
@@ -210,7 +218,7 @@
-
+
@@ -246,7 +254,7 @@
-
+
@@ -271,6 +279,7 @@
+
@@ -315,7 +324,7 @@
-
+
@@ -390,7 +399,7 @@
-
+
@@ -422,7 +431,6 @@
-
@@ -580,7 +588,7 @@
-
+
@@ -591,11 +599,11 @@
-
+
-
+
@@ -604,9 +612,9 @@
-
+
-
+
@@ -674,467 +682,772 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1144,67 +1457,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
@@ -1212,366 +1482,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
-
-
-
-
-
+
+
+
+
+
@@ -1579,504 +1504,154 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2097,132 +1672,118 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -2231,72 +1792,434 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-