From 4599190b1a9b3848cccb0416457678dcf7d2996e Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Mon, 3 Jul 2023 16:33:40 +0200 Subject: [PATCH 01/29] mpsutil.compare: added showDiff flag to assert statement --- .../com.mbeddr.mpsutil.compare/compare.mpl | 14 ++++++++------ .../languageModels/editor.mps | 13 +++++++++++++ .../languageModels/structure.mps | 6 +++++- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl index fdea55a6b1..d436dca545 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl @@ -29,6 +29,10 @@ c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator) 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) 985c8c6a-64b4-486d-a91e-7d4112742556(jetbrains.mps.baseLanguage#1129914002933) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) + ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) + 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) @@ -52,9 +56,11 @@ + + @@ -67,11 +73,10 @@ - - - + + @@ -94,7 +99,6 @@ c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator) - 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) @@ -152,9 +156,7 @@ - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps index 92df2d727b..7670882e56 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps @@ -80,6 +80,7 @@ + @@ -281,6 +282,18 @@ + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps index 6f759b6967..42c8c3a487 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps @@ -2,7 +2,6 @@ - @@ -60,6 +59,11 @@ + + + + + From f7a287cd7817e68fba513d1f97475fcc9fce51e9 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Mon, 3 Jul 2023 16:36:21 +0200 Subject: [PATCH 02/29] mpsutil.comparator.rt: added diff dialog updated build --- .../models/com/mbeddr/platform/build.mps | 38 + .../comparator.msd | 10 + .../models/.model | 8 + .../models/DiffViewDialog.mpsr | 1172 +++++++++++++++++ 4 files changed, 1228 insertions(+) create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffViewDialog.mpsr diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps index d0fb9eadb3..1fac13e381 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps @@ -7612,6 +7612,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -7725,6 +7745,21 @@ + + + + + + + + + + + + + + + @@ -8337,6 +8372,9 @@ + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd index c0dcf8241d..25d4bce310 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd @@ -17,6 +17,9 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) + 6fd1293f-7f65-4ffd-99dc-4719eca7c171(jetbrains.mps.ide.vcs.platform) + 8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test) @@ -24,6 +27,7 @@ + @@ -33,18 +37,24 @@ + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model index a814c64377..d1b417eca0 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model @@ -10,6 +10,7 @@ + @@ -19,7 +20,14 @@ + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffViewDialog.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffViewDialog.mpsr new file mode 100644 index 0000000000..ac4a2fa39e --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffViewDialog.mpsr @@ -0,0 +1,1172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 44590722791dcb181746ef51c642990940f641fa Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Mon, 3 Jul 2023 16:37:52 +0200 Subject: [PATCH 03/29] mpsutil.compare.gen: added diff dialog in case it fails --- .../generator/template/main@generator.mps | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps index 2e270519de..07afea1eba 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps @@ -12,6 +12,9 @@ + + + @@ -110,10 +113,14 @@ + + + + @@ -170,6 +177,9 @@ + + + @@ -236,6 +246,8 @@ + + @@ -410,6 +422,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1bb9fc724e4fd19c07be14a191c4ceecce083e6b Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Mon, 3 Jul 2023 21:22:09 +0200 Subject: [PATCH 04/29] mpsutil.compare: updated captions of diff dialog added diff option to main editor --- .../generator/template/main@generator.mps | 1 - .../languageModels/editor.mps | 43 +++++++++++++------ .../models/.model | 2 +- .../models/DiffViewDialog.mpsr | 8 ++-- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps index 07afea1eba..1927f5bddf 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps @@ -246,7 +246,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps index 7670882e56..29c098b2f4 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps @@ -34,6 +34,7 @@ + @@ -278,22 +279,38 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model index d1b417eca0..ac414b3c5d 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model @@ -25,9 +25,9 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffViewDialog.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffViewDialog.mpsr index ac4a2fa39e..4b85e9b83d 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffViewDialog.mpsr +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffViewDialog.mpsr @@ -1107,7 +1107,7 @@ - + @@ -1119,7 +1119,7 @@ - + @@ -1136,7 +1136,7 @@ - + @@ -1148,7 +1148,7 @@ - + From 3ce8a83832ff4419cb2929cb4e2a3b6dd69bcdfc Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Tue, 4 Jul 2023 10:52:51 +0200 Subject: [PATCH 05/29] mpsutil.comparator: simplified diff dialog creation --- .../models/.model | 2 - .../models/DiffView.mpsr | 350 +++++ .../models/DiffViewDialog.mpsr | 1172 ----------------- 3 files changed, 350 insertions(+), 1174 deletions(-) create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr delete mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffViewDialog.mpsr diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model index ac414b3c5d..74f65d7eb9 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model @@ -25,8 +25,6 @@ - - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr new file mode 100644 index 0000000000..ce5b081664 --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr @@ -0,0 +1,350 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffViewDialog.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffViewDialog.mpsr deleted file mode 100644 index 4b85e9b83d..0000000000 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffViewDialog.mpsr +++ /dev/null @@ -1,1172 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 91b338fedb2e83895b861d050f512b2466bb871f Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Tue, 4 Jul 2023 12:56:41 +0200 Subject: [PATCH 06/29] mpsutil.comparator.gen: embedded TF in SimpleNodeTest simplified retrievel o current project --- .../com.mbeddr.mpsutil.compare/compare.mpl | 22 +- .../generator/template/main@generator.mps | 379 ++++++++++-------- 2 files changed, 226 insertions(+), 175 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl index d436dca545..bbc45b7a26 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl @@ -32,10 +32,10 @@ 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + @@ -44,20 +44,26 @@ + + + + + + @@ -66,15 +72,23 @@ + + + + + + + + @@ -101,6 +115,8 @@ c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator) 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) + 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) + 8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test) @@ -147,6 +163,7 @@ + @@ -156,8 +173,11 @@ + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps index 1927f5bddf..141988556e 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps @@ -4,6 +4,8 @@ + + @@ -14,9 +16,12 @@ - + + + + @@ -110,9 +115,14 @@ + + + + + @@ -122,6 +132,12 @@ + + + + + + @@ -188,6 +204,10 @@ + + + + @@ -205,135 +225,160 @@ - + - - - - - + + + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - + - - - - - + + + + + - + - + - + - + - + - + @@ -351,48 +396,48 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - + - - - - - + + + + + - + - + - + - + - + - + @@ -410,92 +455,78 @@ - + - + - - - - - - - + + + + + + - - - - - - - - + + + + + + + + + - + - - - - - - - - + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - + + + - + - - - - - - - + + + + + + + @@ -503,45 +534,45 @@ - - - - + + + + - + - - - - - - + + + + + + - + - - - - + + + + - + - + From 851fdefea0272add5a716ebfe95b33c694266d13 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Tue, 4 Jul 2023 12:57:37 +0200 Subject: [PATCH 07/29] mpsutil.build: updated deps for compare --- .../com.mbeddr.platform/models/com/mbeddr/platform/build.mps | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps index 1fac13e381..af650110fd 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps @@ -7617,11 +7617,6 @@ - - - - - From f754169721e1c141c46818dd814e8d633d1b516d Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Tue, 4 Jul 2023 14:26:15 +0200 Subject: [PATCH 08/29] mpsutil.comparator.gen: WIP (serialization of orig node pointer) --- .../com.mbeddr.mpsutil.compare/compare.mpl | 8 + .../generator/template/main@generator.mps | 298 ++++++++++++++++-- 2 files changed, 282 insertions(+), 24 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl index bbc45b7a26..002aa77b95 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl @@ -32,6 +32,11 @@ 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + fc4584d6-365c-4ceb-b660-b2c91933024d(jetbrains.mps.lang.test#1210261198005) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) + 8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test) + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) @@ -84,7 +89,10 @@ + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps index 141988556e..1f5575de97 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps @@ -16,6 +16,12 @@ + + + + + + @@ -110,6 +116,7 @@ + @@ -121,6 +128,12 @@ + + + + + + @@ -136,7 +149,13 @@ + + + + + + @@ -157,6 +176,24 @@ + + + + + + + + + + + + + + + + + + @@ -180,16 +217,39 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -211,6 +271,10 @@ + + + + @@ -265,6 +329,14 @@ + + + + + + + + @@ -468,55 +540,233 @@ - - + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + - + - - - - - - + + + + + + - + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + From de9a08af4a7bcf471c4e2ec470f28d99e04de23d Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Tue, 4 Jul 2023 14:34:12 +0200 Subject: [PATCH 09/29] mpsutil.comparator.gen: WIP serialization with SPointer-API --- .../generator/template/main@generator.mps | 233 ++++-------------- 1 file changed, 47 insertions(+), 186 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps index 1f5575de97..5401452d11 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps @@ -20,7 +20,7 @@ - + @@ -47,6 +47,9 @@ + + + @@ -116,7 +119,6 @@ - @@ -128,12 +130,6 @@ - - - - - - @@ -153,9 +149,6 @@ - - - @@ -176,24 +169,6 @@ - - - - - - - - - - - - - - - - - - @@ -217,29 +192,20 @@ + - - - - - - - - - - @@ -271,10 +237,6 @@ - - - - @@ -545,120 +507,57 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -667,48 +566,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + @@ -764,10 +629,6 @@ - - - - From 70fbdb5afa8160c793116f78448de752255a1cd2 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Wed, 5 Jul 2023 09:25:05 +0200 Subject: [PATCH 10/29] mpsutil.comparator.gen: added support for editible and read only diffs --- .../generator/template/main@generator.mps | 561 +++++++++++++----- 1 file changed, 398 insertions(+), 163 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps index 5401452d11..97c4b19439 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps @@ -21,7 +21,7 @@ - + @@ -109,6 +109,9 @@ + + + @@ -117,21 +120,41 @@ + + + + + + + + + + + + + + + + + + + + @@ -140,6 +163,9 @@ + + + @@ -148,6 +174,10 @@ + + + + @@ -193,7 +223,6 @@ - @@ -234,10 +263,22 @@ + + + + + + + + + + + + @@ -248,6 +289,11 @@ + + + + + @@ -291,43 +337,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -496,138 +507,34 @@ + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -1016,5 +923,333 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 0047f50befcef70ccaf24167583db513106b0488 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Wed, 5 Jul 2023 11:17:36 +0200 Subject: [PATCH 11/29] mpsutil.comparator.rt: WIP (trying temp solution approach) --- .../models/com/mbeddr/platform/build.mps | 20 + .../com.mbeddr.mpsutil.compare/compare.mpl | 8 - .../generator/template/main@generator.mps | 2 - .../comparator.msd | 2 + .../models/.model | 4 + .../models/DiffView.mpsr | 401 +++++++++++++++++- 6 files changed, 426 insertions(+), 11 deletions(-) diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps index af650110fd..568132b83e 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps @@ -7627,6 +7627,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl index 002aa77b95..51f590af70 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl @@ -32,7 +32,6 @@ 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - fc4584d6-365c-4ceb-b660-b2c91933024d(jetbrains.mps.lang.test#1210261198005) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) 8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test) @@ -71,7 +70,6 @@ - @@ -92,13 +90,10 @@ - - - @@ -123,7 +118,6 @@ c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator) 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) - 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) 8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test) @@ -181,9 +175,7 @@ - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps index 97c4b19439..aeeb0c8e1a 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps @@ -16,8 +16,6 @@ - - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd index 25d4bce310..d7c0f4693f 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd @@ -22,8 +22,10 @@ 8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test) + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model index 74f65d7eb9..84391c59a1 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model @@ -11,6 +11,8 @@ + + @@ -25,6 +27,8 @@ + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr index ce5b081664..c4c78ff8c9 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr @@ -6,16 +6,30 @@ + + + + + + + + + + + + + + @@ -35,7 +49,9 @@ + + @@ -48,10 +64,21 @@ + + + + + + + + + + + @@ -60,10 +87,13 @@ + + + @@ -78,6 +108,7 @@ + @@ -85,20 +116,49 @@ + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -108,6 +168,18 @@ + + + + + + + + + + + + @@ -295,6 +367,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -340,9 +541,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f170ab8a1cc542712d03e71793a324cd9078224b Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Wed, 5 Jul 2023 11:27:51 +0200 Subject: [PATCH 12/29] mpsutil.comparator.test: added tests for Demo --- .../com/mbeddr/mpsutil/compare/ts@tests.mps | 120 ++++++++++++++++++ .../test.com.mbeddr.mpsutil.compare.msd | 2 +- 2 files changed, 121 insertions(+), 1 deletion(-) diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps index 148fdfea86..02e638fb05 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps @@ -55,6 +55,8 @@ + + @@ -63,6 +65,7 @@ + @@ -96,6 +99,9 @@ + + + @@ -107,6 +113,7 @@ + @@ -142,6 +149,9 @@ + + + @@ -168,6 +178,13 @@ + + + + + + + @@ -816,5 +833,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd index 25d906ca9f..20bcb98e65 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd @@ -14,8 +14,8 @@ c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator) - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 6bbe9909-811d-4431-b023-f60f7e6d7891(test.com.mbeddr.mpsutil.compare.testlang) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) From 99d234fc0b793a218c4d3794d7868e696b793f09 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Wed, 5 Jul 2023 13:52:27 +0200 Subject: [PATCH 13/29] mpsutil.comparator: made diff configuration transient user config. for diff dialog appearance is stored as user object not as part of the model --- .../com.mbeddr.mpsutil.compare/compare.mpl | 2 + .../generator/template/main@generator.mps | 179 ++++++++++++-- .../languageModels/behavior.mps | 164 ++++++++++++- .../languageModels/editor.mps | 225 ++++++++++++++++-- .../languageModels/structure.mps | 5 - .../models/.model | 1 + .../models/DiffView.mpsr | 97 +++++--- .../com/mbeddr/mpsutil/compare/ts@tests.mps | 84 ++++--- 8 files changed, 629 insertions(+), 128 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl index 51f590af70..59e5f83c1d 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/compare.mpl @@ -119,6 +119,7 @@ 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) 8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) @@ -161,6 +162,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps index aeeb0c8e1a..5fb14c0759 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps @@ -53,6 +53,10 @@ + + + + @@ -153,14 +157,10 @@ - - - - @@ -246,9 +246,6 @@ - - - @@ -536,20 +533,6 @@ - - - - - - - - - - - - - - @@ -1035,6 +1018,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1079,8 +1135,11 @@ + + + - + @@ -1175,6 +1234,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1233,6 +1365,9 @@ + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps index 4ca84c472c..09ebf7d568 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps @@ -5,7 +5,167 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps index 29c098b2f4..befcfe03ea 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/editor.mps @@ -13,6 +13,11 @@ + + + + + @@ -50,6 +55,9 @@ + + + @@ -81,12 +89,12 @@ - + @@ -99,22 +107,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -122,11 +179,26 @@ + + + + + + + + + + + + + + + @@ -279,32 +351,149 @@ - - + + - + + - - - - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps index 42c8c3a487..d6a1b212f9 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/structure.mps @@ -59,11 +59,6 @@ - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model index 84391c59a1..59b447efd0 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model @@ -29,6 +29,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr index c4c78ff8c9..d9e44db109 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr @@ -2,6 +2,7 @@ + @@ -9,6 +10,7 @@ + @@ -119,6 +121,7 @@ + @@ -202,6 +205,12 @@ + + + + + + @@ -278,6 +287,8 @@ + + @@ -496,51 +507,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + @@ -740,7 +764,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps index 02e638fb05..70e2a1ade6 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps @@ -149,9 +149,7 @@ - - - + @@ -846,47 +844,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -935,6 +892,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From be2115915a6f7bc75816d27f81e29e39ddbed372 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Wed, 5 Jul 2023 14:16:25 +0200 Subject: [PATCH 14/29] comparator.rt: added null checks --- .../models/DiffView.mpsr | 600 +++++++++--------- 1 file changed, 298 insertions(+), 302 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr index d9e44db109..3c7d1e9904 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr @@ -111,6 +111,7 @@ + @@ -129,6 +130,7 @@ + @@ -267,248 +269,225 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + - - - - - + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + @@ -554,141 +533,158 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + - - - + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + - - - - + + - - + + - - - - - + + From a91d992ed65c78598798ecbd14d7a9f7274682d2 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Wed, 5 Jul 2023 16:26:24 +0200 Subject: [PATCH 15/29] comparator.rt: wrapping transient nodes to temp. models if required --- .../models/.model | 1 + .../models/DiffView.mpsr | 194 ++++++++---------- 2 files changed, 83 insertions(+), 112 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model index 59b447efd0..6b3a1b6f18 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model @@ -29,6 +29,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr index 3c7d1e9904..2383d9dd6e 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr @@ -7,9 +7,10 @@ - - + + + @@ -39,6 +40,7 @@ + @@ -62,6 +64,7 @@ + @@ -123,7 +126,6 @@ - @@ -131,10 +133,6 @@ - - - - @@ -147,7 +145,6 @@ - @@ -178,12 +175,6 @@ - - - - - - @@ -360,134 +351,113 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + - - - - - - - - - - - - + + + + - - - - - - - - - - - + + + + + - + + + + - - - - - - - - + + + + + + + + - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - + + + - - - - - - - - + + + + + + - - - - - + + + + - + From 7d173ca66cabd52e0b86527fa77167b450e23759 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Thu, 6 Jul 2023 14:43:18 +0200 Subject: [PATCH 16/29] comparator.rt: customisation of diff view - custom action for back-synch to original - custom buttom - custom displose (WIP) --- .../generator/template/main@generator.mps | 62 +- .../comparator.msd | 3 + .../models/.model | 6 + .../models/DiffView.mpsr | 1126 ++++++++++++----- 4 files changed, 859 insertions(+), 338 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps index 5fb14c0759..4a9aca6005 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/generator/template/main@generator.mps @@ -1308,56 +1308,56 @@ - + + - - + - - - - - - + + + + + + - + - + - - - - - - + + + + + + - + - + - + - - - - - - + + + + + + - + @@ -1365,12 +1365,12 @@ - + - - - + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd index d7c0f4693f..e215ec070f 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd @@ -20,6 +20,7 @@ 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) 6fd1293f-7f65-4ffd-99dc-4719eca7c171(jetbrains.mps.ide.vcs.platform) 8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) @@ -29,7 +30,9 @@ + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model index 6b3a1b6f18..7825d77d91 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model @@ -13,6 +13,8 @@ + + @@ -30,6 +32,10 @@ + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr index 2383d9dd6e..56f7f2e860 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr @@ -7,18 +7,33 @@ - - - - + + + + + + + + + + + + + + + + + + - - + + + @@ -26,6 +41,12 @@ + + + + + + @@ -36,17 +57,24 @@ + + + + + + + @@ -55,22 +83,22 @@ - + + - @@ -80,6 +108,9 @@ + + + @@ -89,18 +120,23 @@ + + + + - - + + + @@ -114,25 +150,63 @@ + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -145,6 +219,7 @@ + @@ -154,13 +229,6 @@ - - - - - - - @@ -170,22 +238,257 @@ - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -206,6 +509,7 @@ + @@ -351,110 +655,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - @@ -472,156 +686,311 @@ - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -658,80 +1027,223 @@ - - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + - - + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + - - - From e056accfc6394babbefec84c4a64ad1a4793a8b1 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Mon, 10 Jul 2023 09:44:02 +0200 Subject: [PATCH 17/29] comparator.rt: minor cleanups --- .../models/DiffView.mpsr | 156 ++++++------------ 1 file changed, 49 insertions(+), 107 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr index 56f7f2e860..7501f9ad5c 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr @@ -9,32 +9,15 @@ - - + - - - - - - - - - - - - - - - - @@ -108,9 +91,6 @@ - - - @@ -136,7 +116,6 @@ - @@ -250,7 +229,6 @@ - @@ -686,45 +664,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - @@ -924,9 +876,13 @@ + + + + @@ -1028,7 +984,7 @@ - + @@ -1057,25 +1013,41 @@ - - - - - + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1087,39 +1059,14 @@ - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - + @@ -1127,15 +1074,6 @@ - - - - - - - - - @@ -1147,9 +1085,13 @@ - + + + + + From 960f78857ff49d3dcb2b25f1770cc4c85fecbc0a Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Mon, 10 Jul 2023 11:28:21 +0200 Subject: [PATCH 18/29] comparator.rt: temp models are now disposed --- .../comparator.msd | 3 - .../models/.model | 8 +- .../models/DiffView.mpsr | 325 ++++++++++++------ 3 files changed, 227 insertions(+), 109 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd index e215ec070f..30cb100ecd 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/comparator.msd @@ -23,15 +23,12 @@ 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) - - - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model index 7825d77d91..c7e725ba55 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model @@ -10,9 +10,6 @@ - - - @@ -25,15 +22,12 @@ - - + - - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr index 7501f9ad5c..67007c00cf 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr @@ -4,17 +4,17 @@ - + + - - + @@ -121,6 +121,7 @@ + @@ -168,7 +169,9 @@ - + + + @@ -179,6 +182,7 @@ + @@ -186,6 +190,9 @@ + + + @@ -264,11 +271,11 @@ - + - + @@ -349,19 +356,27 @@ - - - - - + + + + + + + + + - - - - - + + + + + + + + + @@ -380,49 +395,98 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -548,11 +612,11 @@ - + - + @@ -633,23 +697,32 @@ - - - - - + + + + + + + + + - - - - - + + + + + + + + + + @@ -669,7 +742,7 @@ - + @@ -693,7 +766,7 @@ - + @@ -876,23 +949,19 @@ - - - - - - - - + + + + + - - - - - - - - + + + + + + + @@ -932,12 +1001,6 @@ - - - - - - @@ -979,12 +1042,11 @@ - - + @@ -1076,7 +1138,9 @@ - + + + @@ -1118,9 +1182,7 @@ - - - + @@ -1139,19 +1201,23 @@ - - - + + + - - - + + + + + + + @@ -1167,8 +1233,11 @@ + + + - + @@ -1185,6 +1254,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9d273450c9f7d09f6c2f2f0ef6185e7adcad2637 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Mon, 10 Jul 2023 12:06:46 +0200 Subject: [PATCH 19/29] comparator.rt: temp models are now disposed (properly) --- .../models/DiffView.mpsr | 71 ++++++++++++------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr index 67007c00cf..b7f9f9df1a 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr @@ -260,6 +260,7 @@ + @@ -445,6 +446,9 @@ + + + @@ -453,6 +457,9 @@ + + + @@ -465,7 +472,6 @@ - @@ -955,6 +961,9 @@ + + + @@ -963,6 +972,9 @@ + + + @@ -1163,22 +1175,6 @@ - - - - - - - - - - - - - - - - @@ -1278,15 +1274,36 @@ - - - - - + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + @@ -1299,6 +1316,12 @@ + + + + + + From 7d19915666ee194b1fc563164777b9c0c3c7c578 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Mon, 10 Jul 2023 12:07:25 +0200 Subject: [PATCH 20/29] comparator.tests: added showcases --- .../com/mbeddr/mpsutil/compare/ts@tests.mps | 68 +++++++++++++++++-- 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps index 70e2a1ade6..be12ba3b31 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps @@ -132,6 +132,9 @@ + + + @@ -844,6 +847,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -892,20 +925,20 @@ - + - + - - - + + + @@ -913,11 +946,32 @@ - + + + + + + + + + + + + + + + + + + + + + + - + From c1fc7342bdace67c848ce4149001f9159af27a43 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Mon, 10 Jul 2023 12:11:55 +0200 Subject: [PATCH 21/29] mpsutils.build: updated compare deps. --- .../models/com/mbeddr/platform/build.mps | 102 ++++++++++-------- 1 file changed, 56 insertions(+), 46 deletions(-) diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps index 568132b83e..8a5f069b32 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps @@ -7680,6 +7680,11 @@ + + + + + @@ -7775,6 +7780,11 @@ + + + + + @@ -17934,6 +17944,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17995,44 +18043,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -19828,11 +19838,6 @@ - - - - - @@ -19855,6 +19860,11 @@ + + + + + @@ -19896,6 +19906,9 @@ + + + @@ -19905,9 +19918,6 @@ - - - From f7b82d8487819af7a6cf6044ea059dc40098d540 Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Mon, 17 Jul 2023 14:48:46 +0200 Subject: [PATCH 22/29] comparator.diff.showcase: moved demo in own test solution --- .../com.mbeddr.mpsutil/.mps/modules.xml | 3 + .../com.mbeddr.demo.comparator.diff.mpl | 104 +++ ...tor.diff.generator.templates@generator.mps | 158 ++++ ...m.mbeddr.demo.comparator.diff.behavior.mps | 12 + ...beddr.demo.comparator.diff.constraints.mps | 19 + ...com.mbeddr.demo.comparator.diff.editor.mps | 115 +++ ....mbeddr.demo.comparator.diff.structure.mps | 61 ++ ...mbeddr.demo.comparator.diff.typesystem.mps | 11 + ...om.mbeddr.demo.compafator.diff.genplan.msd | 23 + ...r.demo.compafator.diff.genplan.genplan.mps | 47 + .../com.mbeddr.demo.compafator.diff.tests.msd | 63 ++ ...demo.compafator.diff.tests.diffs@tests.mps | 868 ++++++++++++++++++ ...beddr.demo.compafator.diff.tests.input.mps | 327 +++++++ ...om.mbeddr.demo.comparator.diff.genplan.msd | 22 + ...r.demo.comparator.diff.genplan.genplan.mps | 46 + .../com/mbeddr/mpsutil/compare/ts@tests.mps | 171 ---- .../test.com.mbeddr.mpsutil.compare.msd | 3 +- 17 files changed, 1880 insertions(+), 173 deletions(-) create mode 100644 code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/com.mbeddr.demo.comparator.diff.mpl create mode 100644 code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/generator/templates/com.mbeddr.demo.comparator.diff.generator.templates@generator.mps create mode 100644 code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.behavior.mps create mode 100644 code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.constraints.mps create mode 100644 code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.editor.mps create mode 100644 code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.structure.mps create mode 100644 code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.typesystem.mps create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.genplan/com.mbeddr.demo.compafator.diff.genplan.msd create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.genplan/models/com.mbeddr.demo.compafator.diff.genplan.genplan.mps create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/com.mbeddr.demo.compafator.diff.tests.msd create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/com.mbeddr.demo.comparator.diff.genplan.msd create mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/models/com.mbeddr.demo.comparator.diff.genplan.genplan.mps diff --git a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml index 85f072b9e8..6eca106ac2 100644 --- a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml +++ b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml @@ -5,6 +5,7 @@ + @@ -104,6 +105,8 @@ + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/com.mbeddr.demo.comparator.diff.mpl b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/com.mbeddr.demo.comparator.diff.mpl new file mode 100644 index 0000000000..912737708d --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/com.mbeddr.demo.comparator.diff.mpl @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/generator/templates/com.mbeddr.demo.comparator.diff.generator.templates@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/generator/templates/com.mbeddr.demo.comparator.diff.generator.templates@generator.mps new file mode 100644 index 0000000000..97ecb348e5 --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/generator/templates/com.mbeddr.demo.comparator.diff.generator.templates@generator.mps @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.behavior.mps new file mode 100644 index 0000000000..c788c7224e --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.behavior.mps @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.constraints.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.constraints.mps new file mode 100644 index 0000000000..01f550af1d --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.constraints.mps @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.editor.mps new file mode 100644 index 0000000000..ee7792a15e --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.editor.mps @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.structure.mps new file mode 100644 index 0000000000..a045ff271f --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.structure.mps @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.typesystem.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.typesystem.mps new file mode 100644 index 0000000000..42dbc59d2c --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.demo.comparator.diff/models/com.mbeddr.demo.comparator.diff.typesystem.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.genplan/com.mbeddr.demo.compafator.diff.genplan.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.genplan/com.mbeddr.demo.compafator.diff.genplan.msd new file mode 100644 index 0000000000..e8b76dacda --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.genplan/com.mbeddr.demo.compafator.diff.genplan.msd @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.genplan/models/com.mbeddr.demo.compafator.diff.genplan.genplan.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.genplan/models/com.mbeddr.demo.compafator.diff.genplan.genplan.mps new file mode 100644 index 0000000000..0a5eecdfb9 --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.genplan/models/com.mbeddr.demo.compafator.diff.genplan.genplan.mps @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/com.mbeddr.demo.compafator.diff.tests.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/com.mbeddr.demo.compafator.diff.tests.msd new file mode 100644 index 0000000000..570afd8e85 --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/com.mbeddr.demo.compafator.diff.tests.msd @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + 2c9058b6-7cd8-4623-82a3-e4c07c3eddff(com.mbeddr.mpsutil.generatorfacade) + ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 7ab1a6fa-0a11-4b95-9e48-75f363d6cb00(jetbrains.mps.lang.generator.plan) + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) + a83addf6-6ea9-4504-83d6-0211dab89b0f(com.mbeddr.demo.compafator.diff.genplan) + 479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps new file mode 100644 index 0000000000..4c000c3ca5 --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps @@ -0,0 +1,868 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps new file mode 100644 index 0000000000..8ad132d689 --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps @@ -0,0 +1,327 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/com.mbeddr.demo.comparator.diff.genplan.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/com.mbeddr.demo.comparator.diff.genplan.msd new file mode 100644 index 0000000000..c9b618f185 --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/com.mbeddr.demo.comparator.diff.genplan.msd @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/models/com.mbeddr.demo.comparator.diff.genplan.genplan.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/models/com.mbeddr.demo.comparator.diff.genplan.genplan.mps new file mode 100644 index 0000000000..c0b2141acf --- /dev/null +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/models/com.mbeddr.demo.comparator.diff.genplan.genplan.mps @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps index be12ba3b31..0021f9939b 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps @@ -5,7 +5,6 @@ - @@ -55,8 +54,6 @@ - - @@ -65,7 +62,6 @@ - @@ -99,9 +95,6 @@ - - - @@ -113,7 +106,6 @@ - @@ -132,9 +124,6 @@ - - - @@ -152,7 +141,6 @@ - @@ -179,13 +167,6 @@ - - - - - - - @@ -834,157 +815,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd index 20bcb98e65..75b79b67d0 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/test.com.mbeddr.mpsutil.compare.msd @@ -15,12 +15,11 @@ c6420b75-4569-420d-aaf7-9bc590ad7b2a(com.mbeddr.mpsutil.comparator) 6bbe9909-811d-4431-b023-f60f7e6d7891(test.com.mbeddr.mpsutil.compare.testlang) - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + - From 7d38c65a725c45e9db8b9acdf99352a155e3a5dc Mon Sep 17 00:00:00 2001 From: Alexander Rimer Date: Mon, 17 Jul 2023 16:36:13 +0200 Subject: [PATCH 23/29] mpsutil.comparator.rt: added support for transient modules of generator runs --- .../models/.model | 1 + .../models/DiffView.mpsr | 142 ++++++++++++------ 2 files changed, 95 insertions(+), 48 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model index c7e725ba55..7ea8bd48f2 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/.model @@ -30,6 +30,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr index b7f9f9df1a..a743ad32b0 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DiffView.mpsr @@ -15,6 +15,7 @@ + @@ -47,6 +48,10 @@ + + + + @@ -563,54 +568,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1173,6 +1130,19 @@ + + + + + + + + + + + + + @@ -1229,6 +1199,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 3e5b82b268e90ee622da192e07c2b94c5f698e29 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 25 Apr 2024 22:25:00 +0200 Subject: [PATCH 24/29] mpsutil.comparator: fix the broken reference and suppress errors in tests --- .../com.mbeddr.demo.compafator.diff.tests.msd | 2 ++ .../com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps | 5 +++-- .../mbeddr/mpsutil/compare/pattern/test/basic@tests.mps | 8 ++++++++ .../models/test/com/mbeddr/mpsutil/compare/ts@tests.mps | 8 ++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/com.mbeddr.demo.compafator.diff.tests.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/com.mbeddr.demo.compafator.diff.tests.msd index 570afd8e85..c0424ca7e2 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/com.mbeddr.demo.compafator.diff.tests.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/com.mbeddr.demo.compafator.diff.tests.msd @@ -22,6 +22,7 @@ 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) a83addf6-6ea9-4504-83d6-0211dab89b0f(com.mbeddr.demo.compafator.diff.genplan) 479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml) + 215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator) @@ -45,6 +46,7 @@ + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps index 4c000c3ca5..afad363633 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps @@ -27,6 +27,7 @@ + @@ -505,7 +506,7 @@ - + @@ -586,7 +587,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/models/com/mbeddr/mpsutil/compare/pattern/test/basic@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/models/com/mbeddr/mpsutil/compare/pattern/test/basic@tests.mps index fb5e028f1e..54d94b7f1c 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/models/com/mbeddr/mpsutil/compare/pattern/test/basic@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/com.mbeddr.mpsutil.compare.pattern.test/models/com/mbeddr/mpsutil/compare/pattern/test/basic@tests.mps @@ -279,6 +279,10 @@ + + + + @@ -2186,6 +2190,10 @@ + + + + diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps index 0021f9939b..940391ca32 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.compare/models/test/com/mbeddr/mpsutil/compare/ts@tests.mps @@ -167,6 +167,10 @@ + + + + @@ -613,6 +617,10 @@ + + + + From 973590c9998f1eceee5cfc6973e061b236932e30 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 25 Apr 2024 22:56:48 +0200 Subject: [PATCH 25/29] mpsutil.comparator: fix the folder structure --- .../com.mbeddr.mpsutil/.mps/modules.xml | 4 +- ...om.mbeddr.demo.comparator.diff.genplan.msd | 22 --------- ...r.demo.comparator.diff.genplan.genplan.mps | 46 ------------------- ....mpsutil.comparator.diff.demo.genplan.msd} | 5 +- ...m.mbeddr.demo.comparator.diff.genplan.mps} | 2 +- ...dr.mpsutil.comparator.diff.demo.tests.msd} | 8 ++-- ...demo.compafator.diff.tests.diffs@tests.mps | 2 +- ...beddr.demo.compafator.diff.tests.input.mps | 0 8 files changed, 10 insertions(+), 79 deletions(-) delete mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/com.mbeddr.demo.comparator.diff.genplan.msd delete mode 100644 code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/models/com.mbeddr.demo.comparator.diff.genplan.genplan.mps rename code/languages/com.mbeddr.mpsutil/solutions/{com.mbeddr.demo.compafator.diff.genplan/com.mbeddr.demo.compafator.diff.genplan.msd => com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd} (79%) rename code/languages/com.mbeddr.mpsutil/solutions/{com.mbeddr.demo.compafator.diff.genplan/models/com.mbeddr.demo.compafator.diff.genplan.genplan.mps => com.mbeddr.mpsutil.comparator.diff.demo.genplan/models/com.mbeddr.demo.comparator.diff.genplan.mps} (98%) rename code/languages/com.mbeddr.mpsutil/solutions/{com.mbeddr.demo.compafator.diff.tests/com.mbeddr.demo.compafator.diff.tests.msd => com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd} (93%) rename code/languages/com.mbeddr.mpsutil/solutions/{com.mbeddr.demo.compafator.diff.tests => com.mbeddr.mpsutil.comparator.diff.demo.tests}/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps (99%) rename code/languages/com.mbeddr.mpsutil/solutions/{com.mbeddr.demo.compafator.diff.tests => com.mbeddr.mpsutil.comparator.diff.demo.tests}/models/com.mbeddr.demo.compafator.diff.tests.input.mps (100%) diff --git a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml index 6eca106ac2..f8b45254b9 100644 --- a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml +++ b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml @@ -105,8 +105,6 @@ - - @@ -115,6 +113,8 @@ + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/com.mbeddr.demo.comparator.diff.genplan.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/com.mbeddr.demo.comparator.diff.genplan.msd deleted file mode 100644 index c9b618f185..0000000000 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/com.mbeddr.demo.comparator.diff.genplan.msd +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/models/com.mbeddr.demo.comparator.diff.genplan.genplan.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/models/com.mbeddr.demo.comparator.diff.genplan.genplan.mps deleted file mode 100644 index c0b2141acf..0000000000 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.comparator.diff.genplan/models/com.mbeddr.demo.comparator.diff.genplan.genplan.mps +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.genplan/com.mbeddr.demo.compafator.diff.genplan.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd similarity index 79% rename from code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.genplan/com.mbeddr.demo.compafator.diff.genplan.msd rename to code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd index e8b76dacda..edd8c2d476 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.genplan/com.mbeddr.demo.compafator.diff.genplan.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd @@ -1,5 +1,5 @@ - + @@ -17,7 +17,6 @@ - + - diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.genplan/models/com.mbeddr.demo.compafator.diff.genplan.genplan.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/models/com.mbeddr.demo.comparator.diff.genplan.mps similarity index 98% rename from code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.genplan/models/com.mbeddr.demo.compafator.diff.genplan.genplan.mps rename to code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/models/com.mbeddr.demo.comparator.diff.genplan.mps index 0a5eecdfb9..a795596070 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.genplan/models/com.mbeddr.demo.compafator.diff.genplan.genplan.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/models/com.mbeddr.demo.comparator.diff.genplan.mps @@ -1,5 +1,5 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/com.mbeddr.demo.compafator.diff.tests.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd similarity index 93% rename from code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/com.mbeddr.demo.compafator.diff.tests.msd rename to code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd index c0424ca7e2..877fcccd75 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/com.mbeddr.demo.compafator.diff.tests.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd @@ -1,5 +1,5 @@ - + @@ -20,7 +20,7 @@ 7ab1a6fa-0a11-4b95-9e48-75f363d6cb00(jetbrains.mps.lang.generator.plan) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) - a83addf6-6ea9-4504-83d6-0211dab89b0f(com.mbeddr.demo.compafator.diff.genplan) + a83addf6-6ea9-4504-83d6-0211dab89b0f(com.mbeddr.mpsutil.comparator.diff.demo.genplan) 479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml) 215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator) @@ -50,8 +50,8 @@ - - + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps similarity index 99% rename from code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps rename to code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps index afad363633..32f24424d0 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps @@ -23,7 +23,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps similarity index 100% rename from code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.demo.compafator.diff.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps rename to code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.input.mps From 2995cc0d863d1875b9481e5562adcf511fe1b41a Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 25 Apr 2024 22:58:47 +0200 Subject: [PATCH 26/29] mpsutil.comparator: activate the tests through a flag --- ...demo.compafator.diff.tests.diffs@tests.mps | 332 +++++++++++------- 1 file changed, 197 insertions(+), 135 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps index 32f24424d0..853627e317 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/models/com.mbeddr.demo.compafator.diff.tests.diffs@tests.mps @@ -39,6 +39,7 @@ + @@ -71,6 +72,7 @@ + @@ -99,9 +101,14 @@ + + + + + @@ -113,6 +120,9 @@ + + + @@ -237,13 +247,6 @@ - - - - - - - @@ -348,6 +351,15 @@ + + + + + + + + + @@ -685,180 +697,230 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + - - + + - - + + + + + - - - - - - - - + + + + + + + + - + From 693f0e304829e7369d6820ac309d343ce48092dc Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 25 Apr 2024 23:19:21 +0200 Subject: [PATCH 27/29] mpsutil.comparator: disable the diff view in headless environments --- .../languageModels/behavior.mps | 41 ++++++++++++++----- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps index 09ebf7d568..d83fda52ae 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.compare/languageModels/behavior.mps @@ -6,6 +6,7 @@ + @@ -37,6 +38,9 @@ + + + @@ -60,6 +64,9 @@ + + + @@ -80,6 +87,7 @@ + @@ -143,18 +151,31 @@ - - - + + + + + + + + + + + - - - + + + - - - - + + + + + + + + + From cb85f61edfbbaf01063e7fab0d04b6bbcc3b9b9b Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 25 Apr 2024 23:21:48 +0200 Subject: [PATCH 28/29] update the changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd96ee99b5..fa3c452782 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,10 @@ Semantic Versioning and the changes are simply documented in reverse chronologic - Hyperlink: `HyperlinkUtil.openInBrowser()` behaves like no-op instead of raising an exception on null or empty URLs. - Asynccell: Stops polling for the calculated value in case the poll-request throws an exception and shows to the user, that the calculation has failed together with the thrown exception, instead of spamming the log on each poll with the exception. +### Added + +- The comparator language now supports a diff tool that can be activated through the `show diff` checkbox. + # March 2024 ## com.mbeddr.mpsutil From aa22b52f0d5367d0bb95f6155ee1db4c37193e1f Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Thu, 25 Apr 2024 23:26:16 +0200 Subject: [PATCH 29/29] update the build script --- .../models/com/mbeddr/platform/build.mps | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps index 8a5f069b32..457378d866 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps @@ -7670,11 +7670,6 @@ - - - - - @@ -7685,6 +7680,11 @@ + + + + +