From d45bfeccc711b8557c5399ec658a37e923dc24e8 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Tue, 10 Apr 2018 15:41:20 +0200 Subject: [PATCH] Deprecate a misplaced concept, copy to where it belongs, create migration. --- .../languageModels/editor.mps | 78 ------- .../languageModels/structure.mps | 2 + .../generator/template/main@generator.mps | 36 +-- .../jetbrains.mps.lang.typesystem2.mpl | 2 +- .../languageModels/editor.mps | 125 +++++++++++ .../languageModels/intentions.mps | 8 +- .../languageModels/migration.mps | 211 +++++++++++++++++- .../languageModels/structure.mps | 20 ++ 8 files changed, 379 insertions(+), 103 deletions(-) diff --git a/logic/languages/jetbrains.mps.logic/languageModels/editor.mps b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps index 96ee6036..489577ab 100644 --- a/logic/languages/jetbrains.mps.logic/languageModels/editor.mps +++ b/logic/languages/jetbrains.mps.logic/languageModels/editor.mps @@ -261,10 +261,6 @@ - - - - @@ -302,7 +298,6 @@ - @@ -413,9 +408,6 @@ - - - @@ -428,7 +420,6 @@ - @@ -1865,75 +1856,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/logic/languages/jetbrains.mps.logic/languageModels/structure.mps b/logic/languages/jetbrains.mps.logic/languageModels/structure.mps index c709ce52..0382ba66 100644 --- a/logic/languages/jetbrains.mps.logic/languageModels/structure.mps +++ b/logic/languages/jetbrains.mps.logic/languageModels/structure.mps @@ -10,6 +10,7 @@ + @@ -338,6 +339,7 @@ + diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps index 6ef7094c..fe597fbe 100644 --- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps +++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps @@ -4348,8 +4348,8 @@ - - + + @@ -4460,12 +4460,12 @@ - - + + - - + + @@ -4476,8 +4476,8 @@ - - + + @@ -4523,12 +4523,12 @@ - - + + - - + + @@ -4539,8 +4539,8 @@ - - + + @@ -4589,8 +4589,8 @@ - - + + @@ -17445,8 +17445,8 @@ - - + + diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl index 87023e12..43d85725 100644 --- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl +++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl @@ -1,5 +1,5 @@ - + diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps index 55223de7..79ec4b1e 100644 --- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps +++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps @@ -287,6 +287,9 @@ + + + @@ -494,6 +497,9 @@ + + + @@ -7607,5 +7613,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps index 42e06c69..bd19ca2d 100644 --- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps +++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/intentions.mps @@ -289,12 +289,12 @@ - + - + @@ -321,7 +321,7 @@ - + @@ -340,7 +340,7 @@ - + diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/migration.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/migration.mps index 26e7a66f..f32d3f55 100644 --- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/migration.mps +++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/migration.mps @@ -5,6 +5,8 @@ + + @@ -22,7 +24,7 @@ - + @@ -146,6 +148,9 @@ + + + @@ -161,10 +166,18 @@ - + + + + + + + + + @@ -878,5 +891,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps index 8db02b22..d653a041 100644 --- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps +++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps @@ -1547,5 +1547,25 @@ + + + + + + + + + + + + + + + + + + + +