From a35b5b46ec786527734d22a67750e08619b3917e Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Fri, 7 Feb 2020 13:12:18 +0100 Subject: [PATCH] Deprecated condition block in rule template, isApplicable method in API. Migration to use if statement instead. --- .../jetbrains.mps.lang.coderules.mpl | 2 +- .../languageModels/editor.mps | 15 + .../languageModels/migration.mps | 449 +++++++++++++++++- .../languageModels/structure.mps | 2 + .../jetbrains.mps.lang.coderules.program.mps | 47 +- .../jetbrains.mps.lang.coderules.template.mps | 61 +-- 6 files changed, 496 insertions(+), 80 deletions(-) diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl index 09c5fd1d..6ad4e96a 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl +++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl @@ -1,5 +1,5 @@ - + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps index 1b170d68..404f38e6 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps @@ -4233,6 +4233,21 @@ + + + + + + + + + + + + + + + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps index 75595964..83f355ec 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/migration.mps @@ -49,6 +49,9 @@ + + + @@ -72,6 +75,7 @@ + @@ -83,10 +87,18 @@ + + + + + + + + @@ -107,6 +119,7 @@ + @@ -139,6 +152,9 @@ + + + @@ -159,10 +175,13 @@ - + + + + @@ -223,10 +242,19 @@ + + + + + + + + + @@ -2006,5 +2034,424 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps index 7d6e7cb8..82d62718 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps @@ -298,6 +298,7 @@ + @@ -986,6 +987,7 @@ + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps index 621fbb57..f9c3c9e4 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps @@ -5698,37 +5698,25 @@ - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + - - - - - - - - @@ -6335,13 +6323,8 @@ - - - - - - - + + diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps index 3527922c..5102f1bb 100644 --- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps +++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps @@ -649,38 +649,16 @@ - - - - - - - - - - - - - - + + + + - - - - + - - - - - - - - - - - + + @@ -720,25 +698,13 @@ - - - - - - - - - - - - - - - + + + - - + + @@ -1020,6 +986,9 @@ + + +