From 27d8ec7bfa1e7c480cf1e7ab93fb01d1c0dc2245 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 20:11:39 +0100 Subject: [PATCH 01/18] mpsqa.treemap.lib: remove unused source root --- .../solutions/org.mpsqa.treemap.lib/org.mpsqa.treemap.lib.msd | 3 --- 1 file changed, 3 deletions(-) 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 40ab47f3..549bdc5a 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,9 +1,6 @@ - - - From 05a93148415e599cb7d616056e75d01f53c4324e Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 20:13:27 +0100 Subject: [PATCH 02/18] org.mpsqa.base: change classloading of stub solutions --- .../solutions/org.mpsqa.base.lib/org.mpsqa.base.lib.msd | 2 +- .../solutions/org.mpsqa.treemap.lib/org.mpsqa.treemap.lib.msd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 f8c1c17e..719904cd 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 @@ -11,7 +11,7 @@ - + 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 549bdc5a..91640603 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 @@ -9,7 +9,7 @@ - + From 8586f04da9a5ee68528fc2143e5b891f1eb777b6 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 20:27:31 +0100 Subject: [PATCH 03/18] fix broken references --- ....mps_lang.linters_library.performance_typesystem_rules.mps | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 eb99d11f..1787842d 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 @@ -649,7 +649,7 @@ - + @@ -1579,7 +1579,7 @@ - + From eee38b9c98fab24d699ec9e80ad347a0e9c8eed9 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 20:34:56 +0100 Subject: [PATCH 04/18] lint.generic: fix warnings and deprecated code --- .../org.mpsqa.lint.generic.behavior.mps | 155 +++++++------ .../models/org.mpsqa.lint.generic.editor.mps | 2 - .../org.mpsqa.lint.generic.typesystem.mps | 30 ++- .../org.mpsqa.lint.generic.mpl | 3 + ...int.generic.linters_library.filesystem.mps | 56 ----- ...a.lint.generic.linters_library.modules.mps | 44 +++- ...org.mpsqa.lint.generic.linters_library.msd | 1 + ....linters_library.performance_generator.mps | 2 +- ...s_lang.linters_library.behavior_aspect.mps | 3 - ...ang.linters_library.performance_editor.mps | 8 +- ...s_library.performance_typesystem_rules.mps | 208 +++++++++++------- ...lang.linters_library.performance_utils.mps | 122 +++++----- ...qa.lint.mps_lang.linters_library.tests.mps | 50 ++++- ...rg.mpsqa.lint.mps_lang.linters_library.msd | 1 + 14 files changed, 385 insertions(+), 300 deletions(-) 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 2a1fd468..bbf08405 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,6 +6,7 @@ + @@ -206,6 +207,9 @@ + + + @@ -1473,84 +1477,99 @@ - - - + + + - - - - - - - - - - - - - - - + + + + + + + + - - - - - + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + - - - - - - - - - + + + + - - - - @@ -1558,12 +1577,12 @@ - - + + - - + + @@ -2293,8 +2312,8 @@ - - + + 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 5bc0fc2f..d37f3ed0 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 @@ -15,8 +15,6 @@ - - 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 735cf47a..f5b447cc 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 @@ -11,6 +11,7 @@ + @@ -269,6 +270,9 @@ + + + @@ -2745,7 +2749,7 @@ - + @@ -3451,7 +3455,6 @@ - @@ -3463,12 +3466,12 @@ - + - + @@ -3730,6 +3733,7 @@ + @@ -3740,6 +3744,7 @@ + @@ -3765,6 +3770,7 @@ + @@ -3851,10 +3857,22 @@ + + + + + + + + + + + + @@ -4240,6 +4258,8 @@ + + @@ -4286,6 +4306,7 @@ + @@ -4297,6 +4318,7 @@ + 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 c1bab6a1..cfcfaab2 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 @@ -95,9 +95,11 @@ ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) b15468d9-435b-45b2-bf51-3f984f734cc4(org.mpsqa.lint.generic.runtime) + 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query) + @@ -153,6 +155,7 @@ + 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 33c90637..2d94ed03 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 @@ -271,62 +271,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 28382728..fb273a82 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 @@ -11,6 +11,7 @@ + @@ -34,6 +35,7 @@ + @@ -231,6 +233,9 @@ + + + @@ -5851,13 +5856,13 @@ - + - + @@ -5890,7 +5895,7 @@ - + @@ -5917,6 +5922,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -5947,13 +5972,8 @@ - - - - - - - + + @@ -6552,8 +6572,8 @@ - - + + 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 76123e8d..6fdcd696 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 @@ -28,6 +28,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 c16c70a9..7a8e5154 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 @@ -615,7 +615,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 01b4a652..fac0c25e 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 @@ -12,9 +12,6 @@ - - - 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 fe1a4612..d689c467 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 @@ -907,8 +907,9 @@ - + + @@ -2311,8 +2312,11 @@ - + + + + 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 1787842d..3d881d0b 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 @@ -22,6 +22,8 @@ + + @@ -436,7 +438,7 @@ - + @@ -451,7 +453,7 @@ - + @@ -468,7 +470,7 @@ - + @@ -512,11 +514,16 @@ - - + + + + + + + - + @@ -552,48 +559,63 @@ - - - + + + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + - - - - - + + - - - - - + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + @@ -1267,53 +1289,68 @@ - - - + + + - - - - + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -1412,7 +1449,7 @@ - + @@ -1427,7 +1464,7 @@ - + @@ -1444,7 +1481,7 @@ - + @@ -1488,11 +1525,16 @@ - - + + + + + + + - + 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 e94bf09f..0a456fa4 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 @@ -8,6 +8,7 @@ + @@ -205,6 +206,9 @@ + + + @@ -358,8 +362,8 @@ - - + + @@ -803,18 +807,30 @@ - - - - - - + + + + + + + + + + + + + + + + + + @@ -1002,7 +1018,7 @@ - + @@ -1186,10 +1202,10 @@ - + - + @@ -1482,9 +1498,9 @@ - + - + @@ -1492,6 +1508,23 @@ + + + + + + + + + + + + + + + + + @@ -1559,7 +1592,14 @@ - + + + + + + + + @@ -1613,8 +1653,8 @@ - - + + @@ -1629,8 +1669,8 @@ - - + + @@ -1660,44 +1700,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1857,8 +1859,8 @@ - - + + @@ -1894,8 +1896,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.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 43fa0a44..b770fa32 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 @@ -166,6 +166,7 @@ + @@ -297,18 +298,49 @@ - - + + - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -324,7 +356,7 @@ - + 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 28f8ba2b..f9fe48c1 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 @@ -36,6 +36,7 @@ + From 5f7f9a912f869ed2f1827b93c1e17d90ea5c6137 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 21:48:46 +0100 Subject: [PATCH 05/18] mpsqa.arch: fix warnings and deprecated code --- .../models/org.mpsqa.arch.editor.mps | 2 +- .../models/org.mpsqa.arch.util.mps | 77 +++++++------ .../org.mpsqa.arch.pluginSolution.plugin.mps | 101 ++++++++++++++---- .../org.mpsqa.arch.pluginSolution.msd | 1 + .../models/org.mpsqa.lint.test@tests.mps | 16 +++ 5 files changed, 143 insertions(+), 54 deletions(-) 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 1eacddd8..cebae177 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 @@ -1028,7 +1028,7 @@ - + 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 29a651d9..52e05eec 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 @@ -494,49 +494,64 @@ - - - + + + - - - - - + + + + + + + + + + + + + + + + - - - - - + + - - - - - - + + + + + - - + + + + + - - + + + + + + + + + + + + + + + - - - - - - - - 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 92762c95..e3a56d8b 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 @@ -10,6 +10,7 @@ + @@ -266,6 +267,7 @@ + @@ -314,6 +316,9 @@ + + + @@ -465,6 +470,7 @@ + @@ -493,8 +499,18 @@ - - + + + + + + + + + + + + @@ -589,6 +605,7 @@ + @@ -657,6 +674,7 @@ + @@ -1627,10 +1645,20 @@ - - - - + + + + + + + + + + + + + + @@ -1653,10 +1681,20 @@ - - - - + + + + + + + + + + + + + + @@ -1681,10 +1719,7 @@ - - - - + @@ -1692,6 +1727,9 @@ + + + @@ -2144,6 +2182,7 @@ + @@ -2260,17 +2299,21 @@ + - - - - - - + + + + + + + + + @@ -2501,6 +2544,7 @@ + @@ -3297,6 +3341,7 @@ + @@ -3521,6 +3566,7 @@ + @@ -3552,6 +3598,7 @@ + @@ -3580,8 +3627,18 @@ - - + + + + + + + + + + + + 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 2dffcc4e..e23e7d0b 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 @@ -23,6 +23,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 394afd6a..60039880 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 @@ -95,6 +95,10 @@ + + + + @@ -167,6 +171,10 @@ + + + + @@ -184,6 +192,10 @@ + + + + @@ -199,6 +211,10 @@ + + + + From 521d2ce6cc0331b236abd0dc6e5c868cf20d436f Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 22:04:58 +0100 Subject: [PATCH 06/18] mpsqa.clones: fix deprecated code --- .../models/ui.mps | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) 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 292f10d7..8d3cdd31 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 @@ -3190,6 +3190,7 @@ + @@ -3329,7 +3330,10 @@ - + + + + @@ -3527,7 +3531,10 @@ - + + + + @@ -3633,7 +3640,10 @@ - + + + + From 599d97540a1b2b3bd394df57ca1f1752691d41b0 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 22:14:21 +0100 Subject: [PATCH 07/18] mpsqa.deprecated: remove deprecated code --- .../org.mpsqa.deprecated.intentions.mps | 126 +++++++++++++++--- .../org.mpsqa.deprecated.mpl | 1 + 2 files changed, 112 insertions(+), 15 deletions(-) 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 72019f89..2d802e34 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 @@ -7,6 +7,7 @@ + @@ -22,6 +23,7 @@ + @@ -170,6 +172,9 @@ + + + @@ -544,6 +549,14 @@ + + + + + + + + @@ -735,6 +748,14 @@ + + + + + + + + @@ -1150,6 +1171,9 @@ + + + @@ -1218,6 +1242,9 @@ + + + @@ -1238,6 +1265,9 @@ + + + @@ -1258,6 +1288,9 @@ + + + @@ -1280,6 +1313,12 @@ + + + + + + @@ -1456,6 +1495,12 @@ + + + + + + @@ -1488,6 +1533,9 @@ + + + @@ -1506,6 +1554,9 @@ + + + @@ -1524,6 +1575,9 @@ + + + @@ -1639,6 +1693,12 @@ + + + + + + @@ -1660,12 +1720,20 @@ - - - + + + + + + + + - - + + + + + @@ -1766,6 +1834,12 @@ + + + + + + @@ -1787,12 +1861,20 @@ - - - + + + + + + + + - - + + + + + @@ -1878,6 +1960,12 @@ + + + + + + @@ -1899,12 +1987,20 @@ - - - + + + + + + + + - - + + + + + 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 9c035d27..347ccf6e 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 @@ -23,6 +23,7 @@ + From faaadc6e5037d08dc17467beb25b8b9d49b52634 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 22:17:14 +0100 Subject: [PATCH 08/18] mpsqa.mutant: fix warnings --- .../org.mpsqa.mutant.base.model_checkers.mps | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) 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 ff1a8736..e89fd0ad 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 @@ -15,6 +15,7 @@ + @@ -85,6 +86,7 @@ + @@ -169,6 +171,12 @@ + + + + + + @@ -203,6 +211,12 @@ + + + + + + @@ -291,6 +305,12 @@ + + + + + + @@ -412,6 +432,9 @@ + + + From 059f47544813db56cecb7fb7028fe9df76c7aea2 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 22:20:09 +0100 Subject: [PATCH 09/18] profile.generator: set correct classloading settings --- .../org.mpsqa.profile.generator.pluginSolution.msd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ef2bc6ec..4a26263d 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 @@ -6,7 +6,7 @@ - + From 96fe44956bb1b0793705245a1a6756e19b0637aa Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 22:22:22 +0100 Subject: [PATCH 10/18] mpsqa.test: removed unused jacoco sandbox --- .../org.mpsqa.testing/.mps/modules.xml | 1 - .../org.mpsqa.testcov.jacoco.sandbox.msd | 18 ------------------ 2 files changed, 19 deletions(-) delete mode 100644 code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.sandbox/org.mpsqa.testcov.jacoco.sandbox.msd diff --git a/code/languages/org.mpsqa.testing/.mps/modules.xml b/code/languages/org.mpsqa.testing/.mps/modules.xml index bf0001cb..fb9a5a0b 100644 --- a/code/languages/org.mpsqa.testing/.mps/modules.xml +++ b/code/languages/org.mpsqa.testing/.mps/modules.xml @@ -12,7 +12,6 @@ - diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.sandbox/org.mpsqa.testcov.jacoco.sandbox.msd b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.sandbox/org.mpsqa.testcov.jacoco.sandbox.msd deleted file mode 100644 index bea738a8..00000000 --- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.sandbox/org.mpsqa.testcov.jacoco.sandbox.msd +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - From 84a46b64cb2c64b4daac9d63db9065bcdc9bad87 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 22:37:58 +0100 Subject: [PATCH 11/18] mpsqa.testing: fix deprecated code and warnings --- ...ation.jacoco.codeowners.generator.util.mps | 7 ++- ...cov.buildIntegration.jacoco.codeowners.mpl | 1 + .../models/org.mpsqa.gentest.baseline.mps | 21 ++++++-- .../org.mpsqa.gentest.baseline.msd | 1 + ...egration.jacoco.codeowners.tests@tests.mps | 48 ++++++++++++++----- .../org.mpsqa.testcov.jacoco.rt.plugin.mps | 2 + ....mpsqa.testcov.jacoco.rt.visualization.mps | 5 +- 7 files changed, 65 insertions(+), 20 deletions(-) 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 ed3c676a..f45c528e 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 @@ -9,6 +9,7 @@ + @@ -212,6 +213,9 @@ + + + @@ -972,7 +976,6 @@ - @@ -980,7 +983,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 0effb02a..f212f2b5 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 @@ -33,6 +33,7 @@ + diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/models/org.mpsqa.gentest.baseline.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/models/org.mpsqa.gentest.baseline.mps index 93eb8812..53a53ef9 100644 --- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/models/org.mpsqa.gentest.baseline.mps +++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/models/org.mpsqa.gentest.baseline.mps @@ -9,6 +9,7 @@ + @@ -22,6 +23,7 @@ + @@ -204,6 +206,9 @@ + + + @@ -479,8 +484,8 @@ - - + + @@ -1170,11 +1175,15 @@ - + + + + + @@ -1186,11 +1195,15 @@ - + + + + + diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/org.mpsqa.gentest.baseline.msd b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/org.mpsqa.gentest.baseline.msd index 8a868235..5ef4bcdc 100644 --- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/org.mpsqa.gentest.baseline.msd +++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.gentest.baseline/org.mpsqa.gentest.baseline.msd @@ -19,6 +19,7 @@ + diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests@tests.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests@tests.mps index 3a0d8103..877cbbbe 100644 --- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests@tests.mps +++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests/models/org.mpsqa.testcov.buildIntegration.jacoco.codeowners.tests@tests.mps @@ -20,6 +20,7 @@ + @@ -27,6 +28,7 @@ + @@ -63,6 +65,9 @@ + + + @@ -131,6 +136,9 @@ + + + @@ -421,7 +429,6 @@ - @@ -431,19 +438,34 @@ - - - - - - - - - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.plugin.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.plugin.mps index c3ee0ddf..7c6b85a8 100644 --- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.plugin.mps +++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.plugin.mps @@ -36,6 +36,7 @@ + @@ -201,6 +202,7 @@ + diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps index eb785400..0590decb 100644 --- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps +++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps @@ -1561,8 +1561,11 @@ - + + + + From f61af74f7dd4c214f59ece23d2d4623ad68531d8 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 22:43:15 +0100 Subject: [PATCH 12/18] mpsqa.unused: fix warnings and deprecated code --- .../org.mpsqa.invisible_models.intentions.mps | 32 +++++++++----- .../org.mpsqa.lancov.fragments.editor.mps | 4 +- ...a.lancov.generator.templates@generator.mps | 24 ----------- .../org.mpsqa.lancov/org.mpsqa.lancov.mpl | 43 ------------------- 4 files changed, 24 insertions(+), 79 deletions(-) delete mode 100644 code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/generator/templates/org.mpsqa.lancov.generator.templates@generator.mps diff --git a/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.intentions.mps b/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.intentions.mps index 6a94c3d2..518e5b5e 100644 --- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.intentions.mps +++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.invisible_models/models/org.mpsqa.invisible_models.intentions.mps @@ -92,7 +92,6 @@ - @@ -169,6 +168,9 @@ + + + @@ -195,6 +197,9 @@ + + + @@ -302,8 +307,11 @@ - + + + + @@ -596,14 +604,8 @@ - - - - - - - - + + @@ -611,6 +613,16 @@ + + + + + + + + + + diff --git a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov.fragments/models/org.mpsqa.lancov.fragments.editor.mps b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov.fragments/models/org.mpsqa.lancov.fragments.editor.mps index c0618461..39a4e25e 100644 --- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov.fragments/models/org.mpsqa.lancov.fragments.editor.mps +++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov.fragments/models/org.mpsqa.lancov.fragments.editor.mps @@ -333,9 +333,9 @@ - + - + diff --git a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/generator/templates/org.mpsqa.lancov.generator.templates@generator.mps b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/generator/templates/org.mpsqa.lancov.generator.templates@generator.mps deleted file mode 100644 index 4d8b18df..00000000 --- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/generator/templates/org.mpsqa.lancov.generator.templates@generator.mps +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/org.mpsqa.lancov.mpl b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/org.mpsqa.lancov.mpl index 748c1e65..6d2f388e 100644 --- a/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/org.mpsqa.lancov.mpl +++ b/code/languages/org.mpsqa.unused/languages/org.mpsqa.lancov/org.mpsqa.lancov.mpl @@ -11,49 +11,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) From f730f1b13536955915a0e1a575c1cf4d48658d38 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 22:48:54 +0100 Subject: [PATCH 13/18] mpsqa.clones.demo: run migrations --- .../org.mpsqa.clones.demo/code/.mps/migration.xml | 3 ++- .../solutions/org.mpsqa.clones.demo.build/models/build.mps | 6 +++--- .../org.mpsqa.clones.demo.build.msd | 6 ++++-- .../org.mpsqa.clones.demo.config.msd | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) 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 d62e30e5..5524d8e3 100644 --- a/code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml +++ b/code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml @@ -11,6 +11,7 @@ - + + \ 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 26aba660..9e433dd8 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 @@ -3,7 +3,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -263,7 +263,7 @@ - + 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 7b9507e6..30732778 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 @@ -6,7 +6,7 @@ - + @@ -14,15 +14,17 @@ 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) + 5e8cea6b-997f-49b1-a8d8-dc2a7a6fa657(org.mpsqa.base.build) - + + 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 10c524fc..c9162d4a 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 @@ -6,7 +6,7 @@ - + From be9691747b012f8736ba82ad3506ec4553c15a11 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 22:50:17 +0100 Subject: [PATCH 14/18] mpsqa.profile: remove a broken comment --- ...mpsqa.profile.generator.pluginSolution.plugin.mps | 12 ------------ 1 file changed, 12 deletions(-) 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 6d121cb7..8bcd633d 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 @@ -1625,18 +1625,6 @@ - - - - - - - - - - - - From 787784a02821857a7dedde09b15db89053d4331b Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 22:52:34 +0100 Subject: [PATCH 15/18] mpsqa.lint: add a missing NullCheck --- ...qa.lint.generic.linters_library.models.mps | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) 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 5fd0f459..19e807f4 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 @@ -1935,14 +1935,22 @@ - - - - - - - - + + + + + + + + + + + + + + + + From 8398c7b67a741648ed37e26332e2d84a55be1867 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 23:04:12 +0100 Subject: [PATCH 16/18] update the build script --- build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 24f9120a..428d115a 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ plugins { id 'de.itemis.mps.gradle.launcher' version '2.5.2.+' } -ext.jbrVers = '17.0.8.1-b1000.32' +ext.jbrVers = '17.0.11-b1207.30' downloadJbr { jbrVersion = jbrVers @@ -27,9 +27,11 @@ if (System.env.CI != null && System.env.CI.toBoolean()) { ext.ciBuild = project.hasProperty("teamcity") } +ext.mpsVersion = '2024.1.1' + // Project versions -ext.major = '999' -ext.minor = '9' +ext.major = '2024' +ext.minor = '1' if (ciBuild) { String branch = GitBasedVersioning.gitBranch @@ -54,9 +56,7 @@ configurations { } dependencies { - // Use the following dependency for published releases: - // mps 'com.jetbrains:mps:2024.1' - mps 'com.jetbrains.mps:mps-prerelease:241.19072.10578' + mps "com.jetbrains:mps:$mpsVersion" antLib "org.apache.ant:ant-junit:1.10.15" antLib "org.jacoco:org.jacoco.ant:0.8.12" } From 91d411ea1aae0a49bd872b4bef7db3e324473e91 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Sun, 10 Nov 2024 23:07:02 +0100 Subject: [PATCH 17/18] update the unused build script --- .../org.mpsqa.build._050_unused_build.mps | 34 +------------------ 1 file changed, 1 insertion(+), 33 deletions(-) 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 09ee2756..6955d751 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 @@ -107,16 +107,13 @@ - - - - + @@ -300,35 +297,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 20e8b149dbd1bf78a8feabe96f822d7a1157f871 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 11 Nov 2024 08:19:34 +0100 Subject: [PATCH 18/18] force save all --- .../languages/org.mpsqa.arch/models/org.mpsqa.arch.editor.mps | 2 +- ...psqa.lint.mps_lang.linters_library.performance_generator.mps | 2 +- ...rg.mpsqa.lint.mps_lang.linters_library.performance_utils.mps | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 cebae177..7bf851b3 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 @@ -985,7 +985,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 7a8e5154..c8f4bcf1 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 @@ -803,7 +803,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_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 0a456fa4..f0469121 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 @@ -1355,7 +1355,7 @@ - +