From 6eb6379d7a31212d9f5a5d7244ced48866819196 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 18 Sep 2024 13:15:03 +0200 Subject: [PATCH 01/42] mpsqa.arch: fix model access for both actions --- .../org.mpsqa.arch.pluginSolution.plugin.mps | 160 +++++++++++++----- .../org.mpsqa.arch.pluginSolution.msd | 9 +- 2 files changed, 121 insertions(+), 48 deletions(-) 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 28f1b391..e36e9fcd 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 @@ -8,6 +8,7 @@ + @@ -23,6 +24,8 @@ + + @@ -61,6 +64,7 @@ + @@ -275,6 +279,14 @@ + + + + + + + + @@ -414,6 +426,7 @@ + @@ -433,32 +446,56 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + @@ -491,6 +528,11 @@ + + + + + @@ -3069,6 +3111,7 @@ + @@ -3088,32 +3131,56 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + @@ -3146,6 +3213,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 fa4dea5c..7cdfab43 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 @@ -4,12 +4,12 @@ - - - - + + + + @@ -38,6 +38,7 @@ + From e8bf8d3cb58098fd2fc9315aa1296620e2e8471e Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 18 Sep 2024 13:23:42 +0200 Subject: [PATCH 02/42] mpsqa.arch: fix refreshing of the plantUML diagram --- .../org.mpsqa.arch.pluginSolution.plugin.mps | 93 +++++++++++++++++-- 1 file changed, 85 insertions(+), 8 deletions(-) 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 e36e9fcd..87c1259e 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 @@ -26,10 +26,10 @@ + - @@ -923,6 +923,16 @@ + + + + + + + + + + @@ -1389,6 +1399,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3076,15 +3127,41 @@ - - - + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + From 47bb22d7eacda2d85486dee3f8435ff2324e78bf Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 18 Sep 2024 13:46:57 +0200 Subject: [PATCH 03/42] mpsqa.arch: improve scaling quality and add support for HiDPI --- .../org.mpsqa.arch.pluginSolution.plugin.mps | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) 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 87c1259e..f14f2f9b 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 @@ -25,6 +25,8 @@ + + @@ -1321,28 +1323,21 @@ - - - - + + + + - - + + + + - - - - - - - - - - - - + + + @@ -1358,9 +1353,19 @@ - - - + + + + + + + + + + + + + From fcee767a128fdf0f23f5c67abfe1a90ba07c500f Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 18 Sep 2024 14:24:29 +0200 Subject: [PATCH 04/42] mpsqa.arch: small improvements + add a refresh button --- .../models/org.mpsqa.arch.editor.mps | 64 +- .../org.mpsqa.arch.pluginSolution.plugin.mps | 754 +++++++++++++----- .../org.mpsqa.arch.pluginSolution.msd | 4 + 3 files changed, 618 insertions(+), 204 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 8996fab3..435ed3b6 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 @@ -10,9 +10,11 @@ + + @@ -50,6 +52,9 @@ + + + @@ -85,12 +90,14 @@ + + @@ -164,6 +171,7 @@ + @@ -223,6 +231,10 @@ + + + + @@ -530,7 +542,7 @@ - + @@ -689,20 +701,29 @@ - - - - + + + + + + + + + - + + + + + @@ -710,8 +731,6 @@ - - @@ -782,10 +801,11 @@ - + + @@ -795,15 +815,35 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + 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 f14f2f9b..7725f748 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 @@ -27,7 +27,11 @@ - + + + + + @@ -35,15 +39,22 @@ - - + + - - + + - - - + + + + + + + + + + @@ -182,6 +193,18 @@ + + + + + + + + + + + + @@ -245,6 +268,7 @@ + @@ -376,13 +400,6 @@ - - - - - - - @@ -433,14 +450,30 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -458,27 +491,8 @@ - - - - - - - - - - - - - - - - - - - - - + + @@ -496,7 +510,7 @@ - + @@ -510,6 +524,9 @@ + + + @@ -549,7 +566,14 @@ - + + + + + + + + @@ -587,6 +611,19 @@ + + + + + + + + + + + + + @@ -599,6 +636,12 @@ + + + + + + @@ -675,18 +718,9 @@ - - - - - - - - - - - - + + + @@ -707,6 +741,23 @@ + + + + + + + + + + + + + + + + + @@ -728,38 +779,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -770,6 +793,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -988,6 +1031,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -998,10 +1118,14 @@ - + + + + + @@ -1014,13 +1138,17 @@ - + + + + + @@ -1445,6 +1573,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1530,8 +1815,13 @@ - - + + + + + + + @@ -1554,30 +1844,22 @@ - - - - - + + - - - - + + + + + + + - - - - - - - - @@ -1605,8 +1887,13 @@ - - + + + + + + + @@ -1618,31 +1905,23 @@ - - - - + - - - - + + + + + + + + - - - - - - - - - @@ -1655,13 +1934,11 @@ - - - - - - - + + + + + @@ -1807,11 +2084,8 @@ - - - - - + + @@ -1893,8 +2167,13 @@ - - + + + + + + + @@ -1984,6 +2263,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2002,16 +2330,8 @@ - - - - - - - - - + @@ -2047,8 +2367,13 @@ - - + + + + + + + @@ -2179,13 +2504,11 @@ - - - - - - - + + + + + @@ -2950,13 +3273,26 @@ - - - - + + + + + + + + + + + + + + - - + + + + + @@ -2967,9 +3303,12 @@ - - - + + + + + + @@ -3126,6 +3465,9 @@ + + + @@ -3183,6 +3525,12 @@ + + + + + + @@ -3198,14 +3546,30 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -3223,27 +3587,8 @@ - - - - - - - - - - - - - - - - - - - - - + + @@ -3261,7 +3606,7 @@ - + @@ -3275,6 +3620,9 @@ + + + @@ -3312,5 +3660,27 @@ + + + + + + + + + + + + + + + + + + + + + + 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 7cdfab43..7c250435 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 @@ -29,6 +29,8 @@ 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) + 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) @@ -54,6 +56,8 @@ + + From 372b54725bd9ea6ea5d1e1726e00339b9720f027 Mon Sep 17 00:00:00 2001 From: mps-ci-buildbot Date: Wed, 18 Sep 2024 17:38:08 +0200 Subject: [PATCH 05/42] Merge maintenance/MPS-2022.2 into maintenance/MPS-2022.3 (#190) * errors_suppressors.plugin: ensure error messages are normalized * errors_suppressors.plugin: trimming line breaks with whitespace Co-authored-by: Alexander Rimer --- ...rrors_suppressor.pluginSolution.plugin.mps | 448 ++++++++++-------- 1 file changed, 256 insertions(+), 192 deletions(-) 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 67ef32a2..d4a9575e 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,6 +1,7 @@ + @@ -12,6 +13,8 @@ + + @@ -26,11 +29,11 @@ + - @@ -141,6 +144,7 @@ + @@ -715,6 +719,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -809,10 +860,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -928,53 +1029,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1209,155 +1266,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - @@ -1637,5 +1552,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2399d297d432bfcc849988600746d139035f7449 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 18 Sep 2024 15:12:57 +0200 Subject: [PATCH 06/42] mpsqa.arch: better deal with incomplete input --- .../models/org.mpsqa.arch.behavior.mps | 328 ++++++++++++------ .../models/org.mpsqa.arch.constraints.mps | 68 +++- .../models/org.mpsqa.arch.editor.mps | 2 +- .../models/org.mpsqa.arch.typesystem.mps | 56 ++- .../org.mpsqa.arch.pluginSolution.plugin.mps | 2 +- .../org.mpsqa.arch.pluginSolution.msd | 3 +- .../org.mpsqa.build._080_lint_build.mps | 3 + 7 files changed, 336 insertions(+), 126 deletions(-) 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 d8b04d9f..b9ff49bf 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 @@ -22,6 +22,7 @@ + @@ -81,6 +82,7 @@ + @@ -146,6 +148,10 @@ + + + + @@ -166,6 +172,9 @@ + + + @@ -228,6 +237,7 @@ + @@ -690,7 +700,26 @@ - + + + + + + + + + + + + + + + + + + + + @@ -759,40 +788,27 @@ - - - - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + - + - + - + @@ -1097,7 +1113,26 @@ - + + + + + + + + + + + + + + + + + + + + @@ -1169,40 +1204,30 @@ - - - - - + + + + + - - - - - - - - - - - - - - - - - + + + + + + + - + - + - + @@ -1505,6 +1530,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1513,16 +1576,8 @@ - - - - - - - - - - + + @@ -1562,6 +1617,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1571,41 +1653,29 @@ - - - - - - - - - - - + + + + - - - - - - - - - - - - + + + + + + + - + - - - - - + + + + + - + @@ -1613,14 +1683,13 @@ - + - + - @@ -1659,8 +1728,8 @@ - - + + @@ -1677,6 +1746,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 535ac03e..bbf56ce7 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 @@ -16,6 +16,7 @@ + @@ -41,6 +42,7 @@ + @@ -56,6 +58,7 @@ + @@ -83,6 +86,10 @@ + + + + @@ -108,7 +115,20 @@ + + + + + + + + + + + + + @@ -166,20 +186,52 @@ - - - - - - - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + 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 435ed3b6..a40dafb4 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 @@ -732,7 +732,7 @@ - + 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 1ea2a401..ae87e767 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 @@ -234,6 +234,10 @@ + + + + @@ -262,6 +266,9 @@ + + + @@ -1642,20 +1649,37 @@ - + - - - - + + + + + + + + + + + + + - - + + - - - + + + + + + + + + + + @@ -1665,18 +1689,18 @@ - - - + + + - + - + - + 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 7725f748..98b5b9e8 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 @@ -29,8 +29,8 @@ - + 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 7c250435..23229811 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,7 +1,7 @@ - + @@ -30,7 +30,6 @@ 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench) - 39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty) 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 9e7ff829..9911f890 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 @@ -242,6 +242,9 @@ + + + From e1a74e4dbbbbd90de5d63304abf8ab8d64540f19 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 19 Sep 2024 11:22:12 +0200 Subject: [PATCH 07/42] mpsqa.arch: show the number of references better in the editor --- .../models/org.mpsqa.arch.behavior.mps | 64 +++++ .../models/org.mpsqa.arch.editor.mps | 240 +++++++++++------- .../models/org.mpsqa.arch.intentions.mps | 2 +- .../models/org.mpsqa.arch.typesystem.mps | 75 +++--- .../models/org.mpsqa.arch.util.mps | 182 +++++++------ .../org.mpsqa.arch/org.mpsqa.arch.mpl | 2 + 6 files changed, 334 insertions(+), 231 deletions(-) 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 b9ff49bf..e767177a 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 @@ -57,6 +57,9 @@ + + + @@ -101,6 +104,7 @@ + @@ -186,6 +190,9 @@ + + + @@ -1977,5 +1984,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 a40dafb4..fa17d448 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 @@ -11,23 +11,24 @@ + + + + + - + + - - - - - - - + + @@ -162,6 +163,9 @@ + + + @@ -179,9 +183,6 @@ - - - @@ -197,6 +198,7 @@ + @@ -227,8 +229,6 @@ - - @@ -267,17 +267,10 @@ - - - - - - - @@ -286,8 +279,8 @@ - - + + @@ -400,18 +393,7 @@ - - - - - - - - - - - - + @@ -423,80 +405,162 @@ + + + - - - - + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + 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 2b7734e5..bc160522 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 @@ -533,7 +533,7 @@ - + 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 ae87e767..b2529447 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 @@ -21,12 +21,8 @@ - - - - - - + + @@ -98,9 +94,6 @@ - - - @@ -238,7 +231,6 @@ - @@ -2012,17 +2004,6 @@ - - - - - - - - - - - @@ -2045,8 +2026,12 @@ + + + + @@ -2064,14 +2049,6 @@ - - - - - - - - @@ -2109,6 +2086,14 @@ + + + + + + + + @@ -2132,14 +2117,6 @@ - - - - - - - - @@ -2193,6 +2170,14 @@ + + + + + + + + @@ -2216,14 +2201,6 @@ - - - - - - - - @@ -2305,6 +2282,14 @@ + + + + + + + + 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 337a4a17..4e8834e3 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 @@ -10,30 +10,31 @@ - - - - - - - + + + + - - + + - - + + + + + + + + + + - - - - @@ -47,7 +48,6 @@ - @@ -69,7 +69,6 @@ - @@ -209,20 +208,8 @@ - - - - - - - - - - - - @@ -603,25 +590,6 @@ - - - - - - - - - - - - - - - - - - - @@ -747,32 +715,31 @@ - - - - + + + + + + + + - - + + + + + - - + + + + + - - - - - - - - - - - @@ -785,6 +752,9 @@ + + + @@ -794,12 +764,12 @@ - - + + - - + + @@ -834,23 +804,21 @@ - - - - - - - - - - + + + + - - - - - - + + + + + + + + + + @@ -1193,17 +1161,15 @@ - - - - + + + + - - - - - - + + + + @@ -1236,5 +1202,27 @@ + + + + + + + + + + + + + + + + + + + + + + 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 4e8f3ff0..825ea08a 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 @@ -21,6 +21,7 @@ 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text) 86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project) + 20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine) @@ -83,6 +84,7 @@ + From e2ad49a43d74396eb09b79a6f249b4aad56e2f91 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Fri, 20 Sep 2024 07:38:14 +0200 Subject: [PATCH 08/42] mpsqa.arch: use simpler terms --- .../org.mpsqa.arch/models/org.mpsqa.arch.editor.mps | 4 ++-- .../org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps | 6 +++--- .../languages/org.mpsqa.arch/models/org.mpsqa.arch.util.mps | 2 +- .../models/org.mpsqa.arch.pluginSolution.plugin.mps | 6 +++--- 4 files changed, 9 insertions(+), 9 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 fa17d448..1ef6de8b 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 @@ -1117,7 +1117,7 @@ - + @@ -1126,7 +1126,7 @@ - + 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 bc160522..46acecbc 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 @@ -533,13 +533,13 @@ - + - + @@ -548,7 +548,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 4e8834e3..b6d4af34 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 @@ -1127,7 +1127,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 98b5b9e8..90db2f20 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 @@ -444,7 +444,7 @@ - + @@ -3126,7 +3126,7 @@ - + @@ -3540,7 +3540,7 @@ - + From 4708e86c8f1832b43d3dd7b9361a01167a01f46a Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Fri, 20 Sep 2024 07:46:28 +0200 Subject: [PATCH 09/42] mpsqa.arch: improve tests --- ...qa.arch._010_simple_dependencies@tests.mps | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) 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 336e2b2d..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 @@ -149,14 +149,23 @@ - - - + + + + + + + + + + + + @@ -194,14 +203,23 @@ - - - + + + + + + + + + + + + From 4a7c4be5d96b6811661779a2d7467945cec3bbd9 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 23 Sep 2024 08:11:00 +0200 Subject: [PATCH 10/42] mpsqa.lint: fix linter results location info --- .../org.mpsqa.lint.generic.behavior.mps | 514 ++++++++++++++---- .../models/org.mpsqa.lint.generic.editor.mps | 229 ++++++-- .../org.mpsqa.lint.generic.structure.mps | 5 + .../org.mpsqa.lint.generic.typesystem.mps | 42 +- 4 files changed, 636 insertions(+), 154 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 cc13ad59..fe9f90cd 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 @@ -24,6 +24,9 @@ + + + @@ -57,6 +60,9 @@ + + + @@ -74,6 +80,7 @@ + @@ -84,6 +91,9 @@ + + + @@ -131,6 +141,7 @@ + @@ -142,9 +153,18 @@ + + + + + + + + + @@ -716,7 +736,7 @@ - + @@ -731,14 +751,44 @@ - - + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + @@ -1340,108 +1390,174 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + - - - - + + + + - - - - - - - - - + + + - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + - - - - + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - + + + + @@ -1669,38 +1785,246 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 f5d0bff2..bdae3985 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 @@ -19,6 +19,7 @@ + @@ -143,6 +144,12 @@ + + + + + + @@ -210,6 +217,7 @@ + @@ -309,6 +317,7 @@ + @@ -317,6 +326,10 @@ + + + + @@ -1055,53 +1068,112 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1110,17 +1182,76 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps index c683a6a5..6ab46108 100644 --- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps +++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps @@ -220,6 +220,11 @@ + + + + + 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 6c478a47..ee89926c 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 @@ -3864,12 +3864,24 @@ - - - + + + + + + + + + + + + + + + - - + + @@ -3955,12 +3967,22 @@ - - - + + + + + + + + + + + + + - - + + From 13abac1ccbd322ee250cba53b4d50d32d269818f Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 23 Sep 2024 09:17:37 +0200 Subject: [PATCH 11/42] mpsqa.lint: add support for returning files as results --- .../org.mpsqa.lint.generic.behavior.mps | 170 ++++++++++----- .../models/org.mpsqa.lint.generic.editor.mps | 203 +++++++++++++++++- ...int.generic.linters_library.filesystem.mps | 126 +++++++---- 3 files changed, 388 insertions(+), 111 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 fe9f90cd..204a722c 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 @@ -27,6 +27,7 @@ + @@ -35,6 +36,12 @@ + + + + + + @@ -465,6 +472,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1870,7 +1910,6 @@ - @@ -1920,50 +1959,55 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - - + + + - - - + + + @@ -1984,28 +2028,33 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + @@ -2013,11 +2062,14 @@ - - - - + + + + + + + @@ -2027,6 +2079,10 @@ + + + + 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 bdae3985..0d16bcf8 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 @@ -17,6 +17,8 @@ + + @@ -25,8 +27,15 @@ + + + + + + + @@ -39,6 +48,7 @@ + @@ -97,6 +107,16 @@ + + + + + + + + + + @@ -117,6 +137,7 @@ + @@ -171,6 +192,9 @@ + + + @@ -192,6 +216,7 @@ + @@ -277,10 +302,18 @@ + + + + + + + + @@ -308,6 +341,12 @@ + + + + + + @@ -1188,18 +1227,24 @@ + - - - - - - - - + + + + + + + + + + + + + @@ -1231,6 +1276,7 @@ + @@ -1777,5 +1823,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 12bf30b5..2c752306 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 @@ -23,6 +23,8 @@ + + @@ -139,6 +141,7 @@ + @@ -256,11 +259,23 @@ - + + + + + + + - - + + + + + + + + @@ -338,9 +353,15 @@ - - - + + + + + + + + + @@ -354,56 +375,69 @@ - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + - - - - - - - - - - - + + - - - + + + - - + + + + + + + @@ -424,7 +458,7 @@ - + From 2ed5003c269e6696fbe28d2364f8a8be1265f5d1 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 23 Sep 2024 09:39:59 +0200 Subject: [PATCH 12/42] mpsqa.lint: make it possible to also open model and module locations --- .../org.mpsqa.lint.generic.behavior.mps | 547 +++++++++++++++--- .../models/org.mpsqa.lint.generic.editor.mps | 148 +---- 2 files changed, 495 insertions(+), 200 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 204a722c..50ea576f 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 @@ -28,6 +28,9 @@ + + + @@ -44,6 +47,7 @@ + @@ -58,6 +62,10 @@ + + + + @@ -92,8 +100,16 @@ + + + + + + + + @@ -125,6 +141,7 @@ + @@ -141,6 +158,13 @@ + + + + + + + @@ -222,6 +246,12 @@ + + + + + + @@ -1907,52 +1937,129 @@ - - - - - - + + + + + + + + + - + - + - - - + + + - - + + - + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + @@ -1965,7 +2072,7 @@ - + @@ -1990,7 +2097,7 @@ - + @@ -2012,55 +2119,66 @@ - - - - - - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - + + - - - - - + + + + + + + + + + + + + + + + + + + - + @@ -2084,6 +2202,301 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 0d16bcf8..6a47fdb9 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 @@ -192,9 +192,6 @@ - - - @@ -216,7 +213,6 @@ - @@ -302,18 +298,10 @@ - - - - - - - - @@ -341,12 +329,6 @@ - - - - - - @@ -1831,94 +1813,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -1929,33 +1832,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + From cc41cea4f14c8331bfa63dc742eefdf34451a7e2 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 23 Sep 2024 09:40:53 +0200 Subject: [PATCH 13/42] force save all + update build script --- .../org.mpsqa.build._080_lint_build.mps | 3 ++ .../org.mpsqa.lint.generic.behavior.mps | 44 ++++++++++--------- ...qa.lint.generic.linters_library.models.mps | 7 +-- 3 files changed, 28 insertions(+), 26 deletions(-) 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 9e7ff829..eec60830 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 @@ -242,6 +242,9 @@ + + + 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 50ea576f..079d9287 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 @@ -833,29 +833,31 @@ - - - - - + + + + + + + + + + - - + + - - - - - - - - - - - - - + + + + + + + + + + @@ -2296,7 +2298,7 @@ - + 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 cc9e77a1..3c74fb1e 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 @@ -61,9 +61,6 @@ - - - @@ -3080,8 +3077,8 @@ - - + + From 2cb736e8346c7c72367e1048d434f9a5fee02579 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 23 Sep 2024 10:49:51 +0200 Subject: [PATCH 14/42] mpsqa.lint: fix error reporting of existing linters --- .../models/org.mpsqa.lint.generic.editor.mps | 4 +- ...int.generic.linters_library.filesystem.mps | 41 +--- ...psqa.lint.generic.linters_library.meta.mps | 112 ++++------ ...a.lint.generic.linters_library.modules.mps | 145 +++++++----- ...sqa.lint.generic.linters_library.nodes.mps | 209 +----------------- ...andbox._010_smoke_user_defined_linters.mps | 108 +++++---- .../org.mpsqa.lint.generic.sandbox.msd | 1 + ...s_lang.linters_library.behavior_aspect.mps | 59 +---- ...mps_lang.linters_library.build_scripts.mps | 23 +- ...ang.linters_library.performance_editor.mps | 121 ++++------ ...linters_library.performance_typesystem.mps | 28 ++- ...lang.linters_library.performance_utils.mps | 81 ++++--- ..._lang.linters_library.structure_aspect.mps | 20 +- ...qa.lint.mps_lang.linters_library.tests.mps | 111 +++++++--- ...lang.linters_library.typesystem_aspect.mps | 58 +---- 15 files changed, 396 insertions(+), 725 deletions(-) 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 6a47fdb9..1b6a639f 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 @@ -1192,8 +1192,8 @@ - - + + 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 2c752306..76035fb7 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 @@ -167,9 +167,6 @@ - - - @@ -389,42 +386,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 1a40461b..dc140b15 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 @@ -14,6 +14,7 @@ + @@ -38,6 +39,9 @@ + + + @@ -52,7 +56,6 @@ - @@ -62,6 +65,12 @@ + + + + + + @@ -120,7 +129,6 @@ - @@ -205,11 +213,19 @@ - + + + + + - + + + + + @@ -364,37 +380,15 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - + + @@ -571,11 +565,19 @@ - + + + + + - + + + + + @@ -658,37 +660,15 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - + + 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 69277fec..08d1af90 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 @@ -34,6 +34,7 @@ + @@ -1113,11 +1114,23 @@ - + + + + + + + - + + + + + + + @@ -1177,9 +1190,16 @@ - - - + + + + + + + + + + @@ -1256,17 +1276,12 @@ - - - - - - - - + + + - - + + @@ -1387,7 +1402,7 @@ - + @@ -1452,18 +1467,33 @@ - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + - - - @@ -2517,7 +2547,7 @@ - + @@ -3053,21 +3083,8 @@ - - - - - - - - - - - - - - - + + @@ -3149,21 +3166,8 @@ - - - - - - - - - - - - - - - + + @@ -5666,11 +5670,23 @@ - + + + + + + + - + + + + + + + @@ -5756,8 +5772,17 @@ - - + + + + + + + + + + + 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 75bb68a5..9b301540 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 @@ -182,18 +182,12 @@ - - - - - - @@ -213,7 +207,6 @@ - @@ -2116,53 +2109,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2172,51 +2118,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + @@ -2712,104 +2625,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2819,8 +2634,8 @@ - - + + 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 60115e7c..e2dda947 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 @@ -21,6 +21,7 @@ + @@ -53,6 +54,7 @@ + @@ -124,9 +126,6 @@ - - - @@ -510,11 +509,23 @@ - + + + + + + + - + + + + + + + @@ -571,9 +582,16 @@ - - - + + + + + + + + + + @@ -716,61 +734,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + - - - + + + - - + + + + + + + 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 6afa64ae..aefd060d 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 @@ -20,6 +20,7 @@ 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime) 215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) 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 bef40159..33cfa864 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 @@ -22,7 +22,6 @@ - @@ -119,13 +118,9 @@ - - - - @@ -770,58 +765,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.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 0ae44d4d..d5cda7a4 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 @@ -80,7 +80,6 @@ - @@ -105,10 +104,6 @@ - - - - @@ -126,7 +121,6 @@ - @@ -468,21 +462,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.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 4375b5c2..9a38f97d 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 @@ -191,6 +191,9 @@ + + + @@ -207,12 +210,6 @@ - - - - - - @@ -1146,12 +1143,24 @@ - - - - - - + + + + + + + + + + + + + + + + + + @@ -2087,36 +2096,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -2226,12 +2207,24 @@ - - - - - - + + + + + + + + + + + + + + + + + + @@ -2261,36 +2254,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.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 2361b594..c197097c 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 @@ -973,11 +973,19 @@ - + + + + + - + + + + + @@ -1273,11 +1281,23 @@ - + + + + + + + - + + + + + + + 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 c930c94e..e921acc5 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 @@ -438,31 +438,24 @@ - - - - - - - - - - - - - - + + + + + + + + + + - - + + - - - - - + + @@ -509,7 +502,13 @@ - + + + + + + + @@ -672,29 +671,25 @@ - - - - - - - + + + + + + + + + - + - - - - - + + - - - - - + + @@ -743,7 +738,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.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 e8451222..10a7c4a9 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 @@ -58,7 +58,6 @@ - @@ -380,23 +379,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 f8c41502..7231e192 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 @@ -19,15 +19,22 @@ + + + + + + + @@ -55,7 +62,6 @@ - @@ -70,12 +76,10 @@ + - - - - + @@ -137,6 +141,9 @@ + + + @@ -144,8 +151,20 @@ - + + + + + + + + + + + + + @@ -155,6 +174,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -171,6 +215,7 @@ + @@ -417,39 +462,39 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + 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 fd881b0e..c7a126ab 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 @@ -14,12 +14,10 @@ - - @@ -60,7 +58,6 @@ - @@ -77,10 +74,6 @@ - - - - @@ -113,13 +106,9 @@ - - - - @@ -264,41 +253,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -395,11 +351,6 @@ - - - - - @@ -560,6 +511,11 @@ + + + + + From d14ec373c053b23f65f04108c5fab69aaa67298f Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 23 Sep 2024 11:03:28 +0200 Subject: [PATCH 15/42] mpsqa.lint: show a better error message when an exception occurs --- .../models/org.mpsqa.lint.generic.typesystem.mps | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 ee89926c..3acb038b 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 @@ -46,6 +46,7 @@ + @@ -2951,13 +2952,12 @@ - - + + + + - - - From 9fc1eec07a70630a2bb3a3d46d29007f979e7847 Mon Sep 17 00:00:00 2001 From: Daniel Ratiu Date: Mon, 23 Sep 2024 15:40:43 +0200 Subject: [PATCH 16/42] lint.generic.editor: mini improvement of ResultEntity --- .../models/org.mpsqa.lint.generic.editor.mps | 184 +++++++++++------- 1 file changed, 110 insertions(+), 74 deletions(-) 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 1b6a639f..2082f0dd 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 @@ -330,6 +330,7 @@ + @@ -1090,81 +1091,115 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -1172,28 +1207,28 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + @@ -1205,6 +1240,7 @@ + From 3588d9474e68ab9494ce61520eb856513558b72a Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 23 Sep 2024 17:02:16 +0200 Subject: [PATCH 17/42] mpsqa: fix new violations method --- .../org.mpsqa.lint.generic.behavior.mps | 127 +++++++++++++----- 1 file changed, 92 insertions(+), 35 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 079d9287..2c45defe 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 @@ -1214,42 +1214,15 @@ - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + @@ -2499,6 +2472,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 21a1080deba091db9858fb2c9917038594e371c4 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 23 Sep 2024 17:09:59 +0200 Subject: [PATCH 18/42] mpsqa: fix error reporting on typesystem level --- .../org.mpsqa.lint.generic.typesystem.mps | 142 +++++++++++------- 1 file changed, 89 insertions(+), 53 deletions(-) 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 3acb038b..77ab6884 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 @@ -280,6 +280,20 @@ + + + + + + + + + + + + + + @@ -1244,6 +1258,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1259,20 +1320,15 @@ - + - - - - - - - + + - + @@ -1294,15 +1350,10 @@ - + - - - - - - - + + @@ -1313,25 +1364,25 @@ - - - - - - - - - - + + + + + + + - - + + + + + - - + + @@ -1353,15 +1404,10 @@ - + - - - - - - - + + @@ -1374,13 +1420,8 @@ - - - - - - - + + @@ -1404,13 +1445,8 @@ - - - - - - - + + From a3907af2c48450d685991c62ccd97a3221130341 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 23 Sep 2024 22:07:53 +0200 Subject: [PATCH 19/42] mpsqa: fix NullPointers when the location is null --- .../org.mpsqa.lint.generic.behavior.mps | 58 ++++++---- .../org.mpsqa.lint.generic.typesystem.mps | 108 +++++++++--------- 2 files changed, 94 insertions(+), 72 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 2c45defe..1650e2d3 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 @@ -2479,27 +2479,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -2546,6 +2525,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 77ab6884..185b2953 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 @@ -1258,49 +1258,72 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + + + + - - + + @@ -1411,23 +1434,6 @@ - - - - - - - - - - - - - - - - - From 1f012e8f75e1ebec10a91c816d6e180637a332c2 Mon Sep 17 00:00:00 2001 From: Daniel Ratiu Date: Tue, 24 Sep 2024 07:54:11 +0200 Subject: [PATCH 20/42] lint.generic.editor: mark with GREEN the linter settings which are "pure" - evaluation is not skipped and no whitelists are used (i.e. everything is GREEN) --- .../models/org.mpsqa.lint.generic.editor.mps | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 2082f0dd..1e9089c0 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 @@ -779,8 +779,8 @@ - - + + @@ -1775,8 +1775,8 @@ - - + + From 98f6a3d59806421eb5a3705f784c948d5772ae23 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 24 Sep 2024 08:43:53 +0200 Subject: [PATCH 21/42] mpsqa: fix more NullPointers --- .../org.mpsqa.lint.generic.behavior.mps | 105 ++++++++++++++---- 1 file changed, 85 insertions(+), 20 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 1650e2d3..64a0fd9e 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 @@ -2040,21 +2040,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + @@ -2245,6 +2278,17 @@ + + + + + + + + + + + @@ -2331,6 +2375,17 @@ + + + + + + + + + + + @@ -2448,19 +2503,29 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + From f8875e8915c5df60fc6e02b87292aed8c71c9f25 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Tue, 24 Sep 2024 10:12:07 +0200 Subject: [PATCH 22/42] fixed IllegalModelAccessError in SuppressCheckerResults (#202) * fixed IllegalModelAccessError in SuppressCheckerResults --- ...rrors_suppressor.pluginSolution.plugin.mps | 184 ++++++++++-------- 1 file changed, 99 insertions(+), 85 deletions(-) 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 d4a9575e..b8b9b908 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 @@ -411,116 +411,130 @@ - - - - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + - - - - - - + + + + + + + + + + - - + + + + + - - - - - - - - - - - - - - - + + + - - - - - - - + + - - + + + + + + + From c588027e19efe5e2f04a05973388d100b6f4bdf2 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Fri, 20 Sep 2024 10:11:09 +0200 Subject: [PATCH 23/42] cleanup dependencies and update the build script --- .../org.mpsqa.arch/models/org.mpsqa.arch.editor.mps | 5 ----- .../languages/org.mpsqa.arch/org.mpsqa.arch.mpl | 6 +----- .../org.mpsqa.arch.pluginSolution.msd | 3 --- .../models/org.mpsqa.build._060_arch_build.mps | 13 ++++++++----- 4 files changed, 9 insertions(+), 18 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 1ef6de8b..6775a04e 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,13 +9,8 @@ - - - - - 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 825ea08a..4309d95a 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 @@ -1,7 +1,7 @@ - + @@ -20,8 +20,6 @@ 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text) - 86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project) - 20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine) @@ -78,13 +76,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 23229811..6c5dfd22 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 @@ -7,9 +7,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 ab13d6d5..5698e796 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 @@ -255,6 +255,9 @@ + + + @@ -352,11 +355,6 @@ - - - - - @@ -471,6 +469,11 @@ + + + + + From 6a2968f52ce15932305f00fd87ffd4d2d7e6aa2c Mon Sep 17 00:00:00 2001 From: Daniel Ratiu Date: Tue, 24 Sep 2024 00:01:41 +0200 Subject: [PATCH 24/42] mpsqa.arch.editor: fixed editors according to discussion with Sergey and Alex --- .../models/org.mpsqa.arch.editor.mps | 43 ++++--------------- 1 file changed, 9 insertions(+), 34 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 6775a04e..fb8192e0 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 @@ -170,7 +170,6 @@ - @@ -226,10 +225,6 @@ - - - - @@ -601,7 +596,7 @@ - + @@ -662,7 +657,7 @@ - + @@ -760,6 +755,9 @@ + + + @@ -780,9 +778,6 @@ - - - @@ -853,7 +848,7 @@ - + @@ -874,35 +869,15 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - From 9f47200292127f2c90561311494d536062f01efd Mon Sep 17 00:00:00 2001 From: Daniel Ratiu Date: Tue, 24 Sep 2024 00:02:03 +0200 Subject: [PATCH 25/42] mpsqa.arch.intention: added intention to remove dependencies strenghts --- .../models/org.mpsqa.arch.intentions.mps | 37 ++++++++++++++ .../models/org.mpsqa.arch.util.mps | 51 +++++++++++++++++++ 2 files changed, 88 insertions(+) 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 46acecbc..c4a64b83 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 @@ -575,5 +575,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 b6d4af34..3749d851 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 @@ -1199,6 +1199,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 84bb05c98c8678eef4b09312069819a2ed70d9d1 Mon Sep 17 00:00:00 2001 From: Daniel Ratiu Date: Tue, 24 Sep 2024 00:03:39 +0200 Subject: [PATCH 26/42] mpsqa.arch.structure: better alias --- .../org.mpsqa.arch/models/org.mpsqa.arch.structure.mps | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps index fb4a2d8d..d93467b3 100644 --- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps +++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps @@ -24,6 +24,7 @@ + @@ -172,7 +173,8 @@ - + + From f679627696e4f57ba238a04085f8913eb1b74b2d Mon Sep 17 00:00:00 2001 From: Daniel Ratiu Date: Tue, 24 Sep 2024 00:04:01 +0200 Subject: [PATCH 27/42] mpsqa.arch.behavior: mini doc --- .../models/org.mpsqa.arch.behavior.mps | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) 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 e767177a..70dc4c36 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 @@ -8,6 +8,7 @@ + @@ -141,6 +142,18 @@ + + + + + + + + + + + + @@ -192,6 +205,7 @@ + @@ -669,7 +683,7 @@ - + @@ -1080,6 +1094,18 @@ + + + + + + + + + + + + From a44ec3c1c63817a96b982207bc35ea1016f977e6 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Tue, 24 Sep 2024 11:59:48 +0200 Subject: [PATCH 28/42] run migrations --- .../models/org.mpsqa.arch.behavior.mps | 6 +++--- .../models/org.mpsqa.arch.constraints.mps | 2 +- .../models/org.mpsqa.arch.typesystem.mps | 2 +- .../org.mpsqa.arch.pluginSolution.plugin.mps | 18 +++++++++--------- ...sqa.arch._010_simple_dependencies@tests.mps | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) 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 70dc4c36..292facce 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 @@ -550,7 +550,7 @@ - + @@ -1610,7 +1610,7 @@ - + @@ -1689,7 +1689,7 @@ - + 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 bbf56ce7..82664109 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 @@ -230,7 +230,7 @@ - + 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 b2529447..b37e806e 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 @@ -1100,7 +1100,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 90db2f20..ba0e6201 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 @@ -473,7 +473,7 @@ - + @@ -816,7 +816,7 @@ - + @@ -848,7 +848,7 @@ - + @@ -1021,7 +1021,7 @@ - + @@ -1061,7 +1061,7 @@ - + @@ -1086,7 +1086,7 @@ - + @@ -1120,7 +1120,7 @@ - + @@ -3289,7 +3289,7 @@ - + @@ -3569,7 +3569,7 @@ - + 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 7a7515b5..f9b0529f 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,6 +272,11 @@ + + + + + @@ -318,11 +323,6 @@ - - - - - From 7afb129630d7651303359783d21f17c8775a7f72 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 10 Oct 2024 09:04:14 +0200 Subject: [PATCH 29/42] linters: fix a sandbox linter message --- ...t.generic.sandbox._010_smoke_user_defined_linters.mps | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) 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 e2dda947..72ad90da 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 @@ -743,13 +743,8 @@ - - - - - - - + + From 23a3fb2f45520135d67b2c1dc20cefa409879c17 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 10 Oct 2024 09:04:58 +0200 Subject: [PATCH 30/42] linters: correctly report the location and also the checker name and node in the error message --- .../org.mpsqa.lint.generic.structure.mps | 9 +- .../org.mpsqa.lint.generic.typesystem.mps | 145 ++++++++++++++++++ 2 files changed, 148 insertions(+), 6 deletions(-) diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps index 6ab46108..b4e9141c 100644 --- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps +++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps @@ -125,9 +125,6 @@ - - - @@ -175,9 +172,6 @@ - - - @@ -271,6 +265,9 @@ + + + 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 185b2953..6481e4ba 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 @@ -398,6 +398,7 @@ + @@ -406,6 +407,7 @@ + @@ -1434,6 +1436,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -1474,6 +1498,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 76219bbffd5ce6ab1911f44e2550cae5762e87f5 Mon Sep 17 00:00:00 2001 From: Vit Losenicky Date: Mon, 4 Nov 2024 15:17:42 +0100 Subject: [PATCH 31/42] adds linter that enforces that virtual method is overriden (cherry picked from commit 3805c11e1f732d72a059610f2ef9d223170b1a91) --- ...s_lang.linters_library.behavior_aspect.mps | 735 ++++++++++++++++++ 1 file changed, 735 insertions(+) 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 824df005..62bf15dd 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 @@ -13,13 +13,19 @@ + + + + + + @@ -37,6 +43,7 @@ + @@ -59,6 +66,7 @@ + @@ -67,6 +75,9 @@ + + + @@ -86,9 +97,28 @@ + + + + + + + + + + + + + + + + + + + @@ -101,10 +131,18 @@ + + + + + + + + @@ -123,6 +161,10 @@ + + + + @@ -158,12 +200,18 @@ + + + + + + @@ -173,6 +221,7 @@ + @@ -180,6 +229,7 @@ + @@ -189,10 +239,12 @@ + + @@ -1060,5 +1112,688 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From be686a488dec11f147df1561bbd8571814dcaebc Mon Sep 17 00:00:00 2001 From: Vit Losenicky Date: Mon, 4 Nov 2024 16:14:23 +0100 Subject: [PATCH 32/42] fixes resolve info --- ....mpsqa.lint.mps_lang.linters_library.behavior_aspect.mps | 6 +----- 1 file changed, 1 insertion(+), 5 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.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 62bf15dd..3cdc2ee3 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 @@ -116,9 +116,6 @@ - - - @@ -1114,7 +1111,6 @@ - @@ -1551,7 +1547,7 @@ - + From b5b99c050f39c2be9a8d8f906e49531666d6fc36 Mon Sep 17 00:00:00 2001 From: Vit Losenicky <87519379+vit-losenicky@users.noreply.github.com> Date: Tue, 5 Nov 2024 03:15:40 +0100 Subject: [PATCH 33/42] adds linter that ensures all smodelAttributes are of concept Attribute. (#222) --- ...sqa.lint.generic.linters_library.nodes.mps | 169 ++++++++++++++++++ 1 file changed, 169 insertions(+) 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 42247749..f6041de8 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 @@ -24,6 +24,7 @@ + @@ -179,6 +180,7 @@ + @@ -214,6 +216,9 @@ + + + @@ -302,6 +307,7 @@ + @@ -2661,5 +2667,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From b78f7a10fcc4424354ac741aa248460ad7ccf18e Mon Sep 17 00:00:00 2001 From: Vit Losenicky Date: Tue, 5 Nov 2024 10:34:56 +0100 Subject: [PATCH 34/42] updates logic of the linter --- ...s_lang.linters_library.behavior_aspect.mps | 1268 +++++++++-------- 1 file changed, 694 insertions(+), 574 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.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 3cdc2ee3..ad4891d9 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 @@ -5,21 +5,24 @@ + + + + + - - + - @@ -43,15 +46,19 @@ - + + + + + @@ -66,7 +73,6 @@ - @@ -75,9 +81,6 @@ - - - @@ -97,9 +100,7 @@ - - - + @@ -116,6 +117,9 @@ + + + @@ -127,11 +131,13 @@ + + @@ -151,6 +157,7 @@ + @@ -158,10 +165,10 @@ - - + + + - @@ -196,13 +203,28 @@ + + + + + + + + + + + + + + + @@ -218,7 +240,6 @@ - @@ -241,7 +262,6 @@ - @@ -1109,686 +1129,786 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + - + + + + + - - - + + + + + + - - - - + + + - + - - - + + + + + + + + + + + - - - - + - + - + - + - + - + - + - + - + - - - - - + + - - + + - - + + - - - - + - + - + - + - - + + + + + + + + + + + + + + + + + - - + + - - + + + - - - + + + - - - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - + - + - + - + - + - + - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - - + - + - + - + - - + + + + + - + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 8b325c3a0be0079529633978f462fba846e34258 Mon Sep 17 00:00:00 2001 From: Vit Losenicky Date: Tue, 5 Nov 2024 10:41:19 +0100 Subject: [PATCH 35/42] updates docstring --- ...ps_lang.linters_library.behavior_aspect.mps | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 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.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 ad4891d9..e6b7f263 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 @@ -1279,20 +1279,14 @@ - - - - - - - - + + - - + + - - + + From 1925f8e38eb5422b8107931a3d9d51b97d3fc1d3 Mon Sep 17 00:00:00 2001 From: Vit Losenicky Date: Tue, 5 Nov 2024 11:09:41 +0100 Subject: [PATCH 36/42] fixes resolve info --- .../org.mpsqa.lint.mps_lang.linters_library.behavior_aspect.mps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e6b7f263..66d63b29 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 @@ -1709,7 +1709,7 @@ - + From 5cda70c66a67fbf68abe05bdb4583510541bcad9 Mon Sep 17 00:00:00 2001 From: Daniel Ratiu Date: Tue, 5 Nov 2024 23:10:52 +0100 Subject: [PATCH 37/42] lint: cosmetic improvements of 'mandatory_virtual_method_override' --- ...s_lang.linters_library.behavior_aspect.mps | 236 +++++------------- 1 file changed, 59 insertions(+), 177 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.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 66d63b29..01b4a652 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 @@ -58,7 +58,6 @@ - @@ -1165,13 +1164,13 @@ - + - + @@ -1186,7 +1185,10 @@ - + + + + @@ -1207,7 +1209,10 @@ - + + + + @@ -1222,7 +1227,7 @@ - + @@ -1237,7 +1242,7 @@ - + @@ -1259,26 +1264,26 @@ - + - + - + - - + + - - - - + + + + @@ -1286,98 +1291,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -1493,7 +1412,6 @@ - @@ -1509,21 +1427,45 @@ - - - + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + - - + + - - + + + + + @@ -1541,64 +1483,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1678,7 +1562,6 @@ - @@ -1783,7 +1666,6 @@ - @@ -1839,7 +1721,7 @@ - + From 493799ce026257dd02be0ebbb39cadd35aaa6b96 Mon Sep 17 00:00:00 2001 From: danielratiu Date: Thu, 7 Nov 2024 15:44:22 +0100 Subject: [PATCH 38/42] deprecated: enhanced the "DeprecatedNodesFinder" to search also for references to deprecated nodes (#227) * deprecated: enhanced the "DeprecatedNodesFinder" to search also for references to deprecated nodes * deprecated: File -> Force Save All * deprecated: fixed the case when a node references MORE deprecated nodes ... + remove the restriction to consider only a subset of deprecated results when too many deprecations are found --------- Co-authored-by: Daniel Ratiu --- .../models/org.mpsqa.deprecated.editor.mps | 146 +++- .../org.mpsqa.deprecated.intentions.mps | 643 +++++++++++++----- .../models/org.mpsqa.deprecated.structure.mps | 31 +- ...eprecated._010_deprecation_tests@tests.mps | 2 +- 4 files changed, 647 insertions(+), 175 deletions(-) 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 e802abb8..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 @@ -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 236d3765..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 @@ -163,9 +163,6 @@ - - - @@ -289,14 +286,6 @@ - - - - - - - - @@ -315,10 +304,6 @@ - - - - @@ -370,7 +355,7 @@ - + @@ -541,13 +526,24 @@ - - - - + + + + + + + + + - - + + + + + + + + @@ -619,7 +615,7 @@ - + @@ -635,76 +631,184 @@ - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + @@ -713,20 +817,16 @@ - - - - - - - - - - - - + + + + + + + + @@ -737,7 +837,7 @@ - + @@ -745,66 +845,11 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -814,18 +859,11 @@ - - - - - - - - - - - + + + + @@ -894,6 +932,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -915,10 +1048,18 @@ - + - + + + + + + + + + @@ -928,11 +1069,19 @@ - - - + + + + + + + + + + + + - @@ -1132,6 +1281,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1b714652..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 @@ -98,10 +98,17 @@ - + + + + + + + + @@ -157,5 +164,27 @@ + + + + + + + + + + + + + + + + + + + + + + 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 de9cfac1..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 @@ -307,7 +307,7 @@ - + From 20cf17f7077f37ec290bb72a71d93880b90d381c Mon Sep 17 00:00:00 2001 From: danielratiu Date: Fri, 8 Nov 2024 09:02:42 +0100 Subject: [PATCH 39/42] arc: removed not needed dependencies (#229) Co-authored-by: Daniel Ratiu --- .../org.mpsqa.arch.pluginSolution.plugin.mps | 71 ++++++------------- .../org.mpsqa.arch.pluginSolution.msd | 16 ----- .../org.mpsqa.build._060_arch_build.mps | 23 ------ 3 files changed, 22 insertions(+), 88 deletions(-) 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 e3fd1dae..92762c95 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 @@ -28,12 +28,9 @@ - - - - + @@ -100,6 +97,7 @@ + @@ -514,7 +512,7 @@ - + @@ -1100,6 +1098,7 @@ + @@ -1596,39 +1595,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1716,11 +1682,15 @@ - - - - + + + + + + + + @@ -1728,12 +1698,8 @@ - - - - - - + + @@ -1748,6 +1714,13 @@ + + + + + + + @@ -3626,7 +3599,7 @@ - + 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 eb5107b8..62c918c1 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 @@ -19,11 +19,7 @@ 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) @@ -50,19 +46,7 @@ - - - - - - - - - - - - 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 d72c7c22..74e4dcc6 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 @@ -243,9 +243,6 @@ - - - @@ -355,11 +352,6 @@ - - - - - @@ -370,11 +362,6 @@ - - - - - @@ -385,11 +372,6 @@ - - - - - @@ -452,11 +434,6 @@ - - - - - From 7a96d588c1e79a312229020e96fcea35436db285 Mon Sep 17 00:00:00 2001 From: Daniel Ratiu Date: Mon, 11 Nov 2024 09:42:51 +0100 Subject: [PATCH 40/42] ran "gradlew migrate remigrate" --- .../models/org.mpsqa.arch.behavior.mps | 2 +- .../models/org.mpsqa.arch.constraints.mps | 4 ++-- .../models/org.mpsqa.arch.editor.mps | 14 ++++++------- .../models/org.mpsqa.arch.intentions.mps | 4 ++-- .../models/org.mpsqa.arch.structure.mps | 2 +- .../models/org.mpsqa.arch.typesystem.mps | 6 +++--- .../org.mpsqa.arch.pluginSolution.plugin.mps | 2 +- .../org.mpsqa.arch.pluginSolution.msd | 1 - ...qa.arch._010_simple_dependencies@tests.mps | 4 ++-- ...rrors_suppressor.pluginSolution.plugin.mps | 12 +++++------ .../org.mpsqa.build._060_arch_build.mps | 4 ++-- .../org.mpsqa.build._080_lint_build.mps | 4 ++-- .../models/org.mpsqa.lint.generic.editor.mps | 20 +++++++++---------- .../org.mpsqa.lint.generic.structure.mps | 2 +- .../org.mpsqa.lint.generic.typesystem.mps | 2 +- .../org.mpsqa.lint.generic.mpl | 2 ++ ...int.generic.linters_library.filesystem.mps | 15 +++++++------- ...psqa.lint.generic.linters_library.meta.mps | 10 +++++----- ...qa.lint.generic.linters_library.models.mps | 18 ++++++++--------- ...a.lint.generic.linters_library.modules.mps | 2 +- ...sqa.lint.generic.linters_library.nodes.mps | 14 ++++++------- ...andbox._010_smoke_user_defined_linters.mps | 2 +- ....linters_library.performance_generator.mps | 2 +- ...s_lang.linters_library.behavior_aspect.mps | 12 +++++------ ...mps_lang.linters_library.build_scripts.mps | 8 ++++---- ...ang.linters_library.performance_editor.mps | 10 +++++----- ...linters_library.performance_typesystem.mps | 8 ++++---- ...lang.linters_library.performance_utils.mps | 10 +++++----- ..._lang.linters_library.structure_aspect.mps | 10 +++++----- ...qa.lint.mps_lang.linters_library.tests.mps | 4 ++-- ...lang.linters_library.typesystem_aspect.mps | 12 +++++------ 31 files changed, 110 insertions(+), 112 deletions(-) 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 40a3770d..5d616215 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 @@ -7,7 +7,7 @@ - + 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 4b23aadd..62bf4c84 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 @@ -82,7 +82,7 @@ - + @@ -143,7 +143,7 @@ - + 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 8094b99d..1eacddd8 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 @@ -71,7 +71,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -250,7 +250,7 @@ - + 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 2ba9f1b2..b4f6678c 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 @@ -81,7 +81,7 @@ - + @@ -145,7 +145,7 @@ - + diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps index d93467b3..e7bb07ae 100644 --- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps +++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps @@ -56,7 +56,7 @@ - + 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 cdb6acbe..a6512a14 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 @@ -107,7 +107,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -281,7 +281,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 02d71df7..92762c95 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 @@ -3,7 +3,7 @@ - + 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 1a84be52..6bae75cc 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 @@ -48,7 +48,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 7a7515b5..ebddcad4 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 @@ -21,7 +21,7 @@ - + @@ -76,7 +76,7 @@ - + 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 31788186..e6edfe65 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 @@ -79,7 +79,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -276,7 +276,7 @@ - + @@ -305,7 +305,7 @@ - + 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 f338cbb7..8498529f 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 @@ -56,7 +56,7 @@ - + @@ -69,7 +69,7 @@ - + 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 091b978a..02d9d19d 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 @@ -52,7 +52,7 @@ - + @@ -65,7 +65,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 b4cd431a..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 @@ - - @@ -87,7 +85,7 @@ - + @@ -123,7 +121,7 @@ - + @@ -146,7 +144,7 @@ - + @@ -159,7 +157,7 @@ - + @@ -194,7 +192,7 @@ - + @@ -227,7 +225,7 @@ - + @@ -280,7 +278,7 @@ - + @@ -297,7 +295,7 @@ - + @@ -371,7 +369,7 @@ - + diff --git a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps index b4e9141c..ae841cee 100644 --- a/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps +++ b/code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.structure.mps @@ -81,7 +81,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 ea74b9c4..4c12e265 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 @@ -6,7 +6,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 f12aaa45..a03e876c 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,6 +95,7 @@ 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 +154,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 23f0b468..33c90637 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 @@ -18,7 +18,6 @@ - @@ -32,7 +31,7 @@ - + @@ -75,7 +74,7 @@ - + @@ -124,7 +123,7 @@ - + @@ -149,7 +148,7 @@ - + @@ -171,7 +170,7 @@ - + @@ -186,7 +185,7 @@ - + @@ -198,7 +197,7 @@ - + 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 37f92773..d3c31380 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 @@ -38,7 +38,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -147,7 +147,7 @@ - + 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 19d7643d..5fd0f459 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 @@ -58,7 +58,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -212,7 +212,7 @@ - + @@ -227,13 +227,13 @@ - + - + @@ -276,13 +276,13 @@ - + - + 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 ecc349ca..ae0a1898 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 @@ -4,7 +4,7 @@ - + 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 bd48387f..f6041de8 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 @@ -64,7 +64,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -147,10 +147,10 @@ - + - + @@ -225,7 +225,7 @@ - + @@ -235,7 +235,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 2386f0fb..fd42c45c 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 @@ -4,7 +4,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 45a223ab..7ec3bbc2 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 @@ -712,7 +712,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 2aff1282..312d3c9b 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 @@ -49,7 +49,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -185,7 +185,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.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 597d1ad1..7bad4db8 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 @@ -46,7 +46,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -129,7 +129,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 31b528a8..fe1a4612 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 @@ -132,7 +132,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -193,7 +193,7 @@ - + @@ -227,7 +227,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_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 bc6c136a..c04b7ba4 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 @@ -55,7 +55,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -94,7 +94,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 a2d3c437..e94bf09f 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 @@ -46,7 +46,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -268,7 +268,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.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 53df526a..64cb46ef 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 @@ -43,7 +43,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -175,7 +175,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.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 33268426..2763d7d5 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 @@ -72,7 +72,7 @@ - + @@ -120,7 +120,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.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 156964b0..38987d00 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 @@ -36,7 +36,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -78,10 +78,10 @@ - + - + @@ -89,7 +89,7 @@ - + @@ -116,7 +116,7 @@ - + From cc61f6a65de1608509c43156025a01c2e734dd8f Mon Sep 17 00:00:00 2001 From: Daniel Ratiu Date: Wed, 13 Nov 2024 13:22:16 +0100 Subject: [PATCH 41/42] arch: added support for forbidden dependencies --- .../languages/org.mpsqa.arch/.mps/modules.xml | 1 + .../models/org.mpsqa.arch.editor.mps | 18 ++++ .../models/org.mpsqa.arch.structure.mps | 8 ++ .../models/org.mpsqa.arch.typesystem.mps | 79 ++++++++++++++ ...end_upon.generator.templates@generator.mps | 24 +++++ ...ge_no_other_shall_depend_upon.behavior.mps | 12 +++ ...no_other_shall_depend_upon.constraints.mps | 19 ++++ ...uage_no_other_shall_depend_upon.editor.mps | 12 +++ ...e_no_other_shall_depend_upon.structure.mps | 10 ++ ..._no_other_shall_depend_upon.typesystem.mps | 11 ++ ...ch.language_no_other_shall_depend_upon.mpl | 102 ++++++++++++++++++ ...qa.arch._010_simple_dependencies@tests.mps | 89 +++++++++++++++ 12 files changed, 385 insertions(+) create mode 100644 code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/generator/templates/test.org.mpsqa.arch.language_no_other_shall_depend_upon.generator.templates@generator.mps create mode 100644 code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.behavior.mps create mode 100644 code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.constraints.mps create mode 100644 code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.editor.mps create mode 100644 code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.structure.mps create mode 100644 code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.typesystem.mps create mode 100644 code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/test.org.mpsqa.arch.language_no_other_shall_depend_upon.mpl diff --git a/code/languages/org.mpsqa.arch/.mps/modules.xml b/code/languages/org.mpsqa.arch/.mps/modules.xml index 2c5d8792..b10c3c8b 100644 --- a/code/languages/org.mpsqa.arch/.mps/modules.xml +++ b/code/languages/org.mpsqa.arch/.mps/modules.xml @@ -6,6 +6,7 @@ + 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..81ce67a8 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 @@ -1169,5 +1169,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps index e7bb07ae..936dd397 100644 --- a/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps +++ b/code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.structure.mps @@ -264,5 +264,13 @@ + + + + + + + + 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 a6512a14..b6832e19 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 @@ -2738,5 +2738,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/generator/templates/test.org.mpsqa.arch.language_no_other_shall_depend_upon.generator.templates@generator.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/generator/templates/test.org.mpsqa.arch.language_no_other_shall_depend_upon.generator.templates@generator.mps new file mode 100644 index 00000000..9dadc94d --- /dev/null +++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/generator/templates/test.org.mpsqa.arch.language_no_other_shall_depend_upon.generator.templates@generator.mps @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.behavior.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.behavior.mps new file mode 100644 index 00000000..31ca6ecb --- /dev/null +++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.behavior.mps @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.constraints.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.constraints.mps new file mode 100644 index 00000000..a28ea8fc --- /dev/null +++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.constraints.mps @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.editor.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.editor.mps new file mode 100644 index 00000000..14e4b0d6 --- /dev/null +++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.editor.mps @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.structure.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.structure.mps new file mode 100644 index 00000000..c07e7ae6 --- /dev/null +++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.structure.mps @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.typesystem.mps b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.typesystem.mps new file mode 100644 index 00000000..8ce82f99 --- /dev/null +++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/models/test.org.mpsqa.arch.language_no_other_shall_depend_upon.typesystem.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/test.org.mpsqa.arch.language_no_other_shall_depend_upon.mpl b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/test.org.mpsqa.arch.language_no_other_shall_depend_upon.mpl new file mode 100644 index 00000000..ca57ccd2 --- /dev/null +++ b/code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.language_no_other_shall_depend_upon/test.org.mpsqa.arch.language_no_other_shall_depend_upon.mpl @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 ebddcad4..df9f9a74 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 @@ -37,6 +37,7 @@ + @@ -512,5 +513,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 94f67ad619d8f56369262b299d545e8733479891 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Mon, 18 Nov 2024 13:18:29 +0100 Subject: [PATCH 42/42] linters: compare inactive violations through the existing equals method --- .../org.mpsqa.lint.generic.behavior.mps | 168 +----------------- 1 file changed, 8 insertions(+), 160 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 965c596a..10cf27f6 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 @@ -175,7 +175,6 @@ - @@ -1320,20 +1319,6 @@ - - - - - - - - - - - - - - @@ -1343,37 +1328,15 @@ - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - + + + + @@ -1615,121 +1578,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -