From 8175464ff65fa4418052e974e66921d06019a71f Mon Sep 17 00:00:00 2001 From: Tristan Albers Date: Mon, 1 Nov 2021 11:51:20 +0100 Subject: [PATCH 01/10] Editor is able to switch languages. English and Dutch are provided, users can also add more. --- code/languages/Flint/Flint.mpl | 6 +- .../languages/Flint/models/Flint.behavior.mps | 264 +++++- code/languages/Flint/models/Flint.editor.mps | 864 +++++++++++++++++- .../Flint/models/Flint.languages.mps | 70 ++ .../Flint/models/Flint.structure.mps | 97 ++ 5 files changed, 1252 insertions(+), 49 deletions(-) create mode 100644 code/languages/Flint/models/Flint.languages.mps diff --git a/code/languages/Flint/Flint.mpl b/code/languages/Flint/Flint.mpl index f0aabd1..69e8b03 100644 --- a/code/languages/Flint/Flint.mpl +++ b/code/languages/Flint/Flint.mpl @@ -10,7 +10,9 @@ - + + + @@ -97,12 +99,14 @@ f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor) + + diff --git a/code/languages/Flint/models/Flint.behavior.mps b/code/languages/Flint/models/Flint.behavior.mps index 3bd1611..cae17c9 100644 --- a/code/languages/Flint/models/Flint.behavior.mps +++ b/code/languages/Flint/models/Flint.behavior.mps @@ -426,6 +426,9 @@ + + + @@ -597,6 +600,25 @@ + + + + + + + + + + + + + + + + + + + @@ -1384,21 +1406,44 @@ - - + + - - - - - - - + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + @@ -1897,6 +1942,25 @@ + + + + + + + + + + + + + + + + + + + @@ -7098,6 +7162,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8456,6 +8660,25 @@ + + + + + + + + + + + + + + + + + + + @@ -10645,6 +10868,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/Flint/models/Flint.editor.mps b/code/languages/Flint/models/Flint.editor.mps index fd86681..e15db9c 100644 --- a/code/languages/Flint/models/Flint.editor.mps +++ b/code/languages/Flint/models/Flint.editor.mps @@ -127,6 +127,7 @@ + @@ -573,6 +574,9 @@ + + + @@ -816,8 +820,40 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -832,10 +868,42 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -877,8 +945,44 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1244,6 +1348,12 @@ + + + + + + @@ -1269,6 +1379,17 @@ + + + + + + + + + + + @@ -1466,9 +1587,45 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1504,8 +1661,40 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1536,8 +1725,40 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1568,8 +1789,40 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1600,8 +1853,40 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1632,8 +1917,40 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1667,8 +1984,40 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1714,8 +2063,40 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1760,8 +2141,40 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1867,8 +2280,40 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1880,8 +2325,40 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1890,8 +2367,40 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1900,8 +2409,40 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1910,8 +2451,40 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1922,9 +2495,45 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5314,5 +5923,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/Flint/models/Flint.languages.mps b/code/languages/Flint/models/Flint.languages.mps new file mode 100644 index 0000000..c21f57c --- /dev/null +++ b/code/languages/Flint/models/Flint.languages.mps @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/Flint/models/Flint.structure.mps b/code/languages/Flint/models/Flint.structure.mps index 710bd7b..77c2884 100644 --- a/code/languages/Flint/models/Flint.structure.mps +++ b/code/languages/Flint/models/Flint.structure.mps @@ -107,6 +107,13 @@ + + + + + + + @@ -1053,5 +1060,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From fad79c55add8c3cc539439c4820c35f82d600868 Mon Sep 17 00:00:00 2001 From: Tristan Albers Date: Tue, 2 Nov 2021 15:25:37 +0100 Subject: [PATCH 02/10] Made english default when no language is selected. Refactored editor usage from languageReference to language root node --- .../languages/Flint/models/Flint.behavior.mps | 337 +++++----- code/languages/Flint/models/Flint.editor.mps | 603 ++++++++---------- .../Flint/models/Flint.structure.mps | 1 - 3 files changed, 416 insertions(+), 525 deletions(-) diff --git a/code/languages/Flint/models/Flint.behavior.mps b/code/languages/Flint/models/Flint.behavior.mps index cae17c9..910efaa 100644 --- a/code/languages/Flint/models/Flint.behavior.mps +++ b/code/languages/Flint/models/Flint.behavior.mps @@ -71,6 +71,7 @@ + @@ -355,6 +356,11 @@ + + + + + @@ -381,6 +387,12 @@ + + + + + + @@ -412,6 +424,7 @@ + @@ -426,9 +439,6 @@ - - - @@ -600,25 +610,6 @@ - - - - - - - - - - - - - - - - - - - @@ -1410,37 +1401,34 @@ - - - - - - - - - - + + + + + + + + - - + - - - - + + + + - + - + - + @@ -1942,25 +1930,6 @@ - - - - - - - - - - - - - - - - - - - @@ -7162,147 +7131,179 @@ - - - - - - + + + + + + - - - - - + + + - - + + - + - + - - + + - - - - + + + + - + - + - + - + - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + - - + + + - - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - - - + + + + - - - - - + + - + + + + - + + + @@ -8660,25 +8661,6 @@ - - - - - - - - - - - - - - - - - - - @@ -10868,25 +10850,6 @@ - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/Flint/models/Flint.editor.mps b/code/languages/Flint/models/Flint.editor.mps index e15db9c..a3bf01b 100644 --- a/code/languages/Flint/models/Flint.editor.mps +++ b/code/languages/Flint/models/Flint.editor.mps @@ -466,6 +466,7 @@ + @@ -820,34 +821,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -869,34 +866,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -946,34 +939,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -1589,34 +1578,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -1663,32 +1648,28 @@ - + - - - - - + + + + + + + - - - - - - - - + + @@ -1725,34 +1706,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -1789,34 +1766,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -1853,34 +1826,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -1917,34 +1886,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -1984,34 +1949,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -2063,34 +2024,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -2141,34 +2098,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -2280,34 +2233,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -2325,34 +2274,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -2367,34 +2312,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -2409,34 +2350,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -2451,34 +2388,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + @@ -2497,34 +2430,30 @@ - + - + - + - - - - - - - + + + + + + + + + - - - - - - - - - + + + diff --git a/code/languages/Flint/models/Flint.structure.mps b/code/languages/Flint/models/Flint.structure.mps index 77c2884..1adf18c 100644 --- a/code/languages/Flint/models/Flint.structure.mps +++ b/code/languages/Flint/models/Flint.structure.mps @@ -111,7 +111,6 @@ - From 0b50bd6c775446a4b6ff9fe348eb7d521f40d3bf Mon Sep 17 00:00:00 2001 From: Tristan Albers Date: Fri, 5 Nov 2021 09:10:22 +0100 Subject: [PATCH 03/10] Added languages to FlintModelTest. Refactored editor languages. --- .../languages/Flint/models/Flint.behavior.mps | 4 +- code/languages/Flint/models/Flint.editor.mps | 82 ++++++++++++++----- .../Flint/models/Flint.languages.mps | 3 + .../Flint/models/Flint.structure.mps | 5 ++ .../FlintTests/models/FlintTests.editor.mps | 7 ++ 5 files changed, 79 insertions(+), 22 deletions(-) diff --git a/code/languages/Flint/models/Flint.behavior.mps b/code/languages/Flint/models/Flint.behavior.mps index 910efaa..028326f 100644 --- a/code/languages/Flint/models/Flint.behavior.mps +++ b/code/languages/Flint/models/Flint.behavior.mps @@ -1404,7 +1404,7 @@ - + @@ -7133,7 +7133,7 @@ - + diff --git a/code/languages/Flint/models/Flint.editor.mps b/code/languages/Flint/models/Flint.editor.mps index a3bf01b..111ad09 100644 --- a/code/languages/Flint/models/Flint.editor.mps +++ b/code/languages/Flint/models/Flint.editor.mps @@ -832,7 +832,7 @@ - + @@ -877,7 +877,7 @@ - + @@ -950,7 +950,7 @@ - + @@ -1589,7 +1589,7 @@ - + @@ -1657,7 +1657,7 @@ - + @@ -1717,7 +1717,7 @@ - + @@ -1777,7 +1777,7 @@ - + @@ -1837,7 +1837,7 @@ - + @@ -1897,7 +1897,7 @@ - + @@ -1960,7 +1960,7 @@ - + @@ -2035,7 +2035,7 @@ - + @@ -2109,7 +2109,7 @@ - + @@ -2244,7 +2244,7 @@ - + @@ -2285,7 +2285,7 @@ - + @@ -2323,7 +2323,7 @@ - + @@ -2361,7 +2361,7 @@ - + @@ -2399,7 +2399,7 @@ - + @@ -2441,7 +2441,7 @@ - + @@ -5858,13 +5858,17 @@ - + + + + + @@ -6005,6 +6009,16 @@ + + + + + + + + + + @@ -6024,8 +6038,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + diff --git a/code/languages/Flint/models/Flint.languages.mps b/code/languages/Flint/models/Flint.languages.mps index c21f57c..de5d7ad 100644 --- a/code/languages/Flint/models/Flint.languages.mps +++ b/code/languages/Flint/models/Flint.languages.mps @@ -10,6 +10,7 @@ + @@ -48,6 +49,7 @@ + @@ -65,6 +67,7 @@ + diff --git a/code/languages/Flint/models/Flint.structure.mps b/code/languages/Flint/models/Flint.structure.mps index 1adf18c..d326909 100644 --- a/code/languages/Flint/models/Flint.structure.mps +++ b/code/languages/Flint/models/Flint.structure.mps @@ -1134,6 +1134,11 @@ + + + + + diff --git a/code/languages/FlintTests/models/FlintTests.editor.mps b/code/languages/FlintTests/models/FlintTests.editor.mps index cbb88f2..732de05 100644 --- a/code/languages/FlintTests/models/FlintTests.editor.mps +++ b/code/languages/FlintTests/models/FlintTests.editor.mps @@ -8,6 +8,7 @@ + @@ -20,6 +21,9 @@ + + + @@ -57,6 +61,9 @@ + + + From 85fd3f3c72b8bdaf16668f958dab991ffda112c9 Mon Sep 17 00:00:00 2001 From: Tristan Albers Date: Mon, 8 Nov 2021 14:52:24 +0100 Subject: [PATCH 04/10] Added interfaces and tests --- .../languages/Flint/models/Flint.behavior.mps | 306 ++++++---- code/languages/Flint/models/Flint.editor.mps | 256 +++++---- .../Flint/models/Flint.structure.mps | 13 + code/languages/FlintTests/FlintTests.mpl | 1 + .../FlintTests/models/FlintTests.behavior.mps | 119 ++++ .../FlintTests/models/FlintTests.editor.mps | 49 ++ .../models/FlintTests.structure.mps | 42 ++ .../Flint.build0/models/Flint.build.mps | 5 + .../Flint.test/models/Flint.test.mpstest.mps | 542 ++++++++++++++++++ 9 files changed, 1124 insertions(+), 209 deletions(-) diff --git a/code/languages/Flint/models/Flint.behavior.mps b/code/languages/Flint/models/Flint.behavior.mps index 028326f..4562b92 100644 --- a/code/languages/Flint/models/Flint.behavior.mps +++ b/code/languages/Flint/models/Flint.behavior.mps @@ -72,7 +72,7 @@ - + @@ -1724,6 +1724,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1930,6 +1957,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7135,173 +7189,173 @@ - - - - - - - - - - - - - - + + + + + - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + - - - + + + - - - - - + + + + + - - - + + + - + - - - - - - + + + + + + - - - + + + - + - + - + - + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - + - - + + - - - - + + + + - - - - + + + + - - + + + + - + - - + + + + + - @@ -8661,6 +8715,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22149,5 +22230,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/Flint/models/Flint.editor.mps b/code/languages/Flint/models/Flint.editor.mps index 111ad09..a29be27 100644 --- a/code/languages/Flint/models/Flint.editor.mps +++ b/code/languages/Flint/models/Flint.editor.mps @@ -823,20 +823,22 @@ - + - - - - - - - + + + + + + + + + @@ -875,13 +877,15 @@ - - - - - - - + + + + + + + + + @@ -948,13 +952,15 @@ - - - - - - - + + + + + + + + + @@ -1580,8 +1586,8 @@ - + @@ -1655,13 +1661,15 @@ - - - - - - - + + + + + + + + + @@ -1715,13 +1723,15 @@ - - - - - - - + + + + + + + + + @@ -1775,13 +1785,15 @@ - - - - - - - + + + + + + + + + @@ -1836,12 +1848,14 @@ - - - - - - + + + + + + + + @@ -1896,12 +1910,14 @@ - - - - - - + + + + + + + + @@ -1959,12 +1975,14 @@ - - - - - - + + + + + + + + @@ -2034,12 +2052,14 @@ - - - - - - + + + + + + + + @@ -2107,13 +2127,15 @@ - - - - - - - + + + + + + + + + @@ -2243,12 +2265,14 @@ - - - - - - + + + + + + + + @@ -2284,12 +2308,14 @@ - - - - - - + + + + + + + + @@ -2322,12 +2348,14 @@ - - - - - - + + + + + + + + @@ -2360,12 +2388,14 @@ - - - - - - + + + + + + + + @@ -2398,12 +2428,14 @@ - - - - - - + + + + + + + + @@ -2440,12 +2472,14 @@ - - - - - - + + + + + + + + diff --git a/code/languages/Flint/models/Flint.structure.mps b/code/languages/Flint/models/Flint.structure.mps index d326909..e42c309 100644 --- a/code/languages/Flint/models/Flint.structure.mps +++ b/code/languages/Flint/models/Flint.structure.mps @@ -144,6 +144,9 @@ + + + @@ -267,6 +270,9 @@ + + + @@ -342,6 +348,9 @@ + + + @@ -1154,5 +1163,9 @@ + + + + diff --git a/code/languages/FlintTests/FlintTests.mpl b/code/languages/FlintTests/FlintTests.mpl index 1726e81..a933969 100644 --- a/code/languages/FlintTests/FlintTests.mpl +++ b/code/languages/FlintTests/FlintTests.mpl @@ -71,6 +71,7 @@ 69940819-10c1-4a38-ac44-700b63f993ba(Flint) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) diff --git a/code/languages/FlintTests/models/FlintTests.behavior.mps b/code/languages/FlintTests/models/FlintTests.behavior.mps index 909825c..34c31a6 100644 --- a/code/languages/FlintTests/models/FlintTests.behavior.mps +++ b/code/languages/FlintTests/models/FlintTests.behavior.mps @@ -11,6 +11,8 @@ + + @@ -582,5 +584,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/FlintTests/models/FlintTests.editor.mps b/code/languages/FlintTests/models/FlintTests.editor.mps index 732de05..f766690 100644 --- a/code/languages/FlintTests/models/FlintTests.editor.mps +++ b/code/languages/FlintTests/models/FlintTests.editor.mps @@ -110,5 +110,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/FlintTests/models/FlintTests.structure.mps b/code/languages/FlintTests/models/FlintTests.structure.mps index c8f5a7f..b215097 100644 --- a/code/languages/FlintTests/models/FlintTests.structure.mps +++ b/code/languages/FlintTests/models/FlintTests.structure.mps @@ -80,5 +80,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/solutions/Flint.build0/models/Flint.build.mps b/code/solutions/Flint.build0/models/Flint.build.mps index 62d8cd8..f0b2a2e 100644 --- a/code/solutions/Flint.build0/models/Flint.build.mps +++ b/code/solutions/Flint.build0/models/Flint.build.mps @@ -3122,6 +3122,11 @@ + + + + + diff --git a/code/solutions/Flint.test/models/Flint.test.mpstest.mps b/code/solutions/Flint.test/models/Flint.test.mpstest.mps index e4d9b75..86811f4 100644 --- a/code/solutions/Flint.test/models/Flint.test.mpstest.mps +++ b/code/solutions/Flint.test/models/Flint.test.mpstest.mps @@ -30,6 +30,8 @@ + + @@ -50,6 +52,10 @@ + + + + @@ -76,7 +82,9 @@ + + @@ -85,6 +93,10 @@ + + + + @@ -123,12 +135,18 @@ + + + + + + @@ -151,6 +169,7 @@ + @@ -199,6 +218,9 @@ + + + @@ -230,6 +252,9 @@ + + + @@ -264,7 +289,25 @@ + + + + + + + + + + + + + + + + + + @@ -274,6 +317,9 @@ + + + @@ -283,9 +329,17 @@ + + + + + + + + @@ -318,13 +372,24 @@ + + + + + + + + + + + @@ -339,6 +404,9 @@ + + + @@ -2878,5 +2946,479 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 99b2946ef73e839a4c4de7f240094c072b6404b9 Mon Sep 17 00:00:00 2001 From: Tristan Albers Date: Mon, 8 Nov 2021 15:43:19 +0100 Subject: [PATCH 05/10] Merge with master --- .github/workflows/test.yml | 6 +- .gitignore | 1 + .idea/codeStyles/Project.xml | 10 +- .idea/runConfigurations.xml | 10 + README.md | 10 + build.gradle | 12 +- code/.mps/modules.xml | 3 + code/java/FlintParser/build.gradle | 6 +- .../main/kotlin/org/discipl/flint/Models.kt | 58 +- .../org/discpl/flint/FlintParserTest.kt | 3 +- code/java/FlintSources/build.gradle | 18 +- .../flint/sources/NsxParserClientImpl.kt | 34 + .../org/discipl/flint/sources/ParserClient.kt | 18 + .../org/discipl/flint/sources/SourceLoader.kt | 156 +- .../sources/clients/AsyncTextLineClient.kt | 27 + .../sources/clients/QuerySolutionProperty.kt | 81 +- .../flint/sources/clients/TextLineClient.kt | 15 +- .../sources/clients/TextLineClientImpl.kt | 59 - .../clients/nsx/NsxAsyncTextLineClientImpl.kt | 53 + .../sources/clients/nsx/NsxEmbeddedResult.kt | 3 + .../nsx/NsxEmbeddedResultDeserializer.kt | 26 + .../flint/sources/clients/nsx/NsxLink.kt | 5 + .../flint/sources/clients/nsx/NsxLinks.kt | 3 + .../flint/sources/clients/nsx/NsxPage.kt | 8 + .../clients/nsx/NsxPublicationParser.kt | 12 + .../clients/nsx/NsxPublicationSource.kt | 5 + .../flint/sources/clients/nsx/NsxResult.kt | 14 + .../clients/nsx/NsxSourceClientImpl.kt | 12 + .../clients/nsx/NsxTextLineClientImpl.kt | 104 + .../nsx/NsxTextLinesForVersionRequest.kt | 13 + .../nsx/NsxTextLinesForVersionRequestId.kt | 5 + .../NsxTextLinesForVersionRequestStatus.kt | 16 + .../nsx/NsxTextLinesForVersionResult.kt | 23 + .../clients/nsx/NsxVersionClientImpl.kt | 11 + .../TripleVersionClientImpl.kt} | 20 +- .../triply/TriplyAsyncTextLineClientImpl.kt | 43 + .../TriplySourceClientImpl.kt} | 5 +- .../triply/TriplyTextLineClientImpl.kt | 127 + .../flint/sources/models/ArticleLine.kt | 11 + .../flint/sources/models/PublicationParser.kt | 11 + .../flint/sources/models/PublicationSource.kt | 8 + .../sources/services/AsyncArticleService.kt | 10 + .../flint/sources/services/Constants.kt | 7 + .../flint/sources/services/ParserService.kt | 7 + .../flint/sources/services/TextLineService.kt | 7 + .../nsx/NsxAsyncArticleServiceImpl.kt | 35 + .../services/nsx/NsxParserServiceImpl.kt | 21 + .../triply/ArticleServiceImpl.kt | 2 +- .../triply/SourceServiceImpl.kt | 2 +- .../services/triply/TextLineServiceImpl.kt | 15 + .../triply/VersionServiceImpl.kt | 2 +- .../transformers/AsyncTextLineTransformer.kt | 84 + .../sources/transformers/ParserTransformer.kt | 22 + .../transformers/TextLineTransformer.kt | 45 +- .../clients/NsxTextLineClientImplTest.kt | 128 + .../flint/sources/clients/ParserClientTest.kt | 23 + .../sources/clients/TextLineClientImplTest.kt | 91 +- .../sources/clients/VersionClientTest.kt | 12 +- .../discipl/flint/sources/di/Extensions.kt | 49 +- .../flint/sources/di/NsxResponseHandler.kt | 137 + .../flint/sources/di/TestSourceLoader.kt | 35 +- .../sources/services/ParserServiceTest.kt | 22 + .../triply/ArticleServiceImplTest.kt | 13 +- .../triply/AsyncArticleServiceImplTest.kt | 83 + .../triply/SourceServiceImplTest.kt | 2 +- .../triply/TriplyTextLineServiceImplTest.kt | 53 + .../org/discpl/flint/FlintParserTest.kt | 23 - .../1.0%3Ac%3ABWBR0043324%26g%3D2020-03-31 | 1128 ++ .../1.0%3Ac%3ABWBR0043324%26g%3D2020-04-17 | 2779 ++++ .../1.0%3Ac%3ABWBR0043324%26g%3D2020-04-22 | 2878 ++++ .../1.0%3Ac%3ABWBR0043324%26g%3D2020-05-16 | 2817 ++++ .../1.0%3Ac%3ABWBR0043324%26g%3D2020-06-25 | 2995 ++++ .../src/test/resources/cov19parseResult.json | 3213 +++++ .../src/test/resources/cov19parseResult2.json | 3329 +++++ .../resources/getTextLineForTextLineId.json | 61 + .../resources/getTextLineForTextLineId2.json | 57 + .../test/resources/parseRequestResult.json | 4232 ++++++ code/languages/Flint/Flint.mpl | 3 +- .../languages/Flint/models/Flint.behavior.mps | 11359 ++++++++-------- code/languages/Flint/models/Flint.editor.mps | 158 +- .../Flint/models/Flint.intentions.mps | 602 +- .../Flint/models/Flint.structure.mps | 50 +- .../languages/Flint/sandbox/Flint.sandbox.msd | 1 + .../Flint/sandbox/models/Flint.test.mps | 397 + code/languages/Flint/sandbox/models/Test.mps | 421 + code/languages/Flint/sandbox/models/demo.mps | 504 +- .../Flint/sandbox/models/sources.mps | 938 ++ code/languages/FlintTests/FlintTests.mpl | 4 +- .../FlintTests/models/FlintTests.editor.mps | 79 + .../models/FlintTests.structure.mps | 63 +- code/languages/LawSource/LawSource.mpl | 134 + ...awSource.generator.templates@generator.mps | 24 + .../LawSource/models/LawSource.behavior.mps | 6666 +++++++++ .../models/LawSource.constraints.mps | 19 + .../LawSource/models/LawSource.editor.mps | 478 + .../LawSource/models/LawSource.intentions.mps | 424 + .../LawSource/models/LawSource.structure.mps | 197 + .../LawSource/models/LawSource.typesystem.mps | 11 + .../ParameterizedRangeSelection.mpl | 5 - .../Flint.build0/models/Flint.build.mps | 593 +- code/solutions/Flint.plugin/Flint.plugin.msd | 3 +- .../models/Flint.plugin.plugin.mps | 8723 +++++++++++- .../solutions/Flint.runtime/Flint.runtime.msd | 113 +- code/solutions/Flint.test/Flint.test.msd | 7 + .../Flint.test/models/Flint.test.mpstest.mps | 1042 +- .../FlintView.plugin/FlintView.plugin.msd | 72 + .../models/FlintView.plugin.plugin.mps | 1335 ++ code/solutions/Test/Test.msd | 39 + code/solutions/Test/models/Test.Test.mps | 135 + code/solutions/Test321/Test321.msd | 35 + .../solutions/Test321/models/Test321.test.mps | 112 + docs/USER_GUIDE.md | 28 +- docs/images/FlintView.png | Bin 0 -> 23333 bytes docs/images/currentmodelselectorpanel.png | Bin 0 -> 6256 bytes docs/images/linesplitted.png | Bin 0 -> 11152 bytes docs/images/parserselectorpanel.png | Bin 0 -> 6778 bytes docs/images/path_variables.png | Bin 0 -> 47773 bytes docs/images/splitline.png | Bin 0 -> 13244 bytes settings.gradle | 2 +- 119 files changed, 53094 insertions(+), 7166 deletions(-) create mode 100644 .idea/runConfigurations.xml create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/NsxParserClientImpl.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/ParserClient.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/AsyncTextLineClient.kt delete mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/TextLineClientImpl.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxAsyncTextLineClientImpl.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxEmbeddedResult.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxEmbeddedResultDeserializer.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxLink.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxLinks.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxPage.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxPublicationParser.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxPublicationSource.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxResult.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxSourceClientImpl.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxTextLineClientImpl.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxTextLinesForVersionRequest.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxTextLinesForVersionRequestId.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxTextLinesForVersionRequestStatus.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxTextLinesForVersionResult.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/nsx/NsxVersionClientImpl.kt rename code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/{VersionClientImpl.kt => triply/TripleVersionClientImpl.kt} (79%) create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/triply/TriplyAsyncTextLineClientImpl.kt rename code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/{SourceClientImpl.kt => triply/TriplySourceClientImpl.kt} (91%) create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/clients/triply/TriplyTextLineClientImpl.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/models/ArticleLine.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/models/PublicationParser.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/models/PublicationSource.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/services/AsyncArticleService.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/services/Constants.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/services/ParserService.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/services/TextLineService.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/services/nsx/NsxAsyncArticleServiceImpl.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/services/nsx/NsxParserServiceImpl.kt rename code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/{ => services}/triply/ArticleServiceImpl.kt (91%) rename code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/{ => services}/triply/SourceServiceImpl.kt (91%) create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/services/triply/TextLineServiceImpl.kt rename code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/{ => services}/triply/VersionServiceImpl.kt (91%) create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/transformers/AsyncTextLineTransformer.kt create mode 100644 code/java/FlintSources/src/main/kotlin/org/discipl/flint/sources/transformers/ParserTransformer.kt create mode 100644 code/java/FlintSources/src/test/kotlin/org/discipl/flint/sources/clients/NsxTextLineClientImplTest.kt create mode 100644 code/java/FlintSources/src/test/kotlin/org/discipl/flint/sources/clients/ParserClientTest.kt create mode 100644 code/java/FlintSources/src/test/kotlin/org/discipl/flint/sources/di/NsxResponseHandler.kt create mode 100644 code/java/FlintSources/src/test/kotlin/org/discipl/flint/sources/services/ParserServiceTest.kt rename code/java/FlintSources/src/test/kotlin/org/discipl/flint/sources/{ => services}/triply/ArticleServiceImplTest.kt (88%) create mode 100644 code/java/FlintSources/src/test/kotlin/org/discipl/flint/sources/services/triply/AsyncArticleServiceImplTest.kt rename code/java/FlintSources/src/test/kotlin/org/discipl/flint/sources/{ => services}/triply/SourceServiceImplTest.kt (97%) create mode 100644 code/java/FlintSources/src/test/kotlin/org/discipl/flint/sources/services/triply/TriplyTextLineServiceImplTest.kt delete mode 100644 code/java/FlintSources/src/test/kotlin/org/discpl/flint/FlintParserTest.kt create mode 100644 code/java/FlintSources/src/test/resources/1.0%3Ac%3ABWBR0043324%26g%3D2020-03-31 create mode 100644 code/java/FlintSources/src/test/resources/1.0%3Ac%3ABWBR0043324%26g%3D2020-04-17 create mode 100644 code/java/FlintSources/src/test/resources/1.0%3Ac%3ABWBR0043324%26g%3D2020-04-22 create mode 100644 code/java/FlintSources/src/test/resources/1.0%3Ac%3ABWBR0043324%26g%3D2020-05-16 create mode 100644 code/java/FlintSources/src/test/resources/1.0%3Ac%3ABWBR0043324%26g%3D2020-06-25 create mode 100644 code/java/FlintSources/src/test/resources/cov19parseResult.json create mode 100644 code/java/FlintSources/src/test/resources/cov19parseResult2.json create mode 100644 code/java/FlintSources/src/test/resources/getTextLineForTextLineId.json create mode 100644 code/java/FlintSources/src/test/resources/getTextLineForTextLineId2.json create mode 100644 code/java/FlintSources/src/test/resources/parseRequestResult.json create mode 100644 code/languages/Flint/sandbox/models/Flint.test.mps create mode 100644 code/languages/Flint/sandbox/models/Test.mps create mode 100644 code/languages/Flint/sandbox/models/sources.mps create mode 100644 code/languages/LawSource/LawSource.mpl create mode 100644 code/languages/LawSource/generator/templates/LawSource.generator.templates@generator.mps create mode 100644 code/languages/LawSource/models/LawSource.behavior.mps create mode 100644 code/languages/LawSource/models/LawSource.constraints.mps create mode 100644 code/languages/LawSource/models/LawSource.editor.mps create mode 100644 code/languages/LawSource/models/LawSource.intentions.mps create mode 100644 code/languages/LawSource/models/LawSource.structure.mps create mode 100644 code/languages/LawSource/models/LawSource.typesystem.mps create mode 100644 code/solutions/FlintView.plugin/FlintView.plugin.msd create mode 100644 code/solutions/FlintView.plugin/models/FlintView.plugin.plugin.mps create mode 100644 code/solutions/Test/Test.msd create mode 100644 code/solutions/Test/models/Test.Test.mps create mode 100644 code/solutions/Test321/Test321.msd create mode 100644 code/solutions/Test321/models/Test321.test.mps create mode 100644 docs/images/FlintView.png create mode 100644 docs/images/currentmodelselectorpanel.png create mode 100644 docs/images/linesplitted.png create mode 100644 docs/images/parserselectorpanel.png create mode 100644 docs/images/path_variables.png create mode 100644 docs/images/splitline.png diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ebc1942..56c0dda 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: DISPLAY: :0 strategy: matrix: - os: [ ubuntu-16.04, macos-latest, windows-latest ] + os: [ ubuntu-20.04, macos-latest, windows-latest ] name: Run Tests runs-on: ${{ matrix.os }} steps: @@ -22,7 +22,7 @@ jobs: - name: Check java run: java --version - name: Setup xvfb (Linux) - if: ${{ matrix.os == 'ubuntu-16.04' }} + if: ${{ matrix.os == 'ubuntu-20.04' }} run: | sudo apt-get install -y xvfb sudo /usr/bin/Xvfb $DISPLAY -screen 0 1280x1024x24 & @@ -33,7 +33,7 @@ jobs: arguments: --no-parallel initProject test gradle-version: wrapper - name: Tests failed - if: ${{ matrix.os == 'ubuntu-16.04' && failure() }} + if: ${{ matrix.os == 'ubuntu-20.04' && failure() }} run: sudo apt-get install lynx && if [ -f ./code/build/reports/html/junit-noframes.html ]; then lynx -dump ./code/build/reports/html/junit-noframes.html; fi && if [ -f ./code/java/FlintParser/build/reports/tests/test/index.html ]; then lynx -dump ./code/java/FlintParser/build/reports/tests/test/index.html; fi && if [ -f ./code/java/FlintParser/build/reports/tests/test/classes/org.discipl.flint.flintfiller.FlintFillerTest.html ]; then lynx -dump ./code/java/FlintParser/build/reports/tests/test/classes/org.discipl.flint.flintfiller.FlintFillerTest.html; fi - name: Upload Test Results if: ${{ always() }} diff --git a/.gitignore b/.gitignore index 18b28ef..9df6048 100644 --- a/.gitignore +++ b/.gitignore @@ -79,6 +79,7 @@ static-resources/generated static-resources/temp workspace.xml +product-workspace.xml junitvmwatcher*.properties build.properties diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 8dc4293..1bec35e 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -4,15 +4,7 @@