From c3a1fca74e818b932f2ca5c39e3f48d70f43fbb5 Mon Sep 17 00:00:00 2001 From: Daniel Ratiu Date: Tue, 29 Apr 2025 22:37:27 +0200 Subject: [PATCH 1/3] lint: added org.mpsqa.lint.devkit which contains usual dependencies which are enough for writing linters --- .../org.mpsqa.build._080_lint_build.mps | 53 ++++ .../org.mpsqa.deprecated.typesystem.mps | 56 +++- .../languages/org.mpsqa.lint/.mps/modules.xml | 6 + .../org.mpsqa.lint.devkit.devkit | 15 + .../org.mpsqa.lint.mpsqa_lint_devkit_demo.mps | 268 ++++++++++++++++++ .../org.mpsqa.lint.generic.sandbox.msd | 2 + 6 files changed, 394 insertions(+), 6 deletions(-) create mode 100644 code/languages/org.mpsqa.lint/devkits/org.mpsqa.lint.devkit/org.mpsqa.lint.devkit.devkit create mode 100644 code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.mpsqa_lint_devkit_demo.mps diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps index 2681d31e..b15cf38e 100644 --- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps +++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps @@ -128,6 +128,15 @@ + + + + + + + + + @@ -875,6 +884,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps index b8118778..75c24f87 100644 --- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps +++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps @@ -83,6 +83,7 @@ + @@ -138,6 +139,9 @@ + + + @@ -166,6 +170,8 @@ + + @@ -427,16 +433,27 @@ + + + + + + + + + + + + + + + - - - - - - + + @@ -454,6 +471,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.lint/.mps/modules.xml b/code/languages/org.mpsqa.lint/.mps/modules.xml index 1450db49..92d570c5 100644 --- a/code/languages/org.mpsqa.lint/.mps/modules.xml +++ b/code/languages/org.mpsqa.lint/.mps/modules.xml @@ -2,6 +2,7 @@ + @@ -10,6 +11,11 @@ + + + + + \ No newline at end of file diff --git a/code/languages/org.mpsqa.lint/devkits/org.mpsqa.lint.devkit/org.mpsqa.lint.devkit.devkit b/code/languages/org.mpsqa.lint/devkits/org.mpsqa.lint.devkit/org.mpsqa.lint.devkit.devkit new file mode 100644 index 00000000..81a1d0fe --- /dev/null +++ b/code/languages/org.mpsqa.lint/devkits/org.mpsqa.lint.devkit/org.mpsqa.lint.devkit.devkit @@ -0,0 +1,15 @@ + + + + + + + + + + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) + + + diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.mpsqa_lint_devkit_demo.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.mpsqa_lint_devkit_demo.mps new file mode 100644 index 00000000..62ee8e79 --- /dev/null +++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/models/org.mpsqa.lint.mpsqa_lint_devkit_demo.mps @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd index af9ea3ef..5268ed23 100644 --- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd +++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.sandbox/org.mpsqa.lint.generic.sandbox.msd @@ -25,9 +25,11 @@ + + From d266d22740ea6dc5deda7cdd4d109a3df5559e1b Mon Sep 17 00:00:00 2001 From: Daniel Ratiu Date: Tue, 29 Apr 2025 23:01:50 +0200 Subject: [PATCH 2/3] deprecated: reverted unintended change --- .../org.mpsqa.deprecated.typesystem.mps | 56 ++----------------- 1 file changed, 6 insertions(+), 50 deletions(-) diff --git a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps index 75c24f87..b8118778 100644 --- a/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps +++ b/code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated/models/org.mpsqa.deprecated.typesystem.mps @@ -83,7 +83,6 @@ - @@ -139,9 +138,6 @@ - - - @@ -170,8 +166,6 @@ - - @@ -433,27 +427,16 @@ - - - - - - - - - - - - - - - - - + + + + + + @@ -471,33 +454,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - From a9ee16db57615cb833468bf0dfc706e331924296 Mon Sep 17 00:00:00 2001 From: Daniel Ratiu Date: Tue, 29 Apr 2025 23:14:31 +0200 Subject: [PATCH 3/3] lint: reverted unintended change --- code/languages/org.mpsqa.lint/.mps/modules.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/languages/org.mpsqa.lint/.mps/modules.xml b/code/languages/org.mpsqa.lint/.mps/modules.xml index 92d570c5..fa3280f0 100644 --- a/code/languages/org.mpsqa.lint/.mps/modules.xml +++ b/code/languages/org.mpsqa.lint/.mps/modules.xml @@ -11,11 +11,6 @@ - - - - - \ No newline at end of file