From e9e7b593987a56584f51b382837e208ae2a133aa Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Wed, 19 Aug 2015 18:08:04 +0300 Subject: [PATCH 01/52] "console" commands to be used in MPS: refactor build scripts, got errors --- .../solutions/mpsBuild/models/build.mps | 5049 +++++++++-------- 1 file changed, 2526 insertions(+), 2523 deletions(-) diff --git a/plugins/mps-build/solutions/mpsBuild/models/build.mps b/plugins/mps-build/solutions/mpsBuild/models/build.mps index 07b2d6265580..71256d1a823c 100644 --- a/plugins/mps-build/solutions/mpsBuild/models/build.mps +++ b/plugins/mps-build/solutions/mpsBuild/models/build.mps @@ -16990,114 +16990,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -17223,1007 +17115,401 @@ - + - - + + - + - + - + - + - - - - + + + + - - + + - + - - + + - + - - + + - - + + - - + + - + - - + + - - + + - + - - - - - + + + + + - - - + + + + - - + + + + + + + + - - - + + + + - - - - - - - - - + + + + - - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + - - + + - + - - - - + + + + - - + + - + - - + + - + - - + + - + - - - - - + + + + + - - + + - + - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - + + - + - + - - + + - + - + - + - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - - - - - - - - - - - - - - - - - - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - + - - + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - + + - - + + - - + + - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -18409,27 +17695,9 @@ - - - - - - - - - - - - - - - - - - @@ -21534,1034 +20802,1465 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - + + + + + + + + + + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + + + + + + + - - + + - + - - - + + + + - - - + + + + - - - + + + + - - - + + + + + + + + + + - - - + + + + - + - + - + - + - - - - + + + + + + + + + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - - - + + + - - + + - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + + + - - - + + + + - - - + + + + - - - + + + + - - - + + + + - - + + - + - - - - - - - - - - - - - - - - + + + + - - + + - + - - + + - - - + + - - - + + + - - - - + + + + + + + - + - + - - + + - - + + - - + + - - - - - - - - + + - - - - - - - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - + + - + - - - - + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - - + + + - - - - - - - - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + - + - - + + - + - - + + - + - - - - + + + + - - + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - + + + + + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + - - + + - - + + - + - + - - - - + + + + + + + - + - - + + - - + + - - + + - - + + + + + + + + - - + + - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - - - - + + - + - - + + - + - + - - - - - - + + + + + + @@ -22569,1150 +22268,1454 @@ - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - + + - + - - + + - + - - + + - + - - + + - + - - + + + + + + - + - - + + - + - - + + - + - - + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - - - - - + + - - - - - + + - - - - - + + + + - - - - + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + - - - - + + + - - - - + + + + + - - - - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + - - - - - + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + - - + + - + - - - - + + + + + + - - + + + + + + + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + - + - + + + + - - - - - - - + + + + + + - - - - + + + + + + + + + + + + + + + + - - + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + - - - - - - - + - - + + - + - - + + - + - - - - - - + + - + - - + + - + - - + + - + - - + + - + - - - - - - - - - - - - - - + + + + + - - + + + + + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + + - - - - + + + + + - - - - + + + + + - - - - - - - - - - - - - - - - + + + + - - - - - - - - + + + + + - - + + + + + - - + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + - - - + + + + - - + + + + + - - + + + + + - - - - + + + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - + + + + + - - - + + + + - - - - - + + + + - - - - - - - - - - - - + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - + + + + - - + + - + - - - - - - + + + + - - - - - - - - + + - + - - + + - - - - + + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + + - + - + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + - - + + - + - - - - + - - + + - - - - - - + - + - - - - - - - - + + + + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4b6e73659a629d4ad5f6984dd6df33b2db8ca7ea Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Wed, 19 Aug 2015 18:08:36 +0300 Subject: [PATCH 02/52] "console" commands to be used in MPS: blCommand.runtime fixed --- ...etbrains.mps.console.blCommand.runtime.msd | 4 ---- .../solutions/mpsBuild/models/build.mps | 24 ------------------- 2 files changed, 28 deletions(-) diff --git a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd b/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd index db292b56875a..b12cf643288e 100644 --- a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd +++ b/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd @@ -12,13 +12,9 @@ 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) - 86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console) - de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime) - 019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) diff --git a/plugins/mps-build/solutions/mpsBuild/models/build.mps b/plugins/mps-build/solutions/mpsBuild/models/build.mps index 71256d1a823c..8e245e105755 100644 --- a/plugins/mps-build/solutions/mpsBuild/models/build.mps +++ b/plugins/mps-build/solutions/mpsBuild/models/build.mps @@ -23034,12 +23034,6 @@ - - - - - - @@ -23058,12 +23052,6 @@ - - - - - - @@ -23076,18 +23064,6 @@ - - - - - - - - - - - - From 0dbe14af19893253f1750b4b7acc334aac046c13 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Wed, 19 Aug 2015 20:40:07 +0300 Subject: [PATCH 03/52] "console" commands to be used in MPS: blCommand: removing dep on platform --- .../console/lang/blCommand/jetbrains.mps.console.blCommand.mpl | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl index a1844c744dbe..1188c2636c57 100644 --- a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl +++ b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl @@ -114,10 +114,7 @@ 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) - a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console) - de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) - 019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime) From f386c85d7da2d8d8b7eef44888dca9d546dd51ba Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Wed, 19 Aug 2015 20:40:47 +0300 Subject: [PATCH 04/52] "console" commands to be used in MPS: ideCommands moved back to plugin (not core part) --- .../solutions/mpsBuild/models/build.mps | 492 +++++++++--------- 1 file changed, 246 insertions(+), 246 deletions(-) diff --git a/plugins/mps-build/solutions/mpsBuild/models/build.mps b/plugins/mps-build/solutions/mpsBuild/models/build.mps index 8e245e105755..6ed12289f78d 100644 --- a/plugins/mps-build/solutions/mpsBuild/models/build.mps +++ b/plugins/mps-build/solutions/mpsBuild/models/build.mps @@ -17434,6 +17434,246 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17704,6 +17944,12 @@ + + + + + + @@ -22696,9 +22942,6 @@ - - - @@ -22708,9 +22951,6 @@ - - - @@ -23332,246 +23572,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 0ee3239c2975e8aa2cb01cd7931537e3a2635048 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Wed, 19 Aug 2015 20:41:30 +0300 Subject: [PATCH 05/52] "console" commands to be used in MPS: ExceptionHolder moved to console.base to get rid of dep on console tool --- .../lang/base/jetbrains.mps.console.base.mpl | 1 + .../lang/base/languageModels/behavior.mps | 111 +++++++++++++++- .../lang/base/languageModels/editor.mps | 16 +++ .../lang/base/languageModels/structure.mps | 12 ++ .../blCommand/languageModels/behavior.mps | 120 +----------------- .../lang/blCommand/languageModels/editor.mps | 22 +--- .../blCommand/languageModels/structure.mps | 16 --- .../mps/console/blCommand/runtime/util.mps | 6 +- ...brains.mps.console.ideCommands.runtime.msd | 1 - 9 files changed, 144 insertions(+), 161 deletions(-) diff --git a/plugins/console/lang/base/jetbrains.mps.console.base.mpl b/plugins/console/lang/base/jetbrains.mps.console.base.mpl index c97c5611ce96..9913207ccfae 100644 --- a/plugins/console/lang/base/jetbrains.mps.console.base.mpl +++ b/plugins/console/lang/base/jetbrains.mps.console.base.mpl @@ -87,6 +87,7 @@ 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index 66b76138c5ae..c0e9c8b4d5dd 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -29,8 +29,12 @@ + + + + @@ -279,7 +283,7 @@ - + @@ -2573,5 +2577,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/languageModels/editor.mps b/plugins/console/lang/base/languageModels/editor.mps index 03b41ded4db1..8cb2a21f18c9 100644 --- a/plugins/console/lang/base/languageModels/editor.mps +++ b/plugins/console/lang/base/languageModels/editor.mps @@ -596,5 +596,21 @@ + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/languageModels/structure.mps b/plugins/console/lang/base/languageModels/structure.mps index e55355ba63ea..101c98875044 100644 --- a/plugins/console/lang/base/languageModels/structure.mps +++ b/plugins/console/lang/base/languageModels/structure.mps @@ -292,5 +292,17 @@ + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/languageModels/behavior.mps b/plugins/console/lang/blCommand/languageModels/behavior.mps index 43248da09c7b..b1595887eed6 100644 --- a/plugins/console/lang/blCommand/languageModels/behavior.mps +++ b/plugins/console/lang/blCommand/languageModels/behavior.mps @@ -48,7 +48,6 @@ - @@ -62,26 +61,20 @@ - - - - - - @@ -109,9 +102,7 @@ - - @@ -119,7 +110,6 @@ - @@ -141,13 +131,10 @@ - - - - + @@ -296,111 +283,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommand/languageModels/editor.mps b/plugins/console/lang/blCommand/languageModels/editor.mps index d92e016cab22..cc9b240230da 100644 --- a/plugins/console/lang/blCommand/languageModels/editor.mps +++ b/plugins/console/lang/blCommand/languageModels/editor.mps @@ -68,10 +68,6 @@ - - - - @@ -380,22 +376,6 @@ - - - - - - - - - - - - - - - - @@ -1221,7 +1201,7 @@ - + diff --git a/plugins/console/lang/blCommand/languageModels/structure.mps b/plugins/console/lang/blCommand/languageModels/structure.mps index bb5d6035c753..99f274811798 100644 --- a/plugins/console/lang/blCommand/languageModels/structure.mps +++ b/plugins/console/lang/blCommand/languageModels/structure.mps @@ -18,7 +18,6 @@ - @@ -30,9 +29,6 @@ - - - @@ -178,18 +174,6 @@ - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps index 678e2c65bba4..cf4282994239 100644 --- a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps +++ b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps @@ -1433,12 +1433,12 @@ - + - + @@ -1451,7 +1451,7 @@ - + diff --git a/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd b/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd index 8ab7b7e83c96..cf6db6adacdf 100644 --- a/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd +++ b/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd @@ -13,7 +13,6 @@ 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) 5fa23c0a-216d-4571-a163-e286643e6f5f(jetbrains.mps.generator) - 8f6725be-608d-433b-98fd-844f816eb05f(jetbrains.mps.ide.make) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) From 9ea88d589ea623b14e7a4567e861ec48852d2efa Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 18:29:57 +0300 Subject: [PATCH 06/52] "console" commands to be used in MPS: BLExpression and BLCommand moved to console.base --- .../mps/console/actions/platform.mps | 9 +- .../generator/template/main@generator.mps | 184 +++++++ .../lang/base/jetbrains.mps.console.base.mpl | 3 + .../lang/base/languageModels/behavior.mps | 166 +++++++ .../lang/base/languageModels/editor.mps | 248 ++++++++++ .../lang/base/languageModels/structure.mps | 33 ++ .../generator/template/main@generator.mps | 457 +----------------- .../lang/blCommand/languageModels/actions.mps | 20 +- .../blCommand/languageModels/behavior.mps | 175 ------- .../lang/blCommand/languageModels/editor.mps | 190 -------- .../blCommand/languageModels/structure.mps | 32 -- .../generator/template/main@generator.mps | 92 ---- .../generator/template/main@generator.mps | 48 -- .../generator/template/main@generator.mps | 40 -- 14 files changed, 656 insertions(+), 1041 deletions(-) diff --git a/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps b/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps index 66065c1f801e..dfe3049cf257 100644 --- a/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps +++ b/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps @@ -12,6 +12,7 @@ + @@ -209,9 +210,6 @@ - - - @@ -238,6 +236,11 @@ + + + + + diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index 79367173f99e..0bed579058bc 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -10,6 +10,9 @@ + + + @@ -17,11 +20,29 @@ + + + + + + + + + + + + + + + + + + @@ -36,11 +57,18 @@ + + + + + + + @@ -55,40 +83,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -135,5 +207,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/jetbrains.mps.console.base.mpl b/plugins/console/lang/base/jetbrains.mps.console.base.mpl index 9913207ccfae..d034530dc5bd 100644 --- a/plugins/console/lang/base/jetbrains.mps.console.base.mpl +++ b/plugins/console/lang/base/jetbrains.mps.console.base.mpl @@ -17,6 +17,9 @@ a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console) + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index c0e9c8b4d5dd..8c6bea255536 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -29,7 +29,9 @@ + + @@ -240,6 +242,11 @@ + + + + + @@ -257,12 +264,18 @@ + + + + + + @@ -2682,5 +2695,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/languageModels/editor.mps b/plugins/console/lang/base/languageModels/editor.mps index 8cb2a21f18c9..7657fe52ca21 100644 --- a/plugins/console/lang/base/languageModels/editor.mps +++ b/plugins/console/lang/base/languageModels/editor.mps @@ -11,9 +11,12 @@ + + + @@ -23,6 +26,7 @@ + @@ -62,6 +66,15 @@ + + + + + + + + + @@ -76,6 +89,9 @@ + + + @@ -119,10 +135,17 @@ + + + + + + + @@ -130,9 +153,17 @@ + + + + + + + + @@ -147,6 +178,10 @@ + + + + @@ -158,13 +193,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -174,6 +239,9 @@ + + + @@ -612,5 +680,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/languageModels/structure.mps b/plugins/console/lang/base/languageModels/structure.mps index 101c98875044..b8899f9004cd 100644 --- a/plugins/console/lang/base/languageModels/structure.mps +++ b/plugins/console/lang/base/languageModels/structure.mps @@ -8,6 +8,7 @@ + @@ -304,5 +305,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index 1e1ff840197d..ed92e9b0f30f 100644 --- a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -10,6 +10,7 @@ + @@ -27,6 +28,7 @@ + @@ -40,17 +42,9 @@ - - - - - - - - @@ -70,7 +64,6 @@ - @@ -93,7 +86,6 @@ - @@ -160,7 +152,6 @@ - @@ -168,14 +159,9 @@ - - - - - @@ -197,9 +183,6 @@ - - - @@ -224,10 +207,6 @@ - - - - @@ -315,11 +294,7 @@ - - - - @@ -359,22 +334,6 @@ - - - - - - - - - - - - - - - - @@ -484,166 +443,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -690,7 +489,7 @@ - + @@ -756,32 +555,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -948,32 +721,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1281,32 +1028,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1389,7 +1110,7 @@ - + @@ -1460,7 +1181,7 @@ - + @@ -1917,32 +1638,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2019,32 +1714,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2059,45 +1728,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2482,64 +2115,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2555,32 +2136,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommand/languageModels/actions.mps b/plugins/console/lang/blCommand/languageModels/actions.mps index 1f52b1b42435..17264a387806 100644 --- a/plugins/console/lang/blCommand/languageModels/actions.mps +++ b/plugins/console/lang/blCommand/languageModels/actions.mps @@ -273,7 +273,7 @@ - + @@ -282,7 +282,7 @@ - + @@ -290,7 +290,7 @@ - + @@ -302,7 +302,7 @@ - + @@ -405,9 +405,9 @@ - + - + @@ -420,14 +420,14 @@ - + - + @@ -435,8 +435,8 @@ - + @@ -449,7 +449,7 @@ - + diff --git a/plugins/console/lang/blCommand/languageModels/behavior.mps b/plugins/console/lang/blCommand/languageModels/behavior.mps index b1595887eed6..a980cdcae07d 100644 --- a/plugins/console/lang/blCommand/languageModels/behavior.mps +++ b/plugins/console/lang/blCommand/languageModels/behavior.mps @@ -99,13 +99,9 @@ - - - - @@ -115,25 +111,8 @@ - - - - - - - - - - - - - - - - - @@ -161,128 +140,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -891,42 +752,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommand/languageModels/editor.mps b/plugins/console/lang/blCommand/languageModels/editor.mps index cc9b240230da..72eaefca6902 100644 --- a/plugins/console/lang/blCommand/languageModels/editor.mps +++ b/plugins/console/lang/blCommand/languageModels/editor.mps @@ -34,8 +34,6 @@ - - @@ -212,21 +210,14 @@ - - - - - - - @@ -267,62 +258,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -696,135 +635,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommand/languageModels/structure.mps b/plugins/console/lang/blCommand/languageModels/structure.mps index 99f274811798..4467b63e1dc0 100644 --- a/plugins/console/lang/blCommand/languageModels/structure.mps +++ b/plugins/console/lang/blCommand/languageModels/structure.mps @@ -45,24 +45,6 @@ - - - - - - - - - - - - - - - - - - @@ -248,20 +230,6 @@ - - - - - - - - - - - - - - diff --git a/plugins/console/lang/ideCommands/generator/template/main@generator.mps b/plugins/console/lang/ideCommands/generator/template/main@generator.mps index 57ccb0c09685..30a65fff7da3 100644 --- a/plugins/console/lang/ideCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/ideCommands/generator/template/main@generator.mps @@ -195,13 +195,6 @@ - - - - - - - @@ -218,9 +211,6 @@ - - - @@ -230,11 +220,7 @@ - - - - @@ -647,32 +633,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -827,32 +787,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -971,32 +905,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/internalCommands/generator/template/main@generator.mps b/plugins/console/lang/internalCommands/generator/template/main@generator.mps index b479d947f7c9..6ce7304f2e56 100644 --- a/plugins/console/lang/internalCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/internalCommands/generator/template/main@generator.mps @@ -100,33 +100,15 @@ - - - - - - - - - - - - - - - - - - @@ -136,10 +118,6 @@ - - - - @@ -237,32 +215,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/scripts/generator/template/main@generator.mps b/plugins/console/lang/scripts/generator/template/main@generator.mps index 199269925ba2..8146d4d6fd75 100644 --- a/plugins/console/lang/scripts/generator/template/main@generator.mps +++ b/plugins/console/lang/scripts/generator/template/main@generator.mps @@ -106,27 +106,13 @@ - - - - - - - - - - - - - - @@ -269,32 +255,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - From 9d99b2c124e46a0b4a8e49598c4c6b397ba21460 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 18:38:26 +0300 Subject: [PATCH 07/52] "console" commands to be used in MPS: BLExpression and BLCommand moved to console.base (actions) --- .../lang/base/languageModels/actions.mps | 256 ++++++++++++++++++ .../jetbrains.mps.console.blCommand.mpl | 5 - .../lang/blCommand/languageModels/actions.mps | 205 -------------- 3 files changed, 256 insertions(+), 210 deletions(-) create mode 100644 plugins/console/lang/base/languageModels/actions.mps diff --git a/plugins/console/lang/base/languageModels/actions.mps b/plugins/console/lang/base/languageModels/actions.mps new file mode 100644 index 000000000000..c8991a504fed --- /dev/null +++ b/plugins/console/lang/base/languageModels/actions.mps @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl index 1188c2636c57..295c61f5fc35 100644 --- a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl +++ b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl @@ -26,11 +26,8 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 857d0a79-6f44-4f46-84ed-9c5b42632011(jetbrains.mps.baseLanguage.closures#1199623535494) 5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197) - a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console) - de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) - 019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) 2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696) @@ -118,7 +115,6 @@ ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime) - 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -152,7 +148,6 @@ 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) - de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples) diff --git a/plugins/console/lang/blCommand/languageModels/actions.mps b/plugins/console/lang/blCommand/languageModels/actions.mps index 17264a387806..e9a4450d4547 100644 --- a/plugins/console/lang/blCommand/languageModels/actions.mps +++ b/plugins/console/lang/blCommand/languageModels/actions.mps @@ -28,16 +28,7 @@ - - - - - - - - - @@ -49,51 +40,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -102,26 +52,8 @@ - - - - - - - - - - - - - - - - - - @@ -133,10 +65,6 @@ - - - - @@ -147,9 +75,6 @@ - - - @@ -267,69 +192,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -394,72 +256,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 7d4653a2277ddb321ef8fb58800b9afa77f4d3f6 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 18:54:29 +0300 Subject: [PATCH 08/52] "console" commands to be used in MPS: command.base lang created --- .mps/modules.xml | 1 + .../lang/base/jetbrains.mps.console.base.mpl | 1 - .../generator/template/main@generator.mps | 26 ++++++++ .../jetbrains.mps.command.base.mpl | 66 +++++++++++++++++++ .../models/behavior.mps | 11 ++++ .../models/constraints.mps | 11 ++++ .../models/editor.mps | 11 ++++ .../models/structure.mps | 11 ++++ .../models/typesystem.mps | 11 ++++ 9 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/models/behavior.mps create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/models/constraints.mps create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/models/editor.mps create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/models/structure.mps create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/models/typesystem.mps diff --git a/.mps/modules.xml b/.mps/modules.xml index ca214466c357..985c152da035 100644 --- a/.mps/modules.xml +++ b/.mps/modules.xml @@ -152,6 +152,7 @@ + diff --git a/plugins/console/lang/base/jetbrains.mps.console.base.mpl b/plugins/console/lang/base/jetbrains.mps.console.base.mpl index d034530dc5bd..780da5105f48 100644 --- a/plugins/console/lang/base/jetbrains.mps.console.base.mpl +++ b/plugins/console/lang/base/jetbrains.mps.console.base.mpl @@ -90,7 +90,6 @@ 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps new file mode 100644 index 000000000000..fa90f3056ca5 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl b/plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl new file mode 100644 index 000000000000..84283a7d9cbd --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) + + + + + + + + + + + + + + + + + + + + + + + 2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design) + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/behavior.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/behavior.mps new file mode 100644 index 000000000000..52252d1a5b20 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/behavior.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/constraints.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/constraints.mps new file mode 100644 index 000000000000..b4a834fda417 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/constraints.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/editor.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/editor.mps new file mode 100644 index 000000000000..9465d9a7f424 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/editor.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/structure.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/structure.mps new file mode 100644 index 000000000000..b2def5efbffe --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/structure.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/typesystem.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/typesystem.mps new file mode 100644 index 000000000000..dbb054973d1c --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/typesystem.mps @@ -0,0 +1,11 @@ + + + + + + + + + + + From f464a8c0a0da2681b6fcb01b0482dd8ffe76adbf Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 19:17:55 +0300 Subject: [PATCH 09/52] "console" commands to be used in MPS: ConsoleHelplProvider moved to command.base --- .../lang/base/jetbrains.mps.console.base.mpl | 1 + .../lang/base/languageModels/behavior.mps | 308 +++++++++--------- .../lang/base/languageModels/constraints.mps | 2 +- .../lang/base/languageModels/structure.mps | 8 +- .../jetbrains.mps.console.blCommand.mpl | 1 + .../ideCommands/languageModels/behavior.mps | 2 +- .../languageModels/behavior.mps | 2 +- 7 files changed, 163 insertions(+), 161 deletions(-) diff --git a/plugins/console/lang/base/jetbrains.mps.console.base.mpl b/plugins/console/lang/base/jetbrains.mps.console.base.mpl index 780da5105f48..d034530dc5bd 100644 --- a/plugins/console/lang/base/jetbrains.mps.console.base.mpl +++ b/plugins/console/lang/base/jetbrains.mps.console.base.mpl @@ -90,6 +90,7 @@ 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index 8c6bea255536..2c16ceb4b46b 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -2376,160 +2376,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2848,5 +2694,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/languageModels/constraints.mps b/plugins/console/lang/base/languageModels/constraints.mps index 2ff28a831637..9de8486082b6 100644 --- a/plugins/console/lang/base/languageModels/constraints.mps +++ b/plugins/console/lang/base/languageModels/constraints.mps @@ -142,7 +142,7 @@ - + diff --git a/plugins/console/lang/base/languageModels/structure.mps b/plugins/console/lang/base/languageModels/structure.mps index b8899f9004cd..4521463a7cd6 100644 --- a/plugins/console/lang/base/languageModels/structure.mps +++ b/plugins/console/lang/base/languageModels/structure.mps @@ -201,10 +201,6 @@ - - - - @@ -337,5 +333,9 @@ + + + + diff --git a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl index 295c61f5fc35..4a1601313112 100644 --- a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl +++ b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl @@ -150,6 +150,7 @@ ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples) + de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) diff --git a/plugins/console/lang/ideCommands/languageModels/behavior.mps b/plugins/console/lang/ideCommands/languageModels/behavior.mps index 6ff67a334dba..df37b77746f7 100644 --- a/plugins/console/lang/ideCommands/languageModels/behavior.mps +++ b/plugins/console/lang/ideCommands/languageModels/behavior.mps @@ -251,7 +251,7 @@ - + diff --git a/plugins/console/lang/internalCommands/languageModels/behavior.mps b/plugins/console/lang/internalCommands/languageModels/behavior.mps index f3ad2161c6a7..d0afd22c4340 100644 --- a/plugins/console/lang/internalCommands/languageModels/behavior.mps +++ b/plugins/console/lang/internalCommands/languageModels/behavior.mps @@ -88,7 +88,7 @@ - + From 270dded672f587ac3f6fcbbd1e68d957fa005fc7 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 19:20:32 +0300 Subject: [PATCH 10/52] "console" commands to be used in MPS: fix minor problems in blCommand --- .../generator/template/main@generator.mps | 87 ------------------- .../blCommand/languageModels/typesystem.mps | 18 ++-- 2 files changed, 9 insertions(+), 96 deletions(-) diff --git a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index ed92e9b0f30f..6583a1654a6b 100644 --- a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -28,7 +28,6 @@ - @@ -206,13 +205,6 @@ - - - - - - - @@ -244,7 +236,6 @@ - @@ -474,32 +465,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1095,32 +1060,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1166,32 +1105,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommand/languageModels/typesystem.mps b/plugins/console/lang/blCommand/languageModels/typesystem.mps index 03a7d9eec726..f7f34f883ac7 100644 --- a/plugins/console/lang/blCommand/languageModels/typesystem.mps +++ b/plugins/console/lang/blCommand/languageModels/typesystem.mps @@ -146,9 +146,12 @@ + - + + + @@ -172,9 +175,6 @@ - - - @@ -716,8 +716,8 @@ - - + + @@ -733,7 +733,7 @@ - + @@ -779,7 +779,7 @@ - + @@ -1241,7 +1241,7 @@ - + From 016ec0da5377c3483a28e1684b11a7a577713af4 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 19:26:27 +0300 Subject: [PATCH 11/52] "console" commands to be used in MPS: move WithStmt and HelpProvider to command.base --- .../lang/base/jetbrains.mps.console.base.mpl | 1 - .../lang/base/languageModels/behavior.mps | 209 ++------------- .../lang/base/languageModels/constraints.mps | 14 +- .../lang/base/languageModels/structure.mps | 9 +- .../generator/template/main@generator.mps | 134 ---------- .../jetbrains.mps.console.blCommand.mpl | 2 +- .../blCommand/languageModels/behavior.mps | 31 +-- .../lang/blCommand/languageModels/editor.mps | 26 -- .../blCommand/languageModels/structure.mps | 23 +- .../blCommand/languageModels/typesystem.mps | 48 ---- .../generator/template/main@generator.mps | 245 ++++++++++++++++- .../jetbrains.mps.command.base.mpl | 14 +- .../models/behavior.mps | 252 +++++++++++++++++- .../models/editor.mps | 58 +++- .../models/structure.mps | 53 +++- .../models/typesystem.mps | 123 ++++++++- .../ideCommands/languageModels/behavior.mps | 9 +- .../languageModels/behavior.mps | 7 +- .../lang/scripts/languageModels/behavior.mps | 5 +- 19 files changed, 805 insertions(+), 458 deletions(-) diff --git a/plugins/console/lang/base/jetbrains.mps.console.base.mpl b/plugins/console/lang/base/jetbrains.mps.console.base.mpl index d034530dc5bd..780da5105f48 100644 --- a/plugins/console/lang/base/jetbrains.mps.console.base.mpl +++ b/plugins/console/lang/base/jetbrains.mps.console.base.mpl @@ -90,7 +90,6 @@ 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index 2c16ceb4b46b..558c4e11f305 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -31,12 +31,14 @@ + - + + @@ -263,7 +265,6 @@ - @@ -1198,7 +1199,7 @@ - + @@ -1418,7 +1419,7 @@ - + @@ -1427,7 +1428,7 @@ - + @@ -1493,7 +1494,7 @@ - + @@ -1517,7 +1518,7 @@ - + @@ -1563,13 +1564,13 @@ - + - + @@ -1605,7 +1606,7 @@ - + @@ -1613,7 +1614,7 @@ - + @@ -1663,7 +1664,7 @@ - + @@ -1671,7 +1672,7 @@ - + @@ -1725,7 +1726,7 @@ - + @@ -2165,11 +2166,11 @@ - + - + @@ -2198,7 +2199,7 @@ - + @@ -2213,7 +2214,7 @@ - + @@ -2224,7 +2225,7 @@ - + @@ -2236,7 +2237,7 @@ - + @@ -2324,7 +2325,7 @@ - + @@ -2350,7 +2351,7 @@ - + @@ -2364,7 +2365,7 @@ - + @@ -2632,7 +2633,7 @@ - + @@ -2646,7 +2647,7 @@ - + @@ -2668,7 +2669,7 @@ - + @@ -2682,7 +2683,7 @@ - + @@ -2694,159 +2695,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/base/languageModels/constraints.mps b/plugins/console/lang/base/languageModels/constraints.mps index 9de8486082b6..437f09577998 100644 --- a/plugins/console/lang/base/languageModels/constraints.mps +++ b/plugins/console/lang/base/languageModels/constraints.mps @@ -13,10 +13,12 @@ - + + + @@ -254,13 +256,13 @@ - + - + @@ -298,7 +300,7 @@ - + @@ -306,14 +308,14 @@ - + - + diff --git a/plugins/console/lang/base/languageModels/structure.mps b/plugins/console/lang/base/languageModels/structure.mps index 4521463a7cd6..52933d8139fe 100644 --- a/plugins/console/lang/base/languageModels/structure.mps +++ b/plugins/console/lang/base/languageModels/structure.mps @@ -9,6 +9,7 @@ + @@ -145,7 +146,7 @@ - + @@ -193,7 +194,7 @@ - + @@ -333,9 +334,5 @@ - - - - diff --git a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index 6583a1654a6b..26577ab7267e 100644 --- a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -50,16 +50,10 @@ - - - - - - @@ -78,9 +72,6 @@ - - - @@ -139,9 +130,6 @@ - - - @@ -427,12 +415,6 @@ - - - - - - @@ -2751,121 +2733,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl index 4a1601313112..cafc72f05bbd 100644 --- a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl +++ b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl @@ -150,7 +150,7 @@ ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples) - de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) + cb3c6536-cd62-4d95-8529-4a37cbf14855(jetbrains.mps.command.base) diff --git a/plugins/console/lang/blCommand/languageModels/behavior.mps b/plugins/console/lang/blCommand/languageModels/behavior.mps index a980cdcae07d..5434e6c8c443 100644 --- a/plugins/console/lang/blCommand/languageModels/behavior.mps +++ b/plugins/console/lang/blCommand/languageModels/behavior.mps @@ -19,6 +19,7 @@ + @@ -182,7 +183,7 @@ - + @@ -190,7 +191,7 @@ - + @@ -206,7 +207,7 @@ - + @@ -217,7 +218,7 @@ - + @@ -264,7 +265,7 @@ - + @@ -357,7 +358,7 @@ - + @@ -366,7 +367,7 @@ - + @@ -562,7 +563,7 @@ - + @@ -570,7 +571,7 @@ - + @@ -586,7 +587,7 @@ - + @@ -597,7 +598,7 @@ - + @@ -693,7 +694,7 @@ - + @@ -740,7 +741,7 @@ - + @@ -763,7 +764,7 @@ - + @@ -786,7 +787,7 @@ - + diff --git a/plugins/console/lang/blCommand/languageModels/editor.mps b/plugins/console/lang/blCommand/languageModels/editor.mps index 72eaefca6902..3889fffe0dc9 100644 --- a/plugins/console/lang/blCommand/languageModels/editor.mps +++ b/plugins/console/lang/blCommand/languageModels/editor.mps @@ -23,16 +23,11 @@ - - - - - @@ -1009,26 +1004,5 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommand/languageModels/structure.mps b/plugins/console/lang/blCommand/languageModels/structure.mps index 4467b63e1dc0..29d43b4b7482 100644 --- a/plugins/console/lang/blCommand/languageModels/structure.mps +++ b/plugins/console/lang/blCommand/languageModels/structure.mps @@ -9,6 +9,7 @@ + @@ -288,32 +289,14 @@ - + - - - - - - - - - - - - - - - - - - - + diff --git a/plugins/console/lang/blCommand/languageModels/typesystem.mps b/plugins/console/lang/blCommand/languageModels/typesystem.mps index f7f34f883ac7..0a1c8afd012b 100644 --- a/plugins/console/lang/blCommand/languageModels/typesystem.mps +++ b/plugins/console/lang/blCommand/languageModels/typesystem.mps @@ -1196,53 +1196,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps index fa90f3056ca5..8227931167d9 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps @@ -6,14 +6,133 @@ + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21,6 +140,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl b/plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl index 84283a7d9cbd..b28a477a5328 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl @@ -14,6 +14,16 @@ + + 504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409) + cb3c6536-cd62-4d95-8529-4a37cbf14855(jetbrains.mps.command.base) + a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console) + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) + fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -61,6 +71,8 @@ - + + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/behavior.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/behavior.mps index 52252d1a5b20..9df3043c4155 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/behavior.mps +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/behavior.mps @@ -5,7 +5,255 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/editor.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/editor.mps index 9465d9a7f424..4402f0d9bdc3 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/editor.mps +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/editor.mps @@ -5,7 +5,61 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/structure.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/structure.mps index b2def5efbffe..de45596c943f 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/structure.mps +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/structure.mps @@ -5,7 +5,56 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/typesystem.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/typesystem.mps index dbb054973d1c..ad9a6903f847 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/typesystem.mps +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/typesystem.mps @@ -5,7 +5,126 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/ideCommands/languageModels/behavior.mps b/plugins/console/lang/ideCommands/languageModels/behavior.mps index df37b77746f7..668e80e53ea9 100644 --- a/plugins/console/lang/ideCommands/languageModels/behavior.mps +++ b/plugins/console/lang/ideCommands/languageModels/behavior.mps @@ -37,6 +37,7 @@ + @@ -2453,7 +2454,7 @@ - + @@ -2498,14 +2499,14 @@ - + - + @@ -2527,7 +2528,7 @@ - + diff --git a/plugins/console/lang/internalCommands/languageModels/behavior.mps b/plugins/console/lang/internalCommands/languageModels/behavior.mps index d0afd22c4340..38e85b324f74 100644 --- a/plugins/console/lang/internalCommands/languageModels/behavior.mps +++ b/plugins/console/lang/internalCommands/languageModels/behavior.mps @@ -15,6 +15,7 @@ + @@ -164,7 +165,7 @@ - + @@ -239,7 +240,7 @@ - + @@ -279,7 +280,7 @@ - + diff --git a/plugins/console/lang/scripts/languageModels/behavior.mps b/plugins/console/lang/scripts/languageModels/behavior.mps index a46863211d13..3c7d3f95b8d7 100644 --- a/plugins/console/lang/scripts/languageModels/behavior.mps +++ b/plugins/console/lang/scripts/languageModels/behavior.mps @@ -9,6 +9,7 @@ + @@ -139,7 +140,7 @@ - + @@ -155,7 +156,7 @@ - + From f431793063d81eeeb9fe9f8e56c18c31c634ca9f Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 19:29:58 +0300 Subject: [PATCH 12/52] "console" commands to be used in MPS: command.base added to build script --- .../solutions/mpsBuild/models/build.mps | 252 ++++++++++++++---- 1 file changed, 199 insertions(+), 53 deletions(-) diff --git a/plugins/mps-build/solutions/mpsBuild/models/build.mps b/plugins/mps-build/solutions/mpsBuild/models/build.mps index 6ed12289f78d..74a66430a8d8 100644 --- a/plugins/mps-build/solutions/mpsBuild/models/build.mps +++ b/plugins/mps-build/solutions/mpsBuild/models/build.mps @@ -22940,6 +22940,9 @@ + + + @@ -23245,6 +23248,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -23352,24 +23551,12 @@ - - - - - - - - - - - - @@ -23394,9 +23581,6 @@ - - - @@ -23405,11 +23589,6 @@ - - - - - @@ -23419,12 +23598,6 @@ - - - - - - @@ -23455,24 +23628,12 @@ - - - - - - - - - - - - @@ -23498,12 +23659,6 @@ - - - - - - @@ -23528,18 +23683,9 @@ - - - - - - - - - From 90ef6153e4441b61830b1431ba1c659d1f57fab1 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 19:38:20 +0300 Subject: [PATCH 13/52] command.base.runtime created, ConsoleContext moved --- .mps/modules.xml | 1 + .../jetbrains.mps.command.base.runtime.msd | 19 +++ .../jetbrains/mps/command/base/runtime.mps | 113 ++++++++++++++++++ plugins/console/jetbrains.mps.console.msd | 1 + .../generator/template/main@generator.mps | 7 +- .../lang/base/languageModels/behavior.mps | 37 +++--- .../generator/template/main@generator.mps | 89 +++++++------- .../mps/console/blCommand/runtime/util.mps | 23 ++-- .../generator/template/main@generator.mps | 7 +- .../jetbrains.mps.command.base.mpl | 7 +- .../generator/template/main@generator.mps | 27 +++-- .../mps/console/ideCommands/util.mps | 39 +++--- .../ideCommands/languageModels/behavior.mps | 67 ++++++----- .../generator/template/main@generator.mps | 7 +- .../languageModels/behavior.mps | 11 +- .../generator/template/main@generator.mps | 9 +- .../mps/console/scripts/runtime/util.mps | 17 +-- .../models/jetbrains/mps/console/tool.mps | 74 ++---------- 18 files changed, 325 insertions(+), 230 deletions(-) create mode 100644 plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd create mode 100644 plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps diff --git a/.mps/modules.xml b/.mps/modules.xml index 985c152da035..e291ea8fa7d1 100644 --- a/.mps/modules.xml +++ b/.mps/modules.xml @@ -147,6 +147,7 @@ + diff --git a/plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd b/plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd new file mode 100644 index 000000000000..07c003aa2c15 --- /dev/null +++ b/plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd @@ -0,0 +1,19 @@ + + + + + + + + + + 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + + + + + + + + + diff --git a/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps b/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps new file mode 100644 index 000000000000..c006f2de17a0 --- /dev/null +++ b/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/jetbrains.mps.console.msd b/plugins/console/jetbrains.mps.console.msd index ad39bc46074e..38b60a230178 100644 --- a/plugins/console/jetbrains.mps.console.msd +++ b/plugins/console/jetbrains.mps.console.msd @@ -26,6 +26,7 @@ f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets) a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime) df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources) + 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index 0bed579058bc..c942d9906437 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -11,6 +11,7 @@ + @@ -198,7 +199,7 @@ - + @@ -221,14 +222,14 @@ - + - + diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index 558c4e11f305..f53076dac1f5 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -30,6 +30,7 @@ + @@ -374,14 +375,14 @@ - + - + @@ -433,7 +434,7 @@ - + @@ -455,7 +456,7 @@ - + @@ -1169,13 +1170,13 @@ - + - + @@ -1288,7 +1289,7 @@ - + @@ -1310,13 +1311,13 @@ - + - + @@ -1343,13 +1344,13 @@ - + - + @@ -1437,7 +1438,7 @@ - + @@ -2117,7 +2118,7 @@ - + @@ -2130,7 +2131,7 @@ - + @@ -2256,7 +2257,7 @@ - + @@ -2288,7 +2289,7 @@ - + @@ -2335,13 +2336,13 @@ - + - + diff --git a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index 26577ab7267e..e46c2875ff80 100644 --- a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -28,6 +28,7 @@ + @@ -428,13 +429,13 @@ - + - + @@ -484,13 +485,13 @@ - + - + @@ -504,7 +505,7 @@ - + @@ -670,7 +671,7 @@ - + @@ -815,13 +816,13 @@ - + - + @@ -887,13 +888,13 @@ - + - + @@ -960,13 +961,13 @@ - + - + @@ -977,7 +978,7 @@ - + @@ -999,13 +1000,13 @@ - + - + @@ -1015,7 +1016,7 @@ - + @@ -1062,13 +1063,13 @@ - + - + @@ -1089,7 +1090,7 @@ - + @@ -1132,13 +1133,13 @@ - + - + @@ -1188,13 +1189,13 @@ - + - + @@ -1244,13 +1245,13 @@ - + - + @@ -1300,13 +1301,13 @@ - + - + @@ -1356,13 +1357,13 @@ - + - + @@ -1555,13 +1556,13 @@ - + - + @@ -1591,13 +1592,13 @@ - + - + @@ -1611,7 +1612,7 @@ - + @@ -1990,13 +1991,13 @@ - + - + @@ -2018,7 +2019,7 @@ - + @@ -2033,7 +2034,7 @@ - + @@ -2578,13 +2579,13 @@ - + - + @@ -2638,13 +2639,13 @@ - + - + @@ -2686,13 +2687,13 @@ - + - + diff --git a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps index cf4282994239..a2b12aa8e8d9 100644 --- a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps +++ b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps @@ -55,6 +55,7 @@ + @@ -668,7 +669,7 @@ - + @@ -681,7 +682,7 @@ - + @@ -709,7 +710,7 @@ - + @@ -774,7 +775,7 @@ - + @@ -1369,7 +1370,7 @@ - + @@ -1382,7 +1383,7 @@ - + @@ -1499,7 +1500,7 @@ - + @@ -1512,13 +1513,13 @@ - + - + @@ -1547,7 +1548,7 @@ - + @@ -1600,7 +1601,7 @@ - + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps index 8227931167d9..62f341f6b89f 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps @@ -19,6 +19,7 @@ + @@ -156,15 +157,15 @@ - - + + - + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl b/plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl index b28a477a5328..fc7f9857a549 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl @@ -7,7 +7,7 @@ - + @@ -17,12 +17,12 @@ 504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409) cb3c6536-cd62-4d95-8529-4a37cbf14855(jetbrains.mps.command.base) - a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) + 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -71,6 +71,9 @@ + + 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) + f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) diff --git a/plugins/console/lang/ideCommands/generator/template/main@generator.mps b/plugins/console/lang/ideCommands/generator/template/main@generator.mps index 30a65fff7da3..58c0a5e5b7a6 100644 --- a/plugins/console/lang/ideCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/ideCommands/generator/template/main@generator.mps @@ -29,6 +29,7 @@ + @@ -325,13 +326,13 @@ - + - + @@ -615,13 +616,13 @@ - + - + @@ -635,7 +636,7 @@ - + @@ -769,13 +770,13 @@ - + - + @@ -789,7 +790,7 @@ - + @@ -887,13 +888,13 @@ - + - + @@ -907,7 +908,7 @@ - + @@ -1232,13 +1233,13 @@ - + - + diff --git a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps index 1d8efbf26efc..0d3e919e2ddf 100644 --- a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps +++ b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps @@ -20,6 +20,7 @@ + @@ -210,7 +211,7 @@ - + @@ -237,7 +238,7 @@ - + @@ -270,7 +271,7 @@ - + @@ -311,7 +312,7 @@ - + @@ -373,7 +374,7 @@ - + @@ -744,7 +745,7 @@ - + @@ -808,7 +809,7 @@ - + @@ -970,7 +971,7 @@ - + @@ -983,7 +984,7 @@ - + @@ -996,7 +997,7 @@ - + @@ -1011,7 +1012,7 @@ - + @@ -1026,7 +1027,7 @@ - + @@ -1062,7 +1063,7 @@ - + @@ -1240,7 +1241,7 @@ - + @@ -1416,7 +1417,7 @@ - + @@ -1429,7 +1430,7 @@ - + @@ -1504,7 +1505,7 @@ - + @@ -1549,7 +1550,7 @@ - + @@ -1562,7 +1563,7 @@ - + diff --git a/plugins/console/lang/ideCommands/languageModels/behavior.mps b/plugins/console/lang/ideCommands/languageModels/behavior.mps index 668e80e53ea9..244debd46b22 100644 --- a/plugins/console/lang/ideCommands/languageModels/behavior.mps +++ b/plugins/console/lang/ideCommands/languageModels/behavior.mps @@ -37,6 +37,7 @@ + @@ -324,13 +325,13 @@ - + - + @@ -351,13 +352,13 @@ - + - + @@ -403,13 +404,13 @@ - + - + @@ -437,7 +438,7 @@ - + @@ -558,7 +559,7 @@ - + @@ -643,7 +644,7 @@ - + @@ -788,7 +789,7 @@ - + @@ -898,7 +899,7 @@ - + @@ -927,7 +928,7 @@ - + @@ -945,7 +946,7 @@ - + @@ -1005,7 +1006,7 @@ - + @@ -1186,7 +1187,7 @@ - + @@ -1216,7 +1217,7 @@ - + @@ -1280,7 +1281,7 @@ - + @@ -1377,7 +1378,7 @@ - + @@ -1400,7 +1401,7 @@ - + @@ -1413,7 +1414,7 @@ - + @@ -1450,7 +1451,7 @@ - + @@ -1512,7 +1513,7 @@ - + @@ -1525,7 +1526,7 @@ - + @@ -1538,7 +1539,7 @@ - + @@ -1551,13 +1552,13 @@ - + - + @@ -1584,7 +1585,7 @@ - + @@ -1803,7 +1804,7 @@ - + @@ -1826,7 +1827,7 @@ - + @@ -1865,7 +1866,7 @@ - + @@ -1899,7 +1900,7 @@ - + @@ -1923,13 +1924,13 @@ - + - + diff --git a/plugins/console/lang/internalCommands/generator/template/main@generator.mps b/plugins/console/lang/internalCommands/generator/template/main@generator.mps index 6ce7304f2e56..34eb63c2f2e8 100644 --- a/plugins/console/lang/internalCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/internalCommands/generator/template/main@generator.mps @@ -18,6 +18,7 @@ + @@ -198,13 +199,13 @@ - + - + @@ -217,7 +218,7 @@ - + diff --git a/plugins/console/lang/internalCommands/languageModels/behavior.mps b/plugins/console/lang/internalCommands/languageModels/behavior.mps index 38e85b324f74..f08d714032b1 100644 --- a/plugins/console/lang/internalCommands/languageModels/behavior.mps +++ b/plugins/console/lang/internalCommands/languageModels/behavior.mps @@ -15,6 +15,7 @@ + @@ -138,7 +139,7 @@ - + @@ -149,13 +150,13 @@ - + - + @@ -192,13 +193,13 @@ - + - + diff --git a/plugins/console/lang/scripts/generator/template/main@generator.mps b/plugins/console/lang/scripts/generator/template/main@generator.mps index 8146d4d6fd75..b59a80fa4537 100644 --- a/plugins/console/lang/scripts/generator/template/main@generator.mps +++ b/plugins/console/lang/scripts/generator/template/main@generator.mps @@ -13,6 +13,7 @@ + @@ -181,13 +182,13 @@ - + - + @@ -238,13 +239,13 @@ - + - + diff --git a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps index 7853bf216f4f..8531e19e4718 100644 --- a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps +++ b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps @@ -28,6 +28,7 @@ + @@ -272,7 +273,7 @@ - + @@ -314,7 +315,7 @@ - + @@ -363,7 +364,7 @@ - + @@ -399,7 +400,7 @@ - + @@ -604,7 +605,7 @@ - + @@ -629,7 +630,7 @@ - + @@ -643,7 +644,7 @@ - + @@ -673,7 +674,7 @@ - + diff --git a/plugins/console/models/jetbrains/mps/console/tool.mps b/plugins/console/models/jetbrains/mps/console/tool.mps index e9ea2a8ac0ed..67f3338cbaf9 100644 --- a/plugins/console/models/jetbrains/mps/console/tool.mps +++ b/plugins/console/models/jetbrains/mps/console/tool.mps @@ -67,6 +67,7 @@ + @@ -310,7 +311,6 @@ - @@ -517,63 +517,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5803,7 +5746,7 @@ - + @@ -5871,7 +5814,7 @@ - + @@ -6226,7 +6169,7 @@ - + @@ -6424,7 +6367,7 @@ - + @@ -7555,6 +7498,9 @@ + + + @@ -7971,7 +7917,7 @@ - + @@ -7986,7 +7932,7 @@ - + From cfd4547a201b106b7ae6628827d104e1cd9ad15d Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 19:40:44 +0300 Subject: [PATCH 14/52] "console" commands to be used in MPS: command.base.runtime in build script, blCommand buildscript errors fixed --- .../solutions/mpsBuild/models/build.mps | 209 +++++++----------- 1 file changed, 74 insertions(+), 135 deletions(-) diff --git a/plugins/mps-build/solutions/mpsBuild/models/build.mps b/plugins/mps-build/solutions/mpsBuild/models/build.mps index 74a66430a8d8..3b47da8de1f5 100644 --- a/plugins/mps-build/solutions/mpsBuild/models/build.mps +++ b/plugins/mps-build/solutions/mpsBuild/models/build.mps @@ -22940,7 +22940,7 @@ - + @@ -22948,6 +22948,9 @@ + + + @@ -23248,26 +23251,53 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + @@ -23277,172 +23307,76 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - + + - + - - + + - - + + - + - - + + - - + + - - - - - - - - - - - - - - + + - - + + - + - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -23717,6 +23651,11 @@ + + + + + From 35f819203e3a6c035b31566931b5ce5793ddb2bd Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 19:55:49 +0300 Subject: [PATCH 15/52] "console" commands to be used in MPS: fixing refs and imports after refactoring --- .../jetbrains/mps/command/base/runtime.mps | 2 +- plugins/console/jetbrains.mps.console.msd | 2 +- .../lang/base/jetbrains.mps.console.base.mpl | 6 +- .../lang/base/languageModels/behavior.mps | 12 ++-- .../lang/base/languageModels/constraints.mps | 8 +-- .../lang/base/languageModels/structure.mps | 2 +- .../generator/template/main@generator.mps | 25 +++---- .../jetbrains.mps.console.blCommand.mpl | 1 + ...etbrains.mps.console.blCommand.runtime.msd | 1 + .../mps/console/blCommand/runtime/util.mps | 2 +- .../generator/template/main@generator.mps | 8 +-- .../generator/template/main@generator.mps | 72 +++++++++++-------- .../jetbrains.mps.console.ideCommands.mpl | 3 + .../mps/console/ideCommands/util.mps | 10 +-- .../ideCommands/languageModels/behavior.mps | 2 +- ...brains.mps.console.ideCommands.runtime.msd | 1 + .../mps/console/ideCommands/runtime/util.mps | 4 +- ...jetbrains.mps.console.internalCommands.mpl | 2 + .../languageModels/behavior.mps | 2 +- .../generator/template/main@generator.mps | 35 +++++---- .../scripts/jetbrains.mps.console.scripts.mpl | 1 + .../jetbrains.mps.console.scripts.runtime.msd | 1 + .../mps/console/scripts/runtime/util.mps | 2 +- .../models/jetbrains/mps/console/tool.mps | 48 +++---------- 24 files changed, 125 insertions(+), 127 deletions(-) diff --git a/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps b/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps index c006f2de17a0..38f19b7c248c 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps +++ b/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps @@ -8,7 +8,7 @@ - + diff --git a/plugins/console/jetbrains.mps.console.msd b/plugins/console/jetbrains.mps.console.msd index 38b60a230178..3c5e77f77281 100644 --- a/plugins/console/jetbrains.mps.console.msd +++ b/plugins/console/jetbrains.mps.console.msd @@ -26,7 +26,7 @@ f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets) a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime) df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources) - 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) + 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/base/jetbrains.mps.console.base.mpl b/plugins/console/lang/base/jetbrains.mps.console.base.mpl index 780da5105f48..819872cd54c9 100644 --- a/plugins/console/lang/base/jetbrains.mps.console.base.mpl +++ b/plugins/console/lang/base/jetbrains.mps.console.base.mpl @@ -20,6 +20,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) + 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -32,6 +33,7 @@ + @@ -45,7 +47,7 @@ 86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench) - 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) + 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) e6368d5c-b931-4d4d-9941-07b7da7d2e2d(jetbrains.mps.tool.builder) @@ -56,6 +58,8 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + cb3c6536-cd62-4d95-8529-4a37cbf14855(jetbrains.mps.command.base) + 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index f53076dac1f5..2640d2e70e37 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -29,17 +29,17 @@ + + + + + - - - - - @@ -1169,7 +1169,7 @@ - + diff --git a/plugins/console/lang/base/languageModels/constraints.mps b/plugins/console/lang/base/languageModels/constraints.mps index 437f09577998..20b129867963 100644 --- a/plugins/console/lang/base/languageModels/constraints.mps +++ b/plugins/console/lang/base/languageModels/constraints.mps @@ -253,12 +253,12 @@ - - - + + + + - diff --git a/plugins/console/lang/base/languageModels/structure.mps b/plugins/console/lang/base/languageModels/structure.mps index 52933d8139fe..881efb57b336 100644 --- a/plugins/console/lang/base/languageModels/structure.mps +++ b/plugins/console/lang/base/languageModels/structure.mps @@ -7,9 +7,9 @@ + - diff --git a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index e46c2875ff80..d6b6c518a985 100644 --- a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -27,8 +27,8 @@ + - @@ -102,9 +102,6 @@ - - - @@ -1021,18 +1018,16 @@ - - - - - - - - - - - + + + + + + + + + diff --git a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl index cafc72f05bbd..8ddfc06801cf 100644 --- a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl +++ b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl @@ -31,6 +31,7 @@ ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) 2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696) + 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd b/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd index b12cf643288e..76c51a3c94ff 100644 --- a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd +++ b/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd @@ -17,6 +17,7 @@ bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) + de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) diff --git a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps index a2b12aa8e8d9..7d727139037e 100644 --- a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps +++ b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps @@ -55,7 +55,7 @@ - + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps index 62f341f6b89f..237ef75f98e2 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps @@ -143,8 +143,8 @@ - - + + @@ -219,8 +219,8 @@ - - + + diff --git a/plugins/console/lang/ideCommands/generator/template/main@generator.mps b/plugins/console/lang/ideCommands/generator/template/main@generator.mps index 58c0a5e5b7a6..6e820d9da15b 100644 --- a/plugins/console/lang/ideCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/ideCommands/generator/template/main@generator.mps @@ -27,9 +27,10 @@ + + - @@ -96,6 +97,9 @@ + + + @@ -229,6 +233,9 @@ + + + @@ -342,24 +349,29 @@ - - - - - - - - - - - + + + + + + + + + + + + + + - + + + @@ -423,21 +435,16 @@ - - - - - - - - - - - - - - + + + + + + + + + @@ -481,8 +488,15 @@ - - + + + + + + + + + diff --git a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl index 553d1e9893ac..ce7dd3d013eb 100644 --- a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl +++ b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl @@ -26,6 +26,8 @@ a5e4de53-46a3-44da-aab3-68fdf1c34ed0(jetbrains.mps.console.ideCommands) c7567052-205c-4a15-80b0-7a32b32a9656(jetbrains.mps.console.ideCommands.runtime) 019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide) + 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) + 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -95,6 +97,7 @@ 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime) 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) + 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps index 0d3e919e2ddf..98b66922d0cc 100644 --- a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps +++ b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps @@ -20,7 +20,7 @@ - + @@ -841,9 +841,7 @@ - - - + @@ -867,9 +865,7 @@ - - - + diff --git a/plugins/console/lang/ideCommands/languageModels/behavior.mps b/plugins/console/lang/ideCommands/languageModels/behavior.mps index 244debd46b22..cbf7acacbe4f 100644 --- a/plugins/console/lang/ideCommands/languageModels/behavior.mps +++ b/plugins/console/lang/ideCommands/languageModels/behavior.mps @@ -37,7 +37,7 @@ - + diff --git a/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd b/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd index cf6db6adacdf..dda9bdac62fe 100644 --- a/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd +++ b/plugins/console/lang/ideCommandsRuntime/jetbrains.mps.console.ideCommands.runtime.msd @@ -15,6 +15,7 @@ 5fa23c0a-216d-4571-a163-e286643e6f5f(jetbrains.mps.generator) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) + 8f6725be-608d-433b-98fd-844f816eb05f(jetbrains.mps.ide.make) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/ideCommandsRuntime/models/jetbrains/mps/console/ideCommands/runtime/util.mps b/plugins/console/lang/ideCommandsRuntime/models/jetbrains/mps/console/ideCommands/runtime/util.mps index 66ea2af2b7be..7a5071807bf3 100644 --- a/plugins/console/lang/ideCommandsRuntime/models/jetbrains/mps/console/ideCommands/runtime/util.mps +++ b/plugins/console/lang/ideCommandsRuntime/models/jetbrains/mps/console/ideCommands/runtime/util.mps @@ -1797,9 +1797,7 @@ - - - + diff --git a/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl b/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl index eddaddd511ff..e20405a4e2d4 100644 --- a/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl +++ b/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl @@ -27,6 +27,7 @@ 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) 995a7394-7f76-4b8b-a929-c53448708106(jetbrains.mps.console.internalCommands) 1a497c57-0f1a-4016-8042-2ff7591fe612(jetbrains.mps.console.internalCommands.runtime) + 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -84,6 +85,7 @@ 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/internalCommands/languageModels/behavior.mps b/plugins/console/lang/internalCommands/languageModels/behavior.mps index f08d714032b1..479c60ac09a0 100644 --- a/plugins/console/lang/internalCommands/languageModels/behavior.mps +++ b/plugins/console/lang/internalCommands/languageModels/behavior.mps @@ -15,7 +15,7 @@ - + diff --git a/plugins/console/lang/scripts/generator/template/main@generator.mps b/plugins/console/lang/scripts/generator/template/main@generator.mps index b59a80fa4537..2f8a15e9af47 100644 --- a/plugins/console/lang/scripts/generator/template/main@generator.mps +++ b/plugins/console/lang/scripts/generator/template/main@generator.mps @@ -30,6 +30,10 @@ + + + + @@ -120,7 +124,9 @@ - + + + @@ -201,23 +207,28 @@ - - - - - - - - - - + + + + + + + + + + + + + - + + + diff --git a/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl b/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl index bf1e6ffa3102..edf9aa238a0d 100644 --- a/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl +++ b/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl @@ -19,6 +19,7 @@ 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) 2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696) + 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd b/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd index 6113f9987719..98ecb087c963 100644 --- a/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd +++ b/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd @@ -16,6 +16,7 @@ bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime) 019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide) 8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform) + 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps index 8531e19e4718..288d4ac40416 100644 --- a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps +++ b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps @@ -24,11 +24,11 @@ + - diff --git a/plugins/console/models/jetbrains/mps/console/tool.mps b/plugins/console/models/jetbrains/mps/console/tool.mps index 67f3338cbaf9..f93c39e11c10 100644 --- a/plugins/console/models/jetbrains/mps/console/tool.mps +++ b/plugins/console/models/jetbrains/mps/console/tool.mps @@ -831,9 +831,7 @@ - - - + @@ -2227,18 +2225,6 @@ - - - - - - - - - - - - @@ -3167,9 +3153,7 @@ - - - + @@ -3314,9 +3298,7 @@ - - - + @@ -3399,9 +3381,7 @@ - - - + @@ -3689,9 +3669,7 @@ - - - + @@ -4131,9 +4109,7 @@ - - - + @@ -4794,9 +4770,7 @@ - - - + @@ -5129,9 +5103,7 @@ - - - + @@ -7862,9 +7834,7 @@ - - - + From a2c6a479d2080e270ed3e9dd6887ef920803ad1d Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 20:11:25 +0300 Subject: [PATCH 16/52] "console" commands to be used in MPS: migrating to CommandOutputWindow (console tool abstraction) --- .../jetbrains/mps/command/base/runtime.mps | 13 ++- .../generator/template/main@generator.mps | 4 +- .../lang/base/languageModels/behavior.mps | 66 ++++++++----- .../generator/template/main@generator.mps | 10 +- .../generator/template/main@generator.mps | 28 ++++-- .../generator/template/main@generator.mps | 2 +- .../mps/console/scripts/runtime/util.mps | 85 ++++++---------- .../models/jetbrains/mps/console/tool.mps | 96 +++++++++---------- 8 files changed, 158 insertions(+), 146 deletions(-) diff --git a/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps b/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps index 38f19b7c248c..98efff7e52a2 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps +++ b/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps @@ -30,6 +30,9 @@ + + + @@ -70,7 +73,7 @@ - + @@ -107,6 +110,14 @@ + + + + + + + + diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index c942d9906437..487fd6f05b64 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -11,7 +11,7 @@ - + @@ -214,7 +214,7 @@ - + diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index 2640d2e70e37..343afbae60e4 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -429,12 +429,19 @@ - - - - - - + + + + + + + + + + + + + @@ -501,17 +508,25 @@ - - + + - - - - - + + + + + + + + + + + + + - + @@ -532,7 +547,7 @@ - + @@ -554,7 +569,7 @@ - + @@ -1433,12 +1448,19 @@ - - - - - - + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps index 237ef75f98e2..172fb72fe361 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps @@ -216,14 +216,14 @@ - + - - + + - - + + diff --git a/plugins/console/lang/internalCommands/generator/template/main@generator.mps b/plugins/console/lang/internalCommands/generator/template/main@generator.mps index 34eb63c2f2e8..6a8d8003481b 100644 --- a/plugins/console/lang/internalCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/internalCommands/generator/template/main@generator.mps @@ -18,7 +18,7 @@ - + @@ -34,6 +34,10 @@ + + + + @@ -57,6 +61,9 @@ + + + @@ -213,12 +220,19 @@ - - - - - - + + + + + + + + + + + + + diff --git a/plugins/console/lang/scripts/generator/template/main@generator.mps b/plugins/console/lang/scripts/generator/template/main@generator.mps index 2f8a15e9af47..2c5b20ee990b 100644 --- a/plugins/console/lang/scripts/generator/template/main@generator.mps +++ b/plugins/console/lang/scripts/generator/template/main@generator.mps @@ -13,7 +13,7 @@ - + diff --git a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps index 288d4ac40416..c1107d98c62b 100644 --- a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps +++ b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps @@ -27,9 +27,7 @@ - - @@ -73,6 +71,10 @@ + + + + @@ -123,6 +125,9 @@ + + + @@ -310,12 +315,19 @@ - - - - - - + + + + + + + + + + + + + @@ -596,57 +608,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - + + - - - - - - - - - - + + diff --git a/plugins/console/models/jetbrains/mps/console/tool.mps b/plugins/console/models/jetbrains/mps/console/tool.mps index f93c39e11c10..4e31f4c7f731 100644 --- a/plugins/console/models/jetbrains/mps/console/tool.mps +++ b/plugins/console/models/jetbrains/mps/console/tool.mps @@ -68,6 +68,7 @@ + @@ -245,7 +246,6 @@ - @@ -4292,6 +4292,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5764,14 +5801,14 @@ - + - - - + + + - - + + @@ -7864,51 +7901,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 65d6f963338ffd6a1e7636a3c6e84d10ce37e702 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 20:23:14 +0300 Subject: [PATCH 17/52] "console" commands to be used in MPS: make changed modules after refactoring --- .../mps/console/actions/plugin/dependencies | 2 + .../mps/console/actions/plugin/generated | 2 +- .../FindInstancesByCondition_Action.java | 129 +- .../ModifyInstancesByCondition_Action.java | 163 +- .../mps/console/actions/plugin/trace.info | 862 +++++++--- .../mps/command/base/runtime/dependencies | 14 + .../mps/command/base/runtime/generated | 3 + .../base/runtime/CommandOutputWindow.java | 8 + .../command/base/runtime}/ConsoleContext.java | 4 +- .../command/base/runtime}/ConsoleStream.java | 2 +- .../mps/command/base/runtime/trace.info | 36 + .../base/generator/template/main/dependencies | 2 + .../base/generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 7 + .../base/generator/template/main/trace.info | 18 +- .../generator/template/main@generator.mps | 9 +- .../mps/console/base/actions/dependencies | 41 + .../mps/console/base/actions/generated | 3 + .../mps/console/base/behavior/dependencies | 111 +- .../mps/console/base/behavior/generated | 2 +- .../mps/console/base/constraints/generated | 2 +- .../jetbrains/mps/console/base/dependencies | 2 + .../mps/console/base/editor/dependencies | 68 + .../mps/console/base/editor/generated | 2 +- .../jetbrains/mps/console/base/generated | 2 +- .../mps/console/base/structure/generated | 2 +- .../jetbrains/mps/console/base/Language.java | 5 + .../console/base}/actions/PasteWrappers.java | 14 +- .../base/actions/QueriesGenerated.java | 53 + .../mps/console/base/actions/trace.info | 127 ++ .../base}/behavior/BLCommand_Behavior.java | 4 +- .../BLCommand_BehaviorDescriptor.java | 5 +- .../base}/behavior/BLExpression_Behavior.java | 2 +- .../BLExpression_BehaviorDescriptor.java | 5 +- .../behavior/BehaviorAspectDescriptor.java | 38 +- .../behavior/Command_BehaviorDescriptor.java | 6 +- .../behavior/ExceptionHolder_Behavior.java | 6 +- .../ExceptionHolder_BehaviorDescriptor.java | 5 +- .../behavior/GeneratedCommand_Behavior.java | 9 +- .../GeneratedCommand_BehaviorDescriptor.java | 4 +- .../base/behavior/HelpCommand_Behavior.java | 9 +- .../HelpCommand_BehaviorDescriptor.java | 6 +- .../behavior/InterpretedCommand_Behavior.java | 4 +- ...InterpretedCommand_BehaviorDescriptor.java | 4 +- .../mps/console/base/behavior/trace.info | 618 ++++--- .../HelpConceptReference_Constraints.java | 2 +- .../base}/editor/BLCommand_Editor.java | 6 +- .../base}/editor/BLExpression_Actions.java | 10 +- .../base}/editor/BLExpression_Editor.java | 4 +- .../editor/EditorAspectDescriptorImpl.java | 34 +- .../base}/editor/ExceptionHolder_Editor.java | 2 +- .../mps/console/base/editor/trace.info | 1187 ++++++++----- .../structure/StructureAspectDescriptor.java | 64 +- .../mps/console/base/structure/trace.info | 2 +- .../jetbrains/mps/console/base/trace.info | 3 +- .../generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 179 +- .../generator/template/main/trace.info | 1468 ++++++++-------- .../console/blCommand/actions/dependencies | 38 +- .../mps/console/blCommand/actions/generated | 2 +- .../console/blCommand/behavior/dependencies | 83 +- .../mps/console/blCommand/behavior/generated | 2 +- .../mps/console/blCommand/editor/dependencies | 91 - .../mps/console/blCommand/editor/generated | 2 +- .../jetbrains/mps/console/blCommand/generated | 2 +- .../mps/console/blCommand/structure/generated | 2 +- .../console/blCommand/typesystem/dependencies | 16 +- .../console/blCommand/typesystem/generated | 2 +- .../mps/console/blCommand/Language.java | 2 +- .../blCommand/actions/QueriesGenerated.java | 46 - .../mps/console/blCommand/actions/trace.info | 116 +- .../behavior/BehaviorAspectDescriptor.java | 52 +- .../ConsoleExpression_BehaviorDescriptor.java | 2 +- .../ConsoleOperation_BehaviorDescriptor.java | 2 +- .../PrintExpression_BehaviorDescriptor.java | 2 +- .../QueryExpression_BehaviorDescriptor.java | 2 +- .../ShowExpression_BehaviorDescriptor.java | 2 +- .../mps/console/blCommand/behavior/trace.info | 136 +- .../editor/EditorAspectDescriptorImpl.java | 30 +- .../mps/console/blCommand/editor/trace.info | 706 +------- .../structure/StructureAspectDescriptor.java | 72 +- .../console/blCommand/structure/trace.info | 2 +- .../typesystem/TypesystemDescriptor.java | 4 - ...uplicatedParameters_NonTypesystemRule.java | 13 +- .../console/blCommand/typesystem/trace.info | 221 +-- .../blCommand/runtime/util/dependencies | 4 +- .../console/blCommand/runtime/util/generated | 2 +- .../blCommand/runtime/util/CommandUtil.java | 8 +- .../console/blCommand/runtime/util/trace.info | 14 +- .../base/generator/template/main/dependencies | 13 + .../base/generator/template/main/generated | 3 + .../template/main/QueriesGenerated.java | 20 + .../base/generator/template/main/trace.info | 18 + .../mps/command/base/behavior/dependencies | 33 + .../mps/command/base/behavior/generated | 3 + .../mps/command/base/constraints/dependencies | 3 + .../mps/command/base/constraints/generated | 3 + .../jetbrains/mps/command/base/dependencies | 24 + .../mps/command/base/editor/dependencies | 37 + .../mps/command/base/editor/generated | 3 + .../jetbrains/mps/command/base/generated | 3 + .../mps/command/base/structure/dependencies | 15 + .../mps/command/base/structure/generated | 3 + .../mps/command/base/typesystem/dependencies | 23 + .../mps/command/base/typesystem/generated | 3 + .../jetbrains/mps/command/base/Language.java | 62 + .../behavior/BehaviorAspectDescriptor.java | 21 + .../ConsoleHelpProvider_Behavior.java | 2 +- ...onsoleHelpProvider_BehaviorDescriptor.java | 2 +- .../WithStatement_BehaviorDescriptor.java | 4 +- .../mps/command/base/behavior/trace.info | 68 + .../mps/command/base/constraints/trace.info | 3 + .../editor/EditorAspectDescriptorImpl.java | 29 + .../base}/editor/WithStatement_Editor.java | 6 +- .../mps/command/base/editor/trace.info | 312 ++++ .../structure/StructureAspectDescriptor.java | 36 + .../mps/command/base/structure/trace.info | 9 + .../jetbrains/mps/command/base/trace.info | 9 + .../base/typesystem/TypesystemDescriptor.java | 15 + .../mps/command/base/typesystem/trace.info | 133 ++ .../typeof_ScopeProvider_InferenceRule.java | 10 +- .../generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 9 - .../generator/template/main/trace.info | 292 ++-- .../console/ideCommands/behavior/dependencies | 68 +- .../console/ideCommands/behavior/generated | 2 +- .../mps/console/ideCommands/generated | 2 +- .../mps/console/ideCommands/util/dependencies | 4 +- .../mps/console/ideCommands/util/generated | 2 +- ...llActionExpression_BehaviorDescriptor.java | 2 +- .../GlobalStatisticTarget_Behavior.java | 2 +- ...balStatisticTarget_BehaviorDescriptor.java | 2 +- .../behavior/INodeSetReference_Behavior.java | 2 +- .../INodeSetReference_BehaviorDescriptor.java | 2 +- .../behavior/IStatisticsTarget_Behavior.java | 2 +- .../IStatisticsTarget_BehaviorDescriptor.java | 2 +- .../ModelStatisticsTarget_Behavior.java | 2 +- ...elStatisticsTarget_BehaviorDescriptor.java | 2 +- .../OfAspectOperation_BehaviorDescriptor.java | 2 +- .../ProjectStatisticsTarget_Behavior.java | 2 +- ...ctStatisticsTarget_BehaviorDescriptor.java | 2 +- .../RebuildProjectCommand_Behavior.java | 4 +- ...uildProjectCommand_BehaviorDescriptor.java | 4 +- .../ShowBrokenReferences_Behavior.java | 4 +- ...owBrokenReferences_BehaviorDescriptor.java | 4 +- .../behavior/ShowGenPlan_Behavior.java | 4 +- .../ShowGenPlan_BehaviorDescriptor.java | 4 +- .../behavior/StatCommand_Behavior.java | 4 +- .../StatCommand_BehaviorDescriptor.java | 4 +- .../SubtreeStatisticsTarget_Behavior.java | 2 +- ...eeStatisticsTarget_BehaviorDescriptor.java | 2 +- .../UnloadModelsCommand_Behavior.java | 4 +- ...nloadModelsCommand_BehaviorDescriptor.java | 4 +- .../console/ideCommands/behavior/trace.info | 30 +- .../console/ideCommands/util/OutputUtils.java | 2 +- .../ideCommands/util/PartitioningHelper.java | 2 +- .../mps/console/ideCommands/util/trace.info | 6 +- .../ideCommands/runtime/util/generated | 2 +- .../generator/template/main/dependencies | 2 - .../generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 4 - .../generator/template/main/trace.info | 16 +- .../internalCommands/behavior/dependencies | 18 +- .../internalCommands/behavior/generated | 2 +- .../mps/console/internalCommands/generated | 2 +- .../InternalMode_BehaviorDescriptor.java | 2 +- .../ReloadClassesCommand_Behavior.java | 4 +- ...loadClassesCommand_BehaviorDescriptor.java | 4 +- .../ShowRepositoryCommand_Behavior.java | 4 +- ...wRepositoryCommand_BehaviorDescriptor.java | 4 +- .../internalCommands/behavior/trace.info | 4 +- .../console/scripts/generator/main/generated | 2 +- .../generator/main/QueriesGenerated.java | 3 - .../console/scripts/generator/main/trace.info | 12 +- .../mps/console/scripts/behavior/dependencies | 2 +- .../mps/console/scripts/behavior/generated | 2 +- .../jetbrains/mps/console/scripts/generated | 2 +- .../RefactorOperation_BehaviorDescriptor.java | 2 +- .../console/scripts/runtime/util/dependencies | 3 +- .../console/scripts/runtime/util/generated | 2 +- .../scripts/runtime/util/ScriptsUtil.java | 8 +- .../console/scripts/runtime/util/trace.info | 129 +- .../jetbrains/mps/console/tool/dependencies | 16 +- .../jetbrains/mps/console/tool/generated | 2 +- .../mps/console/tool/BaseConsoleTab.java | 50 +- .../mps/console/tool/ConsoleTool.java | 3 +- .../mps/console/tool/ConsoleUtil.java | 5 - .../jetbrains/mps/console/tool/trace.info | 1487 ++++++++--------- 188 files changed, 5528 insertions(+), 4752 deletions(-) create mode 100644 plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/dependencies create mode 100644 plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/generated create mode 100644 plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/CommandOutputWindow.java rename plugins/console/{source_gen/jetbrains/mps/console/tool => jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime}/ConsoleContext.java (71%) rename plugins/console/{source_gen/jetbrains/mps/console/tool => jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime}/ConsoleStream.java (80%) create mode 100644 plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/trace.info create mode 100644 plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/dependencies create mode 100644 plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/generated rename plugins/console/lang/{blCommand/source_gen/jetbrains/mps/console/blCommand => base/source_gen/jetbrains/mps/console/base}/actions/PasteWrappers.java (81%) create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/QueriesGenerated.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/trace.info rename plugins/console/lang/{blCommand/source_gen/jetbrains/mps/console/blCommand => base/source_gen/jetbrains/mps/console/base}/behavior/BLCommand_Behavior.java (95%) rename plugins/console/lang/{blCommand/source_gen/jetbrains/mps/console/blCommand => base/source_gen/jetbrains/mps/console/base}/behavior/BLCommand_BehaviorDescriptor.java (92%) rename plugins/console/lang/{blCommand/source_gen/jetbrains/mps/console/blCommand => base/source_gen/jetbrains/mps/console/base}/behavior/BLExpression_Behavior.java (91%) rename plugins/console/lang/{blCommand/source_gen/jetbrains/mps/console/blCommand => base/source_gen/jetbrains/mps/console/base}/behavior/BLExpression_BehaviorDescriptor.java (78%) rename plugins/console/lang/{blCommand/source_gen/jetbrains/mps/console/blCommand => base/source_gen/jetbrains/mps/console/base}/behavior/ExceptionHolder_Behavior.java (81%) rename plugins/console/lang/{blCommand/source_gen/jetbrains/mps/console/blCommand => base/source_gen/jetbrains/mps/console/base}/behavior/ExceptionHolder_BehaviorDescriptor.java (79%) rename plugins/console/lang/{blCommand/source_gen/jetbrains/mps/console/blCommand => base/source_gen/jetbrains/mps/console/base}/editor/BLCommand_Editor.java (97%) rename plugins/console/lang/{blCommand/source_gen/jetbrains/mps/console/blCommand => base/source_gen/jetbrains/mps/console/base}/editor/BLExpression_Actions.java (82%) rename plugins/console/lang/{blCommand/source_gen/jetbrains/mps/console/blCommand => base/source_gen/jetbrains/mps/console/base}/editor/BLExpression_Editor.java (96%) rename plugins/console/lang/{blCommand/source_gen/jetbrains/mps/console/blCommand => base/source_gen/jetbrains/mps/console/base}/editor/ExceptionHolder_Editor.java (97%) create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/dependencies create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/generated create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/QueriesGenerated.java create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/trace.info create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/dependencies create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/generated create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/dependencies create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/generated create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/dependencies create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/dependencies create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/generated create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/generated create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/dependencies create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/generated create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/dependencies create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/generated create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/Language.java create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/BehaviorAspectDescriptor.java rename plugins/console/lang/{base/source_gen/jetbrains/mps/console => command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command}/base/behavior/ConsoleHelpProvider_Behavior.java (98%) rename plugins/console/lang/{base/source_gen/jetbrains/mps/console => command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command}/base/behavior/ConsoleHelpProvider_BehaviorDescriptor.java (93%) rename plugins/console/lang/{blCommand/source_gen/jetbrains/mps/console/blCommand => command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base}/behavior/WithStatement_BehaviorDescriptor.java (70%) create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/trace.info create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/constraints/trace.info create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/EditorAspectDescriptorImpl.java rename plugins/console/lang/{blCommand/source_gen/jetbrains/mps/console/blCommand => command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base}/editor/WithStatement_Editor.java (98%) create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/trace.info create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/StructureAspectDescriptor.java create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/trace.info create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/trace.info create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/TypesystemDescriptor.java create mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/trace.info rename plugins/console/lang/{blCommand/source_gen/jetbrains/mps/console/blCommand => command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base}/typesystem/typeof_ScopeProvider_InferenceRule.java (90%) diff --git a/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/dependencies b/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/dependencies index f26cc58ca89e..6a4e6995a27e 100644 --- a/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/dependencies +++ b/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/dependencies @@ -37,6 +37,7 @@ + @@ -63,6 +64,7 @@ + diff --git a/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated b/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated index 88492b72f5b0..ba0d2ad6d52a 100644 --- a/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated +++ b/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java index b688110c8934..90ad867b5ffc 100644 --- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java +++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java @@ -22,6 +22,7 @@ import org.jetbrains.mps.openapi.persistence.PersistenceFacade; import jetbrains.mps.smodel.SModelUtil_new; import org.jetbrains.mps.openapi.model.SNodeAccessUtil; +import jetbrains.mps.smodel.SReference; public class FindInstancesByCondition_Action extends BaseAction { private static final Icon ICON = null; @@ -81,34 +82,108 @@ private static SNode _quotation_createNode_flklsf_a0c0a(Object parameter_1) { SNode quotedNode_12 = null; SNode quotedNode_13 = null; SNode quotedNode_14 = null; - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, "jetbrains.mps.console.blCommand.structure.BLExpression"), null, null, false); - quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, "jetbrains.mps.console.blCommand.structure.ShowExpression"), null, null, false); - quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); - quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.console.blCommand.structure.InstancesExpression"), null, null, false); - quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"), null, null, false); - SNodeAccessUtil.setReferenceTarget(quotedNode_7, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"), (SNode) parameter_1); - quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), quotedNode_7); - quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.console.blCommand.structure.QueryParameterList"), null, null, false); - quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope"), null, null, false); - quotedNode_13 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.console.blCommand.structure.ProjectScope"), null, null, false); - quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), quotedNode_13); - quotedNode_8.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), quotedNode_10); - quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_8); - quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_5); - quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x117e3fd45c4L, "jetbrains.mps.baseLanguage.collections.structure.WhereOperation"), null, null, false); - quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_9, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); + SNode quotedNode_15 = null; + SNode quotedNode_16 = null; + SNode quotedNode_17 = null; + SNode quotedNode_18 = null; + SNode quotedNode_19 = null; + SNode quotedNode_20 = null; + SNode quotedNode_21 = null; + SNode quotedNode_22 = null; + SNode quotedNode_23 = null; + SNode quotedNode_24 = null; + SNode quotedNode_25 = null; + SNode quotedNode_26 = null; + SNode quotedNode_27 = null; + SNode quotedNode_28 = null; + SNode quotedNode_29 = null; + SNode quotedNode_30 = null; + SNode quotedNode_31 = null; + SNode quotedNode_32 = null; + SNode quotedNode_33 = null; + SNode quotedNode_34 = null; + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, "jetbrains.mps.console.base.structure.BLExpression"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_2, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "execute"); + quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc6bf96dL, "jetbrains.mps.baseLanguage.structure.VoidType"), null, null, false); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1fdL, "returnType"), quotedNode_3); + quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e94L, "jetbrains.mps.baseLanguage.structure.ParameterDeclaration"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_4, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "context"); + SNodeAccessUtil.setProperty(quotedNode_4, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37a7f6eL, 0x111f9e9f00cL, "isFinal"), "true"); + quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_8.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_8, facade.createModelReference("r:c51f26da-d1ec-4385-9c6f-4c7001d1fcfa(jetbrains.mps.command.base.runtime)"), facade.createNodeId("351968380915666545"))); + quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_8); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1feL, "parameter"), quotedNode_4); + quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e94L, "jetbrains.mps.baseLanguage.structure.ParameterDeclaration"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_5, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "console"); + SNodeAccessUtil.setProperty(quotedNode_5, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37a7f6eL, 0x111f9e9f00cL, "isFinal"), "true"); + quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_9.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_9, facade.createModelReference("r:c51f26da-d1ec-4385-9c6f-4c7001d1fcfa(jetbrains.mps.command.base.runtime)"), facade.createNodeId("6852607286009617748"))); + quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_9); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1feL, "parameter"), quotedNode_5); + quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10af9581ff1L, "jetbrains.mps.baseLanguage.structure.PublicVisibility"), null, null, false); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x112670d273fL, 0x112670d886aL, "visibility"), quotedNode_6); + quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); + quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, "jetbrains.mps.baseLanguage.structure.TryCatchStatement"), null, null, false); quotedNode_11 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); - quotedNode_9.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf0522fL, "body"), quotedNode_11); - quotedNode_12 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x118374464e4L, "jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_12, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "node"); - quotedNode_14 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); - quotedNode_12.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_14); - quotedNode_9.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_12); - quotedNode_6.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_9); - quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_6); - quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), quotedNode_4); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), quotedNode_3); + quotedNode_13 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); + quotedNode_16 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b2a9377L, "jetbrains.mps.console.blCommand.structure.PrintExpression"), null, null, false); + quotedNode_19 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, "jetbrains.mps.console.blCommand.structure.ShowExpression"), null, null, false); + quotedNode_21 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); + quotedNode_25 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.console.blCommand.structure.InstancesExpression"), null, null, false); + quotedNode_27 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"), null, null, false); + SNodeAccessUtil.setReferenceTarget(quotedNode_27, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"), (SNode) parameter_1); + quotedNode_25.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), quotedNode_27); + quotedNode_28 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.console.blCommand.structure.QueryParameterList"), null, null, false); + quotedNode_30 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope"), null, null, false); + quotedNode_33 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.console.blCommand.structure.ProjectScope"), null, null, false); + quotedNode_30.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), quotedNode_33); + quotedNode_28.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), quotedNode_30); + quotedNode_25.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_28); + quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_25); + quotedNode_26 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x117e3fd45c4L, "jetbrains.mps.baseLanguage.collections.structure.WhereOperation"), null, null, false); + quotedNode_29 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_29, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); + quotedNode_31 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); + quotedNode_29.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf0522fL, "body"), quotedNode_31); + quotedNode_32 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x118374464e4L, "jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_32, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "node"); + quotedNode_34 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); + quotedNode_32.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_34); + quotedNode_29.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_32); + quotedNode_26.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_29); + quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_26); + quotedNode_19.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), quotedNode_21); + quotedNode_16.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"), quotedNode_19); + quotedNode_13.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_16); + quotedNode_11.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_13); + quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, 0x10f383e83d4L, "body"), quotedNode_11); + quotedNode_12 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, "jetbrains.mps.baseLanguage.structure.CatchClause"), null, null, false); + quotedNode_14 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc67c7efL, "jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_14, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "throwable"); + quotedNode_17 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_17.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_17, facade.createModelReference("6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)"), facade.createNodeId("~Throwable"))); + quotedNode_14.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_17); + quotedNode_12.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, 0x10f39a6a2f1L, "throwable"), quotedNode_14); + quotedNode_15 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); + quotedNode_18 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); + quotedNode_20 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfbbebabf09L, "jetbrains.mps.baseLanguage.structure.StaticMethodCall"), null, null, false); + quotedNode_20.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), quotedNode_20, facade.createModelReference("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)"), facade.createNodeId("2699636778862353917"))); + quotedNode_20.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfbbebabf09L, 0x10a7588b546L, "classConcept"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfbbebabf09L, 0x10a7588b546L, "classConcept"), quotedNode_20, facade.createModelReference("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)"), facade.createNodeId("313482946808721508"))); + quotedNode_22 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); + quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_22); + quotedNode_23 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); + quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_23); + quotedNode_24 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); + quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_24); + quotedNode_18.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_20); + quotedNode_15.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_18); + quotedNode_12.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, 0x10f39a6a2f2L, "catchBody"), quotedNode_15); + quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, 0x10f39a8ba1fL, "catchClause"), quotedNode_12); + quotedNode_7.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_10); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1ffL, "body"), quotedNode_7); + quotedNode_22.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_4); + quotedNode_23.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_5); + quotedNode_24.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_14); return quotedNode_2; } } diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java index dfe42435397c..ed020f2e46ad 100644 --- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java +++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java @@ -22,6 +22,7 @@ import org.jetbrains.mps.openapi.persistence.PersistenceFacade; import jetbrains.mps.smodel.SModelUtil_new; import org.jetbrains.mps.openapi.model.SNodeAccessUtil; +import jetbrains.mps.smodel.SReference; public class ModifyInstancesByCondition_Action extends BaseAction { private static final Icon ICON = null; @@ -87,51 +88,125 @@ private static SNode _quotation_createNode_nwjg5s_a0b0a(Object parameter_1) { SNode quotedNode_19 = null; SNode quotedNode_20 = null; SNode quotedNode_21 = null; - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, "jetbrains.mps.console.blCommand.structure.BLExpression"), null, null, false); - quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); - quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); - quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.console.blCommand.structure.InstancesExpression"), null, null, false); - quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.console.blCommand.structure.QueryParameterList"), null, null, false); - quotedNode_14 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope"), null, null, false); - quotedNode_18 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.console.blCommand.structure.ProjectScope"), null, null, false); - quotedNode_14.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), quotedNode_18); - quotedNode_9.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), quotedNode_14); - quotedNode_6.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_9); - quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"), null, null, false); - SNodeAccessUtil.setReferenceTarget(quotedNode_10, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"), (SNode) parameter_1); - quotedNode_6.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), quotedNode_10); - quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_6); - quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x117e3fd45c4L, "jetbrains.mps.baseLanguage.collections.structure.WhereOperation"), null, null, false); - quotedNode_11 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_11, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); + SNode quotedNode_22 = null; + SNode quotedNode_23 = null; + SNode quotedNode_24 = null; + SNode quotedNode_25 = null; + SNode quotedNode_26 = null; + SNode quotedNode_27 = null; + SNode quotedNode_28 = null; + SNode quotedNode_29 = null; + SNode quotedNode_30 = null; + SNode quotedNode_31 = null; + SNode quotedNode_32 = null; + SNode quotedNode_33 = null; + SNode quotedNode_34 = null; + SNode quotedNode_35 = null; + SNode quotedNode_36 = null; + SNode quotedNode_37 = null; + SNode quotedNode_38 = null; + SNode quotedNode_39 = null; + SNode quotedNode_40 = null; + SNode quotedNode_41 = null; + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, "jetbrains.mps.console.base.structure.BLExpression"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_2, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "execute"); + quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc6bf96dL, "jetbrains.mps.baseLanguage.structure.VoidType"), null, null, false); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1fdL, "returnType"), quotedNode_3); + quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e94L, "jetbrains.mps.baseLanguage.structure.ParameterDeclaration"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_4, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "context"); + SNodeAccessUtil.setProperty(quotedNode_4, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37a7f6eL, 0x111f9e9f00cL, "isFinal"), "true"); + quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_8.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_8, facade.createModelReference("r:c51f26da-d1ec-4385-9c6f-4c7001d1fcfa(jetbrains.mps.command.base.runtime)"), facade.createNodeId("351968380915666545"))); + quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_8); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1feL, "parameter"), quotedNode_4); + quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e94L, "jetbrains.mps.baseLanguage.structure.ParameterDeclaration"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_5, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "console"); + SNodeAccessUtil.setProperty(quotedNode_5, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37a7f6eL, 0x111f9e9f00cL, "isFinal"), "true"); + quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_9.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_9, facade.createModelReference("r:c51f26da-d1ec-4385-9c6f-4c7001d1fcfa(jetbrains.mps.command.base.runtime)"), facade.createNodeId("6852607286009617748"))); + quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_9); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1feL, "parameter"), quotedNode_5); + quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10af9581ff1L, "jetbrains.mps.baseLanguage.structure.PublicVisibility"), null, null, false); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x112670d273fL, 0x112670d886aL, "visibility"), quotedNode_6); + quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); + quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, "jetbrains.mps.baseLanguage.structure.TryCatchStatement"), null, null, false); + quotedNode_11 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); + quotedNode_13 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); + quotedNode_16 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b2a9377L, "jetbrains.mps.console.blCommand.structure.PrintExpression"), null, null, false); + quotedNode_19 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); + quotedNode_21 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); + quotedNode_26 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.console.blCommand.structure.InstancesExpression"), null, null, false); + quotedNode_29 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.console.blCommand.structure.QueryParameterList"), null, null, false); + quotedNode_34 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope"), null, null, false); + quotedNode_38 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.console.blCommand.structure.ProjectScope"), null, null, false); + quotedNode_34.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), quotedNode_38); + quotedNode_29.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), quotedNode_34); + quotedNode_26.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_29); + quotedNode_30 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"), null, null, false); + SNodeAccessUtil.setReferenceTarget(quotedNode_30, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"), (SNode) parameter_1); + quotedNode_26.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), quotedNode_30); + quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_26); + quotedNode_27 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x117e3fd45c4L, "jetbrains.mps.baseLanguage.collections.structure.WhereOperation"), null, null, false); + quotedNode_31 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_31, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); + quotedNode_35 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); + quotedNode_39 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); + quotedNode_41 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_41, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "true"); + quotedNode_39.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_41); + quotedNode_35.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_39); + quotedNode_31.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf0522fL, "body"), quotedNode_35); + quotedNode_36 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x118374464e4L, "jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_36, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "node"); + quotedNode_40 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); + quotedNode_36.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_40); + quotedNode_31.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_36); + quotedNode_27.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_31); + quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_27); + quotedNode_19.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_21); + quotedNode_22 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x20fd2063d7de993eL, "jetbrains.mps.console.scripts.structure.RefactorOperation"), null, null, false); + quotedNode_28 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_28, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); + quotedNode_32 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); + quotedNode_28.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf0522fL, "body"), quotedNode_32); + quotedNode_33 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x118374464e4L, "jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_33, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "node"); + quotedNode_37 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); + quotedNode_33.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_37); + quotedNode_28.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_33); + quotedNode_22.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_28); + quotedNode_19.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_22); + quotedNode_16.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"), quotedNode_19); + quotedNode_13.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_16); + quotedNode_11.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_13); + quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, 0x10f383e83d4L, "body"), quotedNode_11); + quotedNode_12 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, "jetbrains.mps.baseLanguage.structure.CatchClause"), null, null, false); + quotedNode_14 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc67c7efL, "jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_14, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "throwable"); + quotedNode_17 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_17.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_17, facade.createModelReference("6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)"), facade.createNodeId("~Throwable"))); + quotedNode_14.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_17); + quotedNode_12.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, 0x10f39a6a2f1L, "throwable"), quotedNode_14); quotedNode_15 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); - quotedNode_19 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); - quotedNode_21 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_21, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "true"); - quotedNode_19.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_21); - quotedNode_15.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_19); - quotedNode_11.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf0522fL, "body"), quotedNode_15); - quotedNode_16 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x118374464e4L, "jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_16, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "node"); - quotedNode_20 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); - quotedNode_16.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_20); - quotedNode_11.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_16); - quotedNode_7.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_11); - quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_7); - quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_4); - quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x20fd2063d7de993eL, "jetbrains.mps.console.scripts.structure.RefactorOperation"), null, null, false); - quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_8, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); - quotedNode_12 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); - quotedNode_8.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf0522fL, "body"), quotedNode_12); - quotedNode_13 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x118374464e4L, "jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_13, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "node"); - quotedNode_17 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); - quotedNode_13.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_17); - quotedNode_8.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_13); - quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_8); - quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_5); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), quotedNode_3); + quotedNode_18 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); + quotedNode_20 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfbbebabf09L, "jetbrains.mps.baseLanguage.structure.StaticMethodCall"), null, null, false); + quotedNode_20.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), quotedNode_20, facade.createModelReference("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)"), facade.createNodeId("2699636778862353917"))); + quotedNode_20.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfbbebabf09L, 0x10a7588b546L, "classConcept"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfbbebabf09L, 0x10a7588b546L, "classConcept"), quotedNode_20, facade.createModelReference("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)"), facade.createNodeId("313482946808721508"))); + quotedNode_23 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); + quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_23); + quotedNode_24 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); + quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_24); + quotedNode_25 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); + quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_25); + quotedNode_18.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_20); + quotedNode_15.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_18); + quotedNode_12.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, 0x10f39a6a2f2L, "catchBody"), quotedNode_15); + quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, 0x10f39a8ba1fL, "catchClause"), quotedNode_12); + quotedNode_7.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_10); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1ffL, "body"), quotedNode_7); + quotedNode_23.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_4); + quotedNode_24.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_5); + quotedNode_25.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_14); return quotedNode_2; } } diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info index 881585cdc89f..c1f7bcb8ef8e 100644 --- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info +++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info @@ -15,155 +15,309 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + + + + - + - - - - - + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -171,10 +325,10 @@ - + - + @@ -201,35 +355,34 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + @@ -240,151 +393,286 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - + + + + + + - - + + + + - - - - - - - + + + + + + + + + + + - - - - + + + + + + + + + @@ -399,18 +687,38 @@ + + + + + + + + + + + + + + + + + + + + - + - + diff --git a/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/dependencies b/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/dependencies new file mode 100644 index 000000000000..c83ecee5179f --- /dev/null +++ b/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/dependencies @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/generated b/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/generated new file mode 100644 index 000000000000..3768cfe5bbe0 --- /dev/null +++ b/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/generated @@ -0,0 +1,3 @@ + + + diff --git a/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/CommandOutputWindow.java b/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/CommandOutputWindow.java new file mode 100644 index 000000000000..249eae002aa0 --- /dev/null +++ b/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/CommandOutputWindow.java @@ -0,0 +1,8 @@ +package jetbrains.mps.command.base.runtime; + +/*Generated by MPS */ + + +public interface CommandOutputWindow { + public void activate(); +} diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java b/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleContext.java similarity index 71% rename from plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java rename to plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleContext.java index 4dad5ebaf69e..37bb17580b72 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java +++ b/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleContext.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.tool; +package jetbrains.mps.command.base.runtime; /*Generated by MPS */ @@ -8,5 +8,5 @@ public interface ConsoleContext { public Project getProject(); public SearchScope getDefaultSearchscope(); - public BaseConsoleTab getConsoleTab(); + public CommandOutputWindow getOutputWindow(); } diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleStream.java b/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleStream.java similarity index 80% rename from plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleStream.java rename to plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleStream.java index 8a325c689b45..fc06aa39faa9 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleStream.java +++ b/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleStream.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.tool; +package jetbrains.mps.command.base.runtime; /*Generated by MPS */ diff --git a/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/trace.info b/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/trace.info new file mode 100644 index 000000000000..0b7f72af23b8 --- /dev/null +++ b/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/trace.info @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies index 8d5bc13116d7..efd3bbed66c5 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies @@ -1,8 +1,10 @@ + + diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated index 9e060da4d789..9a8c38c4fb4f 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java index 3ac9ef962473..1a7166607814 100644 --- a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java +++ b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java @@ -7,10 +7,17 @@ import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.generator.template.SourceSubstituteMacroNodesContext; @Generated public class QueriesGenerated { public static SNode sourceNodeQuery_1583916890562946186(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL, 0x15fb34051f725bb1L, "commandHolder")), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL, 0x4e27160acb44924L, "command")); } + public static SNode sourceNodeQuery_7600370246429485751(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression")); + } + public static Iterable sourceNodesQuery_5336086527852932024(final SourceSubstituteMacroNodesContext _context) { + return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement")); + } } diff --git a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info index ae346e39e466..ce29c5b55f71 100644 --- a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info +++ b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info @@ -3,13 +3,25 @@ - + - - + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index 487fd6f05b64..022456e4d38a 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -5,6 +5,11 @@ + + + + + @@ -142,8 +147,8 @@ - - + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/dependencies new file mode 100644 index 000000000000..d075c6e4dd99 --- /dev/null +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/dependencies @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/generated new file mode 100644 index 000000000000..788a5719394d --- /dev/null +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/generated @@ -0,0 +1,3 @@ + + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies index e21d3c6a8c4f..443475c7e1a9 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies @@ -1,10 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -49,36 +95,41 @@ + + + + - - - - - - + + - - + + + + + + + + - - - - - - - + + + + + + @@ -93,8 +144,9 @@ - - + + + @@ -108,10 +160,10 @@ + + - - @@ -127,8 +179,9 @@ - - + + + @@ -152,12 +205,12 @@ - - + + + + - - @@ -209,8 +262,8 @@ - - + + @@ -218,10 +271,10 @@ + + - - diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated index 1d5edddea2a5..dc4d734199ea 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated index dd32d603ba1b..a4564892ba0b 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/dependencies index dfd97d2474a3..8ce10bad74da 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/dependencies +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/dependencies @@ -6,12 +6,14 @@ + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/dependencies index bf64b9e54ab6..cf9ec1766952 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/dependencies +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/dependencies @@ -1,5 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -72,9 +122,12 @@ + + + @@ -93,6 +146,21 @@ + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/generated index 122f6f5a4386..6442ba3af02e 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated index 8b0ad7fe2dd9..50316f2828c7 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated index 763dd5aa352b..0ded7dcd2a7a 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java index d19143b7ab33..74ec0822d6d3 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java @@ -9,6 +9,8 @@ import jetbrains.mps.generator.runtime.TemplateModule; import jetbrains.mps.generator.runtime.TemplateUtil; import jetbrains.mps.smodel.runtime.ILanguageAspect; +import jetbrains.mps.openapi.actions.descriptor.ActionAspectDescriptor; +import jetbrains.mps.actions.descriptor.AbstractActionAspectDescriptor; import jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor; import jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor; import jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor; @@ -42,6 +44,9 @@ public Collection getGenerators() { } @Override protected T createAspect(Class aspectClass) { + if (aspectClass == ActionAspectDescriptor.class) { + return (T) new AbstractActionAspectDescriptor() {}; + } if (aspectClass == BehaviorAspectDescriptor.class) { return (T) new jetbrains.mps.console.base.behavior.BehaviorAspectDescriptor(); } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/PasteWrappers.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/PasteWrappers.java similarity index 81% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/PasteWrappers.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/PasteWrappers.java index 5b9aacb2c03b..f1b18be891bf 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/PasteWrappers.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/PasteWrappers.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.blCommand.actions; +package jetbrains.mps.console.base.actions; /*Generated by MPS */ @@ -31,33 +31,33 @@ public SNode wrap(PasteWrapperContext _context) { }); ListSequence.fromList(result).addElement(new PasteWrapper() { public String getSourceConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.BLExpression"; + return "jetbrains.mps.console.base.structure.BLExpression"; } public String getTargetConceptFqName() { return "jetbrains.mps.baseLanguage.structure.Expression"; } public SNode wrap(PasteWrapperContext _context) { - return SLinkOperations.getTarget(_context.getSourceNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression")); + return SLinkOperations.getTarget(_context.getSourceNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression")); } }); ListSequence.fromList(result).addElement(new PasteWrapper() { public String getSourceConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.BLExpression"; + return "jetbrains.mps.console.base.structure.BLExpression"; } public String getTargetConceptFqName() { return "jetbrains.mps.baseLanguage.structure.Statement"; } public SNode wrap(PasteWrapperContext _context) { - return createExpressionStatement_sma98h_a0a0c(SNodeOperations.cast(HUtil.copyIfNecessary(SLinkOperations.getTarget(_context.getSourceNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"))), MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL, "jetbrains.mps.baseLanguage.structure.Expression"))); + return createExpressionStatement_sma98h_a0a0c(SNodeOperations.cast(HUtil.copyIfNecessary(SLinkOperations.getTarget(_context.getSourceNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"))), MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL, "jetbrains.mps.baseLanguage.structure.Expression"))); } }); return result; } private static SNode createBLExpression_sma98h_a0a0a(Object p0) { PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode n1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, "jetbrains.mps.console.blCommand.structure.BLExpression"), null, null, false); + SNode n1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, "jetbrains.mps.console.base.structure.BLExpression"), null, null, false); if (p0 != null) { - n1.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), (SNode) p0); + n1.addChild(MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), (SNode) p0); } return n1; } diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/QueriesGenerated.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/QueriesGenerated.java new file mode 100644 index 000000000000..3e8a99414cfc --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/QueriesGenerated.java @@ -0,0 +1,53 @@ +package jetbrains.mps.console.base.actions; + +/*Generated by MPS */ + +import java.util.List; +import jetbrains.mps.openapi.editor.cells.SubstituteAction; +import jetbrains.mps.smodel.IOperationContext; +import jetbrains.mps.smodel.action.NodeSubstituteActionsFactoryContext; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import java.util.ArrayList; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.smodel.action.IChildNodeSetter; +import jetbrains.mps.smodel.action.AbstractChildNodeSetter; +import org.jetbrains.mps.openapi.model.SModel; +import org.jetbrains.annotations.Nullable; +import jetbrains.mps.openapi.editor.EditorContext; +import jetbrains.mps.smodel.action.SNodeFactoryOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.action.ModelActions; + +public class QueriesGenerated { + public static List nodeSubstituteActionsBuilder_ActionsFactory_Command_3786816536599613947(final IOperationContext operationContext, final NodeSubstituteActionsFactoryContext _context) { + List result = ListSequence.fromList(new ArrayList()); + { + SNode outputConcept = MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, "jetbrains.mps.console.base.structure.BLExpression").getDeclarationNode(); + SNode childConcept = (SNode) _context.getChildConcept(); + if (SConceptOperations.isSuperConceptOf(SNodeOperations.asSConcept(childConcept), SNodeOperations.asSConcept(outputConcept))) { + SNode wrappedConcept = MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL, "jetbrains.mps.baseLanguage.structure.Expression").getDeclarationNode(); + IChildNodeSetter setter = new AbstractChildNodeSetter() { + private SNode wrapNode(SNode nodeToWrap, SModel model, @Nullable EditorContext editorContext) { + SNode result = SNodeFactoryOperations.createNewNode(SNodeOperations.getModel(nodeToWrap), SNodeFactoryOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, "jetbrains.mps.console.base.structure.BLExpression")), null); + SLinkOperations.setTarget(result, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), nodeToWrap); + return result; + } + public boolean returnSmallPart(SNode nodeToWrap) { + return true; + } + @Override + public SNode doExecute(SNode pn, SNode oc, SNode nc, @Nullable EditorContext editorContext) { + SNode wrappedNode = wrapNode(nc, nc.getModel(), editorContext); + _context.getChildSetter().execute(_context.getParentNode(), _context.getCurrentTargetNode(), wrappedNode, editorContext); + return (returnSmallPart(nc) ? nc : wrappedNode); + } + }; + ListSequence.fromList(result).addSequence(ListSequence.fromList(ModelActions.createChildNodeSubstituteActions(_context.getParentNode(), _context.getCurrentTargetNode(), wrappedConcept, setter, operationContext))); + } + } + return result; + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/trace.info new file mode 100644 index 000000000000..917908453328 --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/trace.info @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLCommand_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLCommand_Behavior.java similarity index 95% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLCommand_Behavior.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLCommand_Behavior.java index cde2f556395c..f3d1fdf8df28 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLCommand_Behavior.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLCommand_Behavior.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.blCommand.behavior; +package jetbrains.mps.console.base.behavior; /*Generated by MPS */ @@ -20,7 +20,7 @@ public static SNode virtual_getExpectedRetType_1239354342632(SNode thisNode) { return _quotation_createNode_1tnz54_a0a0(); } public static SNode virtual_getBody_1239354440022(SNode thisNode) { - return SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")); + return SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")); } public static List virtual_getThrowableTypes_6204026822016975623(SNode thisNode) { List result = new ArrayList(); diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLCommand_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLCommand_BehaviorDescriptor.java similarity index 92% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLCommand_BehaviorDescriptor.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLCommand_BehaviorDescriptor.java index 664883ff5b48..3aa653d40a15 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLCommand_BehaviorDescriptor.java @@ -1,8 +1,7 @@ -package jetbrains.mps.console.blCommand.behavior; +package jetbrains.mps.console.base.behavior; /*Generated by MPS */ -import jetbrains.mps.console.base.behavior.GeneratedCommand_BehaviorDescriptor; import jetbrains.mps.baseLanguage.behavior.IMethodLike_BehaviorDescriptor; import jetbrains.mps.baseLanguage.behavior.IStatementListContainer_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; @@ -49,6 +48,6 @@ public boolean virtual_suppress_3393165121846091591(SNode thisNode, SNode child) } @Override public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.BLCommand"; + return "jetbrains.mps.console.base.structure.BLCommand"; } } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLExpression_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLExpression_Behavior.java similarity index 91% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLExpression_Behavior.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLExpression_Behavior.java index 987685f596bc..01b01a39bb0f 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLExpression_Behavior.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLExpression_Behavior.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.blCommand.behavior; +package jetbrains.mps.console.base.behavior; /*Generated by MPS */ diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLExpression_BehaviorDescriptor.java similarity index 78% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLExpression_BehaviorDescriptor.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLExpression_BehaviorDescriptor.java index 2455f7b5fd1a..e19496bef04b 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BLExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BLExpression_BehaviorDescriptor.java @@ -1,8 +1,7 @@ -package jetbrains.mps.console.blCommand.behavior; +package jetbrains.mps.console.base.behavior; /*Generated by MPS */ -import jetbrains.mps.console.base.behavior.GeneratedCommand_BehaviorDescriptor; import jetbrains.mps.lang.core.behavior.IWrapper_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; @@ -17,6 +16,6 @@ public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) { } @Override public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.BLExpression"; + return "jetbrains.mps.console.base.structure.BLExpression"; } } diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java index a97651f23425..cceeadadaad9 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java @@ -11,39 +11,45 @@ public BehaviorAspectDescriptor() { } public BehaviorDescriptor getDescriptor(String fqName) { switch (Arrays.binarySearch(stringSwitchCases_846f5o_a0a0b, fqName)) { - case 4: + case 7: return new History_BehaviorDescriptor(); - case 0: + case 2: return new CommandHolder_BehaviorDescriptor(); - case 10: + case 13: return new NodeWithClosure_BehaviorDescriptor(); - case 12: + case 15: return new PastedNodeReference_BehaviorDescriptor(); - case 8: + case 11: return new NodeReferenceString_BehaviorDescriptor(); - case 7: + case 10: return new NodeReferencePresentation_BehaviorDescriptor(); - case 5: + case 8: return new ModifiedCommandHistoryItem_BehaviorDescriptor(); - case 2: + case 5: return new HelpCommand_BehaviorDescriptor(); - case 1: + case 3: return new ConsoleRoot_BehaviorDescriptor(); - case 13: + case 16: return new Response_BehaviorDescriptor(); - case 9: + case 12: return new NodeResponseItem_BehaviorDescriptor(); - case 14: + case 17: return new TextResponseItem_BehaviorDescriptor(); - case 6: + case 9: return new NewLineResponseItem_BehaviorDescriptor(); - case 3: + case 6: return new HelpConceptReference_BehaviorDescriptor(); - case 11: + case 14: return new OutputConsoleRoot_BehaviorDescriptor(); + case 4: + return new ExceptionHolder_BehaviorDescriptor(); + case 0: + return new BLCommand_BehaviorDescriptor(); + case 1: + return new BLExpression_BehaviorDescriptor(); default: return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName); } } - private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.TextResponseItem"}; + private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.TextResponseItem"}; } diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java index 74769a153c51..057590c4ce67 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java @@ -3,10 +3,12 @@ /*Generated by MPS */ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; +import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; +import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; public abstract class Command_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements ConsoleHelpProvider_BehaviorDescriptor { public Command_BehaviorDescriptor() { diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ExceptionHolder_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ExceptionHolder_Behavior.java similarity index 81% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ExceptionHolder_Behavior.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ExceptionHolder_Behavior.java index ddf4595196b0..dc620768b93e 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ExceptionHolder_Behavior.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ExceptionHolder_Behavior.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.blCommand.behavior; +package jetbrains.mps.console.base.behavior; /*Generated by MPS */ @@ -14,12 +14,12 @@ public class ExceptionHolder_Behavior { public static void init(SNode thisNode) { } public static void virtual_execute_8517397753922085153(SNode thisNode, Project project) { - StringSelection contents = new StringSelection(SPropertyOperations.getString(thisNode, MetaAdapterFactory.getProperty(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5b02f032bc93b714L, 0x5b02f032bc9cb8a9L, "stackTrace"))); + StringSelection contents = new StringSelection(SPropertyOperations.getString(thisNode, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L, 0x5b02f032bc9cb8a9L, "stackTrace"))); CopyPasteManagerEx.getInstanceEx().setContents(contents); final AnalyzeStacktraceDialog dialog = new AnalyzeStacktraceDialog(project); dialog.show(); } public static boolean virtual_canExecute_3282455643657932881(SNode thisNode) { - return SPropertyOperations.getString(thisNode, MetaAdapterFactory.getProperty(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5b02f032bc93b714L, 0x5b02f032bc9cb8a9L, "stackTrace")) != null; + return SPropertyOperations.getString(thisNode, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L, 0x5b02f032bc9cb8a9L, "stackTrace")) != null; } } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ExceptionHolder_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ExceptionHolder_BehaviorDescriptor.java similarity index 79% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ExceptionHolder_BehaviorDescriptor.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ExceptionHolder_BehaviorDescriptor.java index ff95f7e2ba8c..58973362fc84 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ExceptionHolder_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ExceptionHolder_BehaviorDescriptor.java @@ -1,9 +1,8 @@ -package jetbrains.mps.console.blCommand.behavior; +package jetbrains.mps.console.base.behavior; /*Generated by MPS */ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; -import jetbrains.mps.console.base.behavior.IClickable_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; import com.intellij.openapi.project.Project; @@ -18,6 +17,6 @@ public void virtual_execute_8517397753922085153(SNode thisNode, Project project) } @Override public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.ExceptionHolder"; + return "jetbrains.mps.console.base.structure.ExceptionHolder"; } } diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java index c613c6bbfe2d..a58ee6caae13 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java @@ -3,10 +3,11 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; import com.intellij.openapi.application.ApplicationManager; import org.jetbrains.mps.openapi.model.SModel; +import jetbrains.mps.console.tool.BaseConsoleTab; import jetbrains.mps.console.tool.ConsoleUtil; import javax.swing.SwingUtilities; import org.jetbrains.mps.openapi.module.SModule; @@ -24,7 +25,7 @@ public static void init(SNode thisNode) { public static void virtual_execute_6854397602732226506(SNode thisNode, final ConsoleContext context, final ConsoleStream console, final Runnable beforeCallback, final Runnable afterCallback) { ApplicationManager.getApplication().executeOnPooledThread(new Runnable() { public void run() { - final SModel model = context.getConsoleTab().getConsoleModel(); + final SModel model = ((BaseConsoleTab) context.getOutputWindow()).getConsoleModel(); boolean result = ConsoleUtil.make(context.getProject(), model); if (!(result)) { return; @@ -33,7 +34,7 @@ public void run() { public void run() { try { SModule module = model.getModule(); - String name = ConsoleUtil.getGeneratedModelName(context); + String name = model.getModelName() + ".Main"; Class aClass = ClassLoaderManager.getInstance().getClass(module, name); if (aClass == null) { throw new ClassNotFoundException("No class " + name + " for module " + module); diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_BehaviorDescriptor.java index 5969a43eac10..ab45434f11d7 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_BehaviorDescriptor.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; public abstract class GeneratedCommand_BehaviorDescriptor extends Command_BehaviorDescriptor { public GeneratedCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java index ed07c01f0d46..7fd3d8c71ba3 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java @@ -3,12 +3,13 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; import jetbrains.mps.internal.collections.runtime.ListSequence; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; +import jetbrains.mps.console.tool.BaseConsoleTab; import jetbrains.mps.internal.collections.runtime.IWhereFilter; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; import jetbrains.mps.lang.structure.behavior.AbstractConceptDeclaration_Behavior; @@ -33,7 +34,7 @@ public static void init(SNode thisNode) { } public static void virtual_doExecute_3321948346081469500(SNode thisNode, ConsoleContext context, ConsoleStream console) { if ((SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")) == null)) { - Iterable constructions = ListSequence.fromList(SConceptOperations.getAllSubConcepts(MetaAdapterFactory.getInterfaceConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730edd07L, "jetbrains.mps.console.base.structure.ConsoleHelpProvider").getDeclarationNode(), context.getConsoleTab().getConsoleModel())).where(new IWhereFilter() { + Iterable constructions = ListSequence.fromList(SConceptOperations.getAllSubConcepts(MetaAdapterFactory.getInterfaceConcept(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x690b986730edd07L, "jetbrains.mps.command.base.structure.ConsoleHelpProvider").getDeclarationNode(), ((BaseConsoleTab) context.getOutputWindow()).getConsoleModel())).where(new IWhereFilter() { public boolean accept(SNode it) { return SNodeOperations.isInstanceOf(SNodeOperations.asNode(it), MetaAdapterFactory.getConcept(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0xf979ba0450L, "jetbrains.mps.lang.structure.structure.ConceptDeclaration")) && AbstractConceptDeclaration_Behavior.call_isDefaultSubstitutable_7429110134803670673(SNodeOperations.asNode(it)); } @@ -107,7 +108,7 @@ public Integer combine(Integer it, Integer s) { } console.addText("Constructions available in console:\n\n"); console.addText(output.toString()); - } else if (AbstractConceptDeclaration_Behavior.call_isSubconceptOf_8134325418312549386(SLinkOperations.getTarget(SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")), MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L, 0x60279080c2f3f8d6L, "command")), SNodeOperations.getNode("r:359b1d2b-77c4-46df-9bf2-b25cbea32254(jetbrains.mps.console.base.structure)", "473081947981012231"))) { + } else if (AbstractConceptDeclaration_Behavior.call_isSubconceptOf_8134325418312549386(SLinkOperations.getTarget(SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")), MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L, 0x60279080c2f3f8d6L, "command")), SNodeOperations.getNode("r:9ec1d3e7-df4d-441e-8024-73530d64d324(jetbrains.mps.command.base.structure)", "473081947981012231"))) { String helpPage; try { SNode chp = (SNode) (SNode) SLinkOperations.getTarget(SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")), MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L, 0x60279080c2f3f8d6L, "command")); diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java index 3c2c395434ef..b737c2e40951 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java @@ -2,10 +2,12 @@ /*Generated by MPS */ +import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; import org.jetbrains.mps.openapi.language.SConcept; +import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; public class HelpCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements ConsoleHelpProvider_BehaviorDescriptor { public HelpCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_Behavior.java index b9be24a66c40..001b20467439 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_Behavior.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; import jetbrains.mps.smodel.behaviour.BehaviorReflection; public class InterpretedCommand_Behavior { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_BehaviorDescriptor.java index 95ea58b1ff64..63fb74a15901 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_BehaviorDescriptor.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; public abstract class InterpretedCommand_BehaviorDescriptor extends Command_BehaviorDescriptor { public InterpretedCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info index 88d9094619da..180da2b61c2d 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info @@ -14,26 +14,32 @@ + + + + + + - + - - - - + + + + - + @@ -92,98 +98,98 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - + + + - - - - - - - + + + + + + + - + - + - - - + + + - - - + + + - - - - + + + + @@ -197,6 +203,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -238,7 +315,7 @@ - + @@ -319,263 +396,215 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + - + - - + + - + - + - - + + - + - - + + - - - - + + + + - + - - + + - + - + - + - - + + - + - + - - + + - - + + - + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -638,6 +667,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -670,6 +728,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java index 9822a23710cd..f2863ae3f703 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java @@ -56,7 +56,7 @@ public SNodeReference getSearchScopeValidatorNode() { } @Override public Scope createScope(final IOperationContext operationContext, final ReferenceConstraintsContext _context) { - return new FilteringScope(new SubconceptsScope(MetaAdapterFactory.getInterfaceConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730edd07L, "jetbrains.mps.console.base.structure.ConsoleHelpProvider").getDeclarationNode(), _context.getModel()) { + return new FilteringScope(new SubconceptsScope(MetaAdapterFactory.getInterfaceConcept(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x690b986730edd07L, "jetbrains.mps.command.base.structure.ConsoleHelpProvider").getDeclarationNode(), _context.getModel()) { public String getName(SNode child) { return BehaviorReflection.invokeVirtualStatic(String.class, SNodeOperations.asSConcept(((SNode) child)), "virtual_getShortDisplayString_7006261637493126103", new Object[]{}); } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLCommand_Editor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLCommand_Editor.java similarity index 97% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLCommand_Editor.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLCommand_Editor.java index a90fba8ab033..538bde505d0b 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLCommand_Editor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLCommand_Editor.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.blCommand.editor; +package jetbrains.mps.console.base.editor; /*Generated by MPS */ @@ -63,7 +63,7 @@ private EditorCell createConstant_zc016d_a0a(EditorContext editorContext, SNode return editorCell; } private EditorCell createRefNode_zc016d_b0a(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new BLCommand_Editor.bodySingleRoleHandler_zc016d_b0a(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body"), editorContext); + SingleRoleCellProvider provider = new BLCommand_Editor.bodySingleRoleHandler_zc016d_b0a(node, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body"), editorContext); return provider.createCell(); } private class bodySingleRoleHandler_zc016d_b0a extends SingleRoleCellProvider { @@ -110,7 +110,7 @@ private EditorCell createConstant_zc016d_c0a(EditorContext editorContext, SNode return editorCell; } private EditorCell createRefNode_zc016d_a0(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new BLCommand_Editor.bodySingleRoleHandler_zc016d_a0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body"), editorContext); + SingleRoleCellProvider provider = new BLCommand_Editor.bodySingleRoleHandler_zc016d_a0(node, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body"), editorContext); return provider.createCell(); } private class bodySingleRoleHandler_zc016d_a0 extends SingleRoleCellProvider { diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLExpression_Actions.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLExpression_Actions.java similarity index 82% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLExpression_Actions.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLExpression_Actions.java index 39d8789f36a6..877c72bfe524 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLExpression_Actions.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLExpression_Actions.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.blCommand.editor; +package jetbrains.mps.console.base.editor; /*Generated by MPS */ @@ -27,10 +27,10 @@ public void execute(EditorContext editorContext) { this.execute_internal(editorContext, this.myNode); } public void execute_internal(EditorContext editorContext, SNode node) { - SNode blCommand = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"))); - SLinkOperations.setTarget(blCommand, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body"), SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList")))); - SLinkOperations.addNewChild(SLinkOperations.getTarget(blCommand, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"))); - SLinkOperations.setTarget(SNodeOperations.cast(ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(blCommand, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"))).first(), MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"))); + SNode blCommand = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, "jetbrains.mps.console.base.structure.BLCommand"))); + SLinkOperations.setTarget(blCommand, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body"), SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList")))); + SLinkOperations.addNewChild(SLinkOperations.getTarget(blCommand, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"))); + SLinkOperations.setTarget(SNodeOperations.cast(ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(blCommand, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"))).first(), MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"))); SNodeOperations.replaceWithAnother(node, blCommand); } } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLExpression_Editor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLExpression_Editor.java similarity index 96% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLExpression_Editor.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLExpression_Editor.java index 54c2f6108321..3177125a0d93 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/BLExpression_Editor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/BLExpression_Editor.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.blCommand.editor; +package jetbrains.mps.console.base.editor; /*Generated by MPS */ @@ -27,7 +27,7 @@ private EditorCell createCollection_f3ggz9_a(EditorContext editorContext, SNode return editorCell; } private EditorCell createRefNode_f3ggz9_a0(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new BLExpression_Editor.expressionSingleRoleHandler_f3ggz9_a0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), editorContext); + SingleRoleCellProvider provider = new BLExpression_Editor.expressionSingleRoleHandler_f3ggz9_a0(node, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), editorContext); return provider.createCell(); } private class expressionSingleRoleHandler_f3ggz9_a0 extends SingleRoleCellProvider { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/EditorAspectDescriptorImpl.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/EditorAspectDescriptorImpl.java index d6c3822aab15..7e93ecbeda92 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/EditorAspectDescriptorImpl.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/EditorAspectDescriptorImpl.java @@ -15,32 +15,38 @@ public class EditorAspectDescriptorImpl implements EditorAspectDescriptor { public Collection getEditors(ConceptDescriptor descriptor) { switch (Arrays.binarySearch(stringSwitchCases_xbvbvu_a0a0b, descriptor.getConceptFqName())) { case 0: - return Collections.singletonList(new CommandHolder_Editor()); + return Collections.singletonList(new BLCommand_Editor()); case 1: - return Collections.singletonList(new ConsoleRoot_Editor()); + return Collections.singletonList(new BLExpression_Editor()); case 2: - return Collections.singletonList(new HelpCommand_Editor()); + return Collections.singletonList(new CommandHolder_Editor()); case 3: - return Collections.singletonList(new HelpConceptReference_Editor()); + return Collections.singletonList(new ConsoleRoot_Editor()); case 4: - return Collections.singletonList(new History_Editor()); + return Collections.singletonList(new ExceptionHolder_Editor()); case 5: - return Collections.singletonList(new IClickable_Editor()); + return Collections.singletonList(new HelpCommand_Editor()); case 6: - return Collections.singletonList(new INodeWithReference_Editor()); + return Collections.singletonList(new HelpConceptReference_Editor()); case 7: - return Collections.singletonList(new InterpretedCommand_Editor()); + return Collections.singletonList(new History_Editor()); case 8: - return Collections.singletonList(new NewLineResponseItem_Editor()); + return Collections.singletonList(new IClickable_Editor()); case 9: - return Collections.singletonList(new NodeResponseItem_Editor()); + return Collections.singletonList(new INodeWithReference_Editor()); case 10: - return Collections.singletonList(new OutputConsoleRoot_Editor()); + return Collections.singletonList(new InterpretedCommand_Editor()); case 11: - return Collections.singletonList(new PastedNodeReference_Editor()); + return Collections.singletonList(new NewLineResponseItem_Editor()); case 12: - return Collections.singletonList(new Response_Editor()); + return Collections.singletonList(new NodeResponseItem_Editor()); case 13: + return Collections.singletonList(new OutputConsoleRoot_Editor()); + case 14: + return Collections.singletonList(new PastedNodeReference_Editor()); + case 15: + return Collections.singletonList(new Response_Editor()); + case 16: return Collections.singletonList(new TextResponseItem_Editor()); default: } @@ -64,6 +70,6 @@ public Collection getEditorComponents(ConceptDescriptor } - private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference", "jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.TextResponseItem"}; + private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference", "jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.TextResponseItem"}; private static String[] stringSwitchCases_xbvbvu_a0a0c = new String[]{"jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference"}; } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ExceptionHolder_Editor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/ExceptionHolder_Editor.java similarity index 97% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ExceptionHolder_Editor.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/ExceptionHolder_Editor.java index 29c02406447e..b2055e0d0a3c 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ExceptionHolder_Editor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/ExceptionHolder_Editor.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.blCommand.editor; +package jetbrains.mps.console.base.editor; /*Generated by MPS */ diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/trace.info index 4f6a4e72c9d5..f96250858512 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/trace.info @@ -3,6 +3,7 @@ + @@ -11,44 +12,44 @@ - + - - + + - - - - - + + + + + - + - + - + - - - + + + - - - - - - - + + + + + + + @@ -102,12 +103,12 @@ - - + + - - + + @@ -125,89 +126,89 @@ - - + + - + - - + + - + - - + + - + - - + + - + - - - - - + + + + + - + - + - - - - - - + + + + + + - + - - + + - + - - - + + + - - + + - - - - - - + + + + + + - + - - - - - - - - + + + + + + + + @@ -338,15 +339,15 @@ - - - + + + - - - - + + + + @@ -366,15 +367,15 @@ - - - + + + - - - - + + + + @@ -394,68 +395,68 @@ - - - + + + - + - - - + + + - + - - - - - - - - - + + + + + + + + + - + - - - + + + - + - + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -536,11 +537,11 @@ - - + + - + @@ -548,41 +549,41 @@ - - + + - + - - - - - + + + + + - + - + - + - - - + + + - - - - - - - - + + + + + + + + @@ -646,51 +647,51 @@ - - + + - - - + + + - - - - - + + + + + - - + + - - + + - + - - + + - - - - - - - - - - - + + + + + + + + + + + @@ -763,10 +764,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -774,63 +984,63 @@ - - - - + + + + - + - - + + - + - - - + + + - - - - - + + + + + - - + + - + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -927,36 +1137,36 @@ - - + + - - - - - + + + + + - + - + - - - + + + - - - - - - - + + + + + + + @@ -1008,24 +1218,24 @@ - - + + - + - - - - - - - - + + + + + + + + @@ -1049,18 +1259,18 @@ - - + + - + - - - + + + @@ -1079,23 +1289,23 @@ - - + + - + - + - + - - - + + + - + @@ -1104,89 +1314,89 @@ - - + + - + - - + + - + - - - - - - - - - - + + + + + + + + + + - + - - + + - + - - - + + + - + - + - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -1306,15 +1516,15 @@ - - - + + + - - - - + + + + @@ -1332,37 +1542,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + @@ -1401,8 +1668,8 @@ - - + + @@ -1412,41 +1679,41 @@ - - - + + + - - + + - - - - - + + + + + - + - + - - - + + + - - - - - - - - - + + + + + + + + + @@ -1515,46 +1782,46 @@ - - + + - - + + - + - - - - - - - - - + + + + + + + + + - + - - + + - - - - - - - + + + + + + + @@ -1608,7 +1875,7 @@ - + @@ -1617,5 +1884,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java index 6f3c880efd0e..fbe817ea37e4 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java @@ -12,12 +12,14 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { - /*package*/ final ConceptDescriptor myConceptCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.Command", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730edd07L)).abstract_().create(); + /*package*/ final ConceptDescriptor myConceptBLCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.BLCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L)).super_("jetbrains.mps.console.base.structure.GeneratedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).parents("jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.baseLanguage.structure.IMethodLike", "jetbrains.mps.baseLanguage.structure.IStatementListContainer").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L), MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x1208f458d37L), MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11750ef8265L)).childDescriptors(new ConceptDescriptorBuilder.Link(1769790395579689573L, "body", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false)).children(new String[]{"body"}, new boolean[]{false}).alias("{", "baseLanguage statements").create(); + /*package*/ final ConceptDescriptor myConceptBLExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.BLExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L)).super_("jetbrains.mps.console.base.structure.GeneratedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).parents("jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.lang.core.structure.IWrapper").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x11c6fd75034L)).childDescriptors(new ConceptDescriptorBuilder.Link(7656298970878093890L, "expression", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"expression"}, new boolean[]{false}).alias("", "baseLanguage expression").create(); + /*package*/ final ConceptDescriptor myConceptCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.Command", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.command.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x690b986730edd07L)).abstract_().create(); /*package*/ final ConceptDescriptor myConceptCommandHolder = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.CommandHolder", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.lang.core.structure.INamedConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L)).childDescriptors(new ConceptDescriptorBuilder.Link(351968380916615460L, "command", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL), true, false, false)).children(new String[]{"command"}, new boolean[]{false}).create(); - /*package*/ final ConceptDescriptor myConceptConsoleHelpProvider = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ConsoleHelpProvider", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730edd07L)).interface_().create(); /*package*/ final ConceptDescriptor myConceptConsoleRoot = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ConsoleRoot", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).childDescriptors(new ConceptDescriptorBuilder.Link(1583916890557930415L, "history", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xa835f28c1aa02beL), false, false, false), new ConceptDescriptorBuilder.Link(1583916890557930417L, "commandHolder", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL), false, false, false)).children(new String[]{"history", "commandHolder"}, new boolean[]{false, false}).create(); + /*package*/ final ConceptDescriptor myConceptExceptionHolder = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ExceptionHolder", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.IClickable").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L)).propertyDescriptors(new ConceptDescriptorBuilder.Prop(6558068108108282025L, "stackTrace")).properties("stackTrace").create(); /*package*/ final ConceptDescriptor myConceptGeneratedCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.GeneratedCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).super_("jetbrains.mps.console.base.structure.Command").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).parents("jetbrains.mps.console.base.structure.Command").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).abstract_().create(); - /*package*/ final ConceptDescriptor myConceptHelpCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HelpCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730edd07L)).childDescriptors(new ConceptDescriptorBuilder.Link(6928665434433788203L, "target", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L), true, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("?", "help").create(); + /*package*/ final ConceptDescriptor myConceptHelpCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HelpCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.command.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x690b986730edd07L)).childDescriptors(new ConceptDescriptorBuilder.Link(6928665434433788203L, "target", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L), true, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("?", "help").create(); /*package*/ final ConceptDescriptor myConceptHelpConceptReference = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HelpConceptReference", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(6928665434433779926L, "command", MetaIdFactory.conceptId(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0xf979ba0450L), false)).references("command").create(); /*package*/ final ConceptDescriptor myConceptHistory = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.History", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xa835f28c1aa02beL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).childDescriptors(new ConceptDescriptorBuilder.Link(7195119950189425818L, "item", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL), true, true, false)).children(new String[]{"item"}, new boolean[]{true}).create(); /*package*/ final ConceptDescriptor myConceptHistoryItem = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HistoryItem", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL)).interface_().create(); @@ -39,64 +41,68 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { @Override public Collection getDescriptors() { - return Arrays.asList(myConceptCommand, myConceptCommandHolder, myConceptConsoleHelpProvider, myConceptConsoleRoot, myConceptGeneratedCommand, myConceptHelpCommand, myConceptHelpConceptReference, myConceptHistory, myConceptHistoryItem, myConceptIActionHolder, myConceptIClickable, myConceptINodeWithReference, myConceptInterpretedCommand, myConceptModifiedCommandHistoryItem, myConceptNewLineResponseItem, myConceptNodeReferencePresentation, myConceptNodeReferenceString, myConceptNodeResponseItem, myConceptNodeWithClosure, myConceptOutputConsoleRoot, myConceptPastedNodeReference, myConceptResponse, myConceptResponseItem, myConceptTextResponseItem); + return Arrays.asList(myConceptBLCommand, myConceptBLExpression, myConceptCommand, myConceptCommandHolder, myConceptConsoleRoot, myConceptExceptionHolder, myConceptGeneratedCommand, myConceptHelpCommand, myConceptHelpConceptReference, myConceptHistory, myConceptHistoryItem, myConceptIActionHolder, myConceptIClickable, myConceptINodeWithReference, myConceptInterpretedCommand, myConceptModifiedCommandHistoryItem, myConceptNewLineResponseItem, myConceptNodeReferencePresentation, myConceptNodeReferenceString, myConceptNodeResponseItem, myConceptNodeWithClosure, myConceptOutputConsoleRoot, myConceptPastedNodeReference, myConceptResponse, myConceptResponseItem, myConceptTextResponseItem); } @Override @Nullable public ConceptDescriptor getDescriptor(String conceptFqName) { - switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0cb, conceptFqName)) { + switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0eb, conceptFqName)) { case 0: - return myConceptCommand; + return myConceptBLCommand; case 1: - return myConceptCommandHolder; + return myConceptBLExpression; case 2: - return myConceptConsoleHelpProvider; + return myConceptCommand; case 3: - return myConceptConsoleRoot; + return myConceptCommandHolder; case 4: - return myConceptGeneratedCommand; + return myConceptConsoleRoot; case 5: - return myConceptHelpCommand; + return myConceptExceptionHolder; case 6: - return myConceptHelpConceptReference; + return myConceptGeneratedCommand; case 7: - return myConceptHistory; + return myConceptHelpCommand; case 8: - return myConceptHistoryItem; + return myConceptHelpConceptReference; case 9: - return myConceptIActionHolder; + return myConceptHistory; case 10: - return myConceptIClickable; + return myConceptHistoryItem; case 11: - return myConceptINodeWithReference; + return myConceptIActionHolder; case 12: - return myConceptInterpretedCommand; + return myConceptIClickable; case 13: - return myConceptModifiedCommandHistoryItem; + return myConceptINodeWithReference; case 14: - return myConceptNewLineResponseItem; + return myConceptInterpretedCommand; case 15: - return myConceptNodeReferencePresentation; + return myConceptModifiedCommandHistoryItem; case 16: - return myConceptNodeReferenceString; + return myConceptNewLineResponseItem; case 17: - return myConceptNodeResponseItem; + return myConceptNodeReferencePresentation; case 18: - return myConceptNodeWithClosure; + return myConceptNodeReferenceString; case 19: - return myConceptOutputConsoleRoot; + return myConceptNodeResponseItem; case 20: - return myConceptPastedNodeReference; + return myConceptNodeWithClosure; case 21: - return myConceptResponse; + return myConceptOutputConsoleRoot; case 22: - return myConceptResponseItem; + return myConceptPastedNodeReference; case 23: + return myConceptResponse; + case 24: + return myConceptResponseItem; + case 25: return myConceptTextResponseItem; default: return null; } } - private static String[] stringSwitchCases_1htk8d_a0a0cb = new String[]{"jetbrains.mps.console.base.structure.Command", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleHelpProvider", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.console.base.structure.IActionHolder", "jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference", "jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.ResponseItem", "jetbrains.mps.console.base.structure.TextResponseItem"}; + private static String[] stringSwitchCases_1htk8d_a0a0eb = new String[]{"jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.Command", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.console.base.structure.IActionHolder", "jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference", "jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.ResponseItem", "jetbrains.mps.console.base.structure.TextResponseItem"}; } diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info index 8b06b0136198..d163e3b26a9b 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info @@ -2,7 +2,7 @@ - + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/trace.info index 0401d0ccb7fa..e0060249d3fb 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/trace.info @@ -2,7 +2,8 @@ - + + diff --git a/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated b/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated index eee1bbac116b..6ae7bc58c0a9 100644 --- a/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated +++ b/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java b/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java index ffaaee7d37f9..b81ef06a0dde 100644 --- a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java +++ b/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java @@ -44,130 +44,85 @@ public static boolean baseMappingRule_Condition_3856122757887589572(final BaseMa public static boolean baseMappingRule_Condition_3786816536599965790(final BaseMappingRuleContext _context) { return ListSequence.fromList(SNodeOperations.getNodeDescendants(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b2a9377L, "jetbrains.mps.console.blCommand.structure.PrintExpression"), false, new SAbstractConcept[]{})).isEmpty(); } - public static Object propertyMacro_GetPropertyValue_5842059399449233666(final PropertyMacroContext _context) { - return _context.createUniqueName("context", _context.getNode()); - } - public static Object propertyMacro_GetPropertyValue_5842059399449255502(final PropertyMacroContext _context) { - return _context.createUniqueName("console", _context.getNode()); - } public static Object propertyMacro_GetPropertyValue_6690111761723079789(final PropertyMacroContext _context) { return "closure : " + BehaviorReflection.invokeVirtual(String.class, TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), "virtual_getPresentation_1213877396640", new Object[]{}); } public static Object propertyMacro_GetPropertyValue_9010839353952736697(final PropertyMacroContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a8())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a6())) { return "nodes"; } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a8())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a6())) { return "references"; } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a8())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a6())) { return "models"; } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a8())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a6())) { return "modules"; } return null; } - public static Object referenceMacro_GetReferent_8126917369944781043(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(_context.getNode(), "contextParameter"); - } - public static Object referenceMacro_GetReferent_8126917369944799036(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(_context.getNode(), "consoleParameter"); - } - public static Object referenceMacro_GetReferent_6273399648879447700(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "consoleParameter"); - } - public static Object referenceMacro_GetReferent_8006938998446049201(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter"); - } public static Object referenceMacro_GetReferent_3501374812264730107(final ReferenceMacroContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a31())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a7())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263258755"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a31())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a7())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263262593"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a31())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a7())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263265578"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a31())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a7())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263268620"); } return null; } - public static Object referenceMacro_GetReferent_3501374812265756145(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter"); - } public static Object referenceMacro_GetReferent_7600370246425972944(final ReferenceMacroContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a51())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a8())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844631948"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a51())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a8())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844631948"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a51())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a8())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844632137"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a51())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a8())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844632254"); } return null; } - public static Object referenceMacro_GetReferent_752693057587775365(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter"); - } - public static Object referenceMacro_GetReferent_5510759644748879586(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "consoleParameter"); - } - public static Object referenceMacro_GetReferent_5510759644748869358(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "consoleParameter"); - } - public static Object referenceMacro_GetReferent_4307205004143761133(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter"); - } - public static Object referenceMacro_GetReferent_4307205004144705887(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter"); - } - public static Object referenceMacro_GetReferent_9010839353953001247(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "consoleParameter"); - } - public static Object referenceMacro_GetReferent_9010839353953082327(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter"); - } - public static Object referenceMacro_GetReferent_1597470200014435793(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter"); - } public static Object referenceMacro_GetReferent_1597470200014435807(final ReferenceMacroContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a42())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a9())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844631948"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a42())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a9())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844631948"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a42())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a9())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844632137"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a42())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a9())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844632254"); } return null; } public static Object referenceMacro_GetReferent_3501374812263511250(final ReferenceMacroContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a52())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a01())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263258755"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a52())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a01())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263262593"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a52())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a01())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263265578"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a52())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a01())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263268620"); } return null; @@ -218,7 +173,7 @@ public SNode select(SNode it) { return SNodeOperations.cast(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope")); } }); - return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0mb() : SLinkOperations.getTarget(Sequence.fromIterable(results).first(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"))); + return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0x() : SLinkOperations.getTarget(Sequence.fromIterable(results).first(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"))); } public static SNode sourceNodeQuery_4307205004142895894(final SourceSubstituteMacroNodeContext _context) { Iterable results = ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).where(new IWhereFilter() { @@ -226,10 +181,7 @@ public boolean accept(SNode it) { return SNodeOperations.isInstanceOf(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly")); } }); - return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0nb_0() : _quotation_createNode_x583g4_a0b0nb()); - } - public static SNode sourceNodeQuery_7600370246429485751(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression")); + return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0y_0() : _quotation_createNode_x583g4_a0b0y()); } public static SNode sourceNodeQuery_3395429865810287239(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); @@ -245,17 +197,17 @@ public static SNode sourceNodeQuery_7600370246419387223(final SourceSubstituteMa } public static SNode sourceNodeQuery_3501374812261883521(final SourceSubstituteMacroNodeContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a54())) { - return _quotation_createNode_x583g4_a0a1a54(); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a92())) { + return _quotation_createNode_x583g4_a0a1a92(); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a54())) { - return _quotation_createNode_x583g4_a0a2a54(); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a92())) { + return _quotation_createNode_x583g4_a0a2a92(); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a54())) { - return _quotation_createNode_x583g4_a0a3a54(); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a92())) { + return _quotation_createNode_x583g4_a0a3a92(); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a54())) { - return _quotation_createNode_x583g4_a0a4a54(); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a92())) { + return _quotation_createNode_x583g4_a0a4a92(); } return null; } @@ -265,21 +217,12 @@ public static SNode sourceNodeQuery_9010839353952788840(final SourceSubstituteMa public static SNode sourceNodeQuery_3492877759612269969(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, 0x307931d0f985950eL, "scope")); } - public static SNode sourceNodeQuery_1964420931776208395(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope")); - } - public static Iterable sourceNodesQuery_5336086527852932024(final SourceSubstituteMacroNodesContext _context) { - return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement")); - } public static Iterable sourceNodesQuery_6134217374019191580(final SourceSubstituteMacroNodesContext _context) { return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL, 0x307931d0f952484fL, "model")); } public static Iterable sourceNodesQuery_3492877759611137837(final SourceSubstituteMacroNodesContext _context) { return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL, 0x307931d0f94af768L, "module")); } - public static Iterable sourceNodesQuery_1964420931776045744(final SourceSubstituteMacroNodesContext _context) { - return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement")); - } private static SNode _quotation_createNode_x583g4_b0a0a0() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; @@ -329,7 +272,7 @@ private static SNode _quotation_createNode_x583g4_b0a0b0c() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a1a8() { + private static SNode _quotation_createNode_x583g4_b0a1a6() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -338,7 +281,7 @@ private static SNode _quotation_createNode_x583g4_b0a1a8() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a2a8() { + private static SNode _quotation_createNode_x583g4_b0a2a6() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -347,7 +290,7 @@ private static SNode _quotation_createNode_x583g4_b0a2a8() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a3a8() { + private static SNode _quotation_createNode_x583g4_b0a3a6() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -356,7 +299,7 @@ private static SNode _quotation_createNode_x583g4_b0a3a8() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a4a8() { + private static SNode _quotation_createNode_x583g4_b0a4a6() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -366,7 +309,7 @@ private static SNode _quotation_createNode_x583g4_b0a4a8() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a1a31() { + private static SNode _quotation_createNode_x583g4_b0a1a7() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -375,7 +318,7 @@ private static SNode _quotation_createNode_x583g4_b0a1a31() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a2a31() { + private static SNode _quotation_createNode_x583g4_b0a2a7() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -384,7 +327,7 @@ private static SNode _quotation_createNode_x583g4_b0a2a31() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a3a31() { + private static SNode _quotation_createNode_x583g4_b0a3a7() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -393,7 +336,7 @@ private static SNode _quotation_createNode_x583g4_b0a3a31() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a4a31() { + private static SNode _quotation_createNode_x583g4_b0a4a7() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -403,7 +346,7 @@ private static SNode _quotation_createNode_x583g4_b0a4a31() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a1a51() { + private static SNode _quotation_createNode_x583g4_b0a1a8() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -412,7 +355,7 @@ private static SNode _quotation_createNode_x583g4_b0a1a51() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a2a51() { + private static SNode _quotation_createNode_x583g4_b0a2a8() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -421,7 +364,7 @@ private static SNode _quotation_createNode_x583g4_b0a2a51() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a3a51() { + private static SNode _quotation_createNode_x583g4_b0a3a8() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -430,7 +373,7 @@ private static SNode _quotation_createNode_x583g4_b0a3a51() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a4a51() { + private static SNode _quotation_createNode_x583g4_b0a4a8() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -440,7 +383,7 @@ private static SNode _quotation_createNode_x583g4_b0a4a51() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a1a42() { + private static SNode _quotation_createNode_x583g4_b0a1a9() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -449,7 +392,7 @@ private static SNode _quotation_createNode_x583g4_b0a1a42() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a2a42() { + private static SNode _quotation_createNode_x583g4_b0a2a9() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -458,7 +401,7 @@ private static SNode _quotation_createNode_x583g4_b0a2a42() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a3a42() { + private static SNode _quotation_createNode_x583g4_b0a3a9() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -467,7 +410,7 @@ private static SNode _quotation_createNode_x583g4_b0a3a42() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a4a42() { + private static SNode _quotation_createNode_x583g4_b0a4a9() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -477,7 +420,7 @@ private static SNode _quotation_createNode_x583g4_b0a4a42() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a1a52() { + private static SNode _quotation_createNode_x583g4_b0a1a01() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -486,7 +429,7 @@ private static SNode _quotation_createNode_x583g4_b0a1a52() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a2a52() { + private static SNode _quotation_createNode_x583g4_b0a2a01() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -495,7 +438,7 @@ private static SNode _quotation_createNode_x583g4_b0a2a52() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a3a52() { + private static SNode _quotation_createNode_x583g4_b0a3a01() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -504,7 +447,7 @@ private static SNode _quotation_createNode_x583g4_b0a3a52() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a4a52() { + private static SNode _quotation_createNode_x583g4_b0a4a01() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -514,34 +457,34 @@ private static SNode _quotation_createNode_x583g4_b0a4a52() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0b0mb() { + private static SNode _quotation_createNode_x583g4_a0b0x() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf940cd6167L, "jetbrains.mps.baseLanguage.structure.NullLiteral"), null, null, false); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0b0nb() { + private static SNode _quotation_createNode_x583g4_a0b0y() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false); SNodeAccessUtil.setProperty(quotedNode_1, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "true"); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0b0nb_0() { + private static SNode _quotation_createNode_x583g4_a0b0y_0() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false); SNodeAccessUtil.setProperty(quotedNode_1, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "false"); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0a1a54() { + private static SNode _quotation_createNode_x583g4_a0a1a92() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference"))); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a1a54() { + private static SNode _quotation_createNode_x583g4_b0a1a92() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -550,14 +493,14 @@ private static SNode _quotation_createNode_x583g4_b0a1a54() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0a2a54() { + private static SNode _quotation_createNode_x583g4_a0a2a92() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference"))); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a2a54() { + private static SNode _quotation_createNode_x583g4_b0a2a92() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -566,14 +509,14 @@ private static SNode _quotation_createNode_x583g4_b0a2a54() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0a3a54() { + private static SNode _quotation_createNode_x583g4_a0a3a92() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SModelReference"))); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a3a54() { + private static SNode _quotation_createNode_x583g4_b0a3a92() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -582,14 +525,14 @@ private static SNode _quotation_createNode_x583g4_b0a3a54() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0a4a54() { + private static SNode _quotation_createNode_x583g4_a0a4a92() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModuleReference"))); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a4a54() { + private static SNode _quotation_createNode_x583g4_b0a4a92() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; diff --git a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info b/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info index c3399ea7d4a4..8535a216b3aa 100644 --- a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info +++ b/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info @@ -9,383 +9,339 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - - - - + + + + - - - - - - - - - + + + - - - - + + - - - - - - - - - - - - - - - - + + - - - - + + - - + + - - + + - - - - - - - - + + @@ -397,622 +353,608 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - + - - - - + + + + - + - + - + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - + - - - - - - - - - - + + + + - - - - + + + + - - - - + + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies index d5ea7f04d57f..d03af3e544e9 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies @@ -12,43 +12,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated index 075739f6a4fd..2853b1b4c922 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies index 652a6c6eadf8..5908427cb04e 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies @@ -12,56 +12,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -82,7 +36,6 @@ - @@ -93,7 +46,7 @@ - + @@ -102,7 +55,7 @@ - + @@ -111,26 +64,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -233,7 +166,7 @@ - + @@ -305,7 +238,7 @@ - + @@ -371,7 +304,7 @@ - + @@ -401,11 +334,5 @@ - - - - - - diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated index 578dc60ec193..2d742da5ca72 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies index 8d0c5807d5ab..b07bce969959 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies @@ -30,56 +30,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -111,10 +61,7 @@ - - - @@ -126,27 +73,11 @@ - - - - - - - - - - - - - - - - @@ -418,27 +349,5 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated index 07248bc004eb..ca204c39b1a8 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated index e800006649cd..1084f346ba4b 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated index 24999f1437ef..b498ca390571 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies index 647362ccd000..e79de1021e4c 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies @@ -17,7 +17,6 @@ - @@ -41,6 +40,7 @@ + @@ -247,20 +247,6 @@ - - - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated index 6d56b9311860..2d87085934d8 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/Language.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/Language.java index 295f6cc6b349..2e5ebfa1755d 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/Language.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/Language.java @@ -38,7 +38,7 @@ public SLanguageId getId() { } @Override protected String[] getExtendedLanguageIDs() { - return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.console.base", "jetbrains.mps.baseLanguage", "jetbrains.mps.baseLanguage.tuples"}; + return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.baseLanguage", "jetbrains.mps.baseLanguage.tuples", "jetbrains.mps.command.base"}; } @Override public Collection getGenerators() { diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java index 37c867522515..ffa5bc8daacd 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java @@ -2,52 +2,6 @@ /*Generated by MPS */ -import java.util.List; -import jetbrains.mps.openapi.editor.cells.SubstituteAction; -import jetbrains.mps.smodel.IOperationContext; -import jetbrains.mps.smodel.action.NodeSubstituteActionsFactoryContext; -import jetbrains.mps.internal.collections.runtime.ListSequence; -import java.util.ArrayList; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.smodel.action.IChildNodeSetter; -import jetbrains.mps.smodel.action.AbstractChildNodeSetter; -import org.jetbrains.mps.openapi.model.SModel; -import org.jetbrains.annotations.Nullable; -import jetbrains.mps.openapi.editor.EditorContext; -import jetbrains.mps.smodel.action.SNodeFactoryOperations; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.action.ModelActions; public class QueriesGenerated { - public static List nodeSubstituteActionsBuilder_ActionsFactory_Command_3786816536599613947(final IOperationContext operationContext, final NodeSubstituteActionsFactoryContext _context) { - List result = ListSequence.fromList(new ArrayList()); - { - SNode outputConcept = MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, "jetbrains.mps.console.blCommand.structure.BLExpression").getDeclarationNode(); - SNode childConcept = (SNode) _context.getChildConcept(); - if (SConceptOperations.isSuperConceptOf(SNodeOperations.asSConcept(childConcept), SNodeOperations.asSConcept(outputConcept))) { - SNode wrappedConcept = MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL, "jetbrains.mps.baseLanguage.structure.Expression").getDeclarationNode(); - IChildNodeSetter setter = new AbstractChildNodeSetter() { - private SNode wrapNode(SNode nodeToWrap, SModel model, @Nullable EditorContext editorContext) { - SNode result = SNodeFactoryOperations.createNewNode(SNodeOperations.getModel(nodeToWrap), SNodeFactoryOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, "jetbrains.mps.console.blCommand.structure.BLExpression")), null); - SLinkOperations.setTarget(result, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), nodeToWrap); - return result; - } - public boolean returnSmallPart(SNode nodeToWrap) { - return true; - } - @Override - public SNode doExecute(SNode pn, SNode oc, SNode nc, @Nullable EditorContext editorContext) { - SNode wrappedNode = wrapNode(nc, nc.getModel(), editorContext); - _context.getChildSetter().execute(_context.getParentNode(), _context.getCurrentTargetNode(), wrappedNode, editorContext); - return (returnSmallPart(nc) ? nc : wrappedNode); - } - }; - ListSequence.fromList(result).addSequence(ListSequence.fromList(ModelActions.createChildNodeSubstituteActions(_context.getParentNode(), _context.getCurrentTargetNode(), wrappedConcept, setter, operationContext))); - } - } - return result; - } } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/trace.info b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/trace.info index fb3b9e71534d..c16adb953358 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/trace.info +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/trace.info @@ -4,21 +4,12 @@ - - - - - - - - - - + @@ -56,69 +47,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -139,48 +67,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java index d5a24a10948d..a7c7b6d06925 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java @@ -11,59 +11,51 @@ public BehaviorAspectDescriptor() { } public BehaviorDescriptor getDescriptor(String fqName) { switch (Arrays.binarySearch(stringSwitchCases_846f5o_a0a0b, fqName)) { - case 0: - return new BLCommand_BehaviorDescriptor(); - case 13: + case 10: return new PrintNodeReferenceExpression_BehaviorDescriptor(); - case 23: + case 20: return new UsagesExpression_BehaviorDescriptor(); - case 22: + case 19: return new ShowExpression_BehaviorDescriptor(); - case 5: + case 2: return new InstancesExpression_BehaviorDescriptor(); - case 16: + case 13: return new ProjectExpression_BehaviorDescriptor(); - case 15: - return new PrintTextExpression_BehaviorDescriptor(); case 12: + return new PrintTextExpression_BehaviorDescriptor(); + case 9: return new PrintNodeExpression_BehaviorDescriptor(); - case 10: + case 7: return new NodesExpression_BehaviorDescriptor(); - case 21: + case 18: return new ReferencesExpression_BehaviorDescriptor(); - case 7: + case 4: return new ModelsExpression_BehaviorDescriptor(); - case 8: + case 5: return new ModulesExpression_BehaviorDescriptor(); - case 3: - return new ExceptionHolder_BehaviorDescriptor(); - case 19: + case 16: return new QueryParameterList_BehaviorDescriptor(); - case 18: + case 15: return new QueryParameterIncludeReadOnly_BehaviorDescriptor(); - case 20: + case 17: return new QueryParameterScope_BehaviorDescriptor(); - case 4: + case 1: return new GlobalScope_BehaviorDescriptor(); - case 17: + case 14: return new ProjectScope_BehaviorDescriptor(); - case 1: - return new BLExpression_BehaviorDescriptor(); - case 11: + case 8: return new PrintExpression_BehaviorDescriptor(); - case 14: + case 11: return new PrintSequenceExpression_BehaviorDescriptor(); - case 9: - return new ModulesScope_BehaviorDescriptor(); case 6: + return new ModulesScope_BehaviorDescriptor(); + case 3: return new ModelScope_BehaviorDescriptor(); - case 2: + case 0: return new CustomScope_BehaviorDescriptor(); - case 24: - return new WithStatement_BehaviorDescriptor(); default: return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName); } } - private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.blCommand.structure.BLCommand", "jetbrains.mps.console.blCommand.structure.BLExpression", "jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.ExceptionHolder", "jetbrains.mps.console.blCommand.structure.GlobalScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModelsExpression", "jetbrains.mps.console.blCommand.structure.ModulesExpression", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.NodesExpression", "jetbrains.mps.console.blCommand.structure.PrintExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression", "jetbrains.mps.console.blCommand.structure.PrintTextExpression", "jetbrains.mps.console.blCommand.structure.ProjectExpression", "jetbrains.mps.console.blCommand.structure.ProjectScope", "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ReferencesExpression", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression", "jetbrains.mps.console.blCommand.structure.WithStatement"}; + private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.GlobalScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModelsExpression", "jetbrains.mps.console.blCommand.structure.ModulesExpression", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.NodesExpression", "jetbrains.mps.console.blCommand.structure.PrintExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression", "jetbrains.mps.console.blCommand.structure.PrintTextExpression", "jetbrains.mps.console.blCommand.structure.ProjectExpression", "jetbrains.mps.console.blCommand.structure.ProjectScope", "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ReferencesExpression", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression"}; } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java index 50e43a14ea62..d99349412ef8 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java @@ -2,7 +2,7 @@ /*Generated by MPS */ -import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_BehaviorDescriptor; +import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_BehaviorDescriptor; public interface ConsoleExpression_BehaviorDescriptor extends ConsoleHelpProvider_BehaviorDescriptor { } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java index 6d2d20bf588d..425b6b8a702d 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java @@ -2,7 +2,7 @@ /*Generated by MPS */ -import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_BehaviorDescriptor; +import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_BehaviorDescriptor; public interface ConsoleOperation_BehaviorDescriptor extends ConsoleHelpProvider_BehaviorDescriptor { } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java index 4d079157b9ac..714c052b2f71 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java @@ -3,7 +3,7 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; public class PrintExpression_BehaviorDescriptor extends AbstractPrintExpression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor { public PrintExpression_BehaviorDescriptor() { diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java index dbbb4b70c1e8..b4bce134c393 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; import org.jetbrains.mps.openapi.model.SNode; public abstract class QueryExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor { diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java index 0386f7eac558..ef1723732cc5 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; public class ShowExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor { public ShowExpression_BehaviorDescriptor() { diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info index ada7d468314e..867021268c32 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info @@ -10,14 +10,8 @@ - - - - - - - + @@ -28,9 +22,6 @@ - - - @@ -100,80 +91,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -397,57 +314,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java index 23f91904156c..f697d15bf7a8 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java @@ -17,35 +17,27 @@ public Collection getEditors(ConceptDescriptor descriptor) { case 0: return Collections.singletonList(new AbstractPrintExpression_Editor()); case 1: - return Collections.singletonList(new BLCommand_Editor()); - case 2: - return Collections.singletonList(new BLExpression_Editor()); - case 3: return Collections.singletonList(new CustomScope_Editor()); - case 4: - return Collections.singletonList(new ExceptionHolder_Editor()); - case 5: + case 2: return Collections.singletonList(new InstancesExpression_Editor()); - case 6: + case 3: return Collections.singletonList(new ModelScope_Editor()); - case 7: + case 4: return Collections.singletonList(new ModulesScope_Editor()); - case 8: + case 5: return Collections.singletonList(new QueryExpression_Editor()); - case 9: + case 6: return Collections.singletonList(new QueryParameter_Editor()); - case 10: + case 7: return Collections.singletonList(new QueryParameterList_Editor()); - case 11: + case 8: return Collections.singletonList(new QueryParameterScope_Editor()); - case 12: + case 9: return Collections.singletonList(new ScopeParameter_Editor()); - case 13: + case 10: return Collections.singletonList(new ShowExpression_Editor()); - case 14: + case 11: return Collections.singletonList(new UsagesExpression_Editor()); - case 15: - return Collections.singletonList(new WithStatement_Editor()); default: } return Collections.emptyList(); @@ -63,6 +55,6 @@ public Collection getEditorComponents(ConceptDescriptor } - private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", "jetbrains.mps.console.blCommand.structure.BLCommand", "jetbrains.mps.console.blCommand.structure.BLExpression", "jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.ExceptionHolder", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.QueryExpression", "jetbrains.mps.console.blCommand.structure.QueryParameter", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ScopeParameter", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression", "jetbrains.mps.console.blCommand.structure.WithStatement"}; + private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", "jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.QueryExpression", "jetbrains.mps.console.blCommand.structure.QueryParameter", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ScopeParameter", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression"}; private static String[] stringSwitchCases_xbvbvu_a0a0c = new String[]{"jetbrains.mps.console.blCommand.structure.QueryExpression"}; } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/trace.info b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/trace.info index 9d1147617dc8..313ad41d7d5a 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/trace.info +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/trace.info @@ -13,7 +13,7 @@ - + @@ -698,300 +698,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1757,272 +1463,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2079,88 +1519,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2529,67 +1887,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java index 1662d3c84774..e2eca83bef3d 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java @@ -13,12 +13,9 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { /*package*/ final ConceptDescriptor myConceptAbstractPrintExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).childDescriptors(new ConceptDescriptorBuilder.Link(8365379837260461921L, "object", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"object"}, new boolean[]{false}).abstract_().create(); - /*package*/ final ConceptDescriptor myConceptBLCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.BLCommand", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L)).super_("jetbrains.mps.console.base.structure.GeneratedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).parents("jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.baseLanguage.structure.IMethodLike", "jetbrains.mps.baseLanguage.structure.IStatementListContainer").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L), MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x1208f458d37L), MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11750ef8265L)).childDescriptors(new ConceptDescriptorBuilder.Link(1769790395579689573L, "body", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false)).children(new String[]{"body"}, new boolean[]{false}).alias("{", "baseLanguage statements").create(); - /*package*/ final ConceptDescriptor myConceptBLExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.BLExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6a40a3596560a9d9L)).super_("jetbrains.mps.console.base.structure.GeneratedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).parents("jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.lang.core.structure.IWrapper").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x11c6fd75034L)).childDescriptors(new ConceptDescriptorBuilder.Link(7656298970878093890L, "expression", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"expression"}, new boolean[]{false}).alias("", "baseLanguage expression").create(); - /*package*/ final ConceptDescriptor myConceptConsoleExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ConsoleExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).interface_().parents("jetbrains.mps.console.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730edd07L)).create(); - /*package*/ final ConceptDescriptor myConceptConsoleOperation = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ConsoleOperation", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).interface_().parents("jetbrains.mps.console.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730edd07L)).create(); + /*package*/ final ConceptDescriptor myConceptConsoleExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ConsoleExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).interface_().parents("jetbrains.mps.command.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x690b986730edd07L)).create(); + /*package*/ final ConceptDescriptor myConceptConsoleOperation = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ConsoleOperation", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).interface_().parents("jetbrains.mps.command.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x690b986730edd07L)).create(); /*package*/ final ConceptDescriptor myConceptCustomScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.CustomScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759611770126L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"scope"}, new boolean[]{false}).alias("custom", "? extends SearchScope").create(); - /*package*/ final ConceptDescriptor myConceptExceptionHolder = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ExceptionHolder", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5b02f032bc93b714L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.IClickable").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L)).propertyDescriptors(new ConceptDescriptorBuilder.Prop(6558068108108282025L, "stackTrace")).properties("stackTrace").create(); /*package*/ final ConceptDescriptor myConceptGlobalScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.GlobalScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add42L)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).alias("global", "").create(); /*package*/ final ConceptDescriptor myConceptInstancesExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.InstancesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(7738379549910147342L, "conceptArg", MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x118f285e4f7L), false, false, false)).children(new String[]{"conceptArg"}, new boolean[]{false}).alias("#instances", "instances of a concept in scope").create(); /*package*/ final ConceptDescriptor myConceptModelScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ModelScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759608408143L, "model", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, true, false)).children(new String[]{"model"}, new boolean[]{true}).alias("models", "").create(); @@ -42,82 +39,73 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { /*package*/ final ConceptDescriptor myConceptScopeParameter = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ScopeParameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).abstract_().create(); /*package*/ final ConceptDescriptor myConceptShowExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ShowExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).childDescriptors(new ConceptDescriptorBuilder.Link(7600370246423275637L, "object", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"object"}, new boolean[]{false}).alias("#show", "show in usage view").create(); /*package*/ final ConceptDescriptor myConceptUsagesExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.UsagesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(8483375838963816172L, "node", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"node"}, new boolean[]{false}).alias("#usages", "direct references to a node in scope").create(); - /*package*/ final ConceptDescriptor myConceptWithStatement = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.WithStatement", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL)).super_("jetbrains.mps.baseLanguage.structure.Statement").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).parents("jetbrains.mps.baseLanguage.structure.Statement").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).childDescriptors(new ConceptDescriptorBuilder.Link(4234138103881610892L, "stmts", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false), new ConceptDescriptorBuilder.Link(4234138103881610935L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"stmts", "scope"}, new boolean[]{false, false}).alias("with", "").create(); @Override public Collection getDescriptors() { - return Arrays.asList(myConceptAbstractPrintExpression, myConceptBLCommand, myConceptBLExpression, myConceptConsoleExpression, myConceptConsoleOperation, myConceptCustomScope, myConceptExceptionHolder, myConceptGlobalScope, myConceptInstancesExpression, myConceptModelScope, myConceptModelsExpression, myConceptModulesExpression, myConceptModulesScope, myConceptNodesExpression, myConceptPrintExpression, myConceptPrintNodeExpression, myConceptPrintNodeReferenceExpression, myConceptPrintSequenceExpression, myConceptPrintTextExpression, myConceptProjectExpression, myConceptProjectScope, myConceptQueryExpression, myConceptQueryParameter, myConceptQueryParameterIncludeReadOnly, myConceptQueryParameterList, myConceptQueryParameterScope, myConceptReferencesExpression, myConceptScopeParameter, myConceptShowExpression, myConceptUsagesExpression, myConceptWithStatement); + return Arrays.asList(myConceptAbstractPrintExpression, myConceptConsoleExpression, myConceptConsoleOperation, myConceptCustomScope, myConceptGlobalScope, myConceptInstancesExpression, myConceptModelScope, myConceptModelsExpression, myConceptModulesExpression, myConceptModulesScope, myConceptNodesExpression, myConceptPrintExpression, myConceptPrintNodeExpression, myConceptPrintNodeReferenceExpression, myConceptPrintSequenceExpression, myConceptPrintTextExpression, myConceptProjectExpression, myConceptProjectScope, myConceptQueryExpression, myConceptQueryParameter, myConceptQueryParameterIncludeReadOnly, myConceptQueryParameterList, myConceptQueryParameterScope, myConceptReferencesExpression, myConceptScopeParameter, myConceptShowExpression, myConceptUsagesExpression); } @Override @Nullable public ConceptDescriptor getDescriptor(String conceptFqName) { - switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0jb, conceptFqName)) { + switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0fb, conceptFqName)) { case 0: return myConceptAbstractPrintExpression; case 1: - return myConceptBLCommand; - case 2: - return myConceptBLExpression; - case 3: return myConceptConsoleExpression; - case 4: + case 2: return myConceptConsoleOperation; - case 5: + case 3: return myConceptCustomScope; - case 6: - return myConceptExceptionHolder; - case 7: + case 4: return myConceptGlobalScope; - case 8: + case 5: return myConceptInstancesExpression; - case 9: + case 6: return myConceptModelScope; - case 10: + case 7: return myConceptModelsExpression; - case 11: + case 8: return myConceptModulesExpression; - case 12: + case 9: return myConceptModulesScope; - case 13: + case 10: return myConceptNodesExpression; - case 14: + case 11: return myConceptPrintExpression; - case 15: + case 12: return myConceptPrintNodeExpression; - case 16: + case 13: return myConceptPrintNodeReferenceExpression; - case 17: + case 14: return myConceptPrintSequenceExpression; - case 18: + case 15: return myConceptPrintTextExpression; - case 19: + case 16: return myConceptProjectExpression; - case 20: + case 17: return myConceptProjectScope; - case 21: + case 18: return myConceptQueryExpression; - case 22: + case 19: return myConceptQueryParameter; - case 23: + case 20: return myConceptQueryParameterIncludeReadOnly; - case 24: + case 21: return myConceptQueryParameterList; - case 25: + case 22: return myConceptQueryParameterScope; - case 26: + case 23: return myConceptReferencesExpression; - case 27: + case 24: return myConceptScopeParameter; - case 28: + case 25: return myConceptShowExpression; - case 29: + case 26: return myConceptUsagesExpression; - case 30: - return myConceptWithStatement; default: return null; } } - private static String[] stringSwitchCases_1htk8d_a0a0jb = new String[]{"jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", "jetbrains.mps.console.blCommand.structure.BLCommand", "jetbrains.mps.console.blCommand.structure.BLExpression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression", "jetbrains.mps.console.blCommand.structure.ConsoleOperation", "jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.ExceptionHolder", "jetbrains.mps.console.blCommand.structure.GlobalScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModelsExpression", "jetbrains.mps.console.blCommand.structure.ModulesExpression", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.NodesExpression", "jetbrains.mps.console.blCommand.structure.PrintExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression", "jetbrains.mps.console.blCommand.structure.PrintTextExpression", "jetbrains.mps.console.blCommand.structure.ProjectExpression", "jetbrains.mps.console.blCommand.structure.ProjectScope", "jetbrains.mps.console.blCommand.structure.QueryExpression", "jetbrains.mps.console.blCommand.structure.QueryParameter", "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ReferencesExpression", "jetbrains.mps.console.blCommand.structure.ScopeParameter", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression", "jetbrains.mps.console.blCommand.structure.WithStatement"}; + private static String[] stringSwitchCases_1htk8d_a0a0fb = new String[]{"jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression", "jetbrains.mps.console.blCommand.structure.ConsoleOperation", "jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.GlobalScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModelsExpression", "jetbrains.mps.console.blCommand.structure.ModulesExpression", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.NodesExpression", "jetbrains.mps.console.blCommand.structure.PrintExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression", "jetbrains.mps.console.blCommand.structure.PrintTextExpression", "jetbrains.mps.console.blCommand.structure.ProjectExpression", "jetbrains.mps.console.blCommand.structure.ProjectScope", "jetbrains.mps.console.blCommand.structure.QueryExpression", "jetbrains.mps.console.blCommand.structure.QueryParameter", "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ReferencesExpression", "jetbrains.mps.console.blCommand.structure.ScopeParameter", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression"}; } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/trace.info b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/trace.info index 4b69df4dddfb..fb152a972417 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/trace.info +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/trace.info @@ -2,7 +2,7 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java index 12bb9a68fa37..04be71ba98bd 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java @@ -68,10 +68,6 @@ public TypesystemDescriptor() { InferenceRule_Runtime inferenceRule = new typeof_ReferencesExpression_InferenceRule(); this.myInferenceRules.add(inferenceRule); } - { - InferenceRule_Runtime inferenceRule = new typeof_ScopeProvider_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } { InferenceRule_Runtime inferenceRule = new typeof_ShowExpression_InferenceRule(); this.myInferenceRules.add(inferenceRule); diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java index bc874ec2499c..e9f7a6e01976 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java @@ -9,6 +9,7 @@ import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.language.SConcept; import jetbrains.mps.internal.collections.runtime.Sequence; import jetbrains.mps.internal.collections.runtime.ISelector; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; @@ -26,16 +27,16 @@ public check_QueryDuplicatedParameters_NonTypesystemRule() { } public void applyRule(final SNode queryParameterList, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { final Iterable parameters = SLinkOperations.getChildren(queryParameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter")); - Iterable parameterConcepts = Sequence.fromIterable(parameters).select(new ISelector() { - public SNode select(SNode it) { - return SNodeOperations.getConceptDeclaration(it); + Iterable parameterConcepts = Sequence.fromIterable(parameters).select(new ISelector() { + public SConcept select(SNode it) { + return SNodeOperations.getConcept(it); } }).distinct(); - Iterable> groupedByConcepts = Sequence.fromIterable(parameterConcepts).select(new ISelector>() { - public ISequence select(final SNode c) { + Iterable> groupedByConcepts = Sequence.fromIterable(parameterConcepts).select(new ISelector>() { + public ISequence select(final SConcept c) { return Sequence.fromIterable(parameters).where(new IWhereFilter() { public boolean accept(SNode p) { - return SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConceptDeclaration(p)), SNodeOperations.asSConcept(c)); + return SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(p)), SNodeOperations.asSConcept(c)); } }); } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info index b8b153e13f8e..b65df2e4c674 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info @@ -12,7 +12,7 @@ - + @@ -186,199 +186,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - - - - - + + + + + - + - - + + - + - + - - - - + + + + diff --git a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies index d02b12bae554..1f64d2a230c5 100644 --- a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies +++ b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies @@ -14,9 +14,9 @@ + + - - diff --git a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated index 4bc04af21e92..d97528a0a620 100644 --- a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated +++ b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java index ef755b8d52a1..b3caedf3d68d 100644 --- a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java +++ b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java @@ -22,7 +22,7 @@ import jetbrains.mps.ide.findusages.model.SearchResults; import jetbrains.mps.ide.project.ProjectHelper; import org.apache.log4j.Level; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleStream; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations; @@ -35,7 +35,7 @@ import org.jetbrains.mps.openapi.model.SModelReference; import org.jetbrains.mps.openapi.module.SModuleReference; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleContext; import java.io.StringWriter; import java.io.PrintWriter; import org.jetbrains.annotations.Nullable; @@ -189,8 +189,8 @@ public static void registerAnalyzeStacktraceDialogClosure(ConsoleContext context StringWriter writer = new StringWriter(); exception.printStackTrace(new PrintWriter(writer)); - SNode exceptionHolder = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5b02f032bc93b714L, "jetbrains.mps.console.blCommand.structure.ExceptionHolder"))); - SPropertyOperations.set(exceptionHolder, MetaAdapterFactory.getProperty(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5b02f032bc93b714L, 0x5b02f032bc9cb8a9L, "stackTrace"), writer.toString()); + SNode exceptionHolder = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L, "jetbrains.mps.console.base.structure.ExceptionHolder"))); + SPropertyOperations.set(exceptionHolder, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L, 0x5b02f032bc9cb8a9L, "stackTrace"), writer.toString()); SPropertyOperations.set(exceptionHolder, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L, 0x360b134fc047ce2aL, "text"), exception.getClass().getName()); console.addNode(exceptionHolder); } diff --git a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info index da41a01ba025..62b2dbc7602c 100644 --- a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info +++ b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info @@ -49,8 +49,8 @@ - - + + @@ -121,12 +121,12 @@ - + - - + + @@ -149,8 +149,8 @@ - - + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/dependencies b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/dependencies new file mode 100644 index 000000000000..9dcf0415eb1f --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/dependencies @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/generated b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/generated new file mode 100644 index 000000000000..5844d3bff878 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/generated @@ -0,0 +1,3 @@ + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/QueriesGenerated.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/QueriesGenerated.java new file mode 100644 index 000000000000..83fe29a20975 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/QueriesGenerated.java @@ -0,0 +1,20 @@ +package jetbrains.mps.command.base.generator.template.main; + +/*Generated by MPS */ + +import jetbrains.mps.generator.runtime.Generated; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.generator.template.SourceSubstituteMacroNodesContext; + +@Generated +public class QueriesGenerated { + public static SNode sourceNodeQuery_1964420931776208395(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope")); + } + public static Iterable sourceNodesQuery_1964420931776045744(final SourceSubstituteMacroNodesContext _context) { + return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement")); + } +} diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/trace.info b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/trace.info new file mode 100644 index 000000000000..afc9e3b1ed7f --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/trace.info @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/dependencies b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/dependencies new file mode 100644 index 000000000000..562e4e3dc2d3 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/dependencies @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/generated b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/generated new file mode 100644 index 000000000000..a9651072fc5b --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/generated @@ -0,0 +1,3 @@ + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/dependencies b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/dependencies new file mode 100644 index 000000000000..71ea00a877b6 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/dependencies @@ -0,0 +1,3 @@ + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/generated b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/generated new file mode 100644 index 000000000000..d5fdd92ea94f --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/generated @@ -0,0 +1,3 @@ + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/dependencies b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/dependencies new file mode 100644 index 000000000000..c9acee0ff4c0 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/dependencies @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/dependencies b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/dependencies new file mode 100644 index 000000000000..bfeef467f255 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/dependencies @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/generated b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/generated new file mode 100644 index 000000000000..f39bca529899 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/generated @@ -0,0 +1,3 @@ + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/generated b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/generated new file mode 100644 index 000000000000..b83b92c3c296 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/generated @@ -0,0 +1,3 @@ + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/dependencies b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/dependencies new file mode 100644 index 000000000000..82f7d84cf5f1 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/dependencies @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/generated b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/generated new file mode 100644 index 000000000000..31157cbc9034 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/generated @@ -0,0 +1,3 @@ + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/dependencies b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/dependencies new file mode 100644 index 000000000000..49e37dd0ef8b --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/dependencies @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/generated b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/generated new file mode 100644 index 000000000000..8cd6abc68dc2 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/generated @@ -0,0 +1,3 @@ + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/Language.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/Language.java new file mode 100644 index 000000000000..c461d7d24fa6 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/Language.java @@ -0,0 +1,62 @@ +package jetbrains.mps.command.base; + +/*Generated by MPS */ + +import jetbrains.mps.smodel.language.LanguageRuntime; +import jetbrains.mps.smodel.adapter.ids.SLanguageId; +import java.util.UUID; +import java.util.Collection; +import jetbrains.mps.generator.runtime.TemplateModule; +import jetbrains.mps.generator.runtime.TemplateUtil; +import jetbrains.mps.smodel.runtime.ILanguageAspect; +import jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor; +import jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor; +import jetbrains.mps.command.base.editor.EditorAspectDescriptorImpl; +import jetbrains.mps.smodel.runtime.StructureAspectDescriptor; +import jetbrains.mps.lang.typesystem.runtime.IHelginsDescriptor; +import jetbrains.mps.command.base.typesystem.TypesystemDescriptor; + +public class Language extends LanguageRuntime { + public static String MODULE_REF = "cb3c6536-cd62-4d95-8529-4a37cbf14855(jetbrains.mps.command.base)"; + public Language() { + } + @Override + public String getNamespace() { + return "jetbrains.mps.command.base"; + } + + @Override + public int getVersion() { + return 0; + } + + public SLanguageId getId() { + return new SLanguageId(UUID.fromString("cb3c6536-cd62-4d95-8529-4a37cbf14855")); + } + @Override + protected String[] getExtendedLanguageIDs() { + return new String[]{"jetbrains.mps.baseLanguage"}; + } + @Override + public Collection getGenerators() { + return TemplateUtil.asCollection(TemplateUtil.createInterpretedGenerator(this, "1c94f5db-f74b-4602-bad4-ee3345457344(jetbrains.mps.command.base#6356982101392640211)")); + } + @Override + protected T createAspect(Class aspectClass) { + if (aspectClass == BehaviorAspectDescriptor.class) { + return (T) new jetbrains.mps.command.base.behavior.BehaviorAspectDescriptor(); + } + if (aspectClass == EditorAspectDescriptor.class) { + return (T) new EditorAspectDescriptorImpl(); + } + if (aspectClass == StructureAspectDescriptor.class) { + return (T) new jetbrains.mps.command.base.structure.StructureAspectDescriptor(); + } + if (aspectClass == IHelginsDescriptor.class) { + return (T) new TypesystemDescriptor(); + } + + + return super.createAspect(aspectClass); + } +} diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/BehaviorAspectDescriptor.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/BehaviorAspectDescriptor.java new file mode 100644 index 000000000000..93f2b86298c8 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/BehaviorAspectDescriptor.java @@ -0,0 +1,21 @@ +package jetbrains.mps.command.base.behavior; + +/*Generated by MPS */ + +import jetbrains.mps.smodel.runtime.BehaviorDescriptor; +import java.util.Arrays; +import jetbrains.mps.smodel.runtime.interpreted.BehaviorAspectInterpreted; + +public class BehaviorAspectDescriptor implements jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor { + public BehaviorAspectDescriptor() { + } + public BehaviorDescriptor getDescriptor(String fqName) { + switch (Arrays.binarySearch(stringSwitchCases_846f5o_a0a0b, fqName)) { + case 0: + return new WithStatement_BehaviorDescriptor(); + default: + return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName); + } + } + private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.command.base.structure.WithStatement"}; +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ConsoleHelpProvider_Behavior.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/ConsoleHelpProvider_Behavior.java similarity index 98% rename from plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ConsoleHelpProvider_Behavior.java rename to plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/ConsoleHelpProvider_Behavior.java index f70daf7da746..dd4134e6a31d 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ConsoleHelpProvider_Behavior.java +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/ConsoleHelpProvider_Behavior.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.base.behavior; +package jetbrains.mps.command.base.behavior; /*Generated by MPS */ diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ConsoleHelpProvider_BehaviorDescriptor.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/ConsoleHelpProvider_BehaviorDescriptor.java similarity index 93% rename from plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ConsoleHelpProvider_BehaviorDescriptor.java rename to plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/ConsoleHelpProvider_BehaviorDescriptor.java index 0e639fdea349..48df193a3324 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ConsoleHelpProvider_BehaviorDescriptor.java +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/ConsoleHelpProvider_BehaviorDescriptor.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.base.behavior; +package jetbrains.mps.command.base.behavior; /*Generated by MPS */ diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/WithStatement_BehaviorDescriptor.java similarity index 70% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java rename to plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/WithStatement_BehaviorDescriptor.java index ecf6c6714ca9..dfb8ffeee90c 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/WithStatement_BehaviorDescriptor.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.blCommand.behavior; +package jetbrains.mps.command.base.behavior; /*Generated by MPS */ @@ -9,6 +9,6 @@ public WithStatement_BehaviorDescriptor() { } @Override public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.WithStatement"; + return "jetbrains.mps.command.base.structure.WithStatement"; } } diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/trace.info b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/trace.info new file mode 100644 index 000000000000..435b8865093e --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/trace.info @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/constraints/trace.info b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/constraints/trace.info new file mode 100644 index 000000000000..78624c872225 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/constraints/trace.info @@ -0,0 +1,3 @@ + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/EditorAspectDescriptorImpl.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/EditorAspectDescriptorImpl.java new file mode 100644 index 000000000000..51fd644f3a48 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/EditorAspectDescriptorImpl.java @@ -0,0 +1,29 @@ +package jetbrains.mps.command.base.editor; + +/*Generated by MPS */ + +import jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor; +import java.util.Collection; +import jetbrains.mps.openapi.editor.descriptor.ConceptEditor; +import jetbrains.mps.smodel.runtime.ConceptDescriptor; +import java.util.Arrays; +import java.util.Collections; +import jetbrains.mps.openapi.editor.descriptor.ConceptEditorComponent; + +public class EditorAspectDescriptorImpl implements EditorAspectDescriptor { + + public Collection getEditors(ConceptDescriptor descriptor) { + switch (Arrays.binarySearch(stringSwitchCases_xbvbvu_a0a0b, descriptor.getConceptFqName())) { + case 0: + return Collections.singletonList(new WithStatement_Editor()); + default: + } + return Collections.emptyList(); + } + public Collection getEditorComponents(ConceptDescriptor descriptor, String editorComponentId) { + return Collections.emptyList(); + } + + + private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.command.base.structure.WithStatement"}; +} diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/WithStatement_Editor.java similarity index 98% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java rename to plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/WithStatement_Editor.java index 4b2c16c1332d..98ccdcffb93a 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/WithStatement_Editor.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.blCommand.editor; +package jetbrains.mps.command.base.editor; /*Generated by MPS */ @@ -67,7 +67,7 @@ private EditorCell createConstant_4f6do1_a0a0(EditorContext editorContext, SNode return editorCell; } private EditorCell createRefNode_4f6do1_b0a0(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new WithStatement_Editor.scopeSingleRoleHandler_4f6do1_b0a0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope"), editorContext); + SingleRoleCellProvider provider = new WithStatement_Editor.scopeSingleRoleHandler_4f6do1_b0a0(node, MetaAdapterFactory.getContainmentLink(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope"), editorContext); return provider.createCell(); } private class scopeSingleRoleHandler_4f6do1_b0a0 extends SingleRoleCellProvider { @@ -135,7 +135,7 @@ private EditorCell createIndentCell_4f6do1_a1a(EditorContext editorContext, SNod return editorCell; } private EditorCell createRefNode_4f6do1_b1a(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new WithStatement_Editor.stmtsSingleRoleHandler_4f6do1_b1a(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts"), editorContext); + SingleRoleCellProvider provider = new WithStatement_Editor.stmtsSingleRoleHandler_4f6do1_b1a(node, MetaAdapterFactory.getContainmentLink(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts"), editorContext); return provider.createCell(); } private class stmtsSingleRoleHandler_4f6do1_b1a extends SingleRoleCellProvider { diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/trace.info b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/trace.info new file mode 100644 index 000000000000..6eff61d8e75e --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/trace.info @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/StructureAspectDescriptor.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/StructureAspectDescriptor.java new file mode 100644 index 000000000000..0d5947e5dae6 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/StructureAspectDescriptor.java @@ -0,0 +1,36 @@ +package jetbrains.mps.command.base.structure; + +/*Generated by MPS */ + +import jetbrains.mps.smodel.runtime.BaseStructureAspectDescriptor; +import jetbrains.mps.smodel.runtime.ConceptDescriptor; +import jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder; +import jetbrains.mps.smodel.adapter.ids.MetaIdFactory; +import java.util.Collection; +import java.util.Arrays; +import org.jetbrains.annotations.Nullable; + +public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { + + /*package*/ final ConceptDescriptor myConceptConsoleHelpProvider = new ConceptDescriptorBuilder("jetbrains.mps.command.base.structure.ConsoleHelpProvider", MetaIdFactory.conceptId(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x690b986730edd07L)).interface_().create(); + /*package*/ final ConceptDescriptor myConceptWithStatement = new ConceptDescriptorBuilder("jetbrains.mps.command.base.structure.WithStatement", MetaIdFactory.conceptId(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x3ac2ae2c0bcf368bL)).super_("jetbrains.mps.baseLanguage.structure.Statement").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).parents("jetbrains.mps.baseLanguage.structure.Statement").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).childDescriptors(new ConceptDescriptorBuilder.Link(4234138103881610892L, "stmts", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false), new ConceptDescriptorBuilder.Link(4234138103881610935L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"stmts", "scope"}, new boolean[]{false, false}).alias("with", "").create(); + + @Override + public Collection getDescriptors() { + return Arrays.asList(myConceptConsoleHelpProvider, myConceptWithStatement); + } + + @Override + @Nullable + public ConceptDescriptor getDescriptor(String conceptFqName) { + switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0g, conceptFqName)) { + case 0: + return myConceptConsoleHelpProvider; + case 1: + return myConceptWithStatement; + default: + return null; + } + } + private static String[] stringSwitchCases_1htk8d_a0a0g = new String[]{"jetbrains.mps.command.base.structure.ConsoleHelpProvider", "jetbrains.mps.command.base.structure.WithStatement"}; +} diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/trace.info b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/trace.info new file mode 100644 index 000000000000..bb5686745ffb --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/trace.info @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/trace.info b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/trace.info new file mode 100644 index 000000000000..b8712c6c54bc --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/trace.info @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/TypesystemDescriptor.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/TypesystemDescriptor.java new file mode 100644 index 000000000000..feed05f8af66 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/TypesystemDescriptor.java @@ -0,0 +1,15 @@ +package jetbrains.mps.command.base.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.BaseHelginsDescriptor; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; + +public class TypesystemDescriptor extends BaseHelginsDescriptor { + public TypesystemDescriptor() { + { + InferenceRule_Runtime inferenceRule = new typeof_ScopeProvider_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + } +} diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/trace.info b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/trace.info new file mode 100644 index 000000000000..a1506c37d1e1 --- /dev/null +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/trace.info @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/typeof_ScopeProvider_InferenceRule.java similarity index 90% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java rename to plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/typeof_ScopeProvider_InferenceRule.java index f5e618f5d435..dd767e42f82f 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java +++ b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/typeof_ScopeProvider_InferenceRule.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.blCommand.typesystem; +package jetbrains.mps.command.base.typesystem; /*Generated by MPS */ @@ -20,13 +20,13 @@ public typeof_ScopeProvider_InferenceRule() { } public void applyRule(final SNode scopeProvider, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { { - SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(scopeProvider, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope")); - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "4234138103881642865", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "4234138103881614549", true), (SNode) _quotation_createNode_jkxe46_a0a0b(), false, false, _info_12389875345); + SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(scopeProvider, MetaAdapterFactory.getContainmentLink(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope")); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:3af60cb8-fb7a-47df-833f-08753fac85c6(jetbrains.mps.command.base.typesystem)", "4234138103881642865", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:3af60cb8-fb7a-47df-833f-08753fac85c6(jetbrains.mps.command.base.typesystem)", "4234138103881614549", true), (SNode) _quotation_createNode_jkxe46_a0a0b(), false, false, _info_12389875345); } } public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, "jetbrains.mps.console.blCommand.structure.WithStatement"); + return MetaAdapterFactory.getConcept(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x3ac2ae2c0bcf368bL, "jetbrains.mps.command.base.structure.WithStatement"); } public IsApplicableStatus isApplicableAndPattern(SNode argument) { return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); diff --git a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated index 9eb1eb256040..375b8a97bd5b 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated +++ b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java index e03ccdbec8a6..71cd059896d0 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java +++ b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java @@ -58,15 +58,6 @@ public static Object referenceMacro_GetReferent_5582028874769201330(final Refere public static Object referenceMacro_GetReferent_5582028874769201340(final ReferenceMacroContext _context) { return BehaviorReflection.invokeVirtual((Class) ((Class) Object.class), _context.getNode(), "virtual_getParameterDeclaration_5582028874769074473", new Object[]{}); } - public static Object referenceMacro_GetReferent_5582028874771857731(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter"); - } - public static Object referenceMacro_GetReferent_5308946314782030193(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter"); - } - public static Object referenceMacro_GetReferent_5308946314782036448(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter"); - } public static Object referenceMacro_GetReferent_5932042262276049107(final ReferenceMacroContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getReferenceLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x5252d9021b8b45a8L, 0x5252d9021b8c25b0L, "requestedAspect")); } diff --git a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info index ddd64bfdaf12..ecc5bcec8db8 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info +++ b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info @@ -7,35 +7,31 @@ - + - - - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + @@ -44,78 +40,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - + + - - + + - - + + @@ -124,78 +120,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - + + - - + + - - + + @@ -203,47 +199,45 @@ - - + + - - + + - - + + - - + + - - - - - + + + + - - - - - + + + + - - + + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies index cc379b17528f..d0a006c1cd59 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies @@ -94,7 +94,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -174,10 +174,10 @@ + - @@ -185,12 +185,12 @@ - + - + @@ -198,7 +198,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -264,8 +264,8 @@ + - @@ -282,10 +282,10 @@ + - @@ -318,7 +318,7 @@ - + @@ -333,7 +333,7 @@ - + @@ -349,27 +349,27 @@ + - - - + + + + - - @@ -392,8 +392,8 @@ - - + + @@ -410,18 +410,18 @@ + + - - + + - - @@ -432,10 +432,10 @@ + + - - @@ -446,9 +446,9 @@ + + - - @@ -457,10 +457,10 @@ + + - - @@ -474,7 +474,7 @@ - + @@ -491,27 +491,27 @@ + - - - + + + + - - diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated index ff4bdb5e8a05..2d64b5e80b81 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated index 4269ebbd8947..86e0938f54fe 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/dependencies b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/dependencies index 01bb21e700f8..696243c4a6e0 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/dependencies +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/dependencies @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated index e484b9a71262..e131ccf6495e 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java index df0782be977d..ef05c4d0595c 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java @@ -5,7 +5,7 @@ import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior; public class CallActionExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_Behavior.java index 491ce58fe18d..ac6a59e5a737 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleContext; import java.util.List; import jetbrains.mps.internal.collections.runtime.ListSequence; import java.util.ArrayList; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_BehaviorDescriptor.java index 1c9f5b549ee7..dc4dcc3dbc33 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleContext; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; public class GlobalStatisticTarget_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements IStatisticsTarget_BehaviorDescriptor, INodeSetReference_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_Behavior.java index fe31e402118e..52756fbcdba0 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_Behavior.java @@ -3,7 +3,7 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleContext; public class INodeSetReference_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_BehaviorDescriptor.java index d7001878a0fd..748e6b62d5c3 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_BehaviorDescriptor.java @@ -3,7 +3,7 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleContext; public interface INodeSetReference_BehaviorDescriptor { public Iterable virtual_getNodes_5207260697411458163(SNode thisNode, ConsoleContext context); diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_Behavior.java index 07a77fde0fc0..230f66dae782 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleContext; public class IStatisticsTarget_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_BehaviorDescriptor.java index 774d7b3efffe..445c54084a02 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleContext; public interface IStatisticsTarget_BehaviorDescriptor { public Iterable> virtual_getStat_7490254719527247609(SNode thisNode, ConsoleContext context); diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_Behavior.java index be43ce9cbb4d..0e530d8384c3 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleContext; import jetbrains.mps.smodel.behaviour.BehaviorReflection; import jetbrains.mps.util.IterableUtil; import jetbrains.mps.util.SNodeOperations; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_BehaviorDescriptor.java index ad2a47719a57..07beb3b0f45c 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleContext; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; public class ModelStatisticsTarget_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements IStatisticsTarget_BehaviorDescriptor, INodeSetReference_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java index edf8613290df..a31d18cb3546 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java @@ -5,7 +5,7 @@ import jetbrains.mps.baseLanguage.collections.behavior.SequenceOperation_BehaviorDescriptor; import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_Behavior; public class OfAspectOperation_BehaviorDescriptor extends SequenceOperation_BehaviorDescriptor implements ConsoleOperation_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_Behavior.java index 7c9c6887434b..d71e413ee81c 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleContext; import java.util.List; import jetbrains.mps.internal.collections.runtime.ListSequence; import java.util.ArrayList; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_BehaviorDescriptor.java index 7f487a93a3b5..8172d02730cd 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleContext; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; public class ProjectStatisticsTarget_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements IStatisticsTarget_BehaviorDescriptor, INodeSetReference_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_Behavior.java index 49e111895209..179099bc5ff9 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; public class RebuildProjectCommand_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_BehaviorDescriptor.java index 7b53f44bf4e7..61c701af5cf6 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_BehaviorDescriptor.java @@ -5,8 +5,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; public abstract class RebuildProjectCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements IDontSubstituteByDefault_BehaviorDescriptor { public RebuildProjectCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_Behavior.java index f813ecbee9ce..b3d6636c6282 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; import org.jetbrains.mps.openapi.model.SReference; import jetbrains.mps.internal.collections.runtime.Sequence; import jetbrains.mps.smodel.behaviour.BehaviorReflection; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_BehaviorDescriptor.java index 1396b5dc2bca..d08ce127cfd0 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_BehaviorDescriptor.java @@ -4,8 +4,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; public class ShowBrokenReferences_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor { public ShowBrokenReferences_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_Behavior.java index 97d1064b0682..a33bf57060de 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; import org.jetbrains.mps.openapi.model.SModel; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_BehaviorDescriptor.java index e36c3f5b98f9..64fdc011a02e 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_BehaviorDescriptor.java @@ -4,8 +4,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; public class ShowGenPlan_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor { public ShowGenPlan_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_Behavior.java index a2f1de931c46..d2f92212f517 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; import jetbrains.mps.console.ideCommands.util.OutputUtils; import jetbrains.mps.smodel.behaviour.BehaviorReflection; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_BehaviorDescriptor.java index 97850ef5d45d..2f66d707a92c 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_BehaviorDescriptor.java @@ -4,8 +4,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; public class StatCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor { public StatCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_Behavior.java index 1bd8ec19a450..2bf3d7bb4665 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleContext; import jetbrains.mps.smodel.behaviour.BehaviorReflection; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_BehaviorDescriptor.java index 76a0b556fc80..0912e195aa96 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleContext; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; public class SubtreeStatisticsTarget_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements IStatisticsTarget_BehaviorDescriptor, INodeSetReference_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_Behavior.java index 8aabcb6963fc..efd9cc50c76a 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; public class UnloadModelsCommand_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_BehaviorDescriptor.java index 2b882f1df09e..1be7d3cdc918 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_BehaviorDescriptor.java @@ -5,8 +5,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; public abstract class UnloadModelsCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements IDontSubstituteByDefault_BehaviorDescriptor { public UnloadModelsCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info index c0a3bba89189..33f40fb36f2e 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info @@ -117,7 +117,7 @@ - + @@ -166,9 +166,9 @@ - + - + @@ -369,7 +369,7 @@ - + @@ -507,7 +507,7 @@ - + @@ -524,7 +524,7 @@ - + @@ -545,7 +545,7 @@ - + @@ -583,7 +583,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -628,9 +628,9 @@ - + - + @@ -678,9 +678,9 @@ - + - + @@ -733,8 +733,8 @@ - - + + diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/OutputUtils.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/OutputUtils.java index a61c700bd918..e6df1deb7216 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/OutputUtils.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/OutputUtils.java @@ -2,7 +2,7 @@ /*Generated by MPS */ -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleStream; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; import jetbrains.mps.internal.collections.runtime.Sequence; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/PartitioningHelper.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/PartitioningHelper.java index 374129050b0f..67576d2919ae 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/PartitioningHelper.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/PartitioningHelper.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SModel; import jetbrains.mps.ide.messages.MessagesViewTool; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleStream; import jetbrains.mps.generator.impl.plan.GenerationPlan; import java.util.Map; import jetbrains.mps.generator.runtime.TemplateMappingPriorityRule; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/trace.info b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/trace.info index b82eab7addc5..3c03c04f2475 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/trace.info +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/trace.info @@ -101,7 +101,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -204,7 +204,7 @@ - + diff --git a/plugins/console/lang/ideCommandsRuntime/source_gen.caches/jetbrains/mps/console/ideCommands/runtime/util/generated b/plugins/console/lang/ideCommandsRuntime/source_gen.caches/jetbrains/mps/console/ideCommands/runtime/util/generated index f2b64602fe6b..7ce22bca051c 100644 --- a/plugins/console/lang/ideCommandsRuntime/source_gen.caches/jetbrains/mps/console/ideCommands/runtime/util/generated +++ b/plugins/console/lang/ideCommandsRuntime/source_gen.caches/jetbrains/mps/console/ideCommands/runtime/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/dependencies b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/dependencies index 4e05c2e38ed3..7a843d71580e 100644 --- a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/dependencies +++ b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/dependencies @@ -1,10 +1,8 @@ - - diff --git a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated index 579c42fea892..aa12c5efa1cd 100644 --- a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated +++ b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/QueriesGenerated.java b/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/QueriesGenerated.java index 0ba00a8827b0..09077876a88e 100644 --- a/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/QueriesGenerated.java +++ b/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/QueriesGenerated.java @@ -7,7 +7,6 @@ import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.generator.template.ReferenceMacroContext; import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext; @@ -16,9 +15,6 @@ public class QueriesGenerated { public static boolean baseMappingRule_Condition_8829647120617326153(final BaseMappingRuleContext _context) { return SNodeOperations.isInstanceOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11b0d00332cL, 0xf8c77f1e97L, "lValue")), MetaAdapterFactory.getConcept(0x995a73947f764b8bL, 0xa929c53448708106L, 0x7a89354654722219L, "jetbrains.mps.console.internalCommands.structure.InternalMode")); } - public static Object referenceMacro_GetReferent_5582028874770465419(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter"); - } public static SNode sourceNodeQuery_6369875563697213767(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11b0d00332cL, 0xf8c77f1e99L, "rValue")); } diff --git a/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/trace.info b/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/trace.info index ac32e67aa7f0..92bf8161578f 100644 --- a/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/trace.info +++ b/plugins/console/lang/internalCommands/generator/source_gen/jetbrains/mps/console/internalCommands/generator/template/main/trace.info @@ -3,21 +3,15 @@ - - - - - - - + - - - - + + + + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies index 9743b816c914..8c5f0e1721c3 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies @@ -37,7 +37,7 @@ - + @@ -49,8 +49,8 @@ - - + + @@ -58,26 +58,26 @@ + + - - - - + + + + - - diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated index 28215b981432..b7a79c7aa42c 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated index 92a6f2cb57b9..bac0bfe73f87 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java index bb0fa8fc1311..efed91777ac2 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java @@ -5,7 +5,7 @@ import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior; import org.jetbrains.mps.openapi.model.SNode; diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_Behavior.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_Behavior.java index 1723abd0528c..0e652bb8ba43 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_Behavior.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; import jetbrains.mps.classloading.ClassLoaderManager; import jetbrains.mps.progress.EmptyProgressMonitor; import org.jetbrains.mps.openapi.language.SAbstractConcept; diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_BehaviorDescriptor.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_BehaviorDescriptor.java index 30fad16723c9..82e7d3024a35 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_BehaviorDescriptor.java @@ -4,8 +4,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; import org.jetbrains.mps.openapi.language.SConcept; public class ReloadClassesCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor { diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_Behavior.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_Behavior.java index c7bff75c4ecd..d946ed666453 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_Behavior.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; public class ShowRepositoryCommand_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_BehaviorDescriptor.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_BehaviorDescriptor.java index 2d6a624cd9f5..b099f879b3a1 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_BehaviorDescriptor.java @@ -5,8 +5,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.tool.ConsoleContext; -import jetbrains.mps.console.tool.ConsoleStream; +import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleStream; public abstract class ShowRepositoryCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements IDontSubstituteByDefault_BehaviorDescriptor { public ShowRepositoryCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/trace.info b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/trace.info index 9f0ad6f2a782..ca1dd5f187d9 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/trace.info +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/trace.info @@ -49,7 +49,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated b/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated index 57bd7d9e5908..0a9f4e98a359 100644 --- a/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated +++ b/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/QueriesGenerated.java b/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/QueriesGenerated.java index 1201c01cee57..1ba2dc390565 100644 --- a/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/QueriesGenerated.java +++ b/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/QueriesGenerated.java @@ -19,9 +19,6 @@ public static boolean baseMappingRule_Condition_1672541786946118133(final BaseMa public static Object referenceMacro_GetReferent_1734392475491234406(final ReferenceMacroContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getReferenceLink(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x1811ccc46ac3dc6aL, 0x1811ccc46ac3dc6bL, "script")); } - public static Object referenceMacro_GetReferent_2377091791518659475(final ReferenceMacroContext _context) { - return _context.getOutputNodeByInputNodeAndMappingLabel(SNodeOperations.getNodeAncestor(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4bd43869e610f3e9L, "jetbrains.mps.console.blCommand.structure.BLCommand"), false, false), "contextParameter"); - } public static SNode sourceNodeQuery_2377091791518076320(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand")); } diff --git a/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/trace.info b/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/trace.info index fcafd422b75d..625f06430b1e 100644 --- a/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/trace.info +++ b/plugins/console/lang/scripts/generator/source_gen/jetbrains/mps/console/scripts/generator/main/trace.info @@ -3,17 +3,15 @@ - + - - - - - - + + + + diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies index 5a6d3fdc170a..2e6fc2fd1b7e 100644 --- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies +++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies @@ -55,7 +55,7 @@ - + diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated index a4ffad3f74c5..1af72eeddf6d 100644 --- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated +++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated index 4aae506f1112..02f561ffc426 100644 --- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated +++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java index 272634685f48..6530dbd4fcd1 100644 --- a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java +++ b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java @@ -5,7 +5,7 @@ import jetbrains.mps.baseLanguage.collections.behavior.InternalSequenceOperation_BehaviorDescriptor; import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.console.base.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_Behavior; public class RefactorOperation_BehaviorDescriptor extends InternalSequenceOperation_BehaviorDescriptor implements ConsoleOperation_BehaviorDescriptor { diff --git a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies index 383614d8c169..87b7a7ae3be5 100644 --- a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies +++ b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies @@ -9,7 +9,8 @@ - + + diff --git a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated index 7c710a27ba00..4bbee13044b8 100644 --- a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated +++ b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java b/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java index 88acf7979abb..4236a38efec4 100644 --- a/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java +++ b/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java @@ -2,7 +2,7 @@ /*Generated by MPS */ -import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.command.base.runtime.ConsoleContext; import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.smodel.behaviour.BehaviorReflection; import javax.swing.SwingUtilities; @@ -10,6 +10,7 @@ import java.util.List; import jetbrains.mps.internal.collections.runtime.ListSequence; import jetbrains.mps.smodel.ModelAccess; +import jetbrains.mps.console.tool.BaseConsoleTab; import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes; import com.intellij.openapi.project.Project; import jetbrains.mps.ide.project.ProjectHelper; @@ -41,7 +42,7 @@ public static void executeCommands(final ConsoleContext context, final List - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - + @@ -73,58 +72,58 @@ - - + + - + - + - + - + - - + + - + - - - + + + - + - + - - - + + + - - - - + + + + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies index 818d90733d7c..0d4ab52696e7 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies @@ -40,9 +40,9 @@ - + + - @@ -95,11 +95,7 @@ - - - - - + @@ -125,10 +121,6 @@ - - - - @@ -181,7 +173,6 @@ - @@ -198,7 +189,6 @@ - diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated index 85e619ed6a70..34192e98f716 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java b/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java index 127be58e2340..9bc123d4d67c 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java @@ -4,6 +4,7 @@ import javax.swing.JPanel; import com.intellij.openapi.Disposable; +import jetbrains.mps.command.base.runtime.CommandOutputWindow; import org.jetbrains.mps.openapi.model.SModel; import org.jetbrains.mps.openapi.model.SNode; import com.intellij.openapi.fileEditor.FileEditor; @@ -58,12 +59,14 @@ import jetbrains.mps.baseLanguage.closures.runtime.Wrappers; import com.intellij.util.Base64Converter; import jetbrains.mps.persistence.PersistenceUtil; +import jetbrains.mps.command.base.runtime.ConsoleContext; import jetbrains.mps.project.Project; import org.jetbrains.mps.openapi.module.SearchScope; import jetbrains.mps.ide.findusages.model.scopes.ProjectScope; import org.jetbrains.mps.openapi.language.SAbstractConcept; import org.jetbrains.mps.openapi.model.SReference; import jetbrains.mps.internal.collections.runtime.Sequence; +import jetbrains.mps.command.base.runtime.ConsoleStream; import java.util.Scanner; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.actionSystem.MouseShortcut; @@ -81,7 +84,7 @@ import org.jetbrains.mps.openapi.model.SModelReference; import jetbrains.mps.smodel.SModelUtil_new; -public abstract class BaseConsoleTab extends JPanel implements Disposable { +public abstract class BaseConsoleTab extends JPanel implements Disposable, CommandOutputWindow { protected ConsoleTool myTool; protected SModel myModel; protected SNode myRoot; @@ -110,6 +113,11 @@ public ConsoleTool getConsoleTool() { return myTool; } + public void activate() { + getConsoleTool().getToolWindow().activate(null); + getConsoleTool().selectTab(this); + } + protected void addBuiltInImports() { SLanguage base = MetaAdapterFactory.getLanguage(MetaIdFactory.langId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L), "jetbrains.mps.console.base"); Collection baseAndExtensions = new SLanguageHierarchy(Collections.singleton(base)).getExtending(); @@ -151,7 +159,7 @@ protected BaseAction registerShortcutSet(BaseAction a, ShortcutSet shortcutSet) } protected void createEditor() { - this.myEditor = new UIEditorComponent(check_6q36mf_a0a0a0a62(ProjectHelper.toMPSProject(myTool.getProject())), null) { + this.myEditor = new UIEditorComponent(check_6q36mf_a0a0a0a82(ProjectHelper.toMPSProject(myTool.getProject())), null) { @Nullable @Override public Object getData(@NonNls String key) { @@ -159,7 +167,7 @@ public Object getData(@NonNls String key) { return myFileEditor; } if (PlatformDataKeys.PASTE_PROVIDER.is(key)) { - PasteProvider parentPasteProvider = as_6q36mf_a0a0a1a0a0a0a0ab(super.getData(key), PasteProvider.class); + PasteProvider parentPasteProvider = as_6q36mf_a0a0a1a0a0a0a0cb(super.getData(key), PasteProvider.class); return (myTool.getPasteAsRef() ? new BaseConsoleTab.MyPasteProvider(parentPasteProvider) : parentPasteProvider); } return super.getData(key); @@ -228,8 +236,8 @@ public void run() { } EditorCell currentCell = myEditor.getSelectedCell(); SRepository repository = getProject().getRepository(); - SNode referenceTarget = check_6q36mf_a0e0a0a0a5lb(pastingNodeReference, repository); - if (referenceTarget != null && currentCell != null && !(check_6q36mf_a0a5a0a0a0f73(check_6q36mf_a0a0f0a0a0a5lb(pastingNodeReference), myModel))) { + SNode referenceTarget = check_6q36mf_a0e0a0a0a5nb(pastingNodeReference, repository); + if (referenceTarget != null && currentCell != null && !(check_6q36mf_a0a5a0a0a0f93(check_6q36mf_a0a0f0a0a0a5nb(pastingNodeReference), myModel))) { SNode refContainer = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x51132a123c89fa7eL, "jetbrains.mps.console.base.structure.PastedNodeReference"))); SLinkOperations.setTarget(refContainer, MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x36ac6f29ae8c1fb5L, 0x4904fd89e74fc6fL, "target"), referenceTarget); NodePaster paster = new NodePaster(ListSequence.fromListAndArray(new ArrayList(), refContainer)); @@ -240,7 +248,7 @@ public void run() { } TemporaryModels.getInstance().addMissingImports(myModel); } else { - check_6q36mf_a0a0f0a0a0a5lb_0(myDefaultPasteProvider, context); + check_6q36mf_a0a0f0a0a0a5nb_0(myDefaultPasteProvider, context); } } }); @@ -280,7 +288,7 @@ public Project getProject() { public SearchScope getDefaultSearchscope() { return new ProjectScope(getProject()); } - public BaseConsoleTab getConsoleTab() { + public CommandOutputWindow getOutputWindow() { return BaseConsoleTab.this; } }; @@ -320,7 +328,7 @@ public void addText(String text) { while (scanner.hasNextLine()) { String line = scanner.nextLine(); if ((line != null && line.length() > 0)) { - ListSequence.fromList(SLinkOperations.getChildren(getLastReponse(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171a5ba02L, 0x4e3b035171b356edL, "item"))).addElement(createTextResponseItem_6q36mf_a0a0a1a1a0a0a0a94(line)); + ListSequence.fromList(SLinkOperations.getChildren(getLastReponse(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171a5ba02L, 0x4e3b035171b356edL, "item"))).addElement(createTextResponseItem_6q36mf_a0a0a1a1a0a0a0a15(line)); } if (scanner.hasNextLine() || text.charAt(text.length() - 1) == '\n') { SLinkOperations.addNewChild(getLastReponse(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171a5ba02L, 0x4e3b035171b356edL, "item"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b35d30L, "jetbrains.mps.console.base.structure.NewLineResponseItem"))); @@ -377,7 +385,7 @@ public void run() { this.add(toolbarComponent, BorderLayout.WEST); this.add(myEditor.getExternalComponent(), BorderLayout.CENTER); - myHighlighter = check_6q36mf_a0o0gc(myTool.getProject()); + myHighlighter = check_6q36mf_a0o0ic(myTool.getProject()); myHighlighter.addAdditionalEditorComponent(myEditor); } @@ -400,7 +408,7 @@ public void run() { public void run() { ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(myRoot, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL, 0x15fb34051f725bafL, "history")), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xa835f28c1aa02beL, 0x63da33792b5df49aL, "item"))).addElement(SNodeOperations.copyNode(SLinkOperations.getTarget(myRoot, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL, 0x15fb34051f725bb1L, "commandHolder")))); SNodeOperations.deleteNode(SLinkOperations.getTarget(SLinkOperations.getTarget(myRoot, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL, 0x15fb34051f725bb1L, "commandHolder")), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL, 0x4e27160acb44924L, "command"))); - check_6q36mf_a2a0a0a0a0a2a0d0ic(executeBefore); + check_6q36mf_a2a0a0a0a0a2a0d0kc(executeBefore); } }); } @@ -409,7 +417,7 @@ public void run() { getProject().getModelAccess().executeCommand(new Runnable() { public void run() { SLinkOperations.setTarget(SLinkOperations.getTarget(myRoot, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL, 0x15fb34051f725bb1L, "commandHolder")), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL, 0x4e27160acb44924L, "command"), SLinkOperations.getTarget(typedCommand[0], MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL, 0x4e27160acb44924L, "command"))); - check_6q36mf_a1a0a0a0a0a3a0d0ic(executeAfter); + check_6q36mf_a1a0a0a0a0a3a0d0kc(executeAfter); } }); } @@ -469,61 +477,61 @@ public void visit(SNode it) { } protected static Logger LOG = LogManager.getLogger(BaseConsoleTab.class); - private static SRepository check_6q36mf_a0a0a0a62(Project checkedDotOperand) { + private static SRepository check_6q36mf_a0a0a0a82(Project checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getRepository(); } return null; } - private static SNode check_6q36mf_a0e0a0a0a5lb(SNodeReference checkedDotOperand, SRepository repository) { + private static SNode check_6q36mf_a0e0a0a0a5nb(SNodeReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static boolean check_6q36mf_a0a5a0a0a0f73(SModelReference checkedDotOperand, SModel myModel) { + private static boolean check_6q36mf_a0a5a0a0a0f93(SModelReference checkedDotOperand, SModel myModel) { if (null != checkedDotOperand) { return checkedDotOperand.equals(myModel.getReference()); } return false; } - private static SModelReference check_6q36mf_a0a0f0a0a0a5lb(SNodeReference checkedDotOperand) { + private static SModelReference check_6q36mf_a0a0f0a0a0a5nb(SNodeReference checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getModelReference(); } return null; } - private static void check_6q36mf_a0a0f0a0a0a5lb_0(PasteProvider checkedDotOperand, DataContext context) { + private static void check_6q36mf_a0a0f0a0a0a5nb_0(PasteProvider checkedDotOperand, DataContext context) { if (null != checkedDotOperand) { checkedDotOperand.performPaste(context); } } - private static SNode createTextResponseItem_6q36mf_a0a0a1a1a0a0a0a94(Object p0) { + private static SNode createTextResponseItem_6q36mf_a0a0a1a1a0a0a0a15(Object p0) { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode n1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b35c38L, "jetbrains.mps.console.base.structure.TextResponseItem"), null, null, false); n1.setProperty(MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b35c38L, 0x4e3b035171b35d11L, "text"), p0 + ""); return n1; } - private static Highlighter check_6q36mf_a0o0gc(com.intellij.openapi.project.Project checkedDotOperand) { + private static Highlighter check_6q36mf_a0o0ic(com.intellij.openapi.project.Project checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getComponent(Highlighter.class); } return null; } - private static void check_6q36mf_a2a0a0a0a0a2a0d0ic(Runnable checkedDotOperand) { + private static void check_6q36mf_a2a0a0a0a0a2a0d0kc(Runnable checkedDotOperand) { if (null != checkedDotOperand) { checkedDotOperand.run(); } } - private static void check_6q36mf_a1a0a0a0a0a3a0d0ic(Runnable checkedDotOperand) { + private static void check_6q36mf_a1a0a0a0a0a3a0d0kc(Runnable checkedDotOperand) { if (null != checkedDotOperand) { checkedDotOperand.run(); } } - private static T as_6q36mf_a0a0a1a0a0a0a0ab(Object o, Class type) { + private static T as_6q36mf_a0a0a1a0a0a0a0cb(Object o, Class type) { return (type.isInstance(o) ? (T) o : null); } } diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleTool.java b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleTool.java index b6ce4bf00756..aee68c48b858 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleTool.java +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleTool.java @@ -18,7 +18,6 @@ import jetbrains.mps.plugins.tool.IComponentDisposer; import org.jetbrains.mps.openapi.model.SNode; import org.jetbrains.mps.openapi.module.SRepository; -import jetbrains.mps.ide.project.ProjectHelper; import jetbrains.mps.smodel.behaviour.BehaviorReflection; import com.intellij.ui.content.Content; @@ -131,7 +130,7 @@ public void loadState(ConsoleTool.MyState state) { public void executeCommand(final SNode command) { final ConsoleTool.TabState tabState = new ConsoleTool.TabState(); - final SRepository repo = ProjectHelper.toMPSProject(getProject()).getRepository(); + final SRepository repo; repo.getModelAccess().runReadAction(new Runnable() { public void run() { tabState.title = BehaviorReflection.invokeVirtual(String.class, command, "virtual_getPresentation_1213877396640", new Object[]{}); diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleUtil.java b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleUtil.java index 9bb149898c0f..a64ed7c7f15e 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleUtil.java +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleUtil.java @@ -27,11 +27,6 @@ import org.apache.log4j.LogManager; public class ConsoleUtil { - - public static String getGeneratedModelName(ConsoleContext context) { - return context.getConsoleTab().getConsoleModel().getModelName() + ".Main"; - } - public static boolean make(final Project project, final SModel model) { if (SwingUtilities.isEventDispatchThread()) { if (LOG.isEnabledFor(Level.ERROR)) { diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info b/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info index e3f703824100..dc9803b023eb 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info @@ -21,244 +21,244 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - + + + + - + - - - - + + + + - + - + - - - + + + - - - - - - + + + + + + - - - + + + - - + + - + - + - + - - + + - - + + - - + + - + - + - - + + - + - - - - - - + + + + + + @@ -325,17 +325,6 @@ - - - - - - - - - - - @@ -497,655 +486,647 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - + - + - - - - + + + + - + - + - + - + - - - - - - - + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - + - + - + - - - - - - + + + + + + - - - + + + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - - - - - - - - + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - + + - + - + - - + + - + - - + + - + - - + + - - - - + + + + - - + + - - - + + + - + - + - + - - - - + + + + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -1396,77 +1377,71 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + + - + - + - + - - + + From 5e14802f005c96026e763abb53d22d62c2c96a3c Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 22:08:07 +0300 Subject: [PATCH 18/52] "console" commands to be used in MPS: resolving deps problems in CommandUtil --- .../generator/template/main@generator.mps | 141 ++++++++++++++++-- .../lang/base/jetbrains.mps.console.base.mpl | 3 + ...etbrains.mps.console.blCommand.runtime.msd | 2 +- .../mps/console/blCommand/runtime/util.mps | 141 ------------------ .../mps/console/ideCommands/util.mps | 8 +- .../solutions/mpsBuild/models/build.mps | 6 + 6 files changed, 144 insertions(+), 157 deletions(-) diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index 022456e4d38a..c1a31bfb675b 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -10,6 +10,8 @@ + + @@ -17,11 +19,13 @@ + + - + @@ -30,6 +34,9 @@ + + + @@ -38,13 +45,11 @@ - - - + @@ -67,12 +72,16 @@ + + + + @@ -124,6 +133,18 @@ + + + + + + + + + + + + @@ -272,19 +293,113 @@ - - - - - - + + + + + + - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/jetbrains.mps.console.base.mpl b/plugins/console/lang/base/jetbrains.mps.console.base.mpl index 819872cd54c9..aedff3d23128 100644 --- a/plugins/console/lang/base/jetbrains.mps.console.base.mpl +++ b/plugins/console/lang/base/jetbrains.mps.console.base.mpl @@ -21,6 +21,7 @@ de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -33,7 +34,9 @@ + + diff --git a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd b/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd index 76c51a3c94ff..1bdea4ec88f8 100644 --- a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd +++ b/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd @@ -17,7 +17,7 @@ bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) - de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) + 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) diff --git a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps index 7d727139037e..6ec3b9c317d7 100644 --- a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps +++ b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps @@ -224,9 +224,6 @@ - - - @@ -1392,144 +1389,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps index 98b66922d0cc..389df293b091 100644 --- a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps +++ b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps @@ -841,7 +841,9 @@ - + + + @@ -865,7 +867,9 @@ - + + + diff --git a/plugins/mps-build/solutions/mpsBuild/models/build.mps b/plugins/mps-build/solutions/mpsBuild/models/build.mps index 3b47da8de1f5..4479ffda68c4 100644 --- a/plugins/mps-build/solutions/mpsBuild/models/build.mps +++ b/plugins/mps-build/solutions/mpsBuild/models/build.mps @@ -23592,6 +23592,12 @@ + + + + + + From e3363cfa0fd268933f205823f3b0d50f6d37c88c Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 22:32:31 +0300 Subject: [PATCH 19/52] "console" commands to be used in MPS: resolving deps problems in CommandUtil --- .../jetbrains/mps/command/base/runtime.mps | 48 + .../mps/command/base/runtime/dependencies | 2 + .../mps/command/base/runtime/generated | 2 +- .../command/base/runtime/ConsoleStream.java | 4 + .../mps/command/base/runtime/trace.info | 23 +- .../base/generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 130 +-- .../generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 2 +- .../generator/template/main/trace.info | 4 +- .../generator/template/main@generator.mps | 31 +- .../mps/console/blCommand/runtime/util.mps | 226 +--- .../blCommand/runtime/util/dependencies | 8 - .../console/blCommand/runtime/util/generated | 2 +- .../blCommand/runtime/util/CommandUtil.java | 81 +- .../console/blCommand/runtime/util/trace.info | 545 ++++----- .../mps/console/ideCommands/util/generated | 2 +- .../models/jetbrains/mps/console/tool.mps | 253 ++++ .../jetbrains/mps/console/tool/dependencies | 5 + .../jetbrains/mps/console/tool/generated | 2 +- .../mps/console/tool/BaseConsoleTab.java | 24 + .../jetbrains/mps/console/tool/trace.info | 1034 +++++++++-------- 22 files changed, 1226 insertions(+), 1206 deletions(-) diff --git a/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps b/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps index 98efff7e52a2..398c3ec86b98 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps +++ b/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps @@ -5,10 +5,12 @@ + + @@ -42,6 +44,11 @@ + + + + + @@ -106,6 +113,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/dependencies b/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/dependencies index c83ecee5179f..9ab2fb6fa0ae 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/dependencies +++ b/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/dependencies @@ -8,6 +8,8 @@ + + diff --git a/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/generated b/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/generated index 3768cfe5bbe0..69b2f68a888f 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/generated +++ b/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleStream.java b/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleStream.java index fc06aa39faa9..cde0a67f7dfb 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleStream.java +++ b/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleStream.java @@ -3,8 +3,12 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes; public interface ConsoleStream { public void addText(String text); public void addNode(SNode node); + public void addNodeRef(SNode node); + public void addException(Throwable t); + public void addClosure(_FunctionTypes._void_P0_E0 closure, String text); } diff --git a/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/trace.info b/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/trace.info index 0b7f72af23b8..083a401f0b6c 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/trace.info +++ b/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/trace.info @@ -21,15 +21,28 @@ - - - + + + + + + - + - + + + + + + + + + + + diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated index 9a8c38c4fb4f..6980a6f8b2ef 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index c1a31bfb675b..baa8db904893 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -34,9 +34,6 @@ - - - @@ -49,7 +46,6 @@ - @@ -72,16 +68,12 @@ - - - - @@ -133,18 +125,6 @@ - - - - - - - - - - - - @@ -293,111 +273,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - + + + + diff --git a/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated b/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated index 6ae7bc58c0a9..bf2845f9a691 100644 --- a/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated +++ b/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java b/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java index b81ef06a0dde..41d0c42b1445 100644 --- a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java +++ b/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java @@ -127,7 +127,7 @@ public static Object referenceMacro_GetReferent_3501374812263511250(final Refere } return null; } - public static SNode sourceNodeQuery_6273399648879447287(final SourceSubstituteMacroNodeContext _context) { + public static SNode sourceNodeQuery_4598452390226163566(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); } public static SNode sourceNodeQuery_3501374812264728764(final SourceSubstituteMacroNodeContext _context) { diff --git a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info b/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info index 8535a216b3aa..c664482fea6d 100644 --- a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info +++ b/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info @@ -310,8 +310,8 @@ - - + + diff --git a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index d6b6c518a985..aa080ad61f7d 100644 --- a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -438,30 +438,31 @@ - - - - - - + + + - - - - - - - - + + + + + + + + + + + + - + diff --git a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps index 6ec3b9c317d7..0ecbca1d0e45 100644 --- a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps +++ b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps @@ -62,10 +62,6 @@ - - - - @@ -120,7 +116,6 @@ - @@ -221,9 +216,6 @@ - - - @@ -231,18 +223,7 @@ - - - - - - - - - - - - + @@ -271,7 +252,6 @@ - @@ -608,92 +588,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -725,41 +619,42 @@ - - - - - + + + - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + + + + - - + + - - - @@ -1324,71 +1219,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies index 1f64d2a230c5..48e586182138 100644 --- a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies +++ b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies @@ -2,13 +2,10 @@ - - - @@ -16,7 +13,6 @@ - @@ -29,15 +25,11 @@ - - - - diff --git a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated index d97528a0a620..5134fd79b5ba 100644 --- a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated +++ b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java index b3caedf3d68d..5b083511cbdb 100644 --- a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java +++ b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java @@ -23,10 +23,6 @@ import jetbrains.mps.ide.project.ProjectHelper; import org.apache.log4j.Level; import jetbrains.mps.command.base.runtime.ConsoleStream; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations; -import jetbrains.mps.console.actions.ClosureHoldingNodeUtil; import org.jetbrains.mps.openapi.model.SNodeReference; import org.jetbrains.mps.openapi.module.SRepository; import jetbrains.mps.internal.collections.runtime.IWhereFilter; @@ -34,11 +30,8 @@ import jetbrains.mps.ide.findusages.model.SearchResult; import org.jetbrains.mps.openapi.model.SModelReference; import org.jetbrains.mps.openapi.module.SModuleReference; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import java.io.StringWriter; -import java.io.PrintWriter; import org.jetbrains.annotations.Nullable; +import jetbrains.mps.command.base.runtime.ConsoleContext; import jetbrains.mps.project.EditableFilteringScope; import jetbrains.mps.ide.findusages.model.scopes.ModelsScope; import jetbrains.mps.ide.findusages.model.scopes.ModulesScope; @@ -49,7 +42,6 @@ import jetbrains.mps.ide.findusages.view.UsagesViewTool; public class CommandUtil { - public static Iterable nodes(SearchScope scope) { return Sequence.fromIterable(models(scope)).translate(new ITranslator2() { public Iterable translate(SModel it) { @@ -84,7 +76,7 @@ public static Collection instances(SearchScope scope, SAbstractConcept co public static void show(Project p, _FunctionTypes._return_P0_E0 results) { try { - check_1pinza_a0a0a0n(ProjectHelper.toIdeaProject(p)).show(results.invoke(), "No results to show"); + check_1pinza_a0a0a0m(ProjectHelper.toIdeaProject(p)).show(results.invoke(), "No results to show"); } catch (Exception e) { if (LOG.isEnabledFor(Level.WARN)) { LOG.warn("Exception in showing custom console result", e); @@ -92,18 +84,11 @@ public static void show(Project p, _FunctionTypes._return_P0_E0 results, int resultsCount, String resultDescription) { if (resultsCount == 0) { console.addText("empty sequence"); } else { - CommandUtil.printClosure(console, new _FunctionTypes._void_P0_E0() { + console.addClosure(new _FunctionTypes._void_P0_E0() { public void invoke() { CommandUtil.show(project, results); } @@ -117,11 +102,11 @@ public SearchResults invoke() { final SearchResults res = new SearchResults(); Sequence.fromIterable(nodes).where(new IWhereFilter() { public boolean accept(SNodeReference it) { - return check_1pinza_a0a0a0a0b0a0a91(it, repository) != null; + return check_1pinza_a0a0a0a0b0a0a61(it, repository) != null; } }).visitAll(new IVisitor() { public void visit(SNodeReference it) { - res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a91(it, repository), "usage")); + res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a61(it, repository), "usage")); } }); return res; @@ -135,11 +120,11 @@ public SearchResults invoke() { final SearchResults res = new SearchResults(); Sequence.fromIterable(models).where(new IWhereFilter() { public boolean accept(SModelReference it) { - return check_1pinza_a0a0a0a0b0a0a12(it, repository) != null; + return check_1pinza_a0a0a0a0b0a0a81(it, repository) != null; } }).visitAll(new IVisitor() { public void visit(SModelReference it) { - res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a12(it, repository), "usage")); + res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a81(it, repository), "usage")); } }); return res; @@ -153,11 +138,11 @@ public SearchResults invoke() { final SearchResults res = new SearchResults(); Sequence.fromIterable(modules).where(new IWhereFilter() { public boolean accept(SModuleReference it) { - return check_1pinza_a0a0a0a0b0a0a32(it, repository) != null; + return check_1pinza_a0a0a0a0b0a0a02(it, repository) != null; } }).visitAll(new IVisitor() { public void visit(SModuleReference it) { - res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a32(it, repository), "usage")); + res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a02(it, repository), "usage")); } }); return res; @@ -167,32 +152,16 @@ public void visit(SModuleReference it) { } public static SNodeReference getNodeReference(SNode aNode) { - return check_1pinza_a0a52(aNode); + return check_1pinza_a0a22(aNode); } public static SNodeReference getReferenceReference(SReference aReference) { - return check_1pinza_a0a62(check_1pinza_a0a0ab(aReference)); + return check_1pinza_a0a32(check_1pinza_a0a0x(aReference)); } public static SModelReference getModelReference(SModel aModel) { - return check_1pinza_a0a72(aModel); + return check_1pinza_a0a42(aModel); } public static SModuleReference getModuleReference(SModule aModule) { - return check_1pinza_a0a82(aModule); - } - - public static void addNodeReference(ConsoleStream console, SNode target) { - SNode node = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bbb600cL, "jetbrains.mps.console.base.structure.NodeReferencePresentation"))); - SLinkOperations.setTarget(node, MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x36ac6f29ae8c1fb5L, 0x4904fd89e74fc6fL, "target"), target); - console.addNode(node); - } - - public static void registerAnalyzeStacktraceDialogClosure(ConsoleContext context, ConsoleStream console, Throwable exception) { - StringWriter writer = new StringWriter(); - exception.printStackTrace(new PrintWriter(writer)); - - SNode exceptionHolder = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L, "jetbrains.mps.console.base.structure.ExceptionHolder"))); - SPropertyOperations.set(exceptionHolder, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L, 0x5b02f032bc9cb8a9L, "stackTrace"), writer.toString()); - SPropertyOperations.set(exceptionHolder, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L, 0x360b134fc047ce2aL, "text"), exception.getClass().getName()); - console.addNode(exceptionHolder); + return check_1pinza_a0a52(aModule); } public static SearchScope createConsoleScope(@Nullable final SearchScope baseScope, final boolean includeReadOnly, final ConsoleContext context) { @@ -218,73 +187,73 @@ public static SearchScope createScope(Project project) { } protected static Logger LOG = LogManager.getLogger(CommandUtil.class); - private static UsagesViewTool check_1pinza_a0a0a0n(com.intellij.openapi.project.Project checkedDotOperand) { + private static UsagesViewTool check_1pinza_a0a0a0m(com.intellij.openapi.project.Project checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getComponent(UsagesViewTool.class); } return null; } - private static SNode check_1pinza_a0a0a0a0b0a0a91(SNodeReference checkedDotOperand, SRepository repository) { + private static SNode check_1pinza_a0a0a0a0b0a0a61(SNodeReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SNode check_1pinza_a0a0a0a0a0b0a0a91(SNodeReference checkedDotOperand, SRepository repository) { + private static SNode check_1pinza_a0a0a0a0a0b0a0a61(SNodeReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SModel check_1pinza_a0a0a0a0b0a0a12(SModelReference checkedDotOperand, SRepository repository) { + private static SModel check_1pinza_a0a0a0a0b0a0a81(SModelReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SModel check_1pinza_a0a0a0a0a0b0a0a12(SModelReference checkedDotOperand, SRepository repository) { + private static SModel check_1pinza_a0a0a0a0a0b0a0a81(SModelReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SModule check_1pinza_a0a0a0a0b0a0a32(SModuleReference checkedDotOperand, SRepository repository) { + private static SModule check_1pinza_a0a0a0a0b0a0a02(SModuleReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SModule check_1pinza_a0a0a0a0a0b0a0a32(SModuleReference checkedDotOperand, SRepository repository) { + private static SModule check_1pinza_a0a0a0a0a0b0a0a02(SModuleReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SNodeReference check_1pinza_a0a52(SNode checkedDotOperand) { + private static SNodeReference check_1pinza_a0a22(SNode checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getReference(); } return null; } - private static SNodeReference check_1pinza_a0a62(SNode checkedDotOperand) { + private static SNodeReference check_1pinza_a0a32(SNode checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getReference(); } return null; } - private static SNode check_1pinza_a0a0ab(SReference checkedDotOperand) { + private static SNode check_1pinza_a0a0x(SReference checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getSourceNode(); } return null; } - private static SModelReference check_1pinza_a0a72(SModel checkedDotOperand) { + private static SModelReference check_1pinza_a0a42(SModel checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getReference(); } return null; } - private static SModuleReference check_1pinza_a0a82(SModule checkedDotOperand) { + private static SModuleReference check_1pinza_a0a52(SModule checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getModuleReference(); } diff --git a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info index 62b2dbc7602c..3a7aa76c72ce 100644 --- a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info +++ b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info @@ -12,409 +12,368 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - + - + - + - - - - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - + + - + - - - - - - - + + - + - + - + - - - - - - - + + + + + + + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated index e131ccf6495e..d0e77544329b 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/models/jetbrains/mps/console/tool.mps b/plugins/console/models/jetbrains/mps/console/tool.mps index 4e31f4c7f731..f040517f6bc0 100644 --- a/plugins/console/models/jetbrains/mps/console/tool.mps +++ b/plugins/console/models/jetbrains/mps/console/tool.mps @@ -69,6 +69,7 @@ + @@ -346,6 +347,9 @@ + + + @@ -402,6 +406,9 @@ + + + @@ -457,6 +464,9 @@ + + + @@ -6369,6 +6379,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies index 0d4ab52696e7..355355dfb87a 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies @@ -23,6 +23,8 @@ + + @@ -40,8 +42,10 @@ + + @@ -56,6 +60,7 @@ + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated index 34192e98f716..3d251f5b0b68 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java b/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java index 9bc123d4d67c..cb275b546d75 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java @@ -68,6 +68,11 @@ import jetbrains.mps.internal.collections.runtime.Sequence; import jetbrains.mps.command.base.runtime.ConsoleStream; import java.util.Scanner; +import java.io.StringWriter; +import java.io.PrintWriter; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations; +import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes; +import jetbrains.mps.console.actions.ClosureHoldingNodeUtil; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.actionSystem.MouseShortcut; import java.awt.event.MouseEvent; @@ -339,6 +344,25 @@ public void addNode(SNode node) { addNodeImports(node); SLinkOperations.setTarget(SLinkOperations.addNewChild(getLastReponse(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171a5ba02L, 0x4e3b035171b356edL, "item"), SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b35c14L, "jetbrains.mps.console.base.structure.NodeResponseItem"))), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b35c14L, 0x4e3b035171b35c15L, "node"), node); } + public void addNodeRef(SNode target) { + SNode node = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bbb600cL, "jetbrains.mps.console.base.structure.NodeReferencePresentation"))); + SLinkOperations.setTarget(node, MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x36ac6f29ae8c1fb5L, 0x4904fd89e74fc6fL, "target"), target); + addNode(node); + } + public void addException(Throwable t) { + StringWriter writer = new StringWriter(); + t.printStackTrace(new PrintWriter(writer)); + SNode exceptionHolder = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L, "jetbrains.mps.console.base.structure.ExceptionHolder"))); + SPropertyOperations.set(exceptionHolder, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L, 0x5b02f032bc9cb8a9L, "stackTrace"), writer.toString()); + SPropertyOperations.set(exceptionHolder, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L, 0x360b134fc047ce2aL, "text"), t.getClass().getName()); + addNode(exceptionHolder); + } + public void addClosure(_FunctionTypes._void_P0_E0 closure, String text) { + SNode nodeWithClosure = SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xf6d4d958ec2f2c6L, "jetbrains.mps.console.base.structure.NodeWithClosure"))); + SPropertyOperations.set(nodeWithClosure, MetaAdapterFactory.getProperty(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L, 0x360b134fc047ce2aL, "text"), text); + ClosureHoldingNodeUtil.getInstance().register(nodeWithClosure, closure); + addNode(nodeWithClosure); + } }; } diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info b/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info index dc9803b023eb..cc905247c0c9 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info @@ -486,647 +486,683 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - + - + - - - - + + + + - + - + - + - + - - - - - - - + + + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - + + - - - - + + + + - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - + - + + + + - + - - - - - - + + + + + + - - - + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - - - - - - - - + + + + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - + + - + - + - - + + - + - - + + - + - - + + - - - - + + + + - - + + - - - + - + - + - + - - - - + + + + - + - + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + From f4cdb3ac9986be8faa8b3d2060b0b953255f66b6 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 22:48:02 +0300 Subject: [PATCH 20/52] "console" commands to be used in MPS: fixing build solution --- .../generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 6 - .../jetbrains.mps.console.blCommand.mpl | 19 +- .../lang/blCommand/languageModels/actions.mps | 1 - .../blCommand/languageModels/behavior.mps | 11 - .../lang/blCommand/languageModels/editor.mps | 3 - .../blCommand/languageModels/structure.mps | 1 - .../mps/console/blCommand/actions/generated | 2 +- .../mps/console/blCommand/behavior/generated | 2 +- .../mps/console/blCommand/editor/generated | 2 +- .../jetbrains/mps/console/blCommand/generated | 2 +- .../mps/console/blCommand/structure/generated | 2 +- .../mps/console/blCommand/runtime/util.mps | 37 +- .../console/blCommand/runtime/util/generated | 2 +- .../solutions/mpsBuild/models/build.mps | 356 +++++++++++------- 15 files changed, 237 insertions(+), 211 deletions(-) diff --git a/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated b/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated index bf2845f9a691..a3448f4fa1ff 100644 --- a/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated +++ b/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index aa080ad61f7d..fc3dfaae75e0 100644 --- a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -4,23 +4,17 @@ - - - - - - diff --git a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl index 8ddfc06801cf..cb7cd734f714 100644 --- a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl +++ b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl @@ -18,18 +18,11 @@ - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) - 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) 9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - 857d0a79-6f44-4f46-84ed-9c5b42632011(jetbrains.mps.baseLanguage.closures#1199623535494) - 5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197) 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) - 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) 2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696) 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) @@ -44,10 +37,8 @@ - + - - @@ -104,18 +95,10 @@ - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) - 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) - 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) - 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) - 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) - d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/blCommand/languageModels/actions.mps b/plugins/console/lang/blCommand/languageModels/actions.mps index e9a4450d4547..74f0b0acc18a 100644 --- a/plugins/console/lang/blCommand/languageModels/actions.mps +++ b/plugins/console/lang/blCommand/languageModels/actions.mps @@ -7,7 +7,6 @@ - diff --git a/plugins/console/lang/blCommand/languageModels/behavior.mps b/plugins/console/lang/blCommand/languageModels/behavior.mps index 5434e6c8c443..9fc11c04bf3a 100644 --- a/plugins/console/lang/blCommand/languageModels/behavior.mps +++ b/plugins/console/lang/blCommand/languageModels/behavior.mps @@ -6,19 +6,8 @@ - - - - - - - - - - - diff --git a/plugins/console/lang/blCommand/languageModels/editor.mps b/plugins/console/lang/blCommand/languageModels/editor.mps index 3889fffe0dc9..7f1d0bf35026 100644 --- a/plugins/console/lang/blCommand/languageModels/editor.mps +++ b/plugins/console/lang/blCommand/languageModels/editor.mps @@ -10,11 +10,8 @@ - - - diff --git a/plugins/console/lang/blCommand/languageModels/structure.mps b/plugins/console/lang/blCommand/languageModels/structure.mps index 29d43b4b7482..863710f54948 100644 --- a/plugins/console/lang/blCommand/languageModels/structure.mps +++ b/plugins/console/lang/blCommand/languageModels/structure.mps @@ -5,7 +5,6 @@ - diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated index 2853b1b4c922..dbd3ff781c35 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated index 2d742da5ca72..fe2efd683ecb 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated index ca204c39b1a8..255759267502 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated index 1084f346ba4b..dad0ab88dda6 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated index b498ca390571..559f2860f0f7 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps index 0ecbca1d0e45..fcc2d376d321 100644 --- a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps +++ b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps @@ -2,59 +2,28 @@ - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - @@ -545,12 +514,12 @@ - + - + diff --git a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated index 5134fd79b5ba..82323e2abf3e 100644 --- a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated +++ b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-build/solutions/mpsBuild/models/build.mps b/plugins/mps-build/solutions/mpsBuild/models/build.mps index 4479ffda68c4..2c64eb7eab58 100644 --- a/plugins/mps-build/solutions/mpsBuild/models/build.mps +++ b/plugins/mps-build/solutions/mpsBuild/models/build.mps @@ -17067,6 +17067,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17087,7 +17117,7 @@ - + @@ -17114,6 +17144,18 @@ + + + + + + + + + + + + @@ -17192,6 +17234,12 @@ + + + + + + @@ -17249,6 +17297,12 @@ + + + + + + @@ -17373,6 +17427,12 @@ + + + + + + @@ -17598,6 +17658,18 @@ + + + + + + + + + + + + @@ -17673,6 +17745,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17950,6 +18163,12 @@ + + + + + + @@ -22945,18 +23164,12 @@ - - - - - - @@ -23461,6 +23674,12 @@ + + + + + + @@ -23663,129 +23882,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From be588d5374db3d8f7483d638107cef7c4b340855 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 23:21:30 +0300 Subject: [PATCH 21/52] "console" commands to be used in MPS: fix code changed by mistake --- .../jetbrains.mps.command.base.runtime.msd | 1 + .../console/jetbrains.mps.console.actions.msd | 1 + .../jetbrains/mps/console/base/generated | 2 +- ...etbrains.mps.console.blCommand.runtime.msd | 7 - .../jetbrains.mps.console.ideCommands.mpl | 1 + .../mps/console/ideCommands/generated | 2 +- ...s.mps.console.internalCommands.runtime.msd | 2 +- .../models/jetbrains/mps/console/tool.mps | 12 + .../jetbrains/mps/console/tool/dependencies | 1 + .../jetbrains/mps/console/tool/generated | 2 +- .../mps/console/tool/ConsoleTool.java | 3 +- .../jetbrains/mps/console/tool/trace.info | 368 +++++++++--------- 12 files changed, 206 insertions(+), 196 deletions(-) diff --git a/plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd b/plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd index 07c003aa2c15..80e9a3de582f 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd +++ b/plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd @@ -12,6 +12,7 @@ + diff --git a/plugins/console/jetbrains.mps.console.actions.msd b/plugins/console/jetbrains.mps.console.actions.msd index f8e8864305fd..027afd17b8b9 100644 --- a/plugins/console/jetbrains.mps.console.actions.msd +++ b/plugins/console/jetbrains.mps.console.actions.msd @@ -23,6 +23,7 @@ + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated index 50316f2828c7..b1875a209327 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd b/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd index 1bdea4ec88f8..2ec34e9ff543 100644 --- a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd +++ b/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd @@ -25,16 +25,9 @@ - - - - - - - diff --git a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl index ce7dd3d013eb..f69577ca42a2 100644 --- a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl +++ b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl @@ -40,6 +40,7 @@ + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated index 86e0938f54fe..9dd1d82c1b84 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommandsRuntime/jetbrains.mps.console.internalCommands.runtime.msd b/plugins/console/lang/internalCommandsRuntime/jetbrains.mps.console.internalCommands.runtime.msd index 0d6a0172a35b..65ba677b50a3 100644 --- a/plugins/console/lang/internalCommandsRuntime/jetbrains.mps.console.internalCommands.runtime.msd +++ b/plugins/console/lang/internalCommandsRuntime/jetbrains.mps.console.internalCommands.runtime.msd @@ -20,7 +20,7 @@ - + diff --git a/plugins/console/models/jetbrains/mps/console/tool.mps b/plugins/console/models/jetbrains/mps/console/tool.mps index f040517f6bc0..79507f1868da 100644 --- a/plugins/console/models/jetbrains/mps/console/tool.mps +++ b/plugins/console/models/jetbrains/mps/console/tool.mps @@ -2235,6 +2235,18 @@ + + + + + + + + + + + + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies index 355355dfb87a..cc74c1be7fc0 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies @@ -178,6 +178,7 @@ + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated index 3d251f5b0b68..66616842d27a 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleTool.java b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleTool.java index aee68c48b858..b6ce4bf00756 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleTool.java +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleTool.java @@ -18,6 +18,7 @@ import jetbrains.mps.plugins.tool.IComponentDisposer; import org.jetbrains.mps.openapi.model.SNode; import org.jetbrains.mps.openapi.module.SRepository; +import jetbrains.mps.ide.project.ProjectHelper; import jetbrains.mps.smodel.behaviour.BehaviorReflection; import com.intellij.ui.content.Content; @@ -130,7 +131,7 @@ public void loadState(ConsoleTool.MyState state) { public void executeCommand(final SNode command) { final ConsoleTool.TabState tabState = new ConsoleTool.TabState(); - final SRepository repo; + final SRepository repo = ProjectHelper.toMPSProject(getProject()).getRepository(); repo.getModelAccess().runReadAction(new Runnable() { public void run() { tabState.title = BehaviorReflection.invokeVirtual(String.class, command, "virtual_getPresentation_1213877396640", new Object[]{}); diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info b/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info index cc905247c0c9..82eb98135991 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info @@ -21,244 +21,244 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - + + + + - + - - - - + + + + - + - + - - - + + + - - - - - - + + + + + + - - - + + + - - + + - + - + - + - - + + - - + + - - + + - + - + - - + + - + - - - - - - + + + + + + From 6a3289a62df8a24e836aa821c0be9db91e8db996 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 20 Aug 2015 23:23:00 +0300 Subject: [PATCH 22/52] "console" commands to be used in MPS: rebuild build solution --- build/mpsCore.xml | 506 +++++++++- build/mpsPlugins.xml | 867 ++++++------------ .../jetbrains/mps/ide/build/generated | 2 +- .../jetbrains/mps/ide/build/mpsCore.xml | 506 +++++++++- .../jetbrains/mps/ide/build/mpsPlugins.xml | 867 ++++++------------ .../jetbrains/mps/ide/build/trace.info | 4 +- 6 files changed, 1583 insertions(+), 1169 deletions(-) diff --git a/build/mpsCore.xml b/build/mpsCore.xml index aa46818b4fe5..ac189b38895c 100644 --- a/build/mpsCore.xml +++ b/build/mpsCore.xml @@ -166,6 +166,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mpsBootstrapCore.version=${mpsBootstrapCore.version} @@ -182,7 +339,7 @@ - + @@ -196,6 +353,7 @@ + @@ -262,6 +420,10 @@ + + + + @@ -477,10 +639,352 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/mpsPlugins.xml b/build/mpsPlugins.xml index 36d10d019df3..e6d6d1b90ab1 100644 --- a/build/mpsPlugins.xml +++ b/build/mpsPlugins.xml @@ -153,10 +153,10 @@ - - - - + + + + @@ -170,36 +170,112 @@ - + - - - - - + + + + + - - + + - - + + - - + + - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + @@ -255,6 +331,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -303,90 +414,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -422,117 +449,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -583,7 +499,7 @@ - + @@ -662,6 +578,10 @@ + + + + @@ -669,17 +589,13 @@ - - - - - - - + + + @@ -932,119 +848,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1083,6 +886,9 @@ + + + @@ -1092,71 +898,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + - + @@ -1186,36 +939,32 @@ - - - - + + - - - - + + - - - - + + + + - + @@ -1233,11 +982,7 @@ - - - - - + @@ -1250,16 +995,15 @@ - - - + + + - @@ -1267,20 +1011,21 @@ - - + + - - - - + + + + - + + @@ -1289,9 +1034,12 @@ - + + + + @@ -1301,18 +1049,18 @@ + - - - + + + - @@ -1320,18 +1068,18 @@ - - + + - - - - + + + + - + @@ -1349,9 +1097,7 @@ - - - + @@ -1364,16 +1110,15 @@ - - - + + + - @@ -1381,18 +1126,18 @@ - - + + - - - - + + + + - + @@ -1410,11 +1155,8 @@ - - - @@ -1431,6 +1173,10 @@ + + + + @@ -1440,51 +1186,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + - + - @@ -1493,14 +1208,9 @@ + - - - - - - @@ -1510,15 +1220,18 @@ - + + + + @@ -1526,18 +1239,18 @@ - - + + - - - - + + + + - + @@ -1555,9 +1268,8 @@ - - - + + @@ -1570,12 +1282,19 @@ + + + + + + + @@ -1583,18 +1302,18 @@ - - + + - - - - + + + + - + @@ -1612,8 +1331,9 @@ - - + + + @@ -1626,12 +1346,20 @@ + + + + + + + + @@ -1639,36 +1367,25 @@ - - + + - - - - + + + + - + - - + - - - - - - - - - - @@ -1677,35 +1394,21 @@ - - - - - - - - - - - - - - - - + + - - - - + + + + - + @@ -1723,8 +1426,7 @@ - - + @@ -1741,6 +1443,9 @@ + + + @@ -1750,18 +1455,18 @@ - - + + - - - - + + + + - + @@ -1779,10 +1484,8 @@ - - - - + + @@ -1799,6 +1502,9 @@ + + + @@ -1808,8 +1514,8 @@ - - + + @@ -1895,20 +1601,17 @@ - - - - - - + + + - + \ No newline at end of file diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated index 965b5a66ee3f..c15c8294fe29 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated +++ b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml index aa46818b4fe5..ac189b38895c 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml @@ -166,6 +166,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mpsBootstrapCore.version=${mpsBootstrapCore.version} @@ -182,7 +339,7 @@ - + @@ -196,6 +353,7 @@ + @@ -262,6 +420,10 @@ + + + + @@ -477,10 +639,352 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml index 36d10d019df3..e6d6d1b90ab1 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml @@ -153,10 +153,10 @@ - - - - + + + + @@ -170,36 +170,112 @@ - + - - - - - + + + + + - - + + - - + + - - + + - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + @@ -255,6 +331,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -303,90 +414,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -422,117 +449,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -583,7 +499,7 @@ - + @@ -662,6 +578,10 @@ + + + + @@ -669,17 +589,13 @@ - - - - - - - + + + @@ -932,119 +848,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1083,6 +886,9 @@ + + + @@ -1092,71 +898,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + - + @@ -1186,36 +939,32 @@ - - - - + + - - - - + + - - - - + + + + - + @@ -1233,11 +982,7 @@ - - - - - + @@ -1250,16 +995,15 @@ - - - + + + - @@ -1267,20 +1011,21 @@ - - + + - - - - + + + + - + + @@ -1289,9 +1034,12 @@ - + + + + @@ -1301,18 +1049,18 @@ + - - - + + + - @@ -1320,18 +1068,18 @@ - - + + - - - - + + + + - + @@ -1349,9 +1097,7 @@ - - - + @@ -1364,16 +1110,15 @@ - - - + + + - @@ -1381,18 +1126,18 @@ - - + + - - - - + + + + - + @@ -1410,11 +1155,8 @@ - - - @@ -1431,6 +1173,10 @@ + + + + @@ -1440,51 +1186,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + - + - @@ -1493,14 +1208,9 @@ + - - - - - - @@ -1510,15 +1220,18 @@ - + + + + @@ -1526,18 +1239,18 @@ - - + + - - - - + + + + - + @@ -1555,9 +1268,8 @@ - - - + + @@ -1570,12 +1282,19 @@ + + + + + + + @@ -1583,18 +1302,18 @@ - - + + - - - - + + + + - + @@ -1612,8 +1331,9 @@ - - + + + @@ -1626,12 +1346,20 @@ + + + + + + + + @@ -1639,36 +1367,25 @@ - - + + - - - - + + + + - + - - + - - - - - - - - - - @@ -1677,35 +1394,21 @@ - - - - - - - - - - - - - - - - + + - - - - + + + + - + @@ -1723,8 +1426,7 @@ - - + @@ -1741,6 +1443,9 @@ + + + @@ -1750,18 +1455,18 @@ - - + + - - - - + + + + - + @@ -1779,10 +1484,8 @@ - - - - + + @@ -1799,6 +1502,9 @@ + + + @@ -1808,8 +1514,8 @@ - - + + @@ -1895,20 +1601,17 @@ - - - - - - + + + - + \ No newline at end of file diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info index 57f601c37f52..e8a22c492b64 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info @@ -77,12 +77,12 @@ - + - + From 2c859f52e770892259e33ed5135f62077bee6ab5 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Fri, 21 Aug 2015 18:12:13 +0300 Subject: [PATCH 23/52] fix compilation --- plugins/console/console.iml | 4 ++-- .../jetbrains.mps.command.base.runtime.msd | 2 +- .../lang/blCommand/jetbrains.mps.console.blCommand.mpl | 1 + plugins/console/lang/blCommand/languageModels/editor.mps | 2 +- .../jetbrains/mps/console/blCommand/editor/generated | 2 +- .../jetbrains/mps/console/blCommand/generated | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/console/console.iml b/plugins/console/console.iml index f362d83469fb..1948bdc863f7 100644 --- a/plugins/console/console.iml +++ b/plugins/console/console.iml @@ -7,6 +7,7 @@ + @@ -24,5 +25,4 @@ - - + \ No newline at end of file diff --git a/plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd b/plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd index 80e9a3de582f..65a37b1fdfc5 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd +++ b/plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd @@ -1,5 +1,5 @@ - + diff --git a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl index cb7cd734f714..96a6aa327141 100644 --- a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl +++ b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl @@ -99,6 +99,7 @@ 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) + 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/blCommand/languageModels/editor.mps b/plugins/console/lang/blCommand/languageModels/editor.mps index 7f1d0bf35026..2b77bc3a0e47 100644 --- a/plugins/console/lang/blCommand/languageModels/editor.mps +++ b/plugins/console/lang/blCommand/languageModels/editor.mps @@ -912,7 +912,7 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated index 255759267502..4e2afe88f5e0 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated index dad0ab88dda6..a74fcf79ad32 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated @@ -1,3 +1,3 @@ - + From 355a015402e75ae60d453941c2e5138050cc9891 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Fri, 21 Aug 2015 18:27:04 +0300 Subject: [PATCH 24/52] tmp fix compilation --- .idea/compiler.xml | 8 ++++++-- core/kernel/kernel.iml | 3 +++ plugins/console/console.iml | 1 - .../jetbrains.mps.console.blCommand.runtime.msd | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b37553450863..79fa79b4e8c0 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -72,6 +72,8 @@ + + @@ -79,8 +81,6 @@ - - @@ -652,6 +652,10 @@ + + + + diff --git a/core/kernel/kernel.iml b/core/kernel/kernel.iml index 81b702eb47ad..70b34413f62b 100644 --- a/core/kernel/kernel.iml +++ b/core/kernel/kernel.iml @@ -20,6 +20,9 @@ + + + diff --git a/plugins/console/console.iml b/plugins/console/console.iml index 1948bdc863f7..7f9449dcb847 100644 --- a/plugins/console/console.iml +++ b/plugins/console/console.iml @@ -7,7 +7,6 @@ - diff --git a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd b/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd index 2ec34e9ff543..953379388cb0 100644 --- a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd +++ b/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd @@ -18,6 +18,7 @@ 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) + 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) From 1227ec6ec497b7190a372016848c46077ad0682b Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Tue, 25 Aug 2015 20:32:23 +0300 Subject: [PATCH 25/52] "console" commands to be used in MPS: remove command.base language/runtime --- .mps/modules.xml | 2 - .../jetbrains.mps.command.base.runtime.msd | 20 - .../mps/command/base/runtime/generated | 3 - plugins/console/jetbrains.mps.console.msd | 2 +- .../base/generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 9 +- .../lang/base/jetbrains.mps.console.base.mpl | 7 +- .../lang/base/languageModels/behavior.mps | 92 +- .../lang/base/languageModels/constraints.mps | 14 +- .../lang/base/languageModels/structure.mps | 6 +- .../mps/console/base/behavior/dependencies | 36 +- .../mps/console/base/behavior/generated | 2 +- .../mps/console/base/constraints/generated | 2 +- .../jetbrains/mps/console/base/generated | 2 +- .../mps/console/base/structure/generated | 2 +- .../jetbrains/mps/console/base/Language.java | 2 +- .../behavior/Command_BehaviorDescriptor.java | 8 +- .../behavior/GeneratedCommand_Behavior.java | 4 +- .../GeneratedCommand_BehaviorDescriptor.java | 4 +- .../base/behavior/HelpCommand_Behavior.java | 8 +- .../HelpCommand_BehaviorDescriptor.java | 8 +- .../behavior/InterpretedCommand_Behavior.java | 4 +- ...InterpretedCommand_BehaviorDescriptor.java | 4 +- .../mps/console/base/behavior/trace.info | 12 +- .../HelpConceptReference_Constraints.java | 2 +- .../structure/StructureAspectDescriptor.java | 4 +- .../generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 6 + .../generator/template/main/trace.info | 1120 +++++++++-------- .../generator/template/main@generator.mps | 229 +++- .../jetbrains.mps.console.blCommand.mpl | 6 +- .../blCommand/languageModels/behavior.mps | 199 ++- .../lang/blCommand/languageModels/editor.mps | 26 + .../blCommand/languageModels/structure.mps | 27 +- .../blCommand/languageModels/typesystem.mps | 48 + .../console/blCommand/behavior/dependencies | 32 +- .../mps/console/blCommand/behavior/generated | 2 +- .../mps/console/blCommand/editor/dependencies | 23 + .../mps/console/blCommand/editor/generated | 2 +- .../jetbrains/mps/console/blCommand/generated | 2 +- .../mps/console/blCommand/structure/generated | 2 +- .../console/blCommand/typesystem/dependencies | 15 + .../console/blCommand/typesystem/generated | 2 +- .../mps/console/blCommand/Language.java | 2 +- .../behavior/BehaviorAspectDescriptor.java | 4 +- .../ConsoleExpression_BehaviorDescriptor.java | 1 - .../ConsoleHelpProvider_Behavior.java | 2 +- ...onsoleHelpProvider_BehaviorDescriptor.java | 2 +- .../ConsoleOperation_BehaviorDescriptor.java | 1 - .../PrintExpression_BehaviorDescriptor.java | 1 - .../QueryExpression_BehaviorDescriptor.java | 1 - .../ShowExpression_BehaviorDescriptor.java | 1 - .../WithStatement_BehaviorDescriptor.java | 4 +- .../mps/console/blCommand/behavior/trace.info | 66 +- .../editor/EditorAspectDescriptorImpl.java | 4 +- .../editor/WithStatement_Editor.java | 6 +- .../mps/console/blCommand/editor/trace.info | 296 ++++- .../structure/StructureAspectDescriptor.java | 64 +- .../console/blCommand/structure/trace.info | 2 +- .../typesystem/TypesystemDescriptor.java | 4 + .../console/blCommand/typesystem/trace.info | 119 +- .../typeof_ScopeProvider_InferenceRule.java | 10 +- ...etbrains.mps.console.blCommand.runtime.msd | 1 - .../mps/console/blCommand}/runtime.mps | 37 +- .../mps/console/blCommand/runtime/util.mps | 12 +- .../console/blCommand}/runtime/dependencies | 8 +- .../mps/console/blCommand/runtime/generated | 3 + .../blCommand/runtime/util/dependencies | 4 +- .../console/blCommand/runtime/util/generated | 2 +- .../runtime/CommandOutputWindow.java | 2 +- .../blCommand}/runtime/ConsoleContext.java | 2 +- .../blCommand}/runtime/ConsoleStream.java | 2 +- .../mps/console/blCommand}/runtime/trace.info | 14 +- .../blCommand/runtime/util/CommandUtil.java | 4 +- .../console/blCommand/runtime/util/trace.info | 4 +- .../base/generator/template/main/dependencies | 13 - .../base/generator/template/main/generated | 3 - .../template/main/QueriesGenerated.java | 20 - .../base/generator/template/main/trace.info | 18 - .../generator/template/main@generator.mps | 268 ---- .../jetbrains.mps.command.base.mpl | 81 -- .../models/behavior.mps | 259 ---- .../models/constraints.mps | 11 - .../models/editor.mps | 65 - .../models/structure.mps | 60 - .../models/typesystem.mps | 130 -- .../mps/command/base/behavior/dependencies | 33 - .../mps/command/base/behavior/generated | 3 - .../mps/command/base/constraints/dependencies | 3 - .../mps/command/base/constraints/generated | 3 - .../jetbrains/mps/command/base/dependencies | 24 - .../mps/command/base/editor/dependencies | 37 - .../mps/command/base/editor/generated | 3 - .../jetbrains/mps/command/base/generated | 3 - .../mps/command/base/structure/dependencies | 15 - .../mps/command/base/structure/generated | 3 - .../mps/command/base/typesystem/dependencies | 23 - .../mps/command/base/typesystem/generated | 3 - .../jetbrains/mps/command/base/Language.java | 62 - .../behavior/BehaviorAspectDescriptor.java | 21 - .../mps/command/base/behavior/trace.info | 68 - .../mps/command/base/constraints/trace.info | 3 - .../editor/EditorAspectDescriptorImpl.java | 29 - .../mps/command/base/editor/trace.info | 312 ----- .../structure/StructureAspectDescriptor.java | 36 - .../mps/command/base/structure/trace.info | 9 - .../jetbrains/mps/command/base/trace.info | 9 - .../base/typesystem/TypesystemDescriptor.java | 15 - .../mps/command/base/typesystem/trace.info | 133 -- .../generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 28 +- .../jetbrains.mps.console.ideCommands.mpl | 4 +- .../mps/console/ideCommands/util.mps | 40 +- .../ideCommands/languageModels/behavior.mps | 79 +- .../console/ideCommands/behavior/dependencies | 68 +- .../console/ideCommands/behavior/generated | 2 +- .../mps/console/ideCommands/generated | 2 +- .../mps/console/ideCommands/util/dependencies | 4 +- .../mps/console/ideCommands/util/generated | 2 +- ...llActionExpression_BehaviorDescriptor.java | 2 +- .../GlobalStatisticTarget_Behavior.java | 2 +- ...balStatisticTarget_BehaviorDescriptor.java | 2 +- .../behavior/INodeSetReference_Behavior.java | 2 +- .../INodeSetReference_BehaviorDescriptor.java | 2 +- .../behavior/IStatisticsTarget_Behavior.java | 2 +- .../IStatisticsTarget_BehaviorDescriptor.java | 2 +- .../ModelStatisticsTarget_Behavior.java | 2 +- ...elStatisticsTarget_BehaviorDescriptor.java | 2 +- .../OfAspectOperation_BehaviorDescriptor.java | 2 +- .../ProjectStatisticsTarget_Behavior.java | 2 +- ...ctStatisticsTarget_BehaviorDescriptor.java | 2 +- .../RebuildProjectCommand_Behavior.java | 4 +- ...uildProjectCommand_BehaviorDescriptor.java | 4 +- .../ShowBrokenReferences_Behavior.java | 4 +- ...owBrokenReferences_BehaviorDescriptor.java | 4 +- .../behavior/ShowGenPlan_Behavior.java | 4 +- .../ShowGenPlan_BehaviorDescriptor.java | 4 +- .../behavior/StatCommand_Behavior.java | 4 +- .../StatCommand_BehaviorDescriptor.java | 4 +- .../SubtreeStatisticsTarget_Behavior.java | 2 +- ...eeStatisticsTarget_BehaviorDescriptor.java | 2 +- .../UnloadModelsCommand_Behavior.java | 4 +- ...nloadModelsCommand_BehaviorDescriptor.java | 4 +- .../console/ideCommands/behavior/trace.info | 30 +- .../console/ideCommands/util/OutputUtils.java | 2 +- .../ideCommands/util/PartitioningHelper.java | 2 +- .../mps/console/ideCommands/util/trace.info | 6 +- .../generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 7 +- ...jetbrains.mps.console.internalCommands.mpl | 2 +- .../languageModels/behavior.mps | 18 +- .../internalCommands/behavior/dependencies | 18 +- .../internalCommands/behavior/generated | 2 +- .../mps/console/internalCommands/generated | 2 +- .../InternalMode_BehaviorDescriptor.java | 2 +- .../ReloadClassesCommand_Behavior.java | 4 +- ...loadClassesCommand_BehaviorDescriptor.java | 4 +- .../ShowRepositoryCommand_Behavior.java | 4 +- ...wRepositoryCommand_BehaviorDescriptor.java | 4 +- .../internalCommands/behavior/trace.info | 4 +- .../console/scripts/generator/main/generated | 2 +- .../generator/template/main@generator.mps | 14 +- .../scripts/jetbrains.mps.console.scripts.mpl | 6 +- .../lang/scripts/languageModels/behavior.mps | 12 +- .../mps/console/scripts/behavior/dependencies | 5 +- .../mps/console/scripts/behavior/generated | 2 +- .../jetbrains/mps/console/scripts/generated | 2 +- .../scripts/behavior/Execute_Behavior.java | 10 - .../RefactorOperation_BehaviorDescriptor.java | 2 +- .../mps/console/scripts/behavior/trace.info | 10 - .../jetbrains.mps.console.scripts.runtime.msd | 2 +- .../mps/console/scripts/runtime/util.mps | 15 +- .../console/scripts/runtime/util/dependencies | 2 +- .../console/scripts/runtime/util/generated | 2 +- .../scripts/runtime/util/ScriptsUtil.java | 2 +- .../console/scripts/runtime/util/trace.info | 6 +- .../models/jetbrains/mps/console/tool.mps | 16 +- .../jetbrains/mps/console/tool/dependencies | 6 +- .../jetbrains/mps/console/tool/generated | 2 +- .../mps/console/tool/BaseConsoleTab.java | 6 +- .../jetbrains/mps/console/tool/trace.info | 6 +- 181 files changed, 2058 insertions(+), 2951 deletions(-) delete mode 100644 plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd delete mode 100644 plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/generated rename plugins/console/lang/{command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base => blCommand/source_gen/jetbrains/mps/console/blCommand}/behavior/ConsoleHelpProvider_Behavior.java (97%) rename plugins/console/lang/{command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base => blCommand/source_gen/jetbrains/mps/console/blCommand}/behavior/ConsoleHelpProvider_BehaviorDescriptor.java (92%) rename plugins/console/lang/{command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base => blCommand/source_gen/jetbrains/mps/console/blCommand}/behavior/WithStatement_BehaviorDescriptor.java (70%) rename plugins/console/lang/{command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base => blCommand/source_gen/jetbrains/mps/console/blCommand}/editor/WithStatement_Editor.java (98%) rename plugins/console/lang/{command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base => blCommand/source_gen/jetbrains/mps/console/blCommand}/typesystem/typeof_ScopeProvider_InferenceRule.java (90%) rename plugins/console/{jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base => lang/blCommandRuntime/models/jetbrains/mps/console/blCommand}/runtime.mps (93%) rename plugins/console/{jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base => lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand}/runtime/dependencies (55%) create mode 100644 plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated rename plugins/console/{jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base => lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand}/runtime/CommandOutputWindow.java (65%) rename plugins/console/{jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base => lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand}/runtime/ConsoleContext.java (84%) rename plugins/console/{jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base => lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand}/runtime/ConsoleStream.java (89%) rename plugins/console/{jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base => lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand}/runtime/trace.info (80%) delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/dependencies delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/generated delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/QueriesGenerated.java delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/trace.info delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/models/behavior.mps delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/models/constraints.mps delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/models/editor.mps delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/models/structure.mps delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/models/typesystem.mps delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/dependencies delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/generated delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/dependencies delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/generated delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/dependencies delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/dependencies delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/generated delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/generated delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/dependencies delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/generated delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/dependencies delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/generated delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/Language.java delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/BehaviorAspectDescriptor.java delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/trace.info delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/constraints/trace.info delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/EditorAspectDescriptorImpl.java delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/trace.info delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/StructureAspectDescriptor.java delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/trace.info delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/trace.info delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/TypesystemDescriptor.java delete mode 100644 plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/trace.info delete mode 100644 plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/Execute_Behavior.java diff --git a/.mps/modules.xml b/.mps/modules.xml index e291ea8fa7d1..ca214466c357 100644 --- a/.mps/modules.xml +++ b/.mps/modules.xml @@ -147,13 +147,11 @@ - - diff --git a/plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd b/plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd deleted file mode 100644 index 65a37b1fdfc5..000000000000 --- a/plugins/console/jetbrains.mps.command.base.runtime/jetbrains.mps.command.base.runtime.msd +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - - - - - - - - - - diff --git a/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/generated b/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/generated deleted file mode 100644 index 69b2f68a888f..000000000000 --- a/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/console/jetbrains.mps.console.msd b/plugins/console/jetbrains.mps.console.msd index 3c5e77f77281..fb0d2ffb7bac 100644 --- a/plugins/console/jetbrains.mps.console.msd +++ b/plugins/console/jetbrains.mps.console.msd @@ -26,7 +26,7 @@ f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets) a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime) df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources) - 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated index 6980a6f8b2ef..db11d1ae6efb 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index baa8db904893..13d8c6f19c20 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -21,6 +21,7 @@ + @@ -205,7 +206,7 @@ - + @@ -228,14 +229,14 @@ - + - + @@ -279,7 +280,7 @@ - + diff --git a/plugins/console/lang/base/jetbrains.mps.console.base.mpl b/plugins/console/lang/base/jetbrains.mps.console.base.mpl index aedff3d23128..fc11edf987fb 100644 --- a/plugins/console/lang/base/jetbrains.mps.console.base.mpl +++ b/plugins/console/lang/base/jetbrains.mps.console.base.mpl @@ -3,7 +3,7 @@ - + @@ -20,7 +20,6 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) - 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) @@ -61,8 +60,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - cb3c6536-cd62-4d95-8529-4a37cbf14855(jetbrains.mps.command.base) - 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -97,6 +95,7 @@ 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) + 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index 343afbae60e4..11c49ef6f57b 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -29,13 +29,13 @@ - - + + - + @@ -375,14 +375,14 @@ - + - + @@ -436,7 +436,7 @@ - + @@ -463,7 +463,7 @@ - + @@ -1185,13 +1185,13 @@ - + - + @@ -1215,7 +1215,7 @@ - + @@ -1304,7 +1304,7 @@ - + @@ -1326,13 +1326,13 @@ - + - + @@ -1359,13 +1359,13 @@ - + - + @@ -1435,7 +1435,7 @@ - + @@ -1444,7 +1444,7 @@ - + @@ -1455,7 +1455,7 @@ - + @@ -1517,7 +1517,7 @@ - + @@ -1541,7 +1541,7 @@ - + @@ -1587,13 +1587,13 @@ - + - + @@ -1629,7 +1629,7 @@ - + @@ -1637,7 +1637,7 @@ - + @@ -1687,7 +1687,7 @@ - + @@ -1695,7 +1695,7 @@ - + @@ -1749,7 +1749,7 @@ - + @@ -2140,7 +2140,7 @@ - + @@ -2153,7 +2153,7 @@ - + @@ -2189,11 +2189,11 @@ - + - + @@ -2222,7 +2222,7 @@ - + @@ -2237,7 +2237,7 @@ - + @@ -2248,7 +2248,7 @@ - + @@ -2260,7 +2260,7 @@ - + @@ -2279,7 +2279,7 @@ - + @@ -2311,7 +2311,7 @@ - + @@ -2348,7 +2348,7 @@ - + @@ -2358,13 +2358,13 @@ - + - + @@ -2374,7 +2374,7 @@ - + @@ -2388,7 +2388,7 @@ - + @@ -2656,7 +2656,7 @@ - + @@ -2670,7 +2670,7 @@ - + @@ -2692,7 +2692,7 @@ - + @@ -2706,7 +2706,7 @@ - + diff --git a/plugins/console/lang/base/languageModels/constraints.mps b/plugins/console/lang/base/languageModels/constraints.mps index 20b129867963..a969110d6748 100644 --- a/plugins/console/lang/base/languageModels/constraints.mps +++ b/plugins/console/lang/base/languageModels/constraints.mps @@ -17,8 +17,8 @@ - - + + @@ -257,12 +257,12 @@ - + - + @@ -300,7 +300,7 @@ - + @@ -308,14 +308,14 @@ - + - + diff --git a/plugins/console/lang/base/languageModels/structure.mps b/plugins/console/lang/base/languageModels/structure.mps index 881efb57b336..57f453df1ded 100644 --- a/plugins/console/lang/base/languageModels/structure.mps +++ b/plugins/console/lang/base/languageModels/structure.mps @@ -7,7 +7,7 @@ - + @@ -146,7 +146,7 @@ - + @@ -194,7 +194,7 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies index 443475c7e1a9..db6e9d00d1ca 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies @@ -95,11 +95,11 @@ - - - - + + + + @@ -144,8 +144,8 @@ - - + + @@ -160,10 +160,10 @@ - - + + @@ -179,8 +179,8 @@ - - + + @@ -205,12 +205,12 @@ - - - - + + + + @@ -262,8 +262,8 @@ - - + + @@ -271,10 +271,10 @@ - - + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated index dc4d734199ea..dc99b01edb34 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated index a4564892ba0b..13d35b033332 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated index b1875a209327..139e2a1cee80 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated index 0ded7dcd2a7a..6dfd8a209ba0 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java index 74ec0822d6d3..de38637264d6 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java @@ -36,7 +36,7 @@ public SLanguageId getId() { } @Override protected String[] getExtendedLanguageIDs() { - return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.baseLanguage"}; + return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.baseLanguage", "jetbrains.mps.console.blCommand"}; } @Override public Collection getGenerators() { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java index 057590c4ce67..515a7327c6de 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java @@ -3,12 +3,12 @@ /*Generated by MPS */ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; -import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_BehaviorDescriptor; +import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_Behavior; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; public abstract class Command_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements ConsoleHelpProvider_BehaviorDescriptor { public Command_BehaviorDescriptor() { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java index a58ee6caae13..343005256b29 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import com.intellij.openapi.application.ApplicationManager; import org.jetbrains.mps.openapi.model.SModel; import jetbrains.mps.console.tool.BaseConsoleTab; diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_BehaviorDescriptor.java index ab45434f11d7..ec805edc98c7 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_BehaviorDescriptor.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; public abstract class GeneratedCommand_BehaviorDescriptor extends Command_BehaviorDescriptor { public GeneratedCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java index 7fd3d8c71ba3..7d8e6db581d0 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; import jetbrains.mps.internal.collections.runtime.ListSequence; @@ -34,7 +34,7 @@ public static void init(SNode thisNode) { } public static void virtual_doExecute_3321948346081469500(SNode thisNode, ConsoleContext context, ConsoleStream console) { if ((SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")) == null)) { - Iterable constructions = ListSequence.fromList(SConceptOperations.getAllSubConcepts(MetaAdapterFactory.getInterfaceConcept(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x690b986730edd07L, "jetbrains.mps.command.base.structure.ConsoleHelpProvider").getDeclarationNode(), ((BaseConsoleTab) context.getOutputWindow()).getConsoleModel())).where(new IWhereFilter() { + Iterable constructions = ListSequence.fromList(SConceptOperations.getAllSubConcepts(MetaAdapterFactory.getInterfaceConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L, "jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider").getDeclarationNode(), ((BaseConsoleTab) context.getOutputWindow()).getConsoleModel())).where(new IWhereFilter() { public boolean accept(SNode it) { return SNodeOperations.isInstanceOf(SNodeOperations.asNode(it), MetaAdapterFactory.getConcept(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0xf979ba0450L, "jetbrains.mps.lang.structure.structure.ConceptDeclaration")) && AbstractConceptDeclaration_Behavior.call_isDefaultSubstitutable_7429110134803670673(SNodeOperations.asNode(it)); } @@ -108,7 +108,7 @@ public Integer combine(Integer it, Integer s) { } console.addText("Constructions available in console:\n\n"); console.addText(output.toString()); - } else if (AbstractConceptDeclaration_Behavior.call_isSubconceptOf_8134325418312549386(SLinkOperations.getTarget(SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")), MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L, 0x60279080c2f3f8d6L, "command")), SNodeOperations.getNode("r:9ec1d3e7-df4d-441e-8024-73530d64d324(jetbrains.mps.command.base.structure)", "473081947981012231"))) { + } else if (AbstractConceptDeclaration_Behavior.call_isSubconceptOf_8134325418312549386(SLinkOperations.getTarget(SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")), MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L, 0x60279080c2f3f8d6L, "command")), SNodeOperations.getNode("r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)", "473081947981012231"))) { String helpPage; try { SNode chp = (SNode) (SNode) SLinkOperations.getTarget(SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")), MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L, 0x60279080c2f3f8d6L, "command")); diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java index b737c2e40951..b7430011cf05 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java @@ -2,12 +2,12 @@ /*Generated by MPS */ -import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_BehaviorDescriptor; +import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_Behavior; public class HelpCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements ConsoleHelpProvider_BehaviorDescriptor { public HelpCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_Behavior.java index 001b20467439..81d896d1839f 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_Behavior.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import jetbrains.mps.smodel.behaviour.BehaviorReflection; public class InterpretedCommand_Behavior { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_BehaviorDescriptor.java index 63fb74a15901..dcf5a11c137a 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_BehaviorDescriptor.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; public abstract class InterpretedCommand_BehaviorDescriptor extends Command_BehaviorDescriptor { public InterpretedCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info index 180da2b61c2d..33d12a8c784e 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info @@ -132,7 +132,7 @@ - + @@ -315,7 +315,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -471,7 +471,7 @@ - + @@ -575,7 +575,7 @@ - + @@ -597,7 +597,7 @@ - + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java index f2863ae3f703..3eb7ce2757e1 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java @@ -56,7 +56,7 @@ public SNodeReference getSearchScopeValidatorNode() { } @Override public Scope createScope(final IOperationContext operationContext, final ReferenceConstraintsContext _context) { - return new FilteringScope(new SubconceptsScope(MetaAdapterFactory.getInterfaceConcept(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x690b986730edd07L, "jetbrains.mps.command.base.structure.ConsoleHelpProvider").getDeclarationNode(), _context.getModel()) { + return new FilteringScope(new SubconceptsScope(MetaAdapterFactory.getInterfaceConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L, "jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider").getDeclarationNode(), _context.getModel()) { public String getName(SNode child) { return BehaviorReflection.invokeVirtualStatic(String.class, SNodeOperations.asSConcept(((SNode) child)), "virtual_getShortDisplayString_7006261637493126103", new Object[]{}); } diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java index fbe817ea37e4..51113e9e293e 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java @@ -14,12 +14,12 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { /*package*/ final ConceptDescriptor myConceptBLCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.BLCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L)).super_("jetbrains.mps.console.base.structure.GeneratedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).parents("jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.baseLanguage.structure.IMethodLike", "jetbrains.mps.baseLanguage.structure.IStatementListContainer").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L), MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x1208f458d37L), MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11750ef8265L)).childDescriptors(new ConceptDescriptorBuilder.Link(1769790395579689573L, "body", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false)).children(new String[]{"body"}, new boolean[]{false}).alias("{", "baseLanguage statements").create(); /*package*/ final ConceptDescriptor myConceptBLExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.BLExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L)).super_("jetbrains.mps.console.base.structure.GeneratedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).parents("jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.lang.core.structure.IWrapper").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x11c6fd75034L)).childDescriptors(new ConceptDescriptorBuilder.Link(7656298970878093890L, "expression", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"expression"}, new boolean[]{false}).alias("", "baseLanguage expression").create(); - /*package*/ final ConceptDescriptor myConceptCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.Command", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.command.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x690b986730edd07L)).abstract_().create(); + /*package*/ final ConceptDescriptor myConceptCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.Command", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).abstract_().create(); /*package*/ final ConceptDescriptor myConceptCommandHolder = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.CommandHolder", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.lang.core.structure.INamedConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L)).childDescriptors(new ConceptDescriptorBuilder.Link(351968380916615460L, "command", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL), true, false, false)).children(new String[]{"command"}, new boolean[]{false}).create(); /*package*/ final ConceptDescriptor myConceptConsoleRoot = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ConsoleRoot", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).childDescriptors(new ConceptDescriptorBuilder.Link(1583916890557930415L, "history", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xa835f28c1aa02beL), false, false, false), new ConceptDescriptorBuilder.Link(1583916890557930417L, "commandHolder", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL), false, false, false)).children(new String[]{"history", "commandHolder"}, new boolean[]{false, false}).create(); /*package*/ final ConceptDescriptor myConceptExceptionHolder = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ExceptionHolder", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.IClickable").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L)).propertyDescriptors(new ConceptDescriptorBuilder.Prop(6558068108108282025L, "stackTrace")).properties("stackTrace").create(); /*package*/ final ConceptDescriptor myConceptGeneratedCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.GeneratedCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).super_("jetbrains.mps.console.base.structure.Command").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).parents("jetbrains.mps.console.base.structure.Command").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).abstract_().create(); - /*package*/ final ConceptDescriptor myConceptHelpCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HelpCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.command.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x690b986730edd07L)).childDescriptors(new ConceptDescriptorBuilder.Link(6928665434433788203L, "target", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L), true, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("?", "help").create(); + /*package*/ final ConceptDescriptor myConceptHelpCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HelpCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).childDescriptors(new ConceptDescriptorBuilder.Link(6928665434433788203L, "target", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L), true, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("?", "help").create(); /*package*/ final ConceptDescriptor myConceptHelpConceptReference = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HelpConceptReference", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(6928665434433779926L, "command", MetaIdFactory.conceptId(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0xf979ba0450L), false)).references("command").create(); /*package*/ final ConceptDescriptor myConceptHistory = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.History", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xa835f28c1aa02beL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).childDescriptors(new ConceptDescriptorBuilder.Link(7195119950189425818L, "item", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL), true, true, false)).children(new String[]{"item"}, new boolean[]{true}).create(); /*package*/ final ConceptDescriptor myConceptHistoryItem = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HistoryItem", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL)).interface_().create(); diff --git a/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated b/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated index a3448f4fa1ff..e7b584657931 100644 --- a/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated +++ b/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java b/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java index 41d0c42b1445..7f9efc552348 100644 --- a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java +++ b/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java @@ -217,12 +217,18 @@ public static SNode sourceNodeQuery_9010839353952788840(final SourceSubstituteMa public static SNode sourceNodeQuery_3492877759612269969(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, 0x307931d0f985950eL, "scope")); } + public static SNode sourceNodeQuery_1964420931776208395(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope")); + } public static Iterable sourceNodesQuery_6134217374019191580(final SourceSubstituteMacroNodesContext _context) { return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL, 0x307931d0f952484fL, "model")); } public static Iterable sourceNodesQuery_3492877759611137837(final SourceSubstituteMacroNodesContext _context) { return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL, 0x307931d0f94af768L, "module")); } + public static Iterable sourceNodesQuery_1964420931776045744(final SourceSubstituteMacroNodesContext _context) { + return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement")); + } private static SNode _quotation_createNode_x583g4_b0a0a0() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; diff --git a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info b/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info index c664482fea6d..c741fb74e4d6 100644 --- a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info +++ b/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info @@ -9,7 +9,7 @@ - + @@ -27,76 +27,76 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -105,34 +105,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -142,70 +142,70 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + @@ -214,16 +214,24 @@ + + + + + + + + - - + + - - + + @@ -239,40 +247,40 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + @@ -282,24 +290,24 @@ - + - + - + - - - + + + @@ -358,69 +366,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -429,56 +437,56 @@ - - + + - - - - - - - - + + + + + + + + - + - - - - + + + + - + - + - + - - - - + + + + @@ -508,174 +516,174 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -692,66 +700,66 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -769,158 +777,158 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index fc3dfaae75e0..414550755588 100644 --- a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -8,6 +8,7 @@ + @@ -21,7 +22,9 @@ - + + + @@ -45,10 +48,16 @@ + + + + + + @@ -67,6 +76,9 @@ + + + @@ -122,6 +134,9 @@ + + + @@ -299,6 +314,12 @@ + + + + + + @@ -420,13 +441,13 @@ - + - + @@ -438,7 +459,7 @@ - + @@ -477,13 +498,13 @@ - + - + @@ -497,7 +518,7 @@ - + @@ -663,7 +684,7 @@ - + @@ -808,13 +829,13 @@ - + - + @@ -880,13 +901,13 @@ - + - + @@ -953,13 +974,13 @@ - + - + @@ -970,7 +991,7 @@ - + @@ -992,13 +1013,13 @@ - + - + @@ -1008,7 +1029,7 @@ - + @@ -1053,13 +1074,13 @@ - + - + @@ -1080,7 +1101,7 @@ - + @@ -1123,13 +1144,13 @@ - + - + @@ -1179,13 +1200,13 @@ - + - + @@ -1235,13 +1256,13 @@ - + - + @@ -1291,13 +1312,13 @@ - + - + @@ -1347,13 +1368,13 @@ - + - + @@ -1546,13 +1567,13 @@ - + - + @@ -1582,13 +1603,13 @@ - + - + @@ -1602,7 +1623,7 @@ - + @@ -1981,13 +2002,13 @@ - + - + @@ -2009,7 +2030,7 @@ - + @@ -2024,7 +2045,7 @@ - + @@ -2569,13 +2590,13 @@ - + - + @@ -2629,13 +2650,13 @@ - + - + @@ -2677,13 +2698,13 @@ - + - + @@ -2724,5 +2745,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl index 96a6aa327141..1eef1cdf4239 100644 --- a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl +++ b/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl @@ -24,7 +24,9 @@ 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696) - 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -37,7 +39,6 @@ - @@ -135,7 +136,6 @@ ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples) - cb3c6536-cd62-4d95-8529-4a37cbf14855(jetbrains.mps.command.base) diff --git a/plugins/console/lang/blCommand/languageModels/behavior.mps b/plugins/console/lang/blCommand/languageModels/behavior.mps index 9fc11c04bf3a..cd3c240d9daf 100644 --- a/plugins/console/lang/blCommand/languageModels/behavior.mps +++ b/plugins/console/lang/blCommand/languageModels/behavior.mps @@ -8,7 +8,10 @@ - + + + + @@ -38,6 +41,7 @@ + @@ -60,6 +64,7 @@ + @@ -103,6 +108,14 @@ + + + + + + + + @@ -172,7 +185,7 @@ - + @@ -180,7 +193,7 @@ - + @@ -196,7 +209,7 @@ - + @@ -207,7 +220,7 @@ - + @@ -254,7 +267,7 @@ - + @@ -347,7 +360,7 @@ - + @@ -356,7 +369,7 @@ - + @@ -552,7 +565,7 @@ - + @@ -560,7 +573,7 @@ - + @@ -576,7 +589,7 @@ - + @@ -587,7 +600,7 @@ - + @@ -683,7 +696,7 @@ - + @@ -730,7 +743,7 @@ - + @@ -753,7 +766,7 @@ - + @@ -776,7 +789,7 @@ - + @@ -788,5 +801,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/languageModels/editor.mps b/plugins/console/lang/blCommand/languageModels/editor.mps index 2b77bc3a0e47..061a0942a372 100644 --- a/plugins/console/lang/blCommand/languageModels/editor.mps +++ b/plugins/console/lang/blCommand/languageModels/editor.mps @@ -20,11 +20,16 @@ + + + + + @@ -1001,5 +1006,26 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/languageModels/structure.mps b/plugins/console/lang/blCommand/languageModels/structure.mps index 863710f54948..a4d2ba988669 100644 --- a/plugins/console/lang/blCommand/languageModels/structure.mps +++ b/plugins/console/lang/blCommand/languageModels/structure.mps @@ -8,7 +8,6 @@ - @@ -288,14 +287,36 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/languageModels/typesystem.mps b/plugins/console/lang/blCommand/languageModels/typesystem.mps index 0a1c8afd012b..f726f6a63a95 100644 --- a/plugins/console/lang/blCommand/languageModels/typesystem.mps +++ b/plugins/console/lang/blCommand/languageModels/typesystem.mps @@ -1196,5 +1196,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies index 5908427cb04e..3b4179dc3073 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies @@ -36,6 +36,7 @@ + @@ -46,16 +47,31 @@ - + + + + + + + + + + + + + + + + - + @@ -166,10 +182,10 @@ - + @@ -238,9 +254,9 @@ - + @@ -304,9 +320,9 @@ - + @@ -334,5 +350,11 @@ + + + + + + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated index fe2efd683ecb..74a2ab32aa6c 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies index b07bce969959..212854a480ad 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies @@ -73,6 +73,7 @@ + @@ -349,5 +350,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated index 4e2afe88f5e0..aa7685b8ad53 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated index a74fcf79ad32..bb911da4bd0c 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated index 559f2860f0f7..6a14b08eceda 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies index e79de1021e4c..07f9e7a0f692 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies @@ -17,6 +17,7 @@ + @@ -247,6 +248,20 @@ + + + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated index 2d87085934d8..3e30491005f8 100644 --- a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated +++ b/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/Language.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/Language.java index 2e5ebfa1755d..17aa5542df5e 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/Language.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/Language.java @@ -38,7 +38,7 @@ public SLanguageId getId() { } @Override protected String[] getExtendedLanguageIDs() { - return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.baseLanguage", "jetbrains.mps.baseLanguage.tuples", "jetbrains.mps.command.base"}; + return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.baseLanguage", "jetbrains.mps.baseLanguage.tuples"}; } @Override public Collection getGenerators() { diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java index a7c7b6d06925..f3630dbe4f3a 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java @@ -53,9 +53,11 @@ public BehaviorDescriptor getDescriptor(String fqName) { return new ModelScope_BehaviorDescriptor(); case 0: return new CustomScope_BehaviorDescriptor(); + case 21: + return new WithStatement_BehaviorDescriptor(); default: return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName); } } - private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.GlobalScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModelsExpression", "jetbrains.mps.console.blCommand.structure.ModulesExpression", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.NodesExpression", "jetbrains.mps.console.blCommand.structure.PrintExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression", "jetbrains.mps.console.blCommand.structure.PrintTextExpression", "jetbrains.mps.console.blCommand.structure.ProjectExpression", "jetbrains.mps.console.blCommand.structure.ProjectScope", "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ReferencesExpression", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression"}; + private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.GlobalScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModelsExpression", "jetbrains.mps.console.blCommand.structure.ModulesExpression", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.NodesExpression", "jetbrains.mps.console.blCommand.structure.PrintExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression", "jetbrains.mps.console.blCommand.structure.PrintTextExpression", "jetbrains.mps.console.blCommand.structure.ProjectExpression", "jetbrains.mps.console.blCommand.structure.ProjectScope", "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ReferencesExpression", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression", "jetbrains.mps.console.blCommand.structure.WithStatement"}; } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java index d99349412ef8..791abba8dc35 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java @@ -2,7 +2,6 @@ /*Generated by MPS */ -import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_BehaviorDescriptor; public interface ConsoleExpression_BehaviorDescriptor extends ConsoleHelpProvider_BehaviorDescriptor { } diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/ConsoleHelpProvider_Behavior.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_Behavior.java similarity index 97% rename from plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/ConsoleHelpProvider_Behavior.java rename to plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_Behavior.java index dd4134e6a31d..be7fbb6f9120 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/ConsoleHelpProvider_Behavior.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_Behavior.java @@ -1,4 +1,4 @@ -package jetbrains.mps.command.base.behavior; +package jetbrains.mps.console.blCommand.behavior; /*Generated by MPS */ diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/ConsoleHelpProvider_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_BehaviorDescriptor.java similarity index 92% rename from plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/ConsoleHelpProvider_BehaviorDescriptor.java rename to plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_BehaviorDescriptor.java index 48df193a3324..16d722611ef7 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/ConsoleHelpProvider_BehaviorDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_BehaviorDescriptor.java @@ -1,4 +1,4 @@ -package jetbrains.mps.command.base.behavior; +package jetbrains.mps.console.blCommand.behavior; /*Generated by MPS */ diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java index 425b6b8a702d..9b43fc56d583 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java @@ -2,7 +2,6 @@ /*Generated by MPS */ -import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_BehaviorDescriptor; public interface ConsoleOperation_BehaviorDescriptor extends ConsoleHelpProvider_BehaviorDescriptor { } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java index 714c052b2f71..cb21a7958b15 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java @@ -3,7 +3,6 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; public class PrintExpression_BehaviorDescriptor extends AbstractPrintExpression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor { public PrintExpression_BehaviorDescriptor() { diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java index b4bce134c393..d78d4b5b97b9 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java @@ -4,7 +4,6 @@ import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; import org.jetbrains.mps.openapi.model.SNode; public abstract class QueryExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor { diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java index ef1723732cc5..239ae177735c 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java @@ -4,7 +4,6 @@ import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; public class ShowExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor { public ShowExpression_BehaviorDescriptor() { diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/WithStatement_BehaviorDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java similarity index 70% rename from plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/WithStatement_BehaviorDescriptor.java rename to plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java index dfb8ffeee90c..ecf6c6714ca9 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/WithStatement_BehaviorDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java @@ -1,4 +1,4 @@ -package jetbrains.mps.command.base.behavior; +package jetbrains.mps.console.blCommand.behavior; /*Generated by MPS */ @@ -9,6 +9,6 @@ public WithStatement_BehaviorDescriptor() { } @Override public String getConceptFqName() { - return "jetbrains.mps.command.base.structure.WithStatement"; + return "jetbrains.mps.console.blCommand.structure.WithStatement"; } } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info index 867021268c32..3555e74e0ea6 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info @@ -11,13 +11,16 @@ - + - + + + + - + @@ -44,7 +47,7 @@ - + @@ -65,7 +68,7 @@ - + @@ -86,11 +89,14 @@ - + + + + @@ -298,6 +304,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java index f697d15bf7a8..77833b52ecac 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java @@ -38,6 +38,8 @@ public Collection getEditors(ConceptDescriptor descriptor) { return Collections.singletonList(new ShowExpression_Editor()); case 11: return Collections.singletonList(new UsagesExpression_Editor()); + case 12: + return Collections.singletonList(new WithStatement_Editor()); default: } return Collections.emptyList(); @@ -55,6 +57,6 @@ public Collection getEditorComponents(ConceptDescriptor } - private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", "jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.QueryExpression", "jetbrains.mps.console.blCommand.structure.QueryParameter", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ScopeParameter", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression"}; + private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", "jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.QueryExpression", "jetbrains.mps.console.blCommand.structure.QueryParameter", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ScopeParameter", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression", "jetbrains.mps.console.blCommand.structure.WithStatement"}; private static String[] stringSwitchCases_xbvbvu_a0a0c = new String[]{"jetbrains.mps.console.blCommand.structure.QueryExpression"}; } diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/WithStatement_Editor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java similarity index 98% rename from plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/WithStatement_Editor.java rename to plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java index 98ccdcffb93a..4b2c16c1332d 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/WithStatement_Editor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java @@ -1,4 +1,4 @@ -package jetbrains.mps.command.base.editor; +package jetbrains.mps.console.blCommand.editor; /*Generated by MPS */ @@ -67,7 +67,7 @@ private EditorCell createConstant_4f6do1_a0a0(EditorContext editorContext, SNode return editorCell; } private EditorCell createRefNode_4f6do1_b0a0(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new WithStatement_Editor.scopeSingleRoleHandler_4f6do1_b0a0(node, MetaAdapterFactory.getContainmentLink(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope"), editorContext); + SingleRoleCellProvider provider = new WithStatement_Editor.scopeSingleRoleHandler_4f6do1_b0a0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope"), editorContext); return provider.createCell(); } private class scopeSingleRoleHandler_4f6do1_b0a0 extends SingleRoleCellProvider { @@ -135,7 +135,7 @@ private EditorCell createIndentCell_4f6do1_a1a(EditorContext editorContext, SNod return editorCell; } private EditorCell createRefNode_4f6do1_b1a(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new WithStatement_Editor.stmtsSingleRoleHandler_4f6do1_b1a(node, MetaAdapterFactory.getContainmentLink(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts"), editorContext); + SingleRoleCellProvider provider = new WithStatement_Editor.stmtsSingleRoleHandler_4f6do1_b1a(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts"), editorContext); return provider.createCell(); } private class stmtsSingleRoleHandler_4f6do1_b1a extends SingleRoleCellProvider { diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/trace.info b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/trace.info index 313ad41d7d5a..b8b2ce3c2bda 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/trace.info +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/trace.info @@ -13,7 +13,7 @@ - + @@ -698,6 +698,300 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java index e2eca83bef3d..15b285a82342 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java @@ -13,8 +13,9 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { /*package*/ final ConceptDescriptor myConceptAbstractPrintExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).childDescriptors(new ConceptDescriptorBuilder.Link(8365379837260461921L, "object", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"object"}, new boolean[]{false}).abstract_().create(); - /*package*/ final ConceptDescriptor myConceptConsoleExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ConsoleExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).interface_().parents("jetbrains.mps.command.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x690b986730edd07L)).create(); - /*package*/ final ConceptDescriptor myConceptConsoleOperation = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ConsoleOperation", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).interface_().parents("jetbrains.mps.command.base.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x690b986730edd07L)).create(); + /*package*/ final ConceptDescriptor myConceptConsoleExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ConsoleExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).interface_().parents("jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).create(); + /*package*/ final ConceptDescriptor myConceptConsoleHelpProvider = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).interface_().create(); + /*package*/ final ConceptDescriptor myConceptConsoleOperation = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ConsoleOperation", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).interface_().parents("jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).create(); /*package*/ final ConceptDescriptor myConceptCustomScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.CustomScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759611770126L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"scope"}, new boolean[]{false}).alias("custom", "? extends SearchScope").create(); /*package*/ final ConceptDescriptor myConceptGlobalScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.GlobalScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add42L)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).alias("global", "").create(); /*package*/ final ConceptDescriptor myConceptInstancesExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.InstancesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(7738379549910147342L, "conceptArg", MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x118f285e4f7L), false, false, false)).children(new String[]{"conceptArg"}, new boolean[]{false}).alias("#instances", "instances of a concept in scope").create(); @@ -39,73 +40,78 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { /*package*/ final ConceptDescriptor myConceptScopeParameter = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ScopeParameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).abstract_().create(); /*package*/ final ConceptDescriptor myConceptShowExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ShowExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).childDescriptors(new ConceptDescriptorBuilder.Link(7600370246423275637L, "object", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"object"}, new boolean[]{false}).alias("#show", "show in usage view").create(); /*package*/ final ConceptDescriptor myConceptUsagesExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.UsagesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(8483375838963816172L, "node", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"node"}, new boolean[]{false}).alias("#usages", "direct references to a node in scope").create(); + /*package*/ final ConceptDescriptor myConceptWithStatement = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.WithStatement", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL)).super_("jetbrains.mps.baseLanguage.structure.Statement").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).parents("jetbrains.mps.baseLanguage.structure.Statement").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).childDescriptors(new ConceptDescriptorBuilder.Link(4234138103881610892L, "stmts", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false), new ConceptDescriptorBuilder.Link(4234138103881610935L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"stmts", "scope"}, new boolean[]{false, false}).alias("with", "").create(); @Override public Collection getDescriptors() { - return Arrays.asList(myConceptAbstractPrintExpression, myConceptConsoleExpression, myConceptConsoleOperation, myConceptCustomScope, myConceptGlobalScope, myConceptInstancesExpression, myConceptModelScope, myConceptModelsExpression, myConceptModulesExpression, myConceptModulesScope, myConceptNodesExpression, myConceptPrintExpression, myConceptPrintNodeExpression, myConceptPrintNodeReferenceExpression, myConceptPrintSequenceExpression, myConceptPrintTextExpression, myConceptProjectExpression, myConceptProjectScope, myConceptQueryExpression, myConceptQueryParameter, myConceptQueryParameterIncludeReadOnly, myConceptQueryParameterList, myConceptQueryParameterScope, myConceptReferencesExpression, myConceptScopeParameter, myConceptShowExpression, myConceptUsagesExpression); + return Arrays.asList(myConceptAbstractPrintExpression, myConceptConsoleExpression, myConceptConsoleHelpProvider, myConceptConsoleOperation, myConceptCustomScope, myConceptGlobalScope, myConceptInstancesExpression, myConceptModelScope, myConceptModelsExpression, myConceptModulesExpression, myConceptModulesScope, myConceptNodesExpression, myConceptPrintExpression, myConceptPrintNodeExpression, myConceptPrintNodeReferenceExpression, myConceptPrintSequenceExpression, myConceptPrintTextExpression, myConceptProjectExpression, myConceptProjectScope, myConceptQueryExpression, myConceptQueryParameter, myConceptQueryParameterIncludeReadOnly, myConceptQueryParameterList, myConceptQueryParameterScope, myConceptReferencesExpression, myConceptScopeParameter, myConceptShowExpression, myConceptUsagesExpression, myConceptWithStatement); } @Override @Nullable public ConceptDescriptor getDescriptor(String conceptFqName) { - switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0fb, conceptFqName)) { + switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0hb, conceptFqName)) { case 0: return myConceptAbstractPrintExpression; case 1: return myConceptConsoleExpression; case 2: - return myConceptConsoleOperation; + return myConceptConsoleHelpProvider; case 3: - return myConceptCustomScope; + return myConceptConsoleOperation; case 4: - return myConceptGlobalScope; + return myConceptCustomScope; case 5: - return myConceptInstancesExpression; + return myConceptGlobalScope; case 6: - return myConceptModelScope; + return myConceptInstancesExpression; case 7: - return myConceptModelsExpression; + return myConceptModelScope; case 8: - return myConceptModulesExpression; + return myConceptModelsExpression; case 9: - return myConceptModulesScope; + return myConceptModulesExpression; case 10: - return myConceptNodesExpression; + return myConceptModulesScope; case 11: - return myConceptPrintExpression; + return myConceptNodesExpression; case 12: - return myConceptPrintNodeExpression; + return myConceptPrintExpression; case 13: - return myConceptPrintNodeReferenceExpression; + return myConceptPrintNodeExpression; case 14: - return myConceptPrintSequenceExpression; + return myConceptPrintNodeReferenceExpression; case 15: - return myConceptPrintTextExpression; + return myConceptPrintSequenceExpression; case 16: - return myConceptProjectExpression; + return myConceptPrintTextExpression; case 17: - return myConceptProjectScope; + return myConceptProjectExpression; case 18: - return myConceptQueryExpression; + return myConceptProjectScope; case 19: - return myConceptQueryParameter; + return myConceptQueryExpression; case 20: - return myConceptQueryParameterIncludeReadOnly; + return myConceptQueryParameter; case 21: - return myConceptQueryParameterList; + return myConceptQueryParameterIncludeReadOnly; case 22: - return myConceptQueryParameterScope; + return myConceptQueryParameterList; case 23: - return myConceptReferencesExpression; + return myConceptQueryParameterScope; case 24: - return myConceptScopeParameter; + return myConceptReferencesExpression; case 25: - return myConceptShowExpression; + return myConceptScopeParameter; case 26: + return myConceptShowExpression; + case 27: return myConceptUsagesExpression; + case 28: + return myConceptWithStatement; default: return null; } } - private static String[] stringSwitchCases_1htk8d_a0a0fb = new String[]{"jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression", "jetbrains.mps.console.blCommand.structure.ConsoleOperation", "jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.GlobalScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModelsExpression", "jetbrains.mps.console.blCommand.structure.ModulesExpression", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.NodesExpression", "jetbrains.mps.console.blCommand.structure.PrintExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression", "jetbrains.mps.console.blCommand.structure.PrintTextExpression", "jetbrains.mps.console.blCommand.structure.ProjectExpression", "jetbrains.mps.console.blCommand.structure.ProjectScope", "jetbrains.mps.console.blCommand.structure.QueryExpression", "jetbrains.mps.console.blCommand.structure.QueryParameter", "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ReferencesExpression", "jetbrains.mps.console.blCommand.structure.ScopeParameter", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression"}; + private static String[] stringSwitchCases_1htk8d_a0a0hb = new String[]{"jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression", "jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider", "jetbrains.mps.console.blCommand.structure.ConsoleOperation", "jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.GlobalScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModelsExpression", "jetbrains.mps.console.blCommand.structure.ModulesExpression", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.NodesExpression", "jetbrains.mps.console.blCommand.structure.PrintExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression", "jetbrains.mps.console.blCommand.structure.PrintTextExpression", "jetbrains.mps.console.blCommand.structure.ProjectExpression", "jetbrains.mps.console.blCommand.structure.ProjectScope", "jetbrains.mps.console.blCommand.structure.QueryExpression", "jetbrains.mps.console.blCommand.structure.QueryParameter", "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ReferencesExpression", "jetbrains.mps.console.blCommand.structure.ScopeParameter", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression", "jetbrains.mps.console.blCommand.structure.WithStatement"}; } diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/trace.info b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/trace.info index fb152a972417..7eb5c59db5b8 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/trace.info +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/trace.info @@ -2,7 +2,7 @@ - + diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java index 04be71ba98bd..12bb9a68fa37 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java @@ -68,6 +68,10 @@ public TypesystemDescriptor() { InferenceRule_Runtime inferenceRule = new typeof_ReferencesExpression_InferenceRule(); this.myInferenceRules.add(inferenceRule); } + { + InferenceRule_Runtime inferenceRule = new typeof_ScopeProvider_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } { InferenceRule_Runtime inferenceRule = new typeof_ShowExpression_InferenceRule(); this.myInferenceRules.add(inferenceRule); diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info index b65df2e4c674..fd7397d8c224 100644 --- a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info @@ -12,7 +12,7 @@ - + @@ -186,6 +186,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/typeof_ScopeProvider_InferenceRule.java b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java similarity index 90% rename from plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/typeof_ScopeProvider_InferenceRule.java rename to plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java index dd767e42f82f..f5e618f5d435 100644 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/typeof_ScopeProvider_InferenceRule.java +++ b/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java @@ -1,4 +1,4 @@ -package jetbrains.mps.command.base.typesystem; +package jetbrains.mps.console.blCommand.typesystem; /*Generated by MPS */ @@ -20,13 +20,13 @@ public typeof_ScopeProvider_InferenceRule() { } public void applyRule(final SNode scopeProvider, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { { - SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(scopeProvider, MetaAdapterFactory.getContainmentLink(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope")); - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:3af60cb8-fb7a-47df-833f-08753fac85c6(jetbrains.mps.command.base.typesystem)", "4234138103881642865", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:3af60cb8-fb7a-47df-833f-08753fac85c6(jetbrains.mps.command.base.typesystem)", "4234138103881614549", true), (SNode) _quotation_createNode_jkxe46_a0a0b(), false, false, _info_12389875345); + SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(scopeProvider, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope")); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "4234138103881642865", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "4234138103881614549", true), (SNode) _quotation_createNode_jkxe46_a0a0b(), false, false, _info_12389875345); } } public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x3ac2ae2c0bcf368bL, "jetbrains.mps.command.base.structure.WithStatement"); + return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, "jetbrains.mps.console.blCommand.structure.WithStatement"); } public IsApplicableStatus isApplicableAndPattern(SNode argument) { return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); diff --git a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd b/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd index 953379388cb0..ecc2aff644d7 100644 --- a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd +++ b/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd @@ -17,7 +17,6 @@ bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) - 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) diff --git a/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime.mps similarity index 93% rename from plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps rename to plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime.mps index 398c3ec86b98..d52ce325bfaa 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/models/jetbrains/mps/command/base/runtime.mps +++ b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime.mps @@ -1,16 +1,11 @@ - + - - - - - - + - - + + @@ -58,6 +53,18 @@ + + + + + + + + + + + + @@ -156,17 +163,5 @@ - - - - - - - - - - - - diff --git a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps index fcc2d376d321..305ed00484a5 100644 --- a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps +++ b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps @@ -24,7 +24,7 @@ - + @@ -570,7 +570,7 @@ - + @@ -594,7 +594,7 @@ - + @@ -636,7 +636,7 @@ - + @@ -1206,7 +1206,7 @@ - + @@ -1259,7 +1259,7 @@ - + diff --git a/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/dependencies b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies similarity index 55% rename from plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/dependencies rename to plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies index 9ab2fb6fa0ae..0355761d0eeb 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/source_gen.caches/jetbrains/mps/command/base/runtime/dependencies +++ b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies @@ -1,12 +1,12 @@ - - - + + + - + diff --git a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated new file mode 100644 index 000000000000..4d4c9b459426 --- /dev/null +++ b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated @@ -0,0 +1,3 @@ + + + diff --git a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies index 48e586182138..7e536cef9ca4 100644 --- a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies +++ b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies @@ -11,8 +11,8 @@ - - + + diff --git a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated index 82323e2abf3e..c397765b4a62 100644 --- a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated +++ b/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/CommandOutputWindow.java b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/CommandOutputWindow.java similarity index 65% rename from plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/CommandOutputWindow.java rename to plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/CommandOutputWindow.java index 249eae002aa0..c75d73b38736 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/CommandOutputWindow.java +++ b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/CommandOutputWindow.java @@ -1,4 +1,4 @@ -package jetbrains.mps.command.base.runtime; +package jetbrains.mps.console.blCommand.runtime; /*Generated by MPS */ diff --git a/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleContext.java b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java similarity index 84% rename from plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleContext.java rename to plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java index 37bb17580b72..f3d0523b1a68 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleContext.java +++ b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java @@ -1,4 +1,4 @@ -package jetbrains.mps.command.base.runtime; +package jetbrains.mps.console.blCommand.runtime; /*Generated by MPS */ diff --git a/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleStream.java b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleStream.java similarity index 89% rename from plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleStream.java rename to plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleStream.java index cde0a67f7dfb..f8176105da12 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/ConsoleStream.java +++ b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleStream.java @@ -1,4 +1,4 @@ -package jetbrains.mps.command.base.runtime; +package jetbrains.mps.console.blCommand.runtime; /*Generated by MPS */ diff --git a/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/trace.info b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info similarity index 80% rename from plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/trace.info rename to plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info index 083a401f0b6c..ae89ea3359b9 100644 --- a/plugins/console/jetbrains.mps.command.base.runtime/source_gen/jetbrains/mps/command/base/runtime/trace.info +++ b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info @@ -1,25 +1,25 @@ - + - + - + - + - + - + @@ -42,7 +42,7 @@ - + diff --git a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java index 5b083511cbdb..2fdcaee33081 100644 --- a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java +++ b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java @@ -22,7 +22,7 @@ import jetbrains.mps.ide.findusages.model.SearchResults; import jetbrains.mps.ide.project.ProjectHelper; import org.apache.log4j.Level; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import org.jetbrains.mps.openapi.model.SNodeReference; import org.jetbrains.mps.openapi.module.SRepository; import jetbrains.mps.internal.collections.runtime.IWhereFilter; @@ -31,7 +31,7 @@ import org.jetbrains.mps.openapi.model.SModelReference; import org.jetbrains.mps.openapi.module.SModuleReference; import org.jetbrains.annotations.Nullable; -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; import jetbrains.mps.project.EditableFilteringScope; import jetbrains.mps.ide.findusages.model.scopes.ModelsScope; import jetbrains.mps.ide.findusages.model.scopes.ModulesScope; diff --git a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info index 3a7aa76c72ce..c01875bfcfa8 100644 --- a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info +++ b/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info @@ -107,7 +107,7 @@ - + @@ -133,7 +133,7 @@ - + diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/dependencies b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/dependencies deleted file mode 100644 index 9dcf0415eb1f..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/dependencies +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/generated b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/generated deleted file mode 100644 index 5844d3bff878..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen.caches/jetbrains/mps/command/base/generator/template/main/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/QueriesGenerated.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/QueriesGenerated.java deleted file mode 100644 index 83fe29a20975..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/QueriesGenerated.java +++ /dev/null @@ -1,20 +0,0 @@ -package jetbrains.mps.command.base.generator.template.main; - -/*Generated by MPS */ - -import jetbrains.mps.generator.runtime.Generated; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.generator.template.SourceSubstituteMacroNodesContext; - -@Generated -public class QueriesGenerated { - public static SNode sourceNodeQuery_1964420931776208395(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope")); - } - public static Iterable sourceNodesQuery_1964420931776045744(final SourceSubstituteMacroNodesContext _context) { - return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement")); - } -} diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/trace.info b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/trace.info deleted file mode 100644 index afc9e3b1ed7f..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/source_gen/jetbrains/mps/command/base/generator/template/main/trace.info +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps deleted file mode 100644 index 172fb72fe361..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/generator/template/main@generator.mps +++ /dev/null @@ -1,268 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl b/plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl deleted file mode 100644 index fc7f9857a549..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/jetbrains.mps.command.base.mpl +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - 504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409) - cb3c6536-cd62-4d95-8529-4a37cbf14855(jetbrains.mps.command.base) - f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) - 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) - - - fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) - - - - - - - - - - - - - - - - - - - - - - - 2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design) - - - - - - - - - - - - - - - - - - - - - - - - 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) - - - f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/behavior.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/behavior.mps deleted file mode 100644 index 9df3043c4155..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/behavior.mps +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/constraints.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/constraints.mps deleted file mode 100644 index b4a834fda417..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/constraints.mps +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/editor.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/editor.mps deleted file mode 100644 index 4402f0d9bdc3..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/editor.mps +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/structure.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/structure.mps deleted file mode 100644 index de45596c943f..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/structure.mps +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/typesystem.mps b/plugins/console/lang/command/base/jetbrains.mps.command.base/models/typesystem.mps deleted file mode 100644 index ad9a6903f847..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/models/typesystem.mps +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/dependencies b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/dependencies deleted file mode 100644 index 562e4e3dc2d3..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/dependencies +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/generated b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/generated deleted file mode 100644 index a9651072fc5b..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/behavior/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/dependencies b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/dependencies deleted file mode 100644 index 71ea00a877b6..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/dependencies +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/generated b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/generated deleted file mode 100644 index d5fdd92ea94f..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/constraints/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/dependencies b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/dependencies deleted file mode 100644 index c9acee0ff4c0..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/dependencies +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/dependencies b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/dependencies deleted file mode 100644 index bfeef467f255..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/dependencies +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/generated b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/generated deleted file mode 100644 index f39bca529899..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/editor/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/generated b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/generated deleted file mode 100644 index b83b92c3c296..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/dependencies b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/dependencies deleted file mode 100644 index 82f7d84cf5f1..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/dependencies +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/generated b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/generated deleted file mode 100644 index 31157cbc9034..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/structure/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/dependencies b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/dependencies deleted file mode 100644 index 49e37dd0ef8b..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/dependencies +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/generated b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/generated deleted file mode 100644 index 8cd6abc68dc2..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen.caches/jetbrains/mps/command/base/typesystem/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/Language.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/Language.java deleted file mode 100644 index c461d7d24fa6..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/Language.java +++ /dev/null @@ -1,62 +0,0 @@ -package jetbrains.mps.command.base; - -/*Generated by MPS */ - -import jetbrains.mps.smodel.language.LanguageRuntime; -import jetbrains.mps.smodel.adapter.ids.SLanguageId; -import java.util.UUID; -import java.util.Collection; -import jetbrains.mps.generator.runtime.TemplateModule; -import jetbrains.mps.generator.runtime.TemplateUtil; -import jetbrains.mps.smodel.runtime.ILanguageAspect; -import jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor; -import jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor; -import jetbrains.mps.command.base.editor.EditorAspectDescriptorImpl; -import jetbrains.mps.smodel.runtime.StructureAspectDescriptor; -import jetbrains.mps.lang.typesystem.runtime.IHelginsDescriptor; -import jetbrains.mps.command.base.typesystem.TypesystemDescriptor; - -public class Language extends LanguageRuntime { - public static String MODULE_REF = "cb3c6536-cd62-4d95-8529-4a37cbf14855(jetbrains.mps.command.base)"; - public Language() { - } - @Override - public String getNamespace() { - return "jetbrains.mps.command.base"; - } - - @Override - public int getVersion() { - return 0; - } - - public SLanguageId getId() { - return new SLanguageId(UUID.fromString("cb3c6536-cd62-4d95-8529-4a37cbf14855")); - } - @Override - protected String[] getExtendedLanguageIDs() { - return new String[]{"jetbrains.mps.baseLanguage"}; - } - @Override - public Collection getGenerators() { - return TemplateUtil.asCollection(TemplateUtil.createInterpretedGenerator(this, "1c94f5db-f74b-4602-bad4-ee3345457344(jetbrains.mps.command.base#6356982101392640211)")); - } - @Override - protected T createAspect(Class aspectClass) { - if (aspectClass == BehaviorAspectDescriptor.class) { - return (T) new jetbrains.mps.command.base.behavior.BehaviorAspectDescriptor(); - } - if (aspectClass == EditorAspectDescriptor.class) { - return (T) new EditorAspectDescriptorImpl(); - } - if (aspectClass == StructureAspectDescriptor.class) { - return (T) new jetbrains.mps.command.base.structure.StructureAspectDescriptor(); - } - if (aspectClass == IHelginsDescriptor.class) { - return (T) new TypesystemDescriptor(); - } - - - return super.createAspect(aspectClass); - } -} diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/BehaviorAspectDescriptor.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/BehaviorAspectDescriptor.java deleted file mode 100644 index 93f2b86298c8..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/BehaviorAspectDescriptor.java +++ /dev/null @@ -1,21 +0,0 @@ -package jetbrains.mps.command.base.behavior; - -/*Generated by MPS */ - -import jetbrains.mps.smodel.runtime.BehaviorDescriptor; -import java.util.Arrays; -import jetbrains.mps.smodel.runtime.interpreted.BehaviorAspectInterpreted; - -public class BehaviorAspectDescriptor implements jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor { - public BehaviorAspectDescriptor() { - } - public BehaviorDescriptor getDescriptor(String fqName) { - switch (Arrays.binarySearch(stringSwitchCases_846f5o_a0a0b, fqName)) { - case 0: - return new WithStatement_BehaviorDescriptor(); - default: - return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName); - } - } - private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.command.base.structure.WithStatement"}; -} diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/trace.info b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/trace.info deleted file mode 100644 index 435b8865093e..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/behavior/trace.info +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/constraints/trace.info b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/constraints/trace.info deleted file mode 100644 index 78624c872225..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/constraints/trace.info +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/EditorAspectDescriptorImpl.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/EditorAspectDescriptorImpl.java deleted file mode 100644 index 51fd644f3a48..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/EditorAspectDescriptorImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package jetbrains.mps.command.base.editor; - -/*Generated by MPS */ - -import jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor; -import java.util.Collection; -import jetbrains.mps.openapi.editor.descriptor.ConceptEditor; -import jetbrains.mps.smodel.runtime.ConceptDescriptor; -import java.util.Arrays; -import java.util.Collections; -import jetbrains.mps.openapi.editor.descriptor.ConceptEditorComponent; - -public class EditorAspectDescriptorImpl implements EditorAspectDescriptor { - - public Collection getEditors(ConceptDescriptor descriptor) { - switch (Arrays.binarySearch(stringSwitchCases_xbvbvu_a0a0b, descriptor.getConceptFqName())) { - case 0: - return Collections.singletonList(new WithStatement_Editor()); - default: - } - return Collections.emptyList(); - } - public Collection getEditorComponents(ConceptDescriptor descriptor, String editorComponentId) { - return Collections.emptyList(); - } - - - private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.command.base.structure.WithStatement"}; -} diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/trace.info b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/trace.info deleted file mode 100644 index 6eff61d8e75e..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/editor/trace.info +++ /dev/null @@ -1,312 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/StructureAspectDescriptor.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/StructureAspectDescriptor.java deleted file mode 100644 index 0d5947e5dae6..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/StructureAspectDescriptor.java +++ /dev/null @@ -1,36 +0,0 @@ -package jetbrains.mps.command.base.structure; - -/*Generated by MPS */ - -import jetbrains.mps.smodel.runtime.BaseStructureAspectDescriptor; -import jetbrains.mps.smodel.runtime.ConceptDescriptor; -import jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder; -import jetbrains.mps.smodel.adapter.ids.MetaIdFactory; -import java.util.Collection; -import java.util.Arrays; -import org.jetbrains.annotations.Nullable; - -public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { - - /*package*/ final ConceptDescriptor myConceptConsoleHelpProvider = new ConceptDescriptorBuilder("jetbrains.mps.command.base.structure.ConsoleHelpProvider", MetaIdFactory.conceptId(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x690b986730edd07L)).interface_().create(); - /*package*/ final ConceptDescriptor myConceptWithStatement = new ConceptDescriptorBuilder("jetbrains.mps.command.base.structure.WithStatement", MetaIdFactory.conceptId(0xcb3c6536cd624d95L, 0x85294a37cbf14855L, 0x3ac2ae2c0bcf368bL)).super_("jetbrains.mps.baseLanguage.structure.Statement").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).parents("jetbrains.mps.baseLanguage.structure.Statement").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).childDescriptors(new ConceptDescriptorBuilder.Link(4234138103881610892L, "stmts", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false), new ConceptDescriptorBuilder.Link(4234138103881610935L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"stmts", "scope"}, new boolean[]{false, false}).alias("with", "").create(); - - @Override - public Collection getDescriptors() { - return Arrays.asList(myConceptConsoleHelpProvider, myConceptWithStatement); - } - - @Override - @Nullable - public ConceptDescriptor getDescriptor(String conceptFqName) { - switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0g, conceptFqName)) { - case 0: - return myConceptConsoleHelpProvider; - case 1: - return myConceptWithStatement; - default: - return null; - } - } - private static String[] stringSwitchCases_1htk8d_a0a0g = new String[]{"jetbrains.mps.command.base.structure.ConsoleHelpProvider", "jetbrains.mps.command.base.structure.WithStatement"}; -} diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/trace.info b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/trace.info deleted file mode 100644 index bb5686745ffb..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/structure/trace.info +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/trace.info b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/trace.info deleted file mode 100644 index b8712c6c54bc..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/trace.info +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/TypesystemDescriptor.java b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/TypesystemDescriptor.java deleted file mode 100644 index feed05f8af66..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/TypesystemDescriptor.java +++ /dev/null @@ -1,15 +0,0 @@ -package jetbrains.mps.command.base.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.BaseHelginsDescriptor; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; - -public class TypesystemDescriptor extends BaseHelginsDescriptor { - public TypesystemDescriptor() { - { - InferenceRule_Runtime inferenceRule = new typeof_ScopeProvider_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - } -} diff --git a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/trace.info b/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/trace.info deleted file mode 100644 index a1506c37d1e1..000000000000 --- a/plugins/console/lang/command/base/jetbrains.mps.command.base/source_gen/jetbrains/mps/command/base/typesystem/trace.info +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated index 375b8a97bd5b..54a6bbc0c3b9 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated +++ b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/generator/template/main@generator.mps b/plugins/console/lang/ideCommands/generator/template/main@generator.mps index 6e820d9da15b..01740ba8f6df 100644 --- a/plugins/console/lang/ideCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/ideCommands/generator/template/main@generator.mps @@ -28,7 +28,7 @@ - + @@ -333,13 +333,13 @@ - + - + @@ -630,13 +630,13 @@ - + - + @@ -650,7 +650,7 @@ - + @@ -784,13 +784,13 @@ - + - + @@ -804,7 +804,7 @@ - + @@ -902,13 +902,13 @@ - + - + @@ -922,7 +922,7 @@ - + @@ -1247,13 +1247,13 @@ - + - + diff --git a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl index f69577ca42a2..448a873e0c78 100644 --- a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl +++ b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl @@ -26,7 +26,6 @@ a5e4de53-46a3-44da-aab3-68fdf1c34ed0(jetbrains.mps.console.ideCommands) c7567052-205c-4a15-80b0-7a32b32a9656(jetbrains.mps.console.ideCommands.runtime) 019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide) - 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) @@ -40,7 +39,6 @@ - @@ -98,7 +96,7 @@ 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime) 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) - 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps index 389df293b091..63c7c3403623 100644 --- a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps +++ b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps @@ -20,7 +20,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -238,7 +238,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -312,7 +312,7 @@ - + @@ -374,7 +374,7 @@ - + @@ -745,7 +745,7 @@ - + @@ -809,7 +809,7 @@ - + @@ -971,7 +971,7 @@ - + @@ -984,7 +984,7 @@ - + @@ -997,7 +997,7 @@ - + @@ -1012,7 +1012,7 @@ - + @@ -1027,7 +1027,7 @@ - + @@ -1063,7 +1063,7 @@ - + @@ -1241,7 +1241,7 @@ - + @@ -1417,7 +1417,7 @@ - + @@ -1430,7 +1430,7 @@ - + @@ -1505,7 +1505,7 @@ - + @@ -1550,7 +1550,7 @@ - + @@ -1563,7 +1563,7 @@ - + diff --git a/plugins/console/lang/ideCommands/languageModels/behavior.mps b/plugins/console/lang/ideCommands/languageModels/behavior.mps index cbf7acacbe4f..6f44fee30eac 100644 --- a/plugins/console/lang/ideCommands/languageModels/behavior.mps +++ b/plugins/console/lang/ideCommands/languageModels/behavior.mps @@ -37,8 +37,7 @@ - - + @@ -325,13 +324,13 @@ - + - + @@ -352,13 +351,13 @@ - + - + @@ -404,13 +403,13 @@ - + - + @@ -438,7 +437,7 @@ - + @@ -559,7 +558,7 @@ - + @@ -643,8 +642,8 @@ - - + + @@ -789,7 +788,7 @@ - + @@ -899,7 +898,7 @@ - + @@ -928,7 +927,7 @@ - + @@ -946,7 +945,7 @@ - + @@ -1006,7 +1005,7 @@ - + @@ -1187,7 +1186,7 @@ - + @@ -1217,7 +1216,7 @@ - + @@ -1281,7 +1280,7 @@ - + @@ -1378,7 +1377,7 @@ - + @@ -1401,7 +1400,7 @@ - + @@ -1414,7 +1413,7 @@ - + @@ -1451,7 +1450,7 @@ - + @@ -1513,7 +1512,7 @@ - + @@ -1526,7 +1525,7 @@ - + @@ -1539,7 +1538,7 @@ - + @@ -1552,13 +1551,13 @@ - + - + @@ -1585,7 +1584,7 @@ - + @@ -1804,7 +1803,7 @@ - + @@ -1827,7 +1826,7 @@ - + @@ -1866,7 +1865,7 @@ - + @@ -1900,7 +1899,7 @@ - + @@ -1924,13 +1923,13 @@ - + - + @@ -2455,7 +2454,7 @@ - + @@ -2500,14 +2499,14 @@ - + - + @@ -2529,7 +2528,7 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies index d0a006c1cd59..fe9b41ec6202 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies @@ -94,9 +94,9 @@ - + @@ -156,7 +156,7 @@ - + @@ -174,7 +174,7 @@ - + @@ -185,12 +185,12 @@ - + - + @@ -198,7 +198,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -264,7 +264,7 @@ - + @@ -282,7 +282,7 @@ - + @@ -318,7 +318,7 @@ - + @@ -333,7 +333,7 @@ - + @@ -349,7 +349,7 @@ - + @@ -359,16 +359,16 @@ - - + + - - + + @@ -392,8 +392,8 @@ - - + + @@ -410,16 +410,16 @@ - - + + - - + + @@ -432,9 +432,9 @@ - - + + @@ -446,8 +446,8 @@ - - + + @@ -457,9 +457,9 @@ - - + + @@ -474,7 +474,7 @@ - + @@ -491,7 +491,7 @@ - + @@ -501,16 +501,16 @@ - - + + - - + + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated index 2d64b5e80b81..d7a102136b94 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated index 9dd1d82c1b84..16a9a0400642 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/dependencies b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/dependencies index 696243c4a6e0..8e2ea1961beb 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/dependencies +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/dependencies @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated index d0e77544329b..08dd506bf3ff 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java index ef05c4d0595c..a48e6ac04649 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java @@ -5,7 +5,7 @@ import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_Behavior; import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior; public class CallActionExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_Behavior.java index ac6a59e5a737..c124bb868ff3 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; import java.util.List; import jetbrains.mps.internal.collections.runtime.ListSequence; import java.util.ArrayList; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_BehaviorDescriptor.java index dc4dcc3dbc33..35a53addd4cc 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; public class GlobalStatisticTarget_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements IStatisticsTarget_BehaviorDescriptor, INodeSetReference_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_Behavior.java index 52756fbcdba0..38749385518b 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_Behavior.java @@ -3,7 +3,7 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; public class INodeSetReference_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_BehaviorDescriptor.java index 748e6b62d5c3..ead4f556af35 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_BehaviorDescriptor.java @@ -3,7 +3,7 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; public interface INodeSetReference_BehaviorDescriptor { public Iterable virtual_getNodes_5207260697411458163(SNode thisNode, ConsoleContext context); diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_Behavior.java index 230f66dae782..412e8dcaa72c 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; public class IStatisticsTarget_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_BehaviorDescriptor.java index 445c54084a02..c2d78729c460 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; public interface IStatisticsTarget_BehaviorDescriptor { public Iterable> virtual_getStat_7490254719527247609(SNode thisNode, ConsoleContext context); diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_Behavior.java index 0e530d8384c3..3c090476011f 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; import jetbrains.mps.smodel.behaviour.BehaviorReflection; import jetbrains.mps.util.IterableUtil; import jetbrains.mps.util.SNodeOperations; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_BehaviorDescriptor.java index 07beb3b0f45c..127ee181f677 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; public class ModelStatisticsTarget_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements IStatisticsTarget_BehaviorDescriptor, INodeSetReference_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java index a31d18cb3546..0f587035b355 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java @@ -5,7 +5,7 @@ import jetbrains.mps.baseLanguage.collections.behavior.SequenceOperation_BehaviorDescriptor; import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_Behavior; import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_Behavior; public class OfAspectOperation_BehaviorDescriptor extends SequenceOperation_BehaviorDescriptor implements ConsoleOperation_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_Behavior.java index d71e413ee81c..9e06a7a1b47a 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; import java.util.List; import jetbrains.mps.internal.collections.runtime.ListSequence; import java.util.ArrayList; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_BehaviorDescriptor.java index 8172d02730cd..ed0e8d31cdc3 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; public class ProjectStatisticsTarget_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements IStatisticsTarget_BehaviorDescriptor, INodeSetReference_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_Behavior.java index 179099bc5ff9..e91b2a0c5cbe 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; public class RebuildProjectCommand_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_BehaviorDescriptor.java index 61c701af5cf6..d41cd1738a2c 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_BehaviorDescriptor.java @@ -5,8 +5,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; public abstract class RebuildProjectCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements IDontSubstituteByDefault_BehaviorDescriptor { public RebuildProjectCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_Behavior.java index b3d6636c6282..453ca19cff3f 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import org.jetbrains.mps.openapi.model.SReference; import jetbrains.mps.internal.collections.runtime.Sequence; import jetbrains.mps.smodel.behaviour.BehaviorReflection; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_BehaviorDescriptor.java index d08ce127cfd0..06b4cac12861 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_BehaviorDescriptor.java @@ -4,8 +4,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; public class ShowBrokenReferences_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor { public ShowBrokenReferences_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_Behavior.java index a33bf57060de..5e770935c446 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import org.jetbrains.mps.openapi.model.SModel; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_BehaviorDescriptor.java index 64fdc011a02e..9673fad7aa51 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_BehaviorDescriptor.java @@ -4,8 +4,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; public class ShowGenPlan_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor { public ShowGenPlan_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_Behavior.java index d2f92212f517..5b1d96d0d931 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import jetbrains.mps.console.ideCommands.util.OutputUtils; import jetbrains.mps.smodel.behaviour.BehaviorReflection; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_BehaviorDescriptor.java index 2f66d707a92c..409d214e7d1a 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_BehaviorDescriptor.java @@ -4,8 +4,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; public class StatCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor { public StatCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_Behavior.java index 2bf3d7bb4665..c1abc4362d1c 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; import jetbrains.mps.smodel.behaviour.BehaviorReflection; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_BehaviorDescriptor.java index 0912e195aa96..7792b84c22d1 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; public class SubtreeStatisticsTarget_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements IStatisticsTarget_BehaviorDescriptor, INodeSetReference_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_Behavior.java index efd9cc50c76a..b14c0bffe1e8 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; public class UnloadModelsCommand_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_BehaviorDescriptor.java index 1be7d3cdc918..692922de36cd 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_BehaviorDescriptor.java @@ -5,8 +5,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; public abstract class UnloadModelsCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements IDontSubstituteByDefault_BehaviorDescriptor { public UnloadModelsCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info index 33f40fb36f2e..a49a92560d55 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info @@ -117,7 +117,7 @@ - + @@ -166,9 +166,9 @@ - + - + @@ -369,7 +369,7 @@ - + @@ -507,7 +507,7 @@ - + @@ -524,7 +524,7 @@ - + @@ -545,7 +545,7 @@ - + @@ -583,7 +583,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -628,9 +628,9 @@ - + - + @@ -678,9 +678,9 @@ - + - + @@ -733,8 +733,8 @@ - - + + diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/OutputUtils.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/OutputUtils.java index e6df1deb7216..cb2a747d0db6 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/OutputUtils.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/OutputUtils.java @@ -2,7 +2,7 @@ /*Generated by MPS */ -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; import jetbrains.mps.internal.collections.runtime.Sequence; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/PartitioningHelper.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/PartitioningHelper.java index 67576d2919ae..0d844744a24c 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/PartitioningHelper.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/PartitioningHelper.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SModel; import jetbrains.mps.ide.messages.MessagesViewTool; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import jetbrains.mps.generator.impl.plan.GenerationPlan; import java.util.Map; import jetbrains.mps.generator.runtime.TemplateMappingPriorityRule; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/trace.info b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/trace.info index 3c03c04f2475..a4f56718514e 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/trace.info +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/trace.info @@ -101,7 +101,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -204,7 +204,7 @@ - + diff --git a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated index aa12c5efa1cd..7cfc040c0397 100644 --- a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated +++ b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/generator/template/main@generator.mps b/plugins/console/lang/internalCommands/generator/template/main@generator.mps index 6a8d8003481b..1ac3140a2323 100644 --- a/plugins/console/lang/internalCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/internalCommands/generator/template/main@generator.mps @@ -19,6 +19,7 @@ + @@ -206,13 +207,13 @@ - + - + @@ -227,7 +228,7 @@ - + diff --git a/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl b/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl index e20405a4e2d4..371e39b05b9e 100644 --- a/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl +++ b/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl @@ -85,7 +85,7 @@ 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/internalCommands/languageModels/behavior.mps b/plugins/console/lang/internalCommands/languageModels/behavior.mps index 479c60ac09a0..e2a687db8cb9 100644 --- a/plugins/console/lang/internalCommands/languageModels/behavior.mps +++ b/plugins/console/lang/internalCommands/languageModels/behavior.mps @@ -16,7 +16,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -150,13 +150,13 @@ - + - + @@ -166,7 +166,7 @@ - + @@ -193,13 +193,13 @@ - + - + @@ -241,7 +241,7 @@ - + @@ -281,7 +281,7 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies index 8c5f0e1721c3..0cb1a7992562 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies @@ -37,9 +37,9 @@ - + @@ -49,8 +49,8 @@ - - + + @@ -58,25 +58,25 @@ - - + + - - + + - - + + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated index b7a79c7aa42c..6a22957786d0 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated index bac0bfe73f87..b06b4b5c79a0 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java index efed91777ac2..82afa9c9c1b5 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java @@ -5,7 +5,7 @@ import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_Behavior; import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior; import org.jetbrains.mps.openapi.model.SNode; diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_Behavior.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_Behavior.java index 0e652bb8ba43..d1432410349d 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_Behavior.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import jetbrains.mps.classloading.ClassLoaderManager; import jetbrains.mps.progress.EmptyProgressMonitor; import org.jetbrains.mps.openapi.language.SAbstractConcept; diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_BehaviorDescriptor.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_BehaviorDescriptor.java index 82e7d3024a35..8f449a644fca 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_BehaviorDescriptor.java @@ -4,8 +4,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import org.jetbrains.mps.openapi.language.SConcept; public class ReloadClassesCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor { diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_Behavior.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_Behavior.java index d946ed666453..006a9fe26950 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_Behavior.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; public class ShowRepositoryCommand_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_BehaviorDescriptor.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_BehaviorDescriptor.java index b099f879b3a1..19b50638f94f 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_BehaviorDescriptor.java @@ -5,8 +5,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.command.base.runtime.ConsoleContext; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; public abstract class ShowRepositoryCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements IDontSubstituteByDefault_BehaviorDescriptor { public ShowRepositoryCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/trace.info b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/trace.info index ca1dd5f187d9..690ad33b38c2 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/trace.info +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/trace.info @@ -49,7 +49,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated b/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated index 0a9f4e98a359..0cc011c8f290 100644 --- a/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated +++ b/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scripts/generator/template/main@generator.mps b/plugins/console/lang/scripts/generator/template/main@generator.mps index 2c5b20ee990b..e182b922e10f 100644 --- a/plugins/console/lang/scripts/generator/template/main@generator.mps +++ b/plugins/console/lang/scripts/generator/template/main@generator.mps @@ -4,16 +4,12 @@ - - - - - + @@ -188,13 +184,13 @@ - + - + @@ -250,13 +246,13 @@ - + - + diff --git a/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl b/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl index edf9aa238a0d..076f92371edb 100644 --- a/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl +++ b/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl @@ -2,7 +2,7 @@ - + @@ -19,7 +19,7 @@ 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) 2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696) - 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -31,7 +31,6 @@ - @@ -71,6 +70,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/scripts/languageModels/behavior.mps b/plugins/console/lang/scripts/languageModels/behavior.mps index 3c7d3f95b8d7..c8e339f78835 100644 --- a/plugins/console/lang/scripts/languageModels/behavior.mps +++ b/plugins/console/lang/scripts/languageModels/behavior.mps @@ -9,7 +9,7 @@ - + @@ -124,12 +124,6 @@ - - - - - - @@ -140,7 +134,7 @@ - + @@ -156,7 +150,7 @@ - + diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies index 2e6fc2fd1b7e..a06f051daf4e 100644 --- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies +++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies @@ -37,9 +37,6 @@ - - - @@ -55,7 +52,7 @@ - + diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated index 1af72eeddf6d..9db280e095be 100644 --- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated +++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated index 02f561ffc426..f0d700e2dec9 100644 --- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated +++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/Execute_Behavior.java b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/Execute_Behavior.java deleted file mode 100644 index 91ebf6130dbf..000000000000 --- a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/Execute_Behavior.java +++ /dev/null @@ -1,10 +0,0 @@ -package jetbrains.mps.console.scripts.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; - -public class Execute_Behavior { - public static void init(SNode thisNode) { - } -} diff --git a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java index 6530dbd4fcd1..d198cb7ea362 100644 --- a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java +++ b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java @@ -5,7 +5,7 @@ import jetbrains.mps.baseLanguage.collections.behavior.InternalSequenceOperation_BehaviorDescriptor; import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.command.base.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_Behavior; import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_Behavior; public class RefactorOperation_BehaviorDescriptor extends InternalSequenceOperation_BehaviorDescriptor implements ConsoleOperation_BehaviorDescriptor { diff --git a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/trace.info b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/trace.info index f9b5faed9103..f729e4b11155 100644 --- a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/trace.info +++ b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/trace.info @@ -67,15 +67,5 @@ - - - - - - - - - - diff --git a/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd b/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd index 98ecb087c963..9a23808e8254 100644 --- a/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd +++ b/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd @@ -16,7 +16,7 @@ bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime) 019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide) 8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform) - 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps index c1107d98c62b..347ab9202909 100644 --- a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps +++ b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps @@ -25,6 +25,7 @@ + @@ -278,7 +279,7 @@ - + @@ -322,7 +323,7 @@ - + @@ -376,7 +377,7 @@ - + @@ -412,7 +413,7 @@ - + @@ -615,11 +616,11 @@ - + - + @@ -647,7 +648,7 @@ - + diff --git a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies index 87b7a7ae3be5..639d6ce03b0d 100644 --- a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies +++ b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies @@ -9,7 +9,7 @@ - + diff --git a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated index 4bbee13044b8..28899da0d7b9 100644 --- a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated +++ b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java b/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java index 4236a38efec4..69ed6e7bbc2d 100644 --- a/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java +++ b/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java @@ -2,7 +2,7 @@ /*Generated by MPS */ -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.smodel.behaviour.BehaviorReflection; import javax.swing.SwingUtilities; diff --git a/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/trace.info b/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/trace.info index 8943c441dea0..b2872398bd97 100644 --- a/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/trace.info +++ b/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/trace.info @@ -41,16 +41,16 @@ - + - + - + diff --git a/plugins/console/models/jetbrains/mps/console/tool.mps b/plugins/console/models/jetbrains/mps/console/tool.mps index 79507f1868da..0d55f99cbba7 100644 --- a/plugins/console/models/jetbrains/mps/console/tool.mps +++ b/plugins/console/models/jetbrains/mps/console/tool.mps @@ -67,9 +67,9 @@ - - + + @@ -5777,7 +5777,7 @@ - + @@ -5827,7 +5827,7 @@ - + @@ -5845,7 +5845,7 @@ - + @@ -6200,7 +6200,7 @@ - + @@ -6641,7 +6641,7 @@ - + @@ -7773,7 +7773,7 @@ - + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies index cc74c1be7fc0..c883662c5a48 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies @@ -43,9 +43,9 @@ - - + + @@ -100,7 +100,7 @@ - + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated index 66616842d27a..4d8cef95ce98 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java b/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java index cb275b546d75..d2985197b07c 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java @@ -4,7 +4,7 @@ import javax.swing.JPanel; import com.intellij.openapi.Disposable; -import jetbrains.mps.command.base.runtime.CommandOutputWindow; +import jetbrains.mps.console.blCommand.runtime.CommandOutputWindow; import org.jetbrains.mps.openapi.model.SModel; import org.jetbrains.mps.openapi.model.SNode; import com.intellij.openapi.fileEditor.FileEditor; @@ -59,14 +59,14 @@ import jetbrains.mps.baseLanguage.closures.runtime.Wrappers; import com.intellij.util.Base64Converter; import jetbrains.mps.persistence.PersistenceUtil; -import jetbrains.mps.command.base.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; import jetbrains.mps.project.Project; import org.jetbrains.mps.openapi.module.SearchScope; import jetbrains.mps.ide.findusages.model.scopes.ProjectScope; import org.jetbrains.mps.openapi.language.SAbstractConcept; import org.jetbrains.mps.openapi.model.SReference; import jetbrains.mps.internal.collections.runtime.Sequence; -import jetbrains.mps.command.base.runtime.ConsoleStream; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import java.util.Scanner; import java.io.StringWriter; import java.io.PrintWriter; diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info b/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info index 82eb98135991..5e3cca232455 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info @@ -688,7 +688,7 @@ - + @@ -768,7 +768,7 @@ - + @@ -789,7 +789,7 @@ - + From 6de42af5f68244d7fb9a2200e20ab7d75fb21395 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Tue, 25 Aug 2015 21:09:36 +0300 Subject: [PATCH 26/52] rename console.blCommand to lang.smodel.query --- plugins/console/jetbrains.mps.console.msd | 2 +- .../generator/template/main@generator.mps | 10 +++---- .../lang/base/jetbrains.mps.console.base.mpl | 8 +++--- .../lang/base/languageModels/behavior.mps | 4 +-- .../lang/base/languageModels/constraints.mps | 4 +-- .../lang/base/languageModels/structure.mps | 2 +- .../generator/template/main@generator.mps | 26 +++++++++---------- ...pl => jetbrains.mps.lang.smodel.query.mpl} | 12 ++++----- .../mps/lang/smodel/query}/actions.mps | 4 +-- .../mps/lang/smodel/query}/behavior.mps | 4 +-- .../mps/lang/smodel/query}/constraints.mps | 8 +++--- .../mps/lang/smodel/query}/editor.mps | 6 ++--- .../mps/lang/smodel/query}/structure.mps | 2 +- .../mps/lang/smodel/query}/typesystem.mps | 4 +-- ...tbrains.mps.lang.smodel.query.runtime.msd} | 4 +-- .../smodel/query}/runtime/util.mps | 2 +- .../generator/template/main@generator.mps | 16 ++++++------ .../jetbrains.mps.console.ideCommands.mpl | 6 ++--- .../ideCommands/languageModels/behavior.mps | 4 +-- .../ideCommands/languageModels/editor.mps | 2 +- .../ideCommands/languageModels/structure.mps | 2 +- .../generator/template/main@generator.mps | 4 +-- ...jetbrains.mps.console.internalCommands.mpl | 6 ++--- .../languageModels/behavior.mps | 4 +-- .../languageModels/editor.mps | 2 +- .../languageModels/structure.mps | 2 +- .../scripts/jetbrains.mps.console.scripts.mpl | 8 +++--- .../lang/scripts/languageModels/behavior.mps | 2 +- .../lang/scripts/languageModels/structure.mps | 2 +- .../jetbrains.mps.console.scripts.runtime.msd | 2 +- .../lang/structure/pluginSolution/plugin.mps | 2 +- 31 files changed, 83 insertions(+), 83 deletions(-) rename plugins/console/lang/blCommand/{jetbrains.mps.console.blCommand.mpl => jetbrains.mps.lang.smodel.query.mpl} (96%) rename plugins/console/lang/blCommand/languageModels/{ => jetbrains/mps/lang/smodel/query}/actions.mps (99%) rename plugins/console/lang/blCommand/languageModels/{ => jetbrains/mps/lang/smodel/query}/behavior.mps (99%) rename plugins/console/lang/blCommand/languageModels/{ => jetbrains/mps/lang/smodel/query}/constraints.mps (98%) rename plugins/console/lang/blCommand/languageModels/{ => jetbrains/mps/lang/smodel/query}/editor.mps (99%) rename plugins/console/lang/blCommand/languageModels/{ => jetbrains/mps/lang/smodel/query}/structure.mps (99%) rename plugins/console/lang/blCommand/languageModels/{ => jetbrains/mps/lang/smodel/query}/typesystem.mps (99%) rename plugins/console/lang/blCommandRuntime/{jetbrains.mps.console.blCommand.runtime.msd => jetbrains.mps.lang.smodel.query.runtime.msd} (95%) rename plugins/console/lang/blCommandRuntime/models/jetbrains/mps/{console/blCommand => lang/smodel/query}/runtime/util.mps (99%) diff --git a/plugins/console/jetbrains.mps.console.msd b/plugins/console/jetbrains.mps.console.msd index fb0d2ffb7bac..486376d901bb 100644 --- a/plugins/console/jetbrains.mps.console.msd +++ b/plugins/console/jetbrains.mps.console.msd @@ -26,7 +26,7 @@ f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets) a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime) df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index 13d8c6f19c20..721f74af64d2 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -8,7 +8,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -142,11 +142,11 @@ - - + + - + diff --git a/plugins/console/lang/base/jetbrains.mps.console.base.mpl b/plugins/console/lang/base/jetbrains.mps.console.base.mpl index fc11edf987fb..2d11a5d2a72c 100644 --- a/plugins/console/lang/base/jetbrains.mps.console.base.mpl +++ b/plugins/console/lang/base/jetbrains.mps.console.base.mpl @@ -19,7 +19,7 @@ a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) @@ -35,12 +35,12 @@ - + @@ -60,7 +60,7 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -95,7 +95,7 @@ 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) + 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query) diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index 11c49ef6f57b..03ea78969c50 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -33,9 +33,9 @@ - + - + diff --git a/plugins/console/lang/base/languageModels/constraints.mps b/plugins/console/lang/base/languageModels/constraints.mps index a969110d6748..6e27ca4da8b9 100644 --- a/plugins/console/lang/base/languageModels/constraints.mps +++ b/plugins/console/lang/base/languageModels/constraints.mps @@ -17,8 +17,8 @@ - - + + diff --git a/plugins/console/lang/base/languageModels/structure.mps b/plugins/console/lang/base/languageModels/structure.mps index 57f453df1ded..6da5634ac175 100644 --- a/plugins/console/lang/base/languageModels/structure.mps +++ b/plugins/console/lang/base/languageModels/structure.mps @@ -7,7 +7,7 @@ - + diff --git a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index 414550755588..0506071f039e 100644 --- a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -1,9 +1,9 @@ - + - + @@ -12,8 +12,8 @@ - - + + @@ -275,19 +275,19 @@ - - + + - - - - - + + + + + - - + + diff --git a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl b/plugins/console/lang/blCommand/jetbrains.mps.lang.smodel.query.mpl similarity index 96% rename from plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl rename to plugins/console/lang/blCommand/jetbrains.mps.lang.smodel.query.mpl index 1eef1cdf4239..e6fd4ebf3978 100644 --- a/plugins/console/lang/blCommand/jetbrains.mps.console.blCommand.mpl +++ b/plugins/console/lang/blCommand/jetbrains.mps.lang.smodel.query.mpl @@ -1,5 +1,5 @@ - + @@ -20,8 +20,8 @@ 9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) + 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) @@ -39,12 +39,12 @@ - + @@ -98,7 +98,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) @@ -128,8 +128,8 @@ - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) diff --git a/plugins/console/lang/blCommand/languageModels/actions.mps b/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/actions.mps similarity index 99% rename from plugins/console/lang/blCommand/languageModels/actions.mps rename to plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/actions.mps index 74f0b0acc18a..ea70e6423c97 100644 --- a/plugins/console/lang/blCommand/languageModels/actions.mps +++ b/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/actions.mps @@ -1,12 +1,12 @@ - + - + diff --git a/plugins/console/lang/blCommand/languageModels/behavior.mps b/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps similarity index 99% rename from plugins/console/lang/blCommand/languageModels/behavior.mps rename to plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps index cd3c240d9daf..71ce600a444e 100644 --- a/plugins/console/lang/blCommand/languageModels/behavior.mps +++ b/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps @@ -1,12 +1,12 @@ - + - + diff --git a/plugins/console/lang/blCommand/languageModels/constraints.mps b/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps similarity index 98% rename from plugins/console/lang/blCommand/languageModels/constraints.mps rename to plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps index 5066812f33d2..1120c74c9d9a 100644 --- a/plugins/console/lang/blCommand/languageModels/constraints.mps +++ b/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps @@ -1,13 +1,13 @@ - + - - + + @@ -80,7 +80,7 @@ - + diff --git a/plugins/console/lang/blCommand/languageModels/editor.mps b/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/editor.mps similarity index 99% rename from plugins/console/lang/blCommand/languageModels/editor.mps rename to plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/editor.mps index 061a0942a372..b54d3c1f18d9 100644 --- a/plugins/console/lang/blCommand/languageModels/editor.mps +++ b/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/editor.mps @@ -1,5 +1,5 @@ - + @@ -7,11 +7,11 @@ - + - + diff --git a/plugins/console/lang/blCommand/languageModels/structure.mps b/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/structure.mps similarity index 99% rename from plugins/console/lang/blCommand/languageModels/structure.mps rename to plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/structure.mps index a4d2ba988669..4dc491a8d6f9 100644 --- a/plugins/console/lang/blCommand/languageModels/structure.mps +++ b/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/structure.mps @@ -1,5 +1,5 @@ - + diff --git a/plugins/console/lang/blCommand/languageModels/typesystem.mps b/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps similarity index 99% rename from plugins/console/lang/blCommand/languageModels/typesystem.mps rename to plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps index f726f6a63a95..2c6317cc0abb 100644 --- a/plugins/console/lang/blCommand/languageModels/typesystem.mps +++ b/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps @@ -1,12 +1,12 @@ - + - + diff --git a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd b/plugins/console/lang/blCommandRuntime/jetbrains.mps.lang.smodel.query.runtime.msd similarity index 95% rename from plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd rename to plugins/console/lang/blCommandRuntime/jetbrains.mps.lang.smodel.query.runtime.msd index ecc2aff644d7..462a07aba41e 100644 --- a/plugins/console/lang/blCommandRuntime/jetbrains.mps.console.blCommand.runtime.msd +++ b/plugins/console/lang/blCommandRuntime/jetbrains.mps.lang.smodel.query.runtime.msd @@ -1,5 +1,5 @@ - + @@ -13,7 +13,7 @@ 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) + 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query) bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) diff --git a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps similarity index 99% rename from plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps rename to plugins/console/lang/blCommandRuntime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps index 305ed00484a5..0e18e809315f 100644 --- a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime/util.mps +++ b/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps @@ -1,5 +1,5 @@ - + diff --git a/plugins/console/lang/ideCommands/generator/template/main@generator.mps b/plugins/console/lang/ideCommands/generator/template/main@generator.mps index 01740ba8f6df..ab7a74757ade 100644 --- a/plugins/console/lang/ideCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/ideCommands/generator/template/main@generator.mps @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -260,13 +260,13 @@ - - - - + + + + - + diff --git a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl index 448a873e0c78..8baeb1a88316 100644 --- a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl +++ b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl @@ -40,13 +40,13 @@ - + @@ -96,7 +96,7 @@ 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime) 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -137,7 +137,7 @@ ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) + 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query) diff --git a/plugins/console/lang/ideCommands/languageModels/behavior.mps b/plugins/console/lang/ideCommands/languageModels/behavior.mps index 6f44fee30eac..553e048c3e6d 100644 --- a/plugins/console/lang/ideCommands/languageModels/behavior.mps +++ b/plugins/console/lang/ideCommands/languageModels/behavior.mps @@ -35,8 +35,8 @@ - - + + diff --git a/plugins/console/lang/ideCommands/languageModels/editor.mps b/plugins/console/lang/ideCommands/languageModels/editor.mps index 432a2f2bae6b..1c78ad197203 100644 --- a/plugins/console/lang/ideCommands/languageModels/editor.mps +++ b/plugins/console/lang/ideCommands/languageModels/editor.mps @@ -13,7 +13,7 @@ - + diff --git a/plugins/console/lang/ideCommands/languageModels/structure.mps b/plugins/console/lang/ideCommands/languageModels/structure.mps index c8a07b1e06d1..c2842ec38ae7 100644 --- a/plugins/console/lang/ideCommands/languageModels/structure.mps +++ b/plugins/console/lang/ideCommands/languageModels/structure.mps @@ -10,7 +10,7 @@ - + diff --git a/plugins/console/lang/internalCommands/generator/template/main@generator.mps b/plugins/console/lang/internalCommands/generator/template/main@generator.mps index 1ac3140a2323..9a63a06f834c 100644 --- a/plugins/console/lang/internalCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/internalCommands/generator/template/main@generator.mps @@ -10,9 +10,9 @@ - + - + diff --git a/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl b/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl index 371e39b05b9e..49933bc12bad 100644 --- a/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl +++ b/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl @@ -24,7 +24,7 @@ 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console) - 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) + 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query) 995a7394-7f76-4b8b-a929-c53448708106(jetbrains.mps.console.internalCommands) 1a497c57-0f1a-4016-8042-2ff7591fe612(jetbrains.mps.console.internalCommands.runtime) 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) @@ -85,7 +85,7 @@ 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -117,7 +117,7 @@ de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) - 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) + 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query) diff --git a/plugins/console/lang/internalCommands/languageModels/behavior.mps b/plugins/console/lang/internalCommands/languageModels/behavior.mps index e2a687db8cb9..30b5029bc12b 100644 --- a/plugins/console/lang/internalCommands/languageModels/behavior.mps +++ b/plugins/console/lang/internalCommands/languageModels/behavior.mps @@ -12,8 +12,8 @@ - - + + diff --git a/plugins/console/lang/internalCommands/languageModels/editor.mps b/plugins/console/lang/internalCommands/languageModels/editor.mps index 011178328f78..21c365092d67 100644 --- a/plugins/console/lang/internalCommands/languageModels/editor.mps +++ b/plugins/console/lang/internalCommands/languageModels/editor.mps @@ -8,7 +8,7 @@ - + diff --git a/plugins/console/lang/internalCommands/languageModels/structure.mps b/plugins/console/lang/internalCommands/languageModels/structure.mps index aa4e25e80b6a..03385caf65b7 100644 --- a/plugins/console/lang/internalCommands/languageModels/structure.mps +++ b/plugins/console/lang/internalCommands/languageModels/structure.mps @@ -8,7 +8,7 @@ - + diff --git a/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl b/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl index 076f92371edb..7b4fd77ec4aa 100644 --- a/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl +++ b/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl @@ -17,9 +17,9 @@ - 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) + 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query) 2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -70,7 +70,7 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -101,7 +101,7 @@ de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) - 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand) + 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query) diff --git a/plugins/console/lang/scripts/languageModels/behavior.mps b/plugins/console/lang/scripts/languageModels/behavior.mps index c8e339f78835..a43d7bb1117b 100644 --- a/plugins/console/lang/scripts/languageModels/behavior.mps +++ b/plugins/console/lang/scripts/languageModels/behavior.mps @@ -9,7 +9,7 @@ - + diff --git a/plugins/console/lang/scripts/languageModels/structure.mps b/plugins/console/lang/scripts/languageModels/structure.mps index 0b082128fbca..d23066d27a3a 100644 --- a/plugins/console/lang/scripts/languageModels/structure.mps +++ b/plugins/console/lang/scripts/languageModels/structure.mps @@ -9,7 +9,7 @@ - + diff --git a/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd b/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd index 9a23808e8254..7f5579980d3a 100644 --- a/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd +++ b/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd @@ -16,7 +16,7 @@ bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime) 019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide) 8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.console.blCommand.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps index 9ef9cccd6b2b..afabe329dc50 100644 --- a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps +++ b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps @@ -55,7 +55,7 @@ - + From 4a52ee6af4e7c85c8d5858aa514b7e1348422178 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Tue, 25 Aug 2015 21:14:27 +0300 Subject: [PATCH 27/52] fix idea modules --- .idea/compiler.xml | 2 -- core/kernel/kernel.iml | 3 --- tools/gensources/gensources.iml | 5 +---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 79fa79b4e8c0..14986b2775de 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -197,8 +197,6 @@ - - diff --git a/core/kernel/kernel.iml b/core/kernel/kernel.iml index 70b34413f62b..81b702eb47ad 100644 --- a/core/kernel/kernel.iml +++ b/core/kernel/kernel.iml @@ -20,9 +20,6 @@ - - - diff --git a/tools/gensources/gensources.iml b/tools/gensources/gensources.iml index 855022674ef7..ec4fda184f6a 100644 --- a/tools/gensources/gensources.iml +++ b/tools/gensources/gensources.iml @@ -326,7 +326,6 @@ - @@ -340,7 +339,6 @@ - @@ -1112,5 +1110,4 @@ - - + \ No newline at end of file From ebd10f1cbcad46b1165755e805d828ab77bbb093 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Tue, 25 Aug 2015 21:18:46 +0300 Subject: [PATCH 28/52] move smodel.query to MPS codebase (from plugin) --- .../mps/console/blCommand/generator/template/main/dependencies | 0 .../mps/console/blCommand/generator/template/main/generated | 0 .../blCommand/generator/template/main/QueriesGenerated.java | 0 .../mps/console/blCommand/generator/template/main/trace.info | 0 .../console/lang/commands/generator/template/main@generator.mps | 0 .../smodel.query}/jetbrains.mps.lang.smodel.query.mpl | 0 .../languageModels/jetbrains/mps/lang/smodel/query/actions.mps | 0 .../languageModels/jetbrains/mps/lang/smodel/query/behavior.mps | 0 .../jetbrains/mps/lang/smodel/query/constraints.mps | 0 .../languageModels/jetbrains/mps/lang/smodel/query/editor.mps | 0 .../languageModels/jetbrains/mps/lang/smodel/query/structure.mps | 0 .../languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps | 0 .../runtime}/jetbrains.mps.lang.smodel.query.runtime.msd | 0 .../runtime}/models/jetbrains/mps/console/blCommand/runtime.mps | 0 .../models/jetbrains/mps/lang/smodel/query/runtime/util.mps | 0 .../jetbrains/mps/console/blCommand/runtime/dependencies | 0 .../jetbrains/mps/console/blCommand/runtime/generated | 0 .../jetbrains/mps/console/blCommand/runtime/util/dependencies | 0 .../jetbrains/mps/console/blCommand/runtime/util/generated | 0 .../mps/console/blCommand/runtime/CommandOutputWindow.java | 0 .../jetbrains/mps/console/blCommand/runtime/ConsoleContext.java | 0 .../jetbrains/mps/console/blCommand/runtime/ConsoleStream.java | 0 .../source_gen/jetbrains/mps/console/blCommand/runtime/trace.info | 0 .../jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java | 0 .../jetbrains/mps/console/blCommand/runtime/util/trace.info | 0 .../jetbrains/mps/console/blCommand/actions/dependencies | 0 .../jetbrains/mps/console/blCommand/actions/generated | 0 .../jetbrains/mps/console/blCommand/behavior/dependencies | 0 .../jetbrains/mps/console/blCommand/behavior/generated | 0 .../jetbrains/mps/console/blCommand/constraints/dependencies | 0 .../jetbrains/mps/console/blCommand/constraints/generated | 0 .../jetbrains/mps/console/blCommand/dependencies | 0 .../jetbrains/mps/console/blCommand/editor/dependencies | 0 .../jetbrains/mps/console/blCommand/editor/generated | 0 .../source_gen.caches/jetbrains/mps/console/blCommand/generated | 0 .../jetbrains/mps/console/blCommand/structure/dependencies | 0 .../jetbrains/mps/console/blCommand/structure/generated | 0 .../jetbrains/mps/console/blCommand/typesystem/dependencies | 0 .../jetbrains/mps/console/blCommand/typesystem/generated | 0 .../source_gen/jetbrains/mps/console/blCommand/Language.java | 0 .../mps/console/blCommand/actions/ActionAspectDescriptorImpl.java | 0 .../jetbrains/mps/console/blCommand/actions/QueriesGenerated.java | 0 .../console/blCommand/actions/QueryExpression_NodeFactories.java | 0 .../blCommand/actions/ScopeParameterLiteral_factories.java | 0 .../console/blCommand/actions/printStatement_NodeFactories.java | 0 .../source_gen/jetbrains/mps/console/blCommand/actions/trace.info | 0 .../blCommand/behavior/AbstractPrintExpression_Behavior.java | 0 .../behavior/AbstractPrintExpression_BehaviorDescriptor.java | 0 .../mps/console/blCommand/behavior/BehaviorAspectDescriptor.java | 0 .../console/blCommand/behavior/ConsoleExpression_Behavior.java | 0 .../blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java | 0 .../console/blCommand/behavior/ConsoleHelpProvider_Behavior.java | 0 .../behavior/ConsoleHelpProvider_BehaviorDescriptor.java | 0 .../mps/console/blCommand/behavior/ConsoleOperation_Behavior.java | 0 .../blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java | 0 .../blCommand/behavior/CustomScope_BehaviorDescriptor.java | 0 .../blCommand/behavior/GlobalScope_BehaviorDescriptor.java | 0 .../console/blCommand/behavior/InstancesExpression_Behavior.java | 0 .../behavior/InstancesExpression_BehaviorDescriptor.java | 0 .../console/blCommand/behavior/ModelScope_BehaviorDescriptor.java | 0 .../mps/console/blCommand/behavior/ModelsExpression_Behavior.java | 0 .../blCommand/behavior/ModelsExpression_BehaviorDescriptor.java | 0 .../console/blCommand/behavior/ModulesExpression_Behavior.java | 0 .../blCommand/behavior/ModulesExpression_BehaviorDescriptor.java | 0 .../blCommand/behavior/ModulesScope_BehaviorDescriptor.java | 0 .../mps/console/blCommand/behavior/NodesExpression_Behavior.java | 0 .../blCommand/behavior/NodesExpression_BehaviorDescriptor.java | 0 .../mps/console/blCommand/behavior/PrintExpression_Behavior.java | 0 .../blCommand/behavior/PrintExpression_BehaviorDescriptor.java | 0 .../behavior/PrintNodeExpression_BehaviorDescriptor.java | 0 .../behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java | 0 .../behavior/PrintSequenceExpression_BehaviorDescriptor.java | 0 .../behavior/PrintTextExpression_BehaviorDescriptor.java | 0 .../console/blCommand/behavior/ProjectExpression_Behavior.java | 0 .../blCommand/behavior/ProjectExpression_BehaviorDescriptor.java | 0 .../blCommand/behavior/ProjectScope_BehaviorDescriptor.java | 0 .../mps/console/blCommand/behavior/QueryExpression_Behavior.java | 0 .../blCommand/behavior/QueryExpression_BehaviorDescriptor.java | 0 .../QueryParameterIncludeReadOnly_BehaviorDescriptor.java | 0 .../blCommand/behavior/QueryParameterList_BehaviorDescriptor.java | 0 .../behavior/QueryParameterScope_BehaviorDescriptor.java | 0 .../blCommand/behavior/QueryParameter_BehaviorDescriptor.java | 0 .../console/blCommand/behavior/ReferencesExpression_Behavior.java | 0 .../behavior/ReferencesExpression_BehaviorDescriptor.java | 0 .../blCommand/behavior/ScopeParameter_BehaviorDescriptor.java | 0 .../mps/console/blCommand/behavior/ShowExpression_Behavior.java | 0 .../blCommand/behavior/ShowExpression_BehaviorDescriptor.java | 0 .../mps/console/blCommand/behavior/UsagesExpression_Behavior.java | 0 .../blCommand/behavior/UsagesExpression_BehaviorDescriptor.java | 0 .../blCommand/behavior/WithStatement_BehaviorDescriptor.java | 0 .../jetbrains/mps/console/blCommand/behavior/trace.info | 0 .../blCommand/constraints/ConstraintsAspectDescriptor.java | 0 .../blCommand/constraints/InstancesExpression_Constraints.java | 0 .../console/blCommand/constraints/QueryParameter_Constraints.java | 0 .../blCommand/constraints/UsagesExpression_Constraints.java | 0 .../jetbrains/mps/console/blCommand/constraints/trace.info | 0 .../console/blCommand/editor/AbstractPrintExpression_Actions.java | 0 .../console/blCommand/editor/AbstractPrintExpression_Editor.java | 0 .../mps/console/blCommand/editor/CustomScope_Actions.java | 0 .../mps/console/blCommand/editor/CustomScope_Editor.java | 0 .../mps/console/blCommand/editor/EditorAspectDescriptorImpl.java | 0 .../mps/console/blCommand/editor/InstancesExpression_Editor.java | 0 .../jetbrains/mps/console/blCommand/editor/ModelScope_Editor.java | 0 .../mps/console/blCommand/editor/ModulesScope_Editor.java | 0 .../mps/console/blCommand/editor/QueryExpression_Actions.java | 0 .../mps/console/blCommand/editor/QueryExpression_Editor.java | 0 .../console/blCommand/editor/QueryExpression_EditorComponent.java | 0 .../mps/console/blCommand/editor/QueryExpression_KeyMap.java | 0 .../mps/console/blCommand/editor/QueryParameterList_Editor.java | 0 .../blCommand/editor/QueryParameterScopeValue_Actions.java | 0 .../mps/console/blCommand/editor/QueryParameterScope_Editor.java | 0 .../mps/console/blCommand/editor/QueryParameter_Actions.java | 0 .../mps/console/blCommand/editor/QueryParameter_Editor.java | 0 .../mps/console/blCommand/editor/ScopeParameter_Editor.java | 0 .../mps/console/blCommand/editor/ShowExpression_Editor.java | 0 .../mps/console/blCommand/editor/UsagesExpression_Editor.java | 0 .../mps/console/blCommand/editor/WithStatement_Editor.java | 0 .../source_gen/jetbrains/mps/console/blCommand/editor/trace.info | 0 .../console/blCommand/structure/StructureAspectDescriptor.java | 0 .../jetbrains/mps/console/blCommand/structure/trace.info | 0 .../source_gen/jetbrains/mps/console/blCommand/trace.info | 0 .../mps/console/blCommand/typesystem/TypesystemDescriptor.java | 0 .../check_QueryDuplicatedParameters_NonTypesystemRule.java | 0 .../jetbrains/mps/console/blCommand/typesystem/trace.info | 0 .../typesystem/typeof_AbstractPrintExpression_InferenceRule.java | 0 .../blCommand/typesystem/typeof_CustomScope_InferenceRule.java | 0 .../typesystem/typeof_InstancesExpression_InferenceRule.java | 0 .../typesystem/typeof_ModelScopeLiteral_InferenceRule.java | 0 .../typesystem/typeof_ModelsExpression_InferenceRule.java | 0 .../typesystem/typeof_ModuleScopeLiteral_InferenceRule.java | 0 .../typesystem/typeof_ModulesExpression_InferenceRule.java | 0 .../typesystem/typeof_NodesExpresiion_InferenceRule.java | 0 .../typesystem/typeof_PrintExpression_InferenceRule.java | 0 .../typesystem/typeof_PrintNodeExpression_InferenceRule.java | 0 .../typeof_PrintNodeReferenceExpression_InferenceRule.java | 0 .../typesystem/typeof_PrintSequenceExpression_InferenceRule.java | 0 .../typesystem/typeof_PrintTextExpression_InferenceRule.java | 0 .../typesystem/typeof_ProjectExpression_InferenceRule.java | 0 .../typesystem/typeof_ReferencesExpression_InferenceRule.java | 0 .../blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java | 0 .../blCommand/typesystem/typeof_ShowExpression_InferenceRule.java | 0 .../typesystem/typeof_UsagesExpression_InferenceRule.java | 0 142 files changed, 0 insertions(+), 0 deletions(-) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/dependencies (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/jetbrains.mps.lang.smodel.query.mpl (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/languageModels/jetbrains/mps/lang/smodel/query/actions.mps (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/languageModels/jetbrains/mps/lang/smodel/query/editor.mps (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/languageModels/jetbrains/mps/lang/smodel/query/structure.mps (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps (100%) rename {plugins/console/lang/blCommandRuntime => languages/languageDesign/smodel.query/runtime}/jetbrains.mps.lang.smodel.query.runtime.msd (100%) rename {plugins/console/lang/blCommandRuntime => languages/languageDesign/smodel.query/runtime}/models/jetbrains/mps/console/blCommand/runtime.mps (100%) rename {plugins/console/lang/blCommandRuntime => languages/languageDesign/smodel.query/runtime}/models/jetbrains/mps/lang/smodel/query/runtime/util.mps (100%) rename {plugins/console/lang/blCommandRuntime => languages/languageDesign/smodel.query/runtime}/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies (100%) rename {plugins/console/lang/blCommandRuntime => languages/languageDesign/smodel.query/runtime}/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated (100%) rename {plugins/console/lang/blCommandRuntime => languages/languageDesign/smodel.query/runtime}/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies (100%) rename {plugins/console/lang/blCommandRuntime => languages/languageDesign/smodel.query/runtime}/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated (100%) rename {plugins/console/lang/blCommandRuntime => languages/languageDesign/smodel.query/runtime}/source_gen/jetbrains/mps/console/blCommand/runtime/CommandOutputWindow.java (100%) rename {plugins/console/lang/blCommandRuntime => languages/languageDesign/smodel.query/runtime}/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java (100%) rename {plugins/console/lang/blCommandRuntime => languages/languageDesign/smodel.query/runtime}/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleStream.java (100%) rename {plugins/console/lang/blCommandRuntime => languages/languageDesign/smodel.query/runtime}/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info (100%) rename {plugins/console/lang/blCommandRuntime => languages/languageDesign/smodel.query/runtime}/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java (100%) rename {plugins/console/lang/blCommandRuntime => languages/languageDesign/smodel.query/runtime}/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen.caches/jetbrains/mps/console/blCommand/constraints/dependencies (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen.caches/jetbrains/mps/console/blCommand/constraints/generated (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen.caches/jetbrains/mps/console/blCommand/dependencies (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen.caches/jetbrains/mps/console/blCommand/generated (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen.caches/jetbrains/mps/console/blCommand/structure/dependencies (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/Language.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/actions/ActionAspectDescriptorImpl.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/actions/QueryExpression_NodeFactories.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/actions/ScopeParameterLiteral_factories.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/actions/printStatement_NodeFactories.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/actions/trace.info (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_Behavior.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_Behavior.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_Behavior.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_Behavior.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/CustomScope_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/GlobalScope_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_Behavior.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ModelScope_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_Behavior.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_Behavior.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesScope_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_Behavior.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_Behavior.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/PrintSequenceExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/PrintTextExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_Behavior.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectScope_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_Behavior.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterList_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterScope_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameter_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_Behavior.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ScopeParameter_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_Behavior.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_Behavior.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/constraints/ConstraintsAspectDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/constraints/InstancesExpression_Constraints.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/constraints/QueryParameter_Constraints.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/constraints/UsagesExpression_Constraints.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/constraints/trace.info (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Actions.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Editor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Actions.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Editor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/InstancesExpression_Editor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/ModelScope_Editor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/ModulesScope_Editor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Actions.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Editor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_EditorComponent.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_KeyMap.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterList_Editor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScopeValue_Actions.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScope_Editor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Actions.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Editor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/ScopeParameter_Editor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/ShowExpression_Editor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/UsagesExpression_Editor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/editor/trace.info (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/structure/trace.info (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/trace.info (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_AbstractPrintExpression_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_CustomScope_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_InstancesExpression_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelScopeLiteral_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelsExpression_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModulesExpression_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_NodesExpresiion_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintExpression_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeExpression_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintSequenceExpression_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintTextExpression_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ProjectExpression_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ReferencesExpression_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ShowExpression_InferenceRule.java (100%) rename {plugins/console/lang/blCommand => languages/languageDesign/smodel.query}/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_UsagesExpression_InferenceRule.java (100%) diff --git a/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/dependencies b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/dependencies similarity index 100% rename from plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/dependencies rename to languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/dependencies diff --git a/plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated similarity index 100% rename from plugins/console/lang/blCommand/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated rename to languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated diff --git a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java similarity index 100% rename from plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java rename to languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java diff --git a/plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info similarity index 100% rename from plugins/console/lang/blCommand/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info rename to languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info diff --git a/plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps similarity index 100% rename from plugins/console/lang/blCommand/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps rename to languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps diff --git a/plugins/console/lang/blCommand/jetbrains.mps.lang.smodel.query.mpl b/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl similarity index 100% rename from plugins/console/lang/blCommand/jetbrains.mps.lang.smodel.query.mpl rename to languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl diff --git a/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/actions.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/actions.mps similarity index 100% rename from plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/actions.mps rename to languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/actions.mps diff --git a/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps similarity index 100% rename from plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps rename to languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps diff --git a/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps similarity index 100% rename from plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps rename to languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps diff --git a/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/editor.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/editor.mps similarity index 100% rename from plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/editor.mps rename to languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/editor.mps diff --git a/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/structure.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps similarity index 100% rename from plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/structure.mps rename to languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps diff --git a/plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps similarity index 100% rename from plugins/console/lang/blCommand/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps rename to languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps diff --git a/plugins/console/lang/blCommandRuntime/jetbrains.mps.lang.smodel.query.runtime.msd b/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd similarity index 100% rename from plugins/console/lang/blCommandRuntime/jetbrains.mps.lang.smodel.query.runtime.msd rename to languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd diff --git a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime.mps b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/console/blCommand/runtime.mps similarity index 100% rename from plugins/console/lang/blCommandRuntime/models/jetbrains/mps/console/blCommand/runtime.mps rename to languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/console/blCommand/runtime.mps diff --git a/plugins/console/lang/blCommandRuntime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps similarity index 100% rename from plugins/console/lang/blCommandRuntime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps rename to languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps diff --git a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies similarity index 100% rename from plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies rename to languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies diff --git a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated similarity index 100% rename from plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated rename to languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated diff --git a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies similarity index 100% rename from plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies rename to languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies diff --git a/plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated similarity index 100% rename from plugins/console/lang/blCommandRuntime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated rename to languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated diff --git a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/CommandOutputWindow.java b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/CommandOutputWindow.java similarity index 100% rename from plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/CommandOutputWindow.java rename to languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/CommandOutputWindow.java diff --git a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java similarity index 100% rename from plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java rename to languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java diff --git a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleStream.java b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleStream.java similarity index 100% rename from plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleStream.java rename to languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleStream.java diff --git a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info similarity index 100% rename from plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info rename to languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info diff --git a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java similarity index 100% rename from plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java rename to languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java diff --git a/plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info similarity index 100% rename from plugins/console/lang/blCommandRuntime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info rename to languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies similarity index 100% rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated similarity index 100% rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies similarity index 100% rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated similarity index 100% rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/constraints/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/constraints/dependencies similarity index 100% rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/constraints/dependencies rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/constraints/dependencies diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/constraints/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/constraints/generated similarity index 100% rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/constraints/generated rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/constraints/generated diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/dependencies similarity index 100% rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/dependencies rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/dependencies diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies similarity index 100% rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated similarity index 100% rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/generated similarity index 100% rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/generated rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/generated diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/structure/dependencies similarity index 100% rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/dependencies rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/structure/dependencies diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated similarity index 100% rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies similarity index 100% rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies diff --git a/plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated similarity index 100% rename from plugins/console/lang/blCommand/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated rename to languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/Language.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/Language.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/Language.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/Language.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/ActionAspectDescriptorImpl.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/ActionAspectDescriptorImpl.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/ActionAspectDescriptorImpl.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/ActionAspectDescriptorImpl.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/QueryExpression_NodeFactories.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/QueryExpression_NodeFactories.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/QueryExpression_NodeFactories.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/QueryExpression_NodeFactories.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/ScopeParameterLiteral_factories.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/ScopeParameterLiteral_factories.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/ScopeParameterLiteral_factories.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/ScopeParameterLiteral_factories.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/printStatement_NodeFactories.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/printStatement_NodeFactories.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/printStatement_NodeFactories.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/printStatement_NodeFactories.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/trace.info similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/actions/trace.info rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/trace.info diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_Behavior.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_Behavior.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_Behavior.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_Behavior.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_Behavior.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_Behavior.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_Behavior.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_Behavior.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_Behavior.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_Behavior.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_Behavior.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_Behavior.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/CustomScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/CustomScope_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/CustomScope_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/CustomScope_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/GlobalScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/GlobalScope_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/GlobalScope_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/GlobalScope_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_Behavior.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_Behavior.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_Behavior.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelScope_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelScope_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelScope_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_Behavior.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_Behavior.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_Behavior.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_Behavior.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_Behavior.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_Behavior.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesScope_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesScope_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesScope_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_Behavior.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_Behavior.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_Behavior.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_Behavior.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_Behavior.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_Behavior.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintSequenceExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintSequenceExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintSequenceExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintSequenceExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintTextExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintTextExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/PrintTextExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintTextExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_Behavior.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_Behavior.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_Behavior.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectScope_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectScope_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectScope_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_Behavior.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_Behavior.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_Behavior.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterList_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterList_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterList_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterList_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterScope_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterScope_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterScope_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameter_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameter_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameter_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameter_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_Behavior.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_Behavior.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_Behavior.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ScopeParameter_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ScopeParameter_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ScopeParameter_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ScopeParameter_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_Behavior.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_Behavior.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_Behavior.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_Behavior.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_Behavior.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_Behavior.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/ConstraintsAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/ConstraintsAspectDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/ConstraintsAspectDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/ConstraintsAspectDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/InstancesExpression_Constraints.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/InstancesExpression_Constraints.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/InstancesExpression_Constraints.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/InstancesExpression_Constraints.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/QueryParameter_Constraints.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/QueryParameter_Constraints.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/QueryParameter_Constraints.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/QueryParameter_Constraints.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/UsagesExpression_Constraints.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/UsagesExpression_Constraints.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/UsagesExpression_Constraints.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/UsagesExpression_Constraints.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/trace.info similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/constraints/trace.info rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/trace.info diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Actions.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Actions.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Actions.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Editor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Editor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Editor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Actions.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Actions.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Actions.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Editor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Editor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Editor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/InstancesExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/InstancesExpression_Editor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/InstancesExpression_Editor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/InstancesExpression_Editor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ModelScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ModelScope_Editor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ModelScope_Editor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ModelScope_Editor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ModulesScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ModulesScope_Editor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ModulesScope_Editor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ModulesScope_Editor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Actions.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Actions.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Actions.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Editor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Editor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Editor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_EditorComponent.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_EditorComponent.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_EditorComponent.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_EditorComponent.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_KeyMap.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_KeyMap.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_KeyMap.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_KeyMap.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterList_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterList_Editor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterList_Editor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterList_Editor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScopeValue_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScopeValue_Actions.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScopeValue_Actions.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScopeValue_Actions.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScope_Editor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScope_Editor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScope_Editor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Actions.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Actions.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Actions.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Editor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Editor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Editor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ScopeParameter_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ScopeParameter_Editor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ScopeParameter_Editor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ScopeParameter_Editor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ShowExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ShowExpression_Editor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/ShowExpression_Editor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ShowExpression_Editor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/UsagesExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/UsagesExpression_Editor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/UsagesExpression_Editor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/UsagesExpression_Editor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/trace.info similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/editor/trace.info rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/trace.info diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/structure/trace.info similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/structure/trace.info rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/structure/trace.info diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/trace.info similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/trace.info rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/trace.info diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_AbstractPrintExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_AbstractPrintExpression_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_AbstractPrintExpression_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_AbstractPrintExpression_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_CustomScope_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_CustomScope_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_CustomScope_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_CustomScope_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_InstancesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_InstancesExpression_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_InstancesExpression_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_InstancesExpression_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelScopeLiteral_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelScopeLiteral_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelScopeLiteral_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelScopeLiteral_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelsExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelsExpression_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelsExpression_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelsExpression_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModulesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModulesExpression_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModulesExpression_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModulesExpression_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_NodesExpresiion_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_NodesExpresiion_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_NodesExpresiion_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_NodesExpresiion_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintExpression_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintExpression_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintExpression_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeExpression_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeExpression_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeExpression_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintSequenceExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintSequenceExpression_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintSequenceExpression_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintSequenceExpression_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintTextExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintTextExpression_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintTextExpression_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintTextExpression_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ProjectExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ProjectExpression_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ProjectExpression_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ProjectExpression_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ReferencesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ReferencesExpression_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ReferencesExpression_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ReferencesExpression_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ShowExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ShowExpression_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ShowExpression_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ShowExpression_InferenceRule.java diff --git a/plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_UsagesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_UsagesExpression_InferenceRule.java similarity index 100% rename from plugins/console/lang/blCommand/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_UsagesExpression_InferenceRule.java rename to languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_UsagesExpression_InferenceRule.java From c9b191878dc53a16eaa53f1c674aa1f48ca492ca Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Tue, 25 Aug 2015 21:20:37 +0300 Subject: [PATCH 29/52] move smodel.query to MPS codebase (from plugin): fix mps project --- .mps/modules.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mps/modules.xml b/.mps/modules.xml index ca214466c357..ba8e82852756 100644 --- a/.mps/modules.xml +++ b/.mps/modules.xml @@ -127,6 +127,8 @@ + + @@ -150,8 +152,6 @@ - - From 079d2b1b9fc272cc7fdb7525a7addfa0a9ac7fa3 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Tue, 25 Aug 2015 21:37:34 +0300 Subject: [PATCH 30/52] rename console-named concepts, change virtual packages --- .../generator/template/main/dependencies | 26 + .../query/generator/template/main/generated | 3 + .../template/main/QueriesGenerated.java | 466 ++++ .../query/generator/template/main/trace.info | 832 +++++++ .../generator/template/main@generator.mps | 454 +--- .../mps/lang/smodel/query/actions.mps | 44 +- .../mps/lang/smodel/query/behavior.mps | 76 +- .../mps/lang/smodel/query/constraints.mps | 6 +- .../mps/lang/smodel/query/editor.mps | 75 +- .../mps/lang/smodel/query/structure.mps | 109 +- .../mps/lang/smodel/query/typesystem.mps | 218 +- .../smodel/query/runtime/util/dependencies | 49 + .../lang/smodel/query/runtime/util/generated | 3 + .../query/runtime/util/CommandUtil.java | 262 +++ .../lang/smodel/query/runtime/util/trace.info | 380 ++++ .../lang/smodel/query/actions/dependencies | 31 + .../mps/lang/smodel/query/actions/generated | 3 + .../lang/smodel/query/behavior/dependencies | 302 +++ .../mps/lang/smodel/query/behavior/generated | 3 + .../smodel/query/constraints/dependencies | 57 + .../lang/smodel/query/constraints/generated | 3 + .../mps/lang/smodel/query/dependencies | 28 + .../mps/lang/smodel/query/editor/dependencies | 345 +++ .../mps/lang/smodel/query/editor/generated | 3 + .../jetbrains/mps/lang/smodel/query/generated | 3 + .../lang/smodel/query/structure/dependencies | 15 + .../mps/lang/smodel/query/structure/generated | 3 + .../lang/smodel/query/typesystem/dependencies | 207 ++ .../lang/smodel/query/typesystem/generated | 3 + .../mps/lang/smodel/query/Language.java | 71 + .../actions/ActionAspectDescriptorImpl.java | 32 + .../query/actions/QueriesGenerated.java | 7 + .../QueryExpression_NodeFactories.java | 22 + .../ScopeParameterLiteral_factories.java | 27 + .../mps/lang/smodel/query/actions/trace.info | 71 + .../behavior/BehaviorAspectDescriptor.java | 53 + .../CustomScope_BehaviorDescriptor.java | 13 + .../ExpressionHelpProvider_Behavior.java | 14 + ...essionHelpProvider_BehaviorDescriptor.java | 7 + .../GlobalScope_BehaviorDescriptor.java | 13 + .../query/behavior/HelpProvider_Behavior.java | 36 + .../HelpProvider_BehaviorDescriptor.java | 14 + .../InstancesExpression_Behavior.java | 25 + ...nstancesExpression_BehaviorDescriptor.java | 24 + .../ModelScope_BehaviorDescriptor.java | 13 + .../behavior/ModelsExpression_Behavior.java | 17 + .../ModelsExpression_BehaviorDescriptor.java | 18 + .../behavior/ModulesExpression_Behavior.java | 17 + .../ModulesExpression_BehaviorDescriptor.java | 18 + .../ModulesScope_BehaviorDescriptor.java | 13 + .../behavior/NodesExpression_Behavior.java | 17 + .../NodesExpression_BehaviorDescriptor.java | 18 + .../OperationHelpProvider_Behavior.java | 14 + ...rationHelpProvider_BehaviorDescriptor.java | 7 + .../behavior/ProjectExpression_Behavior.java | 14 + .../ProjectExpression_BehaviorDescriptor.java | 18 + .../ProjectScope_BehaviorDescriptor.java | 13 + .../behavior/QueryExpression_Behavior.java | 39 + .../QueryExpression_BehaviorDescriptor.java | 38 + ...terIncludeReadOnly_BehaviorDescriptor.java | 13 + ...QueryParameterList_BehaviorDescriptor.java | 14 + ...ueryParameterScope_BehaviorDescriptor.java | 13 + .../QueryParameter_BehaviorDescriptor.java | 14 + .../ReferencesExpression_Behavior.java | 17 + ...ferencesExpression_BehaviorDescriptor.java | 18 + .../ScopeParameter_BehaviorDescriptor.java | 14 + .../behavior/ShowExpression_Behavior.java | 17 + .../ShowExpression_BehaviorDescriptor.java | 36 + .../behavior/UsagesExpression_Behavior.java | 25 + .../UsagesExpression_BehaviorDescriptor.java | 24 + .../WithStatement_BehaviorDescriptor.java | 14 + .../mps/lang/smodel/query/behavior/trace.info | 370 +++ .../ConstraintsAspectDescriptor.java | 25 + .../InstancesExpression_Constraints.java | 38 + .../QueryParameter_Constraints.java | 46 + .../UsagesExpression_Constraints.java | 38 + .../lang/smodel/query/constraints/trace.info | 154 ++ .../query/editor/CustomScope_Actions.java | 29 + .../query/editor/CustomScope_Editor.java | 64 + .../editor/EditorAspectDescriptorImpl.java | 60 + .../editor/InstancesExpression_Editor.java | 92 + .../query/editor/ModelScope_Editor.java | 127 ++ .../query/editor/ModulesScope_Editor.java | 127 ++ .../query/editor/QueryExpression_Actions.java | 47 + .../query/editor/QueryExpression_Editor.java | 26 + .../QueryExpression_EditorComponent.java | 127 ++ .../query/editor/QueryExpression_KeyMap.java | 62 + .../editor/QueryParameterList_Editor.java | 90 + .../QueryParameterScopeValue_Actions.java | 63 + .../editor/QueryParameterScope_Editor.java | 92 + .../query/editor/QueryParameter_Actions.java | 70 + .../query/editor/QueryParameter_Editor.java | 36 + .../query/editor/ScopeParameter_Editor.java | 55 + .../query/editor/ShowExpression_Editor.java | 68 + .../query/editor/UsagesExpression_Editor.java | 92 + .../query/editor/WithStatement_Editor.java | 185 ++ .../mps/lang/smodel/query/editor/trace.info | 2025 +++++++++++++++++ .../structure/StructureAspectDescriptor.java | 99 + .../lang/smodel/query/structure/trace.info | 9 + .../mps/lang/smodel/query/trace.info | 9 + .../typesystem/TypesystemDescriptor.java | 64 + ...uplicatedParameters_NonTypesystemRule.java | 65 + .../lang/smodel/query/typesystem/trace.info | 1074 +++++++++ .../typeof_CustomScope_InferenceRule.java | 46 + ...eof_InstancesExpression_InferenceRule.java | 119 + ...ypeof_ModelScopeLiteral_InferenceRule.java | 47 + ...typeof_ModelsExpression_InferenceRule.java | 44 + ...peof_ModuleScopeLiteral_InferenceRule.java | 49 + ...ypeof_ModulesExpression_InferenceRule.java | 46 + .../typeof_NodesExpresiion_InferenceRule.java | 44 + ...ypeof_ProjectExpression_InferenceRule.java | 43 + ...of_ReferencesExpression_InferenceRule.java | 44 + .../typeof_ScopeProvider_InferenceRule.java | 73 + .../typeof_ShowExpression_InferenceRule.java | 81 + ...typeof_UsagesExpression_InferenceRule.java | 58 + .../FindInstancesByCondition_Action.java | 52 +- .../ModifyInstancesByCondition_Action.java | 60 +- .../mps/console/actions/plugin/trace.info | 256 +-- .../base/generator/template/main/dependencies | 13 + .../base/generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 96 +- .../base/generator/template/main/trace.info | 155 +- .../generator/template/main@generator.mps | 505 +++- .../lang/base/jetbrains.mps.console.base.mpl | 6 + .../lang/base/languageModels/actions.mps | 71 + .../lang/base/languageModels/behavior.mps | 44 + .../lang/base/languageModels/editor.mps | 51 + .../lang/base/languageModels/structure.mps | 51 + .../lang/base/languageModels/typesystem.mps | 273 ++- .../mps/console/base/actions/dependencies | 18 + .../mps/console/base/actions/generated | 2 +- .../mps/console/base/behavior/dependencies | 66 +- .../mps/console/base/behavior/generated | 2 +- .../mps/console/base/constraints/generated | 2 +- .../jetbrains/mps/console/base/dependencies | 4 +- .../mps/console/base/editor/dependencies | 31 + .../mps/console/base/editor/generated | 2 +- .../jetbrains/mps/console/base/generated | 2 +- .../mps/console/base/structure/generated | 2 +- .../mps/console/base/typesystem/dependencies | 93 +- .../mps/console/base/typesystem/generated | 2 +- .../jetbrains/mps/console/base/Language.java | 11 +- .../actions/ActionAspectDescriptorImpl.java | 26 + .../actions/printStatement_NodeFactories.java | 20 + .../mps/console/base/actions/trace.info | 20 + .../AbstractPrintExpression_Behavior.java | 14 + ...actPrintExpression_BehaviorDescriptor.java | 18 + .../behavior/BehaviorAspectDescriptor.java | 16 +- .../behavior/Command_BehaviorDescriptor.java | 16 +- .../base/behavior/HelpCommand_Behavior.java | 4 +- .../HelpCommand_BehaviorDescriptor.java | 12 +- .../behavior/PrintExpression_Behavior.java | 14 + .../PrintExpression_BehaviorDescriptor.java | 35 + ...rintNodeExpression_BehaviorDescriptor.java | 13 + ...eferenceExpression_BehaviorDescriptor.java | 13 + ...SequenceExpression_BehaviorDescriptor.java | 13 + ...rintTextExpression_BehaviorDescriptor.java | 13 + .../mps/console/base/behavior/trace.info | 54 +- .../HelpConceptReference_Constraints.java | 2 +- .../AbstractPrintExpression_Actions.java | 43 + .../AbstractPrintExpression_Editor.java | 81 + .../editor/EditorAspectDescriptorImpl.java | 36 +- .../mps/console/base/editor/trace.info | 162 +- .../structure/StructureAspectDescriptor.java | 78 +- .../mps/console/base/structure/trace.info | 2 +- .../jetbrains/mps/console/base/trace.info | 3 +- .../base/typesystem/TypesystemDescriptor.java | 35 + .../mps/console/base/typesystem/trace.info | 399 +++- ...AbstractPrintExpression_InferenceRule.java | 41 + .../typeof_PrintExpression_InferenceRule.java | 50 + ...eof_PrintNodeExpression_InferenceRule.java | 44 + ...NodeReferenceExpression_InferenceRule.java | 44 + ...PrintSequenceExpression_InferenceRule.java | 68 + ...eof_PrintTextExpression_InferenceRule.java | 44 + .../generator/template/main/generated | 2 +- .../console/ideCommands/behavior/dependencies | 16 +- .../console/ideCommands/behavior/generated | 2 +- .../mps/console/ideCommands/editor/generated | 2 +- .../mps/console/ideCommands/generated | 2 +- .../console/ideCommands/structure/generated | 2 +- .../mps/console/ideCommands/Language.java | 2 +- .../AbsractMake_BehaviorDescriptor.java | 2 +- ...llActionExpression_BehaviorDescriptor.java | 20 +- .../OfAspectOperation_BehaviorDescriptor.java | 20 +- .../WithDependencies_BehaviorDescriptor.java | 2 +- .../editor/AbsractMake_Editor.java | 2 +- .../structure/StructureAspectDescriptor.java | 8 +- .../generator/template/main/generated | 2 +- .../internalCommands/behavior/dependencies | 8 +- .../internalCommands/behavior/generated | 2 +- .../console/internalCommands/editor/generated | 2 +- .../mps/console/internalCommands/generated | 2 +- .../internalCommands/structure/generated | 2 +- .../console/internalCommands/Language.java | 2 +- ...oleModelExpression_BehaviorDescriptor.java | 2 +- .../InternalMode_BehaviorDescriptor.java | 18 +- .../structure/StructureAspectDescriptor.java | 4 +- .../mps/console/scripts/behavior/dependencies | 6 +- .../mps/console/scripts/behavior/generated | 2 +- .../jetbrains/mps/console/scripts/generated | 2 +- .../mps/console/scripts/structure/generated | 2 +- .../mps/console/scripts/Language.java | 2 +- .../RefactorOperation_BehaviorDescriptor.java | 16 +- .../structure/StructureAspectDescriptor.java | 2 +- .../models/jetbrains/mps/console/tool.mps | 1 - .../jetbrains/mps/console/tool/generated | 2 +- 206 files changed, 13353 insertions(+), 1266 deletions(-) create mode 100644 languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/dependencies create mode 100644 languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated create mode 100644 languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java create mode 100644 languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info create mode 100644 languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies create mode 100644 languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated create mode 100644 languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java create mode 100644 languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info create mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/actions/dependencies create mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/actions/generated create mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies create mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated create mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/constraints/dependencies create mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/constraints/generated create mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/dependencies create mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/dependencies create mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/generated create mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated create mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/dependencies create mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated create mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies create mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/Language.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/ActionAspectDescriptorImpl.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/QueriesGenerated.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/QueryExpression_NodeFactories.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/ScopeParameterLiteral_factories.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/trace.info create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/CustomScope_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ExpressionHelpProvider_Behavior.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ExpressionHelpProvider_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/GlobalScope_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/HelpProvider_Behavior.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/HelpProvider_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/InstancesExpression_Behavior.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/InstancesExpression_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelScope_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelsExpression_Behavior.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelsExpression_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesExpression_Behavior.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesExpression_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesScope_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/NodesExpression_Behavior.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/NodesExpression_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/OperationHelpProvider_Behavior.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/OperationHelpProvider_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectExpression_Behavior.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectExpression_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectScope_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryExpression_Behavior.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryExpression_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterList_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterScope_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameter_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ReferencesExpression_Behavior.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ReferencesExpression_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ScopeParameter_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ShowExpression_Behavior.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ShowExpression_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/UsagesExpression_Behavior.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/UsagesExpression_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/WithStatement_BehaviorDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/ConstraintsAspectDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/InstancesExpression_Constraints.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/QueryParameter_Constraints.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/UsagesExpression_Constraints.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/trace.info create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/CustomScope_Actions.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/CustomScope_Editor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/EditorAspectDescriptorImpl.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/InstancesExpression_Editor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ModelScope_Editor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ModulesScope_Editor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_Actions.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_Editor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_EditorComponent.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_KeyMap.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterList_Editor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterScopeValue_Actions.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterScope_Editor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameter_Actions.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameter_Editor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ScopeParameter_Editor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ShowExpression_Editor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/UsagesExpression_Editor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/WithStatement_Editor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/trace.info create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/trace.info create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_CustomScope_InferenceRule.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_InstancesExpression_InferenceRule.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModelScopeLiteral_InferenceRule.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModelsExpression_InferenceRule.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModulesExpression_InferenceRule.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_NodesExpresiion_InferenceRule.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ProjectExpression_InferenceRule.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ReferencesExpression_InferenceRule.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ScopeProvider_InferenceRule.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ShowExpression_InferenceRule.java create mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_UsagesExpression_InferenceRule.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/ActionAspectDescriptorImpl.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/printStatement_NodeFactories.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/AbstractPrintExpression_Behavior.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/AbstractPrintExpression_BehaviorDescriptor.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintExpression_Behavior.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintExpression_BehaviorDescriptor.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintNodeExpression_BehaviorDescriptor.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintSequenceExpression_BehaviorDescriptor.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintTextExpression_BehaviorDescriptor.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/AbstractPrintExpression_Actions.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/AbstractPrintExpression_Editor.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/TypesystemDescriptor.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_AbstractPrintExpression_InferenceRule.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintExpression_InferenceRule.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintNodeExpression_InferenceRule.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintSequenceExpression_InferenceRule.java create mode 100644 plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintTextExpression_InferenceRule.java diff --git a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/dependencies b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/dependencies new file mode 100644 index 000000000000..f2cdfc48f936 --- /dev/null +++ b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/dependencies @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated new file mode 100644 index 000000000000..3a37753c1684 --- /dev/null +++ b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated @@ -0,0 +1,3 @@ + + + diff --git a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java new file mode 100644 index 000000000000..0803c3c2135e --- /dev/null +++ b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java @@ -0,0 +1,466 @@ +package jetbrains.mps.lang.smodel.query.generator.template.main; + +/*Generated by MPS */ + +import jetbrains.mps.generator.runtime.Generated; +import jetbrains.mps.generator.template.PropertyMacroContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeChecker; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.generator.template.ReferenceMacroContext; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import jetbrains.mps.internal.collections.runtime.IWhereFilter; +import jetbrains.mps.internal.collections.runtime.ISelector; +import jetbrains.mps.internal.collections.runtime.Sequence; +import jetbrains.mps.generator.template.SourceSubstituteMacroNodesContext; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; +import jetbrains.mps.smodel.SReference; +import org.jetbrains.mps.openapi.model.SNodeAccessUtil; + +@Generated +public class QueriesGenerated { + public static Object propertyMacro_GetPropertyValue_9010839353952736697(final PropertyMacroContext _context) { + SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a0())) { + return "nodes"; + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a0())) { + return "references"; + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a0())) { + return "models"; + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a0())) { + return "modules"; + } + return null; + } + public static Object referenceMacro_GetReferent_3501374812264730107(final ReferenceMacroContext _context) { + SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"))); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a1())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263258755"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a1())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263262593"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a1())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263265578"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a1())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263268620"); + } + return null; + } + public static Object referenceMacro_GetReferent_7600370246425972944(final ReferenceMacroContext _context) { + SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"))); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a2())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a2())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a2())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632137"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a2())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632254"); + } + return null; + } + public static Object referenceMacro_GetReferent_1597470200014435807(final ReferenceMacroContext _context) { + SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a3())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a3())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a3())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632137"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a3())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632254"); + } + return null; + } + public static Object referenceMacro_GetReferent_3501374812263511250(final ReferenceMacroContext _context) { + SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a4())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263258755"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a4())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263262593"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a4())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263265578"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a4())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263268620"); + } + return null; + } + public static SNode sourceNodeQuery_4598452390226163566(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + } + public static SNode sourceNodeQuery_3501374812264728764(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object")); + } + public static SNode sourceNodeQuery_4307205004144966846(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); + } + public static SNode sourceNodeQuery_7738379549905474169(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL, 0x75bb0160f191d6ecL, "node")); + } + public static SNode sourceNodeQuery_4307205004144963070(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); + } + public static SNode sourceNodeQuery_5582028874771414574(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")); + } + public static SNode sourceNodeQuery_5510759644748879578(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + } + public static SNode sourceNodeQuery_6134217374019005717(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + } + public static SNode sourceNodeQuery_4307205004143195962(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); + } + public static SNode sourceNodeQuery_4307205004144964264(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); + } + public static SNode sourceNodeQuery_4307205004144961927(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); + } + public static SNode sourceNodeQuery_4307205004144960989(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); + } + public static SNode sourceNodeQuery_4307205004142795439(final SourceSubstituteMacroNodeContext _context) { + Iterable results = ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).where(new IWhereFilter() { + public boolean accept(SNode it) { + return SNodeOperations.isInstanceOf(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope")); + } + }).select(new ISelector() { + public SNode select(SNode it) { + return SNodeOperations.cast(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope")); + } + }); + return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0r() : SLinkOperations.getTarget(Sequence.fromIterable(results).first(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"))); + } + public static SNode sourceNodeQuery_4307205004142895894(final SourceSubstituteMacroNodeContext _context) { + Iterable results = ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).where(new IWhereFilter() { + public boolean accept(SNode it) { + return SNodeOperations.isInstanceOf(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly")); + } + }); + return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0s_0() : _quotation_createNode_x583g4_a0b0s()); + } + public static SNode sourceNodeQuery_3501374812261883521(final SourceSubstituteMacroNodeContext _context) { + SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a91())) { + return _quotation_createNode_x583g4_a0a1a91(); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a91())) { + return _quotation_createNode_x583g4_a0a2a91(); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a91())) { + return _quotation_createNode_x583g4_a0a3a91(); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a91())) { + return _quotation_createNode_x583g4_a0a4a91(); + } + return null; + } + public static SNode sourceNodeQuery_9010839353952788840(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + } + public static SNode sourceNodeQuery_3492877759612269969(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, 0x307931d0f985950eL, "scope")); + } + public static SNode sourceNodeQuery_1964420931776208395(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope")); + } + public static Iterable sourceNodesQuery_6134217374019191580(final SourceSubstituteMacroNodesContext _context) { + return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL, 0x307931d0f952484fL, "model")); + } + public static Iterable sourceNodesQuery_3492877759611137837(final SourceSubstituteMacroNodesContext _context) { + return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL, 0x307931d0f94af768L, "module")); + } + public static Iterable sourceNodesQuery_1964420931776045744(final SourceSubstituteMacroNodesContext _context) { + return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement")); + } + private static SNode _quotation_createNode_x583g4_b0a1a0() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a2a0() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a3a0() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a4a0() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a1a1() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a2a1() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a3a1() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a4a1() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a1a2() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a2a2() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a3a2() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a4a2() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a1a3() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a2a3() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a3a3() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a4a3() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a1a4() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a2a4() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a3a4() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a4a4() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_a0b0r() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf940cd6167L, "jetbrains.mps.baseLanguage.structure.NullLiteral"), null, null, false); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_a0b0s() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_1, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "true"); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_a0b0s_0() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_1, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "false"); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_a0a1a91() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference"))); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a1a91() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_a0a2a91() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference"))); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a2a91() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_a0a3a91() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SModelReference"))); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a3a91() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_a0a4a91() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModuleReference"))); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a4a91() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } +} diff --git a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info new file mode 100644 index 000000000000..ba952053c7a4 --- /dev/null +++ b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info @@ -0,0 +1,832 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index 0506071f039e..746f2c05fcce 100644 --- a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -9,6 +9,7 @@ + @@ -25,11 +26,10 @@ - + - @@ -63,7 +63,6 @@ - @@ -79,15 +78,12 @@ - - - @@ -104,10 +100,6 @@ - - - - @@ -124,7 +116,6 @@ - @@ -148,32 +139,19 @@ - - - - - - - - - - - - - @@ -211,26 +189,13 @@ - - - - - - - - - - - - - @@ -238,9 +203,6 @@ - - - @@ -276,18 +238,11 @@ - - - - - - - @@ -326,12 +281,6 @@ - - - - - - @@ -350,18 +299,6 @@ - - - - - - - - - - - - @@ -404,12 +341,6 @@ - - - - - - @@ -432,7 +363,7 @@ - + @@ -467,7 +398,7 @@ - + @@ -487,7 +418,7 @@ - + @@ -1004,7 +935,7 @@ - + @@ -1041,7 +972,7 @@ - + @@ -1065,7 +996,7 @@ - + @@ -1113,7 +1044,7 @@ - + @@ -1635,365 +1566,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2065,7 +1641,7 @@ - + @@ -2196,7 +1772,7 @@ - + @@ -2307,7 +1883,7 @@ - + @@ -2422,7 +1998,7 @@ - + @@ -2453,7 +2029,7 @@ - + diff --git a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/actions.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/actions.mps index ea70e6423c97..5b1fa29bcada 100644 --- a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/actions.mps +++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/actions.mps @@ -149,50 +149,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps index 71ce600a444e..ba602bb87a8a 100644 --- a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps +++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps @@ -148,7 +148,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -372,7 +372,7 @@ - + @@ -417,7 +417,7 @@ - + @@ -454,7 +454,7 @@ - + @@ -491,7 +491,7 @@ - + @@ -528,7 +528,7 @@ - + @@ -613,7 +613,7 @@ - + @@ -650,7 +650,7 @@ - + @@ -675,7 +675,7 @@ - + @@ -711,53 +711,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -779,8 +735,8 @@ - - + + @@ -802,8 +758,8 @@ - - + + diff --git a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps index 1120c74c9d9a..71c0d33fe653 100644 --- a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps +++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/constraints.mps @@ -97,7 +97,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -137,7 +137,7 @@ - + diff --git a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/editor.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/editor.mps index b54d3c1f18d9..ace917afaf79 100644 --- a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/editor.mps +++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/editor.mps @@ -225,9 +225,6 @@ - - - @@ -260,7 +257,7 @@ - + @@ -273,7 +270,7 @@ - + @@ -293,27 +290,8 @@ - - - - - - - - - - - - - - - - - - - - + @@ -339,7 +317,7 @@ - + @@ -371,7 +349,7 @@ - + @@ -404,7 +382,7 @@ - + @@ -425,7 +403,7 @@ - + @@ -598,7 +576,7 @@ - + @@ -607,33 +585,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -641,7 +594,7 @@ - + @@ -677,7 +630,7 @@ - + @@ -713,7 +666,7 @@ - + @@ -867,7 +820,7 @@ - + @@ -987,7 +940,7 @@ - + diff --git a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps index 4dc491a8d6f9..9fa368fcb1e8 100644 --- a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps +++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps @@ -44,15 +44,8 @@ - - - - - - - - + @@ -65,13 +58,13 @@ - + - + @@ -81,7 +74,7 @@ - + @@ -96,73 +89,46 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + @@ -172,14 +138,14 @@ - + - + @@ -191,14 +157,14 @@ - + - + @@ -211,43 +177,26 @@ - + - + - + - - - - - - - - - - - - - - - - - - + @@ -259,7 +208,7 @@ - + @@ -271,7 +220,7 @@ - + @@ -284,22 +233,22 @@ - - + + - + - - + + - + - - + + diff --git a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps index 2c6317cc0abb..29084c1b0a6d 100644 --- a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps +++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps @@ -11,7 +11,6 @@ - @@ -220,39 +219,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -298,7 +267,7 @@ - + @@ -530,7 +499,7 @@ - + @@ -554,39 +523,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -612,7 +551,7 @@ - + @@ -638,7 +577,7 @@ - + @@ -664,7 +603,7 @@ - + @@ -692,7 +631,7 @@ - + @@ -890,33 +829,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -973,118 +888,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1126,7 +932,7 @@ - + @@ -1166,7 +972,7 @@ - + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies new file mode 100644 index 000000000000..9a7a7734512a --- /dev/null +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated new file mode 100644 index 000000000000..119348ef3b9f --- /dev/null +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated @@ -0,0 +1,3 @@ + + + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java new file mode 100644 index 000000000000..e2ecd8d62656 --- /dev/null +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java @@ -0,0 +1,262 @@ +package jetbrains.mps.lang.smodel.query.runtime.util; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.module.SearchScope; +import jetbrains.mps.internal.collections.runtime.Sequence; +import jetbrains.mps.internal.collections.runtime.ITranslator2; +import org.jetbrains.mps.openapi.model.SModel; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SModelOperations; +import org.jetbrains.mps.openapi.model.SReference; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import org.jetbrains.mps.openapi.module.SModule; +import java.util.Collection; +import java.util.Set; +import jetbrains.mps.findUsages.FindUsagesManager; +import java.util.Collections; +import jetbrains.mps.progress.EmptyProgressMonitor; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.project.Project; +import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes; +import jetbrains.mps.ide.findusages.model.SearchResults; +import jetbrains.mps.ide.project.ProjectHelper; +import org.apache.log4j.Level; +import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import org.jetbrains.mps.openapi.model.SNodeReference; +import org.jetbrains.mps.openapi.module.SRepository; +import jetbrains.mps.internal.collections.runtime.IWhereFilter; +import jetbrains.mps.internal.collections.runtime.IVisitor; +import jetbrains.mps.ide.findusages.model.SearchResult; +import org.jetbrains.mps.openapi.model.SModelReference; +import org.jetbrains.mps.openapi.module.SModuleReference; +import org.jetbrains.annotations.Nullable; +import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.project.EditableFilteringScope; +import jetbrains.mps.ide.findusages.model.scopes.ModelsScope; +import jetbrains.mps.ide.findusages.model.scopes.ModulesScope; +import java.util.Iterator; +import jetbrains.mps.ide.findusages.model.scopes.ProjectScope; +import org.apache.log4j.Logger; +import org.apache.log4j.LogManager; +import jetbrains.mps.ide.findusages.view.UsagesViewTool; + +public class CommandUtil { + public static Iterable nodes(SearchScope scope) { + return Sequence.fromIterable(models(scope)).translate(new ITranslator2() { + public Iterable translate(SModel it) { + return SModelOperations.nodes(it, null); + } + }); + } + + public static Iterable references(SearchScope scope) { + return Sequence.fromIterable(nodes(scope)).translate(new ITranslator2() { + public Iterable translate(SNode it) { + return SNodeOperations.getReferences(it); + } + }); + } + + public static Iterable models(SearchScope scope) { + return (Iterable) scope.getModels(); + } + + public static Iterable modules(SearchScope scope) { + return scope.getModules(); + } + + public static Collection usages(SearchScope scope, SNode node) { + return (Set) FindUsagesManager.getInstance().findUsages(scope, Collections.singleton(node), new EmptyProgressMonitor()); + } + + public static Collection instances(SearchScope scope, SAbstractConcept concept) { + return FindUsagesManager.getInstance().findInstances(scope, Collections.singleton(concept), false, new EmptyProgressMonitor()); + } + + public static void show(Project p, _FunctionTypes._return_P0_E0 results) { + try { + check_1pinza_a0a0a0m(ProjectHelper.toIdeaProject(p)).show(results.invoke(), "No results to show"); + } catch (Exception e) { + if (LOG.isEnabledFor(Level.WARN)) { + LOG.warn("Exception in showing custom console result", e); + } + } + } + + public static void printSequence(ConsoleStream console, final Project project, final _FunctionTypes._return_P0_E0 results, int resultsCount, String resultDescription) { + if (resultsCount == 0) { + console.addText("empty sequence"); + } else { + console.addClosure(new _FunctionTypes._void_P0_E0() { + public void invoke() { + CommandUtil.show(project, results); + } + }, resultsCount + " " + resultDescription); + } + } + + public static _FunctionTypes._return_P0_E0 nodesToResults(final Iterable nodes, final SRepository repository) { + return new _FunctionTypes._return_P0_E0>() { + public SearchResults invoke() { + final SearchResults res = new SearchResults(); + Sequence.fromIterable(nodes).where(new IWhereFilter() { + public boolean accept(SNodeReference it) { + return check_1pinza_a0a0a0a0b0a0a61(it, repository) != null; + } + }).visitAll(new IVisitor() { + public void visit(SNodeReference it) { + res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a61(it, repository), "usage")); + } + }); + return res; + } + }; + } + + public static _FunctionTypes._return_P0_E0 modelsToResults(final Iterable models, final SRepository repository) { + return new _FunctionTypes._return_P0_E0>() { + public SearchResults invoke() { + final SearchResults res = new SearchResults(); + Sequence.fromIterable(models).where(new IWhereFilter() { + public boolean accept(SModelReference it) { + return check_1pinza_a0a0a0a0b0a0a81(it, repository) != null; + } + }).visitAll(new IVisitor() { + public void visit(SModelReference it) { + res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a81(it, repository), "usage")); + } + }); + return res; + } + }; + } + + public static _FunctionTypes._return_P0_E0 modulesToResults(final Iterable modules, final SRepository repository) { + return new _FunctionTypes._return_P0_E0>() { + public SearchResults invoke() { + final SearchResults res = new SearchResults(); + Sequence.fromIterable(modules).where(new IWhereFilter() { + public boolean accept(SModuleReference it) { + return check_1pinza_a0a0a0a0b0a0a02(it, repository) != null; + } + }).visitAll(new IVisitor() { + public void visit(SModuleReference it) { + res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a02(it, repository), "usage")); + } + }); + return res; + } + }; + + } + + public static SNodeReference getNodeReference(SNode aNode) { + return check_1pinza_a0a22(aNode); + } + public static SNodeReference getReferenceReference(SReference aReference) { + return check_1pinza_a0a32(check_1pinza_a0a0x(aReference)); + } + public static SModelReference getModelReference(SModel aModel) { + return check_1pinza_a0a42(aModel); + } + public static SModuleReference getModuleReference(SModule aModule) { + return check_1pinza_a0a52(aModule); + } + + public static SearchScope createConsoleScope(@Nullable final SearchScope baseScope, final boolean includeReadOnly, final ConsoleContext context) { + SearchScope scope = (baseScope == null ? context.getDefaultSearchscope() : baseScope); + return (includeReadOnly ? scope : new EditableFilteringScope(scope)); + } + + public static SearchScope createScope(SModel model) { + return new ModelsScope(model); + } + public static SearchScope createScope(SModule module) { + return new ModulesScope(module); + } + public static SearchScope createScope(Iterable modelsAndModules) { + Iterator it = modelsAndModules.iterator(); + if (!(it.hasNext())) { + return new ModelsScope(); + } + return (it.next() instanceof SModule ? new ModulesScope(modelsAndModules) : new ModelsScope(modelsAndModules)); + } + public static SearchScope createScope(Project project) { + return new ProjectScope(project); + } + + protected static Logger LOG = LogManager.getLogger(CommandUtil.class); + private static UsagesViewTool check_1pinza_a0a0a0m(com.intellij.openapi.project.Project checkedDotOperand) { + if (null != checkedDotOperand) { + return checkedDotOperand.getComponent(UsagesViewTool.class); + } + return null; + } + private static SNode check_1pinza_a0a0a0a0b0a0a61(SNodeReference checkedDotOperand, SRepository repository) { + if (null != checkedDotOperand) { + return checkedDotOperand.resolve(repository); + } + return null; + } + private static SNode check_1pinza_a0a0a0a0a0b0a0a61(SNodeReference checkedDotOperand, SRepository repository) { + if (null != checkedDotOperand) { + return checkedDotOperand.resolve(repository); + } + return null; + } + private static SModel check_1pinza_a0a0a0a0b0a0a81(SModelReference checkedDotOperand, SRepository repository) { + if (null != checkedDotOperand) { + return checkedDotOperand.resolve(repository); + } + return null; + } + private static SModel check_1pinza_a0a0a0a0a0b0a0a81(SModelReference checkedDotOperand, SRepository repository) { + if (null != checkedDotOperand) { + return checkedDotOperand.resolve(repository); + } + return null; + } + private static SModule check_1pinza_a0a0a0a0b0a0a02(SModuleReference checkedDotOperand, SRepository repository) { + if (null != checkedDotOperand) { + return checkedDotOperand.resolve(repository); + } + return null; + } + private static SModule check_1pinza_a0a0a0a0a0b0a0a02(SModuleReference checkedDotOperand, SRepository repository) { + if (null != checkedDotOperand) { + return checkedDotOperand.resolve(repository); + } + return null; + } + private static SNodeReference check_1pinza_a0a22(SNode checkedDotOperand) { + if (null != checkedDotOperand) { + return checkedDotOperand.getReference(); + } + return null; + } + private static SNodeReference check_1pinza_a0a32(SNode checkedDotOperand) { + if (null != checkedDotOperand) { + return checkedDotOperand.getReference(); + } + return null; + } + private static SNode check_1pinza_a0a0x(SReference checkedDotOperand) { + if (null != checkedDotOperand) { + return checkedDotOperand.getSourceNode(); + } + return null; + } + private static SModelReference check_1pinza_a0a42(SModel checkedDotOperand) { + if (null != checkedDotOperand) { + return checkedDotOperand.getReference(); + } + return null; + } + private static SModuleReference check_1pinza_a0a52(SModule checkedDotOperand) { + if (null != checkedDotOperand) { + return checkedDotOperand.getModuleReference(); + } + return null; + } +} diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info new file mode 100644 index 000000000000..469a22cdb0ab --- /dev/null +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info @@ -0,0 +1,380 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/actions/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/actions/dependencies new file mode 100644 index 000000000000..7ef0b24c2b40 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/actions/dependencies @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/actions/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/actions/generated new file mode 100644 index 000000000000..44b9d10d6e60 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/actions/generated @@ -0,0 +1,3 @@ + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies new file mode 100644 index 000000000000..50108270709f --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies @@ -0,0 +1,302 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated new file mode 100644 index 000000000000..0d2c14b77232 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated @@ -0,0 +1,3 @@ + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/constraints/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/constraints/dependencies new file mode 100644 index 000000000000..405b370ff601 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/constraints/dependencies @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/constraints/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/constraints/generated new file mode 100644 index 000000000000..e77797fb5113 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/constraints/generated @@ -0,0 +1,3 @@ + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/dependencies new file mode 100644 index 000000000000..4f11a33f1375 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/dependencies @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/dependencies new file mode 100644 index 000000000000..886a5e0c35a8 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/dependencies @@ -0,0 +1,345 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/generated new file mode 100644 index 000000000000..d41ee5c43d21 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/generated @@ -0,0 +1,3 @@ + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated new file mode 100644 index 000000000000..9b132155cdd4 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated @@ -0,0 +1,3 @@ + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/dependencies new file mode 100644 index 000000000000..84b0b4c2fdb2 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/dependencies @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated new file mode 100644 index 000000000000..1b6918d84c71 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated @@ -0,0 +1,3 @@ + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies new file mode 100644 index 000000000000..ceae553871b9 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated new file mode 100644 index 000000000000..1b6adc319546 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated @@ -0,0 +1,3 @@ + + + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/Language.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/Language.java new file mode 100644 index 000000000000..0085a9847104 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/Language.java @@ -0,0 +1,71 @@ +package jetbrains.mps.lang.smodel.query; + +/*Generated by MPS */ + +import jetbrains.mps.smodel.language.LanguageRuntime; +import jetbrains.mps.smodel.adapter.ids.SLanguageId; +import java.util.UUID; +import java.util.Collection; +import jetbrains.mps.generator.runtime.TemplateModule; +import jetbrains.mps.generator.runtime.TemplateUtil; +import jetbrains.mps.smodel.runtime.ILanguageAspect; +import jetbrains.mps.openapi.actions.descriptor.ActionAspectDescriptor; +import jetbrains.mps.lang.smodel.query.actions.ActionAspectDescriptorImpl; +import jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor; +import jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor; +import jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor; +import jetbrains.mps.lang.smodel.query.editor.EditorAspectDescriptorImpl; +import jetbrains.mps.smodel.runtime.StructureAspectDescriptor; +import jetbrains.mps.lang.typesystem.runtime.IHelginsDescriptor; +import jetbrains.mps.lang.smodel.query.typesystem.TypesystemDescriptor; + +public class Language extends LanguageRuntime { + public static String MODULE_REF = "1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query)"; + public Language() { + } + @Override + public String getNamespace() { + return "jetbrains.mps.lang.smodel.query"; + } + + @Override + public int getVersion() { + return 0; + } + + public SLanguageId getId() { + return new SLanguageId(UUID.fromString("1a8554c4-eb84-43ba-8c34-6f0d90c6e75a")); + } + @Override + protected String[] getExtendedLanguageIDs() { + return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.baseLanguage", "jetbrains.mps.baseLanguage.tuples"}; + } + @Override + public Collection getGenerators() { + return TemplateUtil.asCollection(TemplateUtil.createInterpretedGenerator(this, "504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)")); + } + @Override + protected T createAspect(Class aspectClass) { + if (aspectClass == ActionAspectDescriptor.class) { + return (T) new ActionAspectDescriptorImpl(); + } + if (aspectClass == BehaviorAspectDescriptor.class) { + return (T) new jetbrains.mps.lang.smodel.query.behavior.BehaviorAspectDescriptor(); + } + if (aspectClass == ConstraintsAspectDescriptor.class) { + return (T) new jetbrains.mps.lang.smodel.query.constraints.ConstraintsAspectDescriptor(); + } + if (aspectClass == EditorAspectDescriptor.class) { + return (T) new EditorAspectDescriptorImpl(); + } + if (aspectClass == StructureAspectDescriptor.class) { + return (T) new jetbrains.mps.lang.smodel.query.structure.StructureAspectDescriptor(); + } + if (aspectClass == IHelginsDescriptor.class) { + return (T) new TypesystemDescriptor(); + } + + + return super.createAspect(aspectClass); + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/ActionAspectDescriptorImpl.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/ActionAspectDescriptorImpl.java new file mode 100644 index 000000000000..73d9ed141c22 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/ActionAspectDescriptorImpl.java @@ -0,0 +1,32 @@ +package jetbrains.mps.lang.smodel.query.actions; + +/*Generated by MPS */ + +import jetbrains.mps.openapi.actions.descriptor.ActionAspectDescriptor; +import java.util.Collection; +import jetbrains.mps.openapi.actions.descriptor.NodeFactory; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import java.util.Arrays; +import java.util.Collections; + +public class ActionAspectDescriptorImpl implements ActionAspectDescriptor { + private static final String LANGUAGE_FQ_NAME = "jetbrains.mps.lang.smodel.query"; + + public Collection getFactories(SAbstractConcept concept) { + if (LANGUAGE_FQ_NAME.equals(concept.getLanguage().getQualifiedName())) { + switch (Arrays.binarySearch(stringSwitchCases_tpto26_a0a0a0c, concept.getName())) { + case 0: + return Collections.singletonList(new ScopeParameterLiteral_factories.NodeFactory_3492877759609298945()); + case 1: + return Collections.singletonList(new ScopeParameterLiteral_factories.NodeFactory_3492877759608986170()); + case 2: + return Collections.singletonList(new ScopeParameterLiteral_factories.NodeFactory_3492877759608901705()); + case 3: + return Collections.singletonList(new QueryExpression_NodeFactories.NodeFactory_4307205004138627840()); + default: + } + } + return Collections.emptyList(); + } + private static String[] stringSwitchCases_tpto26_a0a0a0c = new String[]{"CustomScope", "ModelScope", "ModulesScope", "QueryExpression"}; +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/QueriesGenerated.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/QueriesGenerated.java new file mode 100644 index 000000000000..8372dfc1a561 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/QueriesGenerated.java @@ -0,0 +1,7 @@ +package jetbrains.mps.lang.smodel.query.actions; + +/*Generated by MPS */ + + +public class QueriesGenerated { +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/QueryExpression_NodeFactories.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/QueryExpression_NodeFactories.java new file mode 100644 index 000000000000..9a6b9d59169f --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/QueryExpression_NodeFactories.java @@ -0,0 +1,22 @@ +package jetbrains.mps.lang.smodel.query.actions; + +/*Generated by MPS */ + +import jetbrains.mps.openapi.actions.descriptor.NodeFactory; +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.model.SModel; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; + +public class QueryExpression_NodeFactories { + public static class NodeFactory_4307205004138627840 implements NodeFactory { + public void setup(SNode newNode, SNode sampleNode, SNode enclosingNode, SModel model) { + if (SNodeOperations.isInstanceOf(sampleNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.lang.smodel.query.structure.QueryExpression"))) { + SLinkOperations.setTarget(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), SLinkOperations.getTarget(SNodeOperations.cast(sampleNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.lang.smodel.query.structure.QueryExpression")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"))); + } else { + SLinkOperations.setTarget(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), null); + } + } + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/ScopeParameterLiteral_factories.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/ScopeParameterLiteral_factories.java new file mode 100644 index 000000000000..21d023121b68 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/ScopeParameterLiteral_factories.java @@ -0,0 +1,27 @@ +package jetbrains.mps.lang.smodel.query.actions; + +/*Generated by MPS */ + +import jetbrains.mps.openapi.actions.descriptor.NodeFactory; +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.model.SModel; +import jetbrains.mps.smodel.action.SNodeFactoryOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; + +public class ScopeParameterLiteral_factories { + public static class NodeFactory_3492877759608901705 implements NodeFactory { + public void setup(SNode newNode, SNode sampleNode, SNode enclosingNode, SModel model) { + SNodeFactoryOperations.addNewChild(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL, 0x307931d0f94af768L, "module"), SNodeFactoryOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x38130dc4e3db5af1L, "jetbrains.mps.lang.smodel.structure.ModuleReferenceExpression"))); + } + } + public static class NodeFactory_3492877759608986170 implements NodeFactory { + public void setup(SNode newNode, SNode sampleNode, SNode enclosingNode, SModel model) { + SNodeFactoryOperations.addNewChild(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL, 0x307931d0f952484fL, "model"), SNodeFactoryOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x7c3f2da20e92b62L, "jetbrains.mps.lang.smodel.structure.ModelReferenceExpression"))); + } + } + public static class NodeFactory_3492877759609298945 implements NodeFactory { + public void setup(SNode newNode, SNode sampleNode, SNode enclosingNode, SModel model) { + SNodeFactoryOperations.setNewChild(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, 0x307931d0f985950eL, "scope"), SNodeFactoryOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10ab8473cc5L, "jetbrains.mps.baseLanguage.structure.GenericNewExpression"))); + } + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/trace.info new file mode 100644 index 000000000000..a62900a09a36 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/actions/trace.info @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java new file mode 100644 index 000000000000..57fe52ef46f9 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java @@ -0,0 +1,53 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import jetbrains.mps.smodel.runtime.BehaviorDescriptor; +import java.util.Arrays; +import jetbrains.mps.smodel.runtime.interpreted.BehaviorAspectInterpreted; + +public class BehaviorAspectDescriptor implements jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor { + public BehaviorAspectDescriptor() { + } + public BehaviorDescriptor getDescriptor(String fqName) { + switch (Arrays.binarySearch(stringSwitchCases_846f5o_a0a0b, fqName)) { + case 15: + return new UsagesExpression_BehaviorDescriptor(); + case 14: + return new ShowExpression_BehaviorDescriptor(); + case 2: + return new InstancesExpression_BehaviorDescriptor(); + case 8: + return new ProjectExpression_BehaviorDescriptor(); + case 7: + return new NodesExpression_BehaviorDescriptor(); + case 13: + return new ReferencesExpression_BehaviorDescriptor(); + case 4: + return new ModelsExpression_BehaviorDescriptor(); + case 5: + return new ModulesExpression_BehaviorDescriptor(); + case 11: + return new QueryParameterList_BehaviorDescriptor(); + case 10: + return new QueryParameterIncludeReadOnly_BehaviorDescriptor(); + case 12: + return new QueryParameterScope_BehaviorDescriptor(); + case 1: + return new GlobalScope_BehaviorDescriptor(); + case 9: + return new ProjectScope_BehaviorDescriptor(); + case 6: + return new ModulesScope_BehaviorDescriptor(); + case 3: + return new ModelScope_BehaviorDescriptor(); + case 0: + return new CustomScope_BehaviorDescriptor(); + case 16: + return new WithStatement_BehaviorDescriptor(); + default: + return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName); + } + } + private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.GlobalScope", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModelsExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.NodesExpression", "jetbrains.mps.lang.smodel.query.structure.ProjectExpression", "jetbrains.mps.lang.smodel.query.structure.ProjectScope", "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", "jetbrains.mps.lang.smodel.query.structure.ShowExpression", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"}; +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/CustomScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/CustomScope_BehaviorDescriptor.java new file mode 100644 index 000000000000..97c662345b6a --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/CustomScope_BehaviorDescriptor.java @@ -0,0 +1,13 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + + +public class CustomScope_BehaviorDescriptor extends ScopeParameter_BehaviorDescriptor { + public CustomScope_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.CustomScope"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ExpressionHelpProvider_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ExpressionHelpProvider_Behavior.java new file mode 100644 index 000000000000..faadd8cc65e0 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ExpressionHelpProvider_Behavior.java @@ -0,0 +1,14 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; + +public class ExpressionHelpProvider_Behavior { + public static void init(SNode thisNode) { + } + public static String virtual_getKind_7006261637493126084(SAbstractConcept thisConcept) { + return "expression"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ExpressionHelpProvider_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ExpressionHelpProvider_BehaviorDescriptor.java new file mode 100644 index 000000000000..ed72037b0a5f --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ExpressionHelpProvider_BehaviorDescriptor.java @@ -0,0 +1,7 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + + +public interface ExpressionHelpProvider_BehaviorDescriptor extends HelpProvider_BehaviorDescriptor { +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/GlobalScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/GlobalScope_BehaviorDescriptor.java new file mode 100644 index 000000000000..122ad2709468 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/GlobalScope_BehaviorDescriptor.java @@ -0,0 +1,13 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + + +public class GlobalScope_BehaviorDescriptor extends ScopeParameter_BehaviorDescriptor { + public GlobalScope_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.GlobalScope"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/HelpProvider_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/HelpProvider_Behavior.java new file mode 100644 index 000000000000..84c2acee5ba4 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/HelpProvider_Behavior.java @@ -0,0 +1,36 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.smodel.behaviour.BehaviorReflection; + +public class HelpProvider_Behavior { + public static void init(SNode thisNode) { + } + public static String virtual_getShortHelp_473081947982699339(SAbstractConcept thisConcept) { + return SPropertyOperations.getString(SNodeOperations.asNode(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), MetaAdapterFactory.getProperty(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0x1103553c5ffL, 0x403a32c5772bbe20L, "conceptShortDescription")); + } + public static String virtual_getHelpPage_7006261637493125297(SAbstractConcept thisConcept) { + return null; + } + public static String virtual_getGroup_6928665434441162387(SAbstractConcept thisConcept) { + return SNodeOperations.getModel(SNodeOperations.asNode(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName()))).getModule().getModuleName(); + } + public static String virtual_getShortDisplayString_7006261637493126103(SAbstractConcept thisConcept) { + String alias = SPropertyOperations.getString(SNodeOperations.asNode(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), MetaAdapterFactory.getProperty(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0x1103553c5ffL, 0x46ab0ad5826c74caL, "conceptAlias")); + if ((alias != null && alias.length() > 0)) { + return alias; + } else { + return SPropertyOperations.getString(SNodeOperations.asNode(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name")); + } + } + public static String virtual_getDisplayString_6891027939994892943(SAbstractConcept thisConcept) { + return BehaviorReflection.invokeVirtualStatic(String.class, SNodeOperations.asSConcept(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), "virtual_getShortDisplayString_7006261637493126103", new Object[]{}); + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/HelpProvider_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/HelpProvider_BehaviorDescriptor.java new file mode 100644 index 000000000000..5e72c6354d5c --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/HelpProvider_BehaviorDescriptor.java @@ -0,0 +1,14 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.language.SConcept; + +public interface HelpProvider_BehaviorDescriptor { + public String virtual_getShortHelp_473081947982699339(SConcept thisConcept); + public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept); + public String virtual_getKind_7006261637493126084(SConcept thisConcept); + public String virtual_getGroup_6928665434441162387(SConcept thisConcept); + public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept); + public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept); +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/InstancesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/InstancesExpression_Behavior.java new file mode 100644 index 000000000000..3a5ced2af8b9 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/InstancesExpression_Behavior.java @@ -0,0 +1,25 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import java.util.ArrayList; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.smodel.behaviour.BehaviorReflection; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; + +public class InstancesExpression_Behavior { + public static void init(SNode thisNode) { + } + public static Iterable virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) { + return ListSequence.fromListAndArray(new ArrayList(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly").getDeclarationNode()); + } + public static String virtual_getHelpPage_7006261637493125297(SAbstractConcept thisConcept) { + return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "virtual_getHelpPage_7006261637493125297", new Object[]{}) + "\nImplementation of this command uses the IDE indexes to speed up execution"; + } + public static String virtual_getDisplayString_6891027939994892943(SAbstractConcept thisConcept) { + return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "virtual_getDisplayString_6891027939994892943", new Object[]{}) + "(concept)"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/InstancesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/InstancesExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..699f008784b8 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/InstancesExpression_BehaviorDescriptor.java @@ -0,0 +1,24 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.language.SConcept; +import org.jetbrains.mps.openapi.model.SNode; + +public class InstancesExpression_BehaviorDescriptor extends QueryExpression_BehaviorDescriptor { + public InstancesExpression_BehaviorDescriptor() { + } + public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { + return InstancesExpression_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); + } + public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { + return InstancesExpression_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); + } + public Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept) { + return InstancesExpression_Behavior.virtual_getSupportedParameters_4307205004146936444(thisConcept); + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.InstancesExpression"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelScope_BehaviorDescriptor.java new file mode 100644 index 000000000000..487d456d3afb --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelScope_BehaviorDescriptor.java @@ -0,0 +1,13 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + + +public class ModelScope_BehaviorDescriptor extends ScopeParameter_BehaviorDescriptor { + public ModelScope_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.ModelScope"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelsExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelsExpression_Behavior.java new file mode 100644 index 000000000000..aa30b9a727ea --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelsExpression_Behavior.java @@ -0,0 +1,17 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import java.util.ArrayList; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; + +public class ModelsExpression_Behavior { + public static void init(SNode thisNode) { + } + public static Iterable virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) { + return ListSequence.fromListAndArray(new ArrayList(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly").getDeclarationNode()); + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelsExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelsExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..9dfceaf7a643 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModelsExpression_BehaviorDescriptor.java @@ -0,0 +1,18 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SConcept; + +public class ModelsExpression_BehaviorDescriptor extends QueryExpression_BehaviorDescriptor { + public ModelsExpression_BehaviorDescriptor() { + } + public Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept) { + return ModelsExpression_Behavior.virtual_getSupportedParameters_4307205004146936444(thisConcept); + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.ModelsExpression"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesExpression_Behavior.java new file mode 100644 index 000000000000..58c928994ec8 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesExpression_Behavior.java @@ -0,0 +1,17 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import java.util.ArrayList; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; + +public class ModulesExpression_Behavior { + public static void init(SNode thisNode) { + } + public static Iterable virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) { + return ListSequence.fromListAndArray(new ArrayList(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly").getDeclarationNode()); + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..c9e77bb0e1b9 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesExpression_BehaviorDescriptor.java @@ -0,0 +1,18 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SConcept; + +public class ModulesExpression_BehaviorDescriptor extends QueryExpression_BehaviorDescriptor { + public ModulesExpression_BehaviorDescriptor() { + } + public Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept) { + return ModulesExpression_Behavior.virtual_getSupportedParameters_4307205004146936444(thisConcept); + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.ModulesExpression"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesScope_BehaviorDescriptor.java new file mode 100644 index 000000000000..5a8f857d14cd --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ModulesScope_BehaviorDescriptor.java @@ -0,0 +1,13 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + + +public class ModulesScope_BehaviorDescriptor extends ScopeParameter_BehaviorDescriptor { + public ModulesScope_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.ModulesScope"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/NodesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/NodesExpression_Behavior.java new file mode 100644 index 000000000000..214b12ae0e1c --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/NodesExpression_Behavior.java @@ -0,0 +1,17 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import java.util.ArrayList; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; + +public class NodesExpression_Behavior { + public static void init(SNode thisNode) { + } + public static Iterable virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) { + return ListSequence.fromListAndArray(new ArrayList(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly").getDeclarationNode()); + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/NodesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/NodesExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..345237f22ad5 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/NodesExpression_BehaviorDescriptor.java @@ -0,0 +1,18 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SConcept; + +public class NodesExpression_BehaviorDescriptor extends QueryExpression_BehaviorDescriptor { + public NodesExpression_BehaviorDescriptor() { + } + public Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept) { + return NodesExpression_Behavior.virtual_getSupportedParameters_4307205004146936444(thisConcept); + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.NodesExpression"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/OperationHelpProvider_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/OperationHelpProvider_Behavior.java new file mode 100644 index 000000000000..4b550c2b9fb3 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/OperationHelpProvider_Behavior.java @@ -0,0 +1,14 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; + +public class OperationHelpProvider_Behavior { + public static void init(SNode thisNode) { + } + public static String virtual_getKind_7006261637493126084(SAbstractConcept thisConcept) { + return "operation"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/OperationHelpProvider_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/OperationHelpProvider_BehaviorDescriptor.java new file mode 100644 index 000000000000..414e37799eb0 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/OperationHelpProvider_BehaviorDescriptor.java @@ -0,0 +1,7 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + + +public interface OperationHelpProvider_BehaviorDescriptor extends HelpProvider_BehaviorDescriptor { +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectExpression_Behavior.java new file mode 100644 index 000000000000..e5852254d9c6 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectExpression_Behavior.java @@ -0,0 +1,14 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; + +public class ProjectExpression_Behavior { + public static void init(SNode thisNode) { + } + public static Iterable virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) { + return null; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..625e46207b24 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectExpression_BehaviorDescriptor.java @@ -0,0 +1,18 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SConcept; + +public class ProjectExpression_BehaviorDescriptor extends QueryExpression_BehaviorDescriptor { + public ProjectExpression_BehaviorDescriptor() { + } + public Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept) { + return ProjectExpression_Behavior.virtual_getSupportedParameters_4307205004146936444(thisConcept); + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.ProjectExpression"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectScope_BehaviorDescriptor.java new file mode 100644 index 000000000000..d16ae85aa9f9 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectScope_BehaviorDescriptor.java @@ -0,0 +1,13 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + + +public class ProjectScope_BehaviorDescriptor extends ScopeParameter_BehaviorDescriptor { + public ProjectScope_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.ProjectScope"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryExpression_Behavior.java new file mode 100644 index 000000000000..a36f7a4cebd8 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryExpression_Behavior.java @@ -0,0 +1,39 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.internal.collections.runtime.Sequence; +import jetbrains.mps.smodel.behaviour.BehaviorReflection; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; + +public class QueryExpression_Behavior { + public static void init(SNode thisNode) { + } + public static boolean virtual_legalAsStatement_1262430001741498032(SAbstractConcept thisConcept) { + return true; + } + public static String virtual_getHelpPage_7006261637493125297(SAbstractConcept thisConcept) { + String result = "Supported parameters:\n"; + if (Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class>) ((Class) Object.class), SNodeOperations.asSConcept(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).contains(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope").getDeclarationNode())) { + result += "scope (default = project) specifies the boundaries of the lookup operation\n"; + } + if (Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class>) ((Class) Object.class), SNodeOperations.asSConcept(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).contains(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly").getDeclarationNode())) { + result += "r/o+ (default = false) also search in read-only models\n"; + } else { + result += "Note: read-only models are included in the search scope\n"; + } + return result; + } + public static String virtual_getDisplayString_6891027939994892943(SAbstractConcept thisConcept) { + String result = BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider", "virtual_getShortDisplayString_7006261637493126103", new Object[]{}); + if (Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class>) ((Class) Object.class), SNodeOperations.asSConcept(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).isEmpty()) { + return result; + } else { + return result + ""; + } + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..36c5d2c5ffd3 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryExpression_BehaviorDescriptor.java @@ -0,0 +1,38 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; +import org.jetbrains.mps.openapi.language.SConcept; +import org.jetbrains.mps.openapi.model.SNode; + +public abstract class QueryExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ExpressionHelpProvider_BehaviorDescriptor { + public QueryExpression_BehaviorDescriptor() { + } + public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { + return QueryExpression_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); + } + public String virtual_getGroup_6928665434441162387(SConcept thisConcept) { + return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); + } + public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { + return QueryExpression_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); + } + public String virtual_getKind_7006261637493126084(SConcept thisConcept) { + return ExpressionHelpProvider_Behavior.virtual_getKind_7006261637493126084(thisConcept); + } + public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) { + return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); + } + public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) { + return HelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); + } + public boolean virtual_legalAsStatement_1262430001741498032(SConcept thisConcept) { + return QueryExpression_Behavior.virtual_legalAsStatement_1262430001741498032(thisConcept); + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.QueryExpression"; + } + public abstract Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept); +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java new file mode 100644 index 000000000000..110fe9f0bda5 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java @@ -0,0 +1,13 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + + +public class QueryParameterIncludeReadOnly_BehaviorDescriptor extends QueryParameter_BehaviorDescriptor { + public QueryParameterIncludeReadOnly_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterList_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterList_BehaviorDescriptor.java new file mode 100644 index 000000000000..ef64663d36ff --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterList_BehaviorDescriptor.java @@ -0,0 +1,14 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; + +public class QueryParameterList_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor { + public QueryParameterList_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.QueryParameterList"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterScope_BehaviorDescriptor.java new file mode 100644 index 000000000000..8bc50c34fb47 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameterScope_BehaviorDescriptor.java @@ -0,0 +1,13 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + + +public class QueryParameterScope_BehaviorDescriptor extends QueryParameter_BehaviorDescriptor { + public QueryParameterScope_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameter_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameter_BehaviorDescriptor.java new file mode 100644 index 000000000000..bcec6684376b --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/QueryParameter_BehaviorDescriptor.java @@ -0,0 +1,14 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; + +public abstract class QueryParameter_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor { + public QueryParameter_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.QueryParameter"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ReferencesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ReferencesExpression_Behavior.java new file mode 100644 index 000000000000..c58fdf2231e7 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ReferencesExpression_Behavior.java @@ -0,0 +1,17 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import java.util.ArrayList; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; + +public class ReferencesExpression_Behavior { + public static void init(SNode thisNode) { + } + public static Iterable virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) { + return ListSequence.fromListAndArray(new ArrayList(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly").getDeclarationNode()); + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ReferencesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ReferencesExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..b3b6410a497f --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ReferencesExpression_BehaviorDescriptor.java @@ -0,0 +1,18 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SConcept; + +public class ReferencesExpression_BehaviorDescriptor extends QueryExpression_BehaviorDescriptor { + public ReferencesExpression_BehaviorDescriptor() { + } + public Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept) { + return ReferencesExpression_Behavior.virtual_getSupportedParameters_4307205004146936444(thisConcept); + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ScopeParameter_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ScopeParameter_BehaviorDescriptor.java new file mode 100644 index 000000000000..b5c8ce422e14 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ScopeParameter_BehaviorDescriptor.java @@ -0,0 +1,14 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; + +public abstract class ScopeParameter_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor { + public ScopeParameter_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.ScopeParameter"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ShowExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ShowExpression_Behavior.java new file mode 100644 index 000000000000..cf76896f8e54 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ShowExpression_Behavior.java @@ -0,0 +1,17 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; + +public class ShowExpression_Behavior { + public static void init(SNode thisNode) { + } + public static boolean virtual_legalAsStatement_1262430001741498032(SAbstractConcept thisConcept) { + return true; + } + public static String virtual_getShortHelp_473081947982699339(SAbstractConcept thisConcept) { + return "show sequence of nodes/references/models/modules in the Usages View panel"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ShowExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ShowExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..0e00b5b3e433 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ShowExpression_BehaviorDescriptor.java @@ -0,0 +1,36 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; +import org.jetbrains.mps.openapi.language.SConcept; + +public class ShowExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ExpressionHelpProvider_BehaviorDescriptor { + public ShowExpression_BehaviorDescriptor() { + } + public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { + return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); + } + public String virtual_getGroup_6928665434441162387(SConcept thisConcept) { + return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); + } + public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { + return HelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); + } + public String virtual_getKind_7006261637493126084(SConcept thisConcept) { + return ExpressionHelpProvider_Behavior.virtual_getKind_7006261637493126084(thisConcept); + } + public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) { + return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); + } + public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) { + return ShowExpression_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); + } + public boolean virtual_legalAsStatement_1262430001741498032(SConcept thisConcept) { + return ShowExpression_Behavior.virtual_legalAsStatement_1262430001741498032(thisConcept); + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.ShowExpression"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/UsagesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/UsagesExpression_Behavior.java new file mode 100644 index 000000000000..3d9bd74a50f3 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/UsagesExpression_Behavior.java @@ -0,0 +1,25 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import java.util.ArrayList; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.smodel.behaviour.BehaviorReflection; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; + +public class UsagesExpression_Behavior { + public static void init(SNode thisNode) { + } + public static Iterable virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) { + return ListSequence.fromListAndArray(new ArrayList(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly").getDeclarationNode()); + } + public static String virtual_getHelpPage_7006261637493125297(SAbstractConcept thisConcept) { + return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "virtual_getHelpPage_7006261637493125297", new Object[]{}) + "\nImplementation of this command uses the IDE indexes to speed up execution"; + } + public static String virtual_getDisplayString_6891027939994892943(SAbstractConcept thisConcept) { + return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "virtual_getDisplayString_6891027939994892943", new Object[]{}) + "(node)"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/UsagesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/UsagesExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..a6834ed8ddb9 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/UsagesExpression_BehaviorDescriptor.java @@ -0,0 +1,24 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.language.SConcept; +import org.jetbrains.mps.openapi.model.SNode; + +public class UsagesExpression_BehaviorDescriptor extends QueryExpression_BehaviorDescriptor { + public UsagesExpression_BehaviorDescriptor() { + } + public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { + return UsagesExpression_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); + } + public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { + return UsagesExpression_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); + } + public Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept) { + return UsagesExpression_Behavior.virtual_getSupportedParameters_4307205004146936444(thisConcept); + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.UsagesExpression"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/WithStatement_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/WithStatement_BehaviorDescriptor.java new file mode 100644 index 000000000000..d05575a78dda --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/WithStatement_BehaviorDescriptor.java @@ -0,0 +1,14 @@ +package jetbrains.mps.lang.smodel.query.behavior; + +/*Generated by MPS */ + +import jetbrains.mps.baseLanguage.behavior.Statement_BehaviorDescriptor; + +public class WithStatement_BehaviorDescriptor extends Statement_BehaviorDescriptor { + public WithStatement_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.lang.smodel.query.structure.WithStatement"; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info new file mode 100644 index 000000000000..63899847c877 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info @@ -0,0 +1,370 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/ConstraintsAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/ConstraintsAspectDescriptor.java new file mode 100644 index 000000000000..be3dc8be8c86 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/ConstraintsAspectDescriptor.java @@ -0,0 +1,25 @@ +package jetbrains.mps.lang.smodel.query.constraints; + +/*Generated by MPS */ + +import jetbrains.mps.smodel.runtime.ConstraintsDescriptor; +import jetbrains.mps.smodel.adapter.ids.SConceptId; +import jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor; + +public class ConstraintsAspectDescriptor implements jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor { + public ConstraintsAspectDescriptor() { + } + public ConstraintsDescriptor getDescriptor(SConceptId conceptId) { + long id = conceptId.getIdValue(); + if (id == 0x6b643f33718aa10dL) { + return new InstancesExpression_Constraints(); + } + if (id == 0x75bb0160f191d6ebL) { + return new UsagesExpression_Constraints(); + } + if (id == 0x3bc64421760badf5L) { + return new QueryParameter_Constraints(); + } + return new BaseConstraintsDescriptor(conceptId); + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/InstancesExpression_Constraints.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/InstancesExpression_Constraints.java new file mode 100644 index 000000000000..d4f1c1758344 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/InstancesExpression_Constraints.java @@ -0,0 +1,38 @@ +package jetbrains.mps.lang.smodel.query.constraints; + +/*Generated by MPS */ + +import jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor; +import jetbrains.mps.smodel.adapter.ids.MetaIdFactory; +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.annotations.Nullable; +import jetbrains.mps.smodel.IOperationContext; +import jetbrains.mps.smodel.runtime.CheckingNodeContext; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.smodel.SNodePointer; + +public class InstancesExpression_Constraints extends BaseConstraintsDescriptor { + public InstancesExpression_Constraints() { + super(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL)); + } + @Override + public boolean hasOwnCanBeAncestorMethod() { + return true; + } + @Override + public boolean canBeAncestor(SNode node, @Nullable SNode childNode, SNode childConcept, IOperationContext context, @Nullable CheckingNodeContext checkingNodeContext) { + boolean result = static_canBeAnAncestor(node, childNode, childConcept, context); + + if (!(result) && checkingNodeContext != null) { + checkingNodeContext.setBreakingNode(canBeAncesctorBreakingPoint); + } + + return result; + } + public static boolean static_canBeAnAncestor(SNode node, SNode childNode, SNode childConcept, final IOperationContext operationContext) { + return !(SConceptOperations.isExactly(SNodeOperations.asSConcept(childConcept), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add42L, "jetbrains.mps.lang.smodel.query.structure.GlobalScope"))); + } + private static SNodePointer canBeAncesctorBreakingPoint = new SNodePointer("r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.lang.smodel.query.constraints)", "3470161847493603670"); +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/QueryParameter_Constraints.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/QueryParameter_Constraints.java new file mode 100644 index 000000000000..1a479ae4fa70 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/QueryParameter_Constraints.java @@ -0,0 +1,46 @@ +package jetbrains.mps.lang.smodel.query.constraints; + +/*Generated by MPS */ + +import jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor; +import jetbrains.mps.smodel.adapter.ids.MetaIdFactory; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.smodel.IOperationContext; +import jetbrains.mps.smodel.runtime.CheckingNodeContext; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.internal.collections.runtime.Sequence; +import jetbrains.mps.smodel.behaviour.BehaviorReflection; +import jetbrains.mps.smodel.SNodePointer; + +public class QueryParameter_Constraints extends BaseConstraintsDescriptor { + public QueryParameter_Constraints() { + super(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)); + } + @Override + public boolean hasOwnCanBeChildMethod() { + return true; + } + @Override + public boolean canBeChild(@Nullable SNode node, SNode parentNode, SNode link, SNode childConcept, final IOperationContext operationContext, @Nullable final CheckingNodeContext checkingNodeContext) { + boolean result = static_canBeAChild(node, parentNode, link, childConcept, operationContext); + + if (!(result) && checkingNodeContext != null) { + checkingNodeContext.setBreakingNode(canBeChildBreakingPoint); + } + + return result; + } + public static boolean static_canBeAChild(SNode node, SNode parentNode, SNode link, SNode childConcept, final IOperationContext operationContext) { + if (neq_2bkn6k_a0a0d(SNodeOperations.getContainingLinkDeclaration(parentNode), SLinkOperations.findLinkDeclaration(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")))) { + return false; + } + return Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class>) ((Class) Object.class), SNodeOperations.asSConcept(SNodeOperations.getConcept(SNodeOperations.cast(SNodeOperations.getParent(parentNode), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.lang.smodel.query.structure.QueryExpression")))), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).contains((SNode) childConcept); + } + private static boolean neq_2bkn6k_a0a0d(Object a, Object b) { + return !(((a != null ? a.equals(b) : a == b))); + } + private static SNodePointer canBeChildBreakingPoint = new SNodePointer("r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.lang.smodel.query.constraints)", "6891027939993473118"); +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/UsagesExpression_Constraints.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/UsagesExpression_Constraints.java new file mode 100644 index 000000000000..f851c80b5f74 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/UsagesExpression_Constraints.java @@ -0,0 +1,38 @@ +package jetbrains.mps.lang.smodel.query.constraints; + +/*Generated by MPS */ + +import jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor; +import jetbrains.mps.smodel.adapter.ids.MetaIdFactory; +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.annotations.Nullable; +import jetbrains.mps.smodel.IOperationContext; +import jetbrains.mps.smodel.runtime.CheckingNodeContext; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.smodel.SNodePointer; + +public class UsagesExpression_Constraints extends BaseConstraintsDescriptor { + public UsagesExpression_Constraints() { + super(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL)); + } + @Override + public boolean hasOwnCanBeAncestorMethod() { + return true; + } + @Override + public boolean canBeAncestor(SNode node, @Nullable SNode childNode, SNode childConcept, IOperationContext context, @Nullable CheckingNodeContext checkingNodeContext) { + boolean result = static_canBeAnAncestor(node, childNode, childConcept, context); + + if (!(result) && checkingNodeContext != null) { + checkingNodeContext.setBreakingNode(canBeAncesctorBreakingPoint); + } + + return result; + } + public static boolean static_canBeAnAncestor(SNode node, SNode childNode, SNode childConcept, final IOperationContext operationContext) { + return !(SConceptOperations.isExactly(SNodeOperations.asSConcept(childConcept), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add42L, "jetbrains.mps.lang.smodel.query.structure.GlobalScope"))); + } + private static SNodePointer canBeAncesctorBreakingPoint = new SNodePointer("r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.lang.smodel.query.constraints)", "3470161847493618356"); +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/trace.info new file mode 100644 index 000000000000..50d49bcf3aac --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/constraints/trace.info @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/CustomScope_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/CustomScope_Actions.java new file mode 100644 index 000000000000..dbe987ebd00a --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/CustomScope_Actions.java @@ -0,0 +1,29 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.openapi.editor.cells.EditorCell; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.openapi.editor.EditorContext; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.cells.AbstractCellAction; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; + +public class CustomScope_Actions { + public static void setCellActions(EditorCell editorCell, SNode node, EditorContext context) { + editorCell.setAction(CellActionType.BACKSPACE, new CustomScope_Actions.CustomScope_Actions_BACKSPACE(node)); + } + public static class CustomScope_Actions_BACKSPACE extends AbstractCellAction { + /*package*/ SNode myNode; + public CustomScope_Actions_BACKSPACE(SNode node) { + this.myNode = node; + } + public void execute(EditorContext editorContext) { + this.execute_internal(editorContext, this.myNode); + } + public void execute_internal(EditorContext editorContext, SNode node) { + SNodeOperations.replaceWithNewChild(node, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.lang.smodel.query.structure.ScopeParameter")); + } + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/CustomScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/CustomScope_Editor.java new file mode 100644 index 000000000000..5950c14bf253 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/CustomScope_Editor.java @@ -0,0 +1,64 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.nodeEditor.DefaultNodeEditor; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import jetbrains.mps.openapi.editor.EditorContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; +import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.language.SContainmentLink; +import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; + +public class CustomScope_Editor extends DefaultNodeEditor { + public EditorCell createEditorCell(EditorContext editorContext, SNode node) { + return this.createCollection_sm4cuc_a(editorContext, node); + } + private EditorCell createCollection_sm4cuc_a(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); + editorCell.setCellId("Collection_sm4cuc_a"); + editorCell.setBig(true); + editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); + editorCell.addEditorCell(this.createRefNode_sm4cuc_a0(editorContext, node)); + return editorCell; + } + private EditorCell createRefNode_sm4cuc_a0(EditorContext editorContext, SNode node) { + SingleRoleCellProvider provider = new CustomScope_Editor.scopeSingleRoleHandler_sm4cuc_a0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, 0x307931d0f985950eL, "scope"), editorContext); + return provider.createCell(); + } + private class scopeSingleRoleHandler_sm4cuc_a0 extends SingleRoleCellProvider { + public scopeSingleRoleHandler_sm4cuc_a0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { + super(ownerNode, containmentLink, context); + } + public EditorCell createChildCell(EditorContext editorContext, SNode child) { + EditorCell editorCell = super.createChildCell(editorContext, child); + installCellInfo(child, editorCell); + return editorCell; + } + public void installCellInfo(SNode child, EditorCell editorCell) { + editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); + if (editorCell.getRole() == null) { + editorCell.setRole("scope"); + } + CustomScope_Actions.setCellActions(editorCell, myOwnerNode, myEditorContext); + } + + + @Override + protected EditorCell createEmptyCell() { + EditorCell editorCell = super.createEmptyCell(); + editorCell.setCellId("empty_scope"); + installCellInfo(null, editorCell); + return editorCell; + } + + protected String getNoTargetText() { + return ""; + } + + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/EditorAspectDescriptorImpl.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/EditorAspectDescriptorImpl.java new file mode 100644 index 000000000000..239e3eda0c65 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/EditorAspectDescriptorImpl.java @@ -0,0 +1,60 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor; +import java.util.Collection; +import jetbrains.mps.openapi.editor.descriptor.ConceptEditor; +import jetbrains.mps.smodel.runtime.ConceptDescriptor; +import java.util.Arrays; +import java.util.Collections; +import jetbrains.mps.openapi.editor.descriptor.ConceptEditorComponent; + +public class EditorAspectDescriptorImpl implements EditorAspectDescriptor { + + public Collection getEditors(ConceptDescriptor descriptor) { + switch (Arrays.binarySearch(stringSwitchCases_xbvbvu_a0a0b, descriptor.getConceptFqName())) { + case 0: + return Collections.singletonList(new CustomScope_Editor()); + case 1: + return Collections.singletonList(new InstancesExpression_Editor()); + case 2: + return Collections.singletonList(new ModelScope_Editor()); + case 3: + return Collections.singletonList(new ModulesScope_Editor()); + case 4: + return Collections.singletonList(new QueryExpression_Editor()); + case 5: + return Collections.singletonList(new QueryParameter_Editor()); + case 6: + return Collections.singletonList(new QueryParameterList_Editor()); + case 7: + return Collections.singletonList(new QueryParameterScope_Editor()); + case 8: + return Collections.singletonList(new ScopeParameter_Editor()); + case 9: + return Collections.singletonList(new ShowExpression_Editor()); + case 10: + return Collections.singletonList(new UsagesExpression_Editor()); + case 11: + return Collections.singletonList(new WithStatement_Editor()); + default: + } + return Collections.emptyList(); + } + public Collection getEditorComponents(ConceptDescriptor descriptor, String editorComponentId) { + switch (Arrays.binarySearch(stringSwitchCases_xbvbvu_a0a0c, descriptor.getConceptFqName())) { + case 0: + if ("jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent".equals(editorComponentId)) { + return Collections.singletonList(new QueryExpression_EditorComponent()); + } + break; + default: + } + return Collections.emptyList(); + } + + + private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "jetbrains.mps.lang.smodel.query.structure.QueryParameter", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ScopeParameter", "jetbrains.mps.lang.smodel.query.structure.ShowExpression", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"}; + private static String[] stringSwitchCases_xbvbvu_a0a0c = new String[]{"jetbrains.mps.lang.smodel.query.structure.QueryExpression"}; +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/InstancesExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/InstancesExpression_Editor.java new file mode 100644 index 000000000000..5407a460e32f --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/InstancesExpression_Editor.java @@ -0,0 +1,92 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.nodeEditor.DefaultNodeEditor; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import jetbrains.mps.openapi.editor.EditorContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; +import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; +import jetbrains.mps.openapi.editor.style.Style; +import jetbrains.mps.editor.runtime.style.StyleImpl; +import jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet; +import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.language.SContainmentLink; +import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; + +public class InstancesExpression_Editor extends DefaultNodeEditor { + public EditorCell createEditorCell(EditorContext editorContext, SNode node) { + return this.createCollection_le77e3_a(editorContext, node); + } + private EditorCell createCollection_le77e3_a(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); + editorCell.setCellId("Collection_le77e3_a"); + editorCell.setBig(true); + editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); + editorCell.addEditorCell(this.createComponent_le77e3_a0(editorContext, node)); + editorCell.addEditorCell(this.createConstant_le77e3_b0(editorContext, node)); + editorCell.addEditorCell(this.createRefNode_le77e3_c0(editorContext, node)); + editorCell.addEditorCell(this.createConstant_le77e3_d0(editorContext, node)); + return editorCell; + } + private EditorCell createComponent_le77e3_a0(EditorContext editorContext, SNode node) { + EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent"); + return editorCell; + } + private EditorCell createConstant_le77e3_b0(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "("); + editorCell.setCellId("Constant_le77e3_b0"); + Style style = new StyleImpl(); + BaseLanguageStyle_StyleSheet.apply_LeftParenAfterName(style, editorCell); + editorCell.getStyle().putAll(style); + editorCell.setDefaultText(""); + return editorCell; + } + private EditorCell createRefNode_le77e3_c0(EditorContext editorContext, SNode node) { + SingleRoleCellProvider provider = new InstancesExpression_Editor.conceptArgSingleRoleHandler_le77e3_c0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), editorContext); + return provider.createCell(); + } + private class conceptArgSingleRoleHandler_le77e3_c0 extends SingleRoleCellProvider { + public conceptArgSingleRoleHandler_le77e3_c0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { + super(ownerNode, containmentLink, context); + } + public EditorCell createChildCell(EditorContext editorContext, SNode child) { + EditorCell editorCell = super.createChildCell(editorContext, child); + installCellInfo(child, editorCell); + return editorCell; + } + public void installCellInfo(SNode child, EditorCell editorCell) { + editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); + if (editorCell.getRole() == null) { + editorCell.setRole("conceptArg"); + } + } + + + @Override + protected EditorCell createEmptyCell() { + EditorCell editorCell = super.createEmptyCell(); + editorCell.setCellId("empty_conceptArg"); + installCellInfo(null, editorCell); + return editorCell; + } + + protected String getNoTargetText() { + return ""; + } + + } + private EditorCell createConstant_le77e3_d0(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, ")"); + editorCell.setCellId("Constant_le77e3_d0"); + Style style = new StyleImpl(); + BaseLanguageStyle_StyleSheet.apply_RightParen(style, editorCell); + editorCell.getStyle().putAll(style); + editorCell.setDefaultText(""); + return editorCell; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ModelScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ModelScope_Editor.java new file mode 100644 index 000000000000..92f9e9d9579d --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ModelScope_Editor.java @@ -0,0 +1,127 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.nodeEditor.DefaultNodeEditor; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import jetbrains.mps.openapi.editor.EditorContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; +import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; +import jetbrains.mps.openapi.editor.style.Style; +import jetbrains.mps.editor.runtime.style.StyleImpl; +import jetbrains.mps.editor.runtime.style.StyleAttributes; +import jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet; +import jetbrains.mps.nodeEditor.cellProviders.AbstractCellListHandler; +import jetbrains.mps.nodeEditor.cellLayout.CellLayout_Indent; +import jetbrains.mps.lang.editor.cellProviders.RefNodeListHandler; +import jetbrains.mps.smodel.action.NodeFactoryManager; +import jetbrains.mps.nodeEditor.cellActions.CellAction_DeleteNode; +import jetbrains.mps.lang.editor.cellProviders.RefNodeListHandlerElementKeyMap; +import jetbrains.mps.openapi.editor.cells.DefaultSubstituteInfo; +import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; + +public class ModelScope_Editor extends DefaultNodeEditor { + public EditorCell createEditorCell(EditorContext editorContext, SNode node) { + return this.createCollection_ukl9kw_a(editorContext, node); + } + private EditorCell createCollection_ukl9kw_a(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); + editorCell.setCellId("Collection_ukl9kw_a"); + editorCell.setBig(true); + editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); + editorCell.addEditorCell(this.createComponent_ukl9kw_a0(editorContext, node)); + editorCell.addEditorCell(this.createConstant_ukl9kw_b0(editorContext, node)); + editorCell.addEditorCell(this.createConstant_ukl9kw_c0(editorContext, node)); + editorCell.addEditorCell(this.createRefNodeList_ukl9kw_d0(editorContext, node)); + editorCell.addEditorCell(this.createConstant_ukl9kw_e0(editorContext, node)); + return editorCell; + } + private EditorCell createComponent_ukl9kw_a0(EditorContext editorContext, SNode node) { + EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); + return editorCell; + } + private EditorCell createConstant_ukl9kw_b0(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, ":"); + editorCell.setCellId("Constant_ukl9kw_b0"); + Style style = new StyleImpl(); + style.set(StyleAttributes.PUNCTUATION_LEFT, 0, true); + style.set(StyleAttributes.PUNCTUATION_RIGHT, 0, true); + editorCell.getStyle().putAll(style); + editorCell.setDefaultText(""); + return editorCell; + } + private EditorCell createConstant_ukl9kw_c0(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "["); + editorCell.setCellId("Constant_ukl9kw_c0"); + Style style = new StyleImpl(); + BaseLanguageStyle_StyleSheet.apply_LeftBracket(style, editorCell); + style.set(StyleAttributes.PUNCTUATION_LEFT, 0, true); + editorCell.getStyle().putAll(style); + editorCell.setDefaultText(""); + return editorCell; + } + private EditorCell createRefNodeList_ukl9kw_d0(EditorContext editorContext, SNode node) { + AbstractCellListHandler handler = new ModelScope_Editor.modelListHandler_ukl9kw_d0(node, "model", editorContext); + EditorCell_Collection editorCell = handler.createCells(editorContext, new CellLayout_Indent(), false); + editorCell.setCellId("refNodeList_model"); + editorCell.setRole(handler.getElementRole()); + return editorCell; + } + private static class modelListHandler_ukl9kw_d0 extends RefNodeListHandler { + public modelListHandler_ukl9kw_d0(SNode ownerNode, String childRole, EditorContext context) { + super(ownerNode, childRole, context, false); + } + public SNode createNodeToInsert(EditorContext editorContext) { + SNode listOwner = super.getOwner(); + return NodeFactoryManager.createNode(listOwner, editorContext, super.getElementRole()); + } + public EditorCell createNodeCell(EditorContext editorContext, SNode elementNode) { + EditorCell elementCell = super.createNodeCell(editorContext, elementNode); + this.installElementCellActions(this.getOwner(), elementNode, elementCell, editorContext); + return elementCell; + } + public EditorCell createEmptyCell(EditorContext editorContext) { + EditorCell emptyCell = null; + emptyCell = super.createEmptyCell(editorContext); + this.installElementCellActions(super.getOwner(), null, emptyCell, editorContext); + return emptyCell; + } + public void installElementCellActions(SNode listOwner, SNode elementNode, EditorCell elementCell, EditorContext editorContext) { + if (elementCell.getUserObject(AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET) == null) { + elementCell.putUserObject(AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET, AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET); + if (elementNode != null) { + elementCell.setAction(CellActionType.DELETE, new CellAction_DeleteNode(elementNode)); + elementCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteNode(elementNode)); + elementCell.addKeyMap(new RefNodeListHandlerElementKeyMap(this, ",")); + } + if (elementCell.getSubstituteInfo() == null || elementCell.getSubstituteInfo() instanceof DefaultSubstituteInfo) { + elementCell.setSubstituteInfo(new DefaultChildSubstituteInfo(listOwner, elementNode, super.getLinkDeclaration(), editorContext)); + } + } + } + @Override + public EditorCell createSeparatorCell(EditorContext editorContext, SNode prevNode, SNode nextNode) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, this.getOwner(), ","); + editorCell.setSelectable(false); + Style style = new StyleImpl(); + style.set(StyleAttributes.LAYOUT_CONSTRAINT, ""); + style.set(StyleAttributes.PUNCTUATION_LEFT, true); + editorCell.getStyle().putAll(style); + editorCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteNode(prevNode)); + editorCell.setAction(CellActionType.DELETE, new CellAction_DeleteNode(prevNode)); + return editorCell; + } + } + private EditorCell createConstant_ukl9kw_e0(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "]"); + editorCell.setCellId("Constant_ukl9kw_e0"); + Style style = new StyleImpl(); + BaseLanguageStyle_StyleSheet.apply_RightBracket(style, editorCell); + editorCell.getStyle().putAll(style); + editorCell.setDefaultText(""); + return editorCell; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ModulesScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ModulesScope_Editor.java new file mode 100644 index 000000000000..73f96eb95fba --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ModulesScope_Editor.java @@ -0,0 +1,127 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.nodeEditor.DefaultNodeEditor; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import jetbrains.mps.openapi.editor.EditorContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; +import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; +import jetbrains.mps.openapi.editor.style.Style; +import jetbrains.mps.editor.runtime.style.StyleImpl; +import jetbrains.mps.editor.runtime.style.StyleAttributes; +import jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet; +import jetbrains.mps.nodeEditor.cellProviders.AbstractCellListHandler; +import jetbrains.mps.nodeEditor.cellLayout.CellLayout_Indent; +import jetbrains.mps.lang.editor.cellProviders.RefNodeListHandler; +import jetbrains.mps.smodel.action.NodeFactoryManager; +import jetbrains.mps.nodeEditor.cellActions.CellAction_DeleteNode; +import jetbrains.mps.lang.editor.cellProviders.RefNodeListHandlerElementKeyMap; +import jetbrains.mps.openapi.editor.cells.DefaultSubstituteInfo; +import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; + +public class ModulesScope_Editor extends DefaultNodeEditor { + public EditorCell createEditorCell(EditorContext editorContext, SNode node) { + return this.createCollection_szrfqn_a(editorContext, node); + } + private EditorCell createCollection_szrfqn_a(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); + editorCell.setCellId("Collection_szrfqn_a"); + editorCell.setBig(true); + editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); + editorCell.addEditorCell(this.createComponent_szrfqn_a0(editorContext, node)); + editorCell.addEditorCell(this.createConstant_szrfqn_b0(editorContext, node)); + editorCell.addEditorCell(this.createConstant_szrfqn_c0(editorContext, node)); + editorCell.addEditorCell(this.createRefNodeList_szrfqn_d0(editorContext, node)); + editorCell.addEditorCell(this.createConstant_szrfqn_e0(editorContext, node)); + return editorCell; + } + private EditorCell createComponent_szrfqn_a0(EditorContext editorContext, SNode node) { + EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); + return editorCell; + } + private EditorCell createConstant_szrfqn_b0(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, ":"); + editorCell.setCellId("Constant_szrfqn_b0"); + Style style = new StyleImpl(); + style.set(StyleAttributes.PUNCTUATION_LEFT, 0, true); + style.set(StyleAttributes.PUNCTUATION_RIGHT, 0, true); + editorCell.getStyle().putAll(style); + editorCell.setDefaultText(""); + return editorCell; + } + private EditorCell createConstant_szrfqn_c0(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "["); + editorCell.setCellId("Constant_szrfqn_c0"); + Style style = new StyleImpl(); + BaseLanguageStyle_StyleSheet.apply_LeftBracket(style, editorCell); + style.set(StyleAttributes.PUNCTUATION_LEFT, 0, true); + editorCell.getStyle().putAll(style); + editorCell.setDefaultText(""); + return editorCell; + } + private EditorCell createRefNodeList_szrfqn_d0(EditorContext editorContext, SNode node) { + AbstractCellListHandler handler = new ModulesScope_Editor.moduleListHandler_szrfqn_d0(node, "module", editorContext); + EditorCell_Collection editorCell = handler.createCells(editorContext, new CellLayout_Indent(), false); + editorCell.setCellId("refNodeList_module"); + editorCell.setRole(handler.getElementRole()); + return editorCell; + } + private static class moduleListHandler_szrfqn_d0 extends RefNodeListHandler { + public moduleListHandler_szrfqn_d0(SNode ownerNode, String childRole, EditorContext context) { + super(ownerNode, childRole, context, false); + } + public SNode createNodeToInsert(EditorContext editorContext) { + SNode listOwner = super.getOwner(); + return NodeFactoryManager.createNode(listOwner, editorContext, super.getElementRole()); + } + public EditorCell createNodeCell(EditorContext editorContext, SNode elementNode) { + EditorCell elementCell = super.createNodeCell(editorContext, elementNode); + this.installElementCellActions(this.getOwner(), elementNode, elementCell, editorContext); + return elementCell; + } + public EditorCell createEmptyCell(EditorContext editorContext) { + EditorCell emptyCell = null; + emptyCell = super.createEmptyCell(editorContext); + this.installElementCellActions(super.getOwner(), null, emptyCell, editorContext); + return emptyCell; + } + public void installElementCellActions(SNode listOwner, SNode elementNode, EditorCell elementCell, EditorContext editorContext) { + if (elementCell.getUserObject(AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET) == null) { + elementCell.putUserObject(AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET, AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET); + if (elementNode != null) { + elementCell.setAction(CellActionType.DELETE, new CellAction_DeleteNode(elementNode)); + elementCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteNode(elementNode)); + elementCell.addKeyMap(new RefNodeListHandlerElementKeyMap(this, ",")); + } + if (elementCell.getSubstituteInfo() == null || elementCell.getSubstituteInfo() instanceof DefaultSubstituteInfo) { + elementCell.setSubstituteInfo(new DefaultChildSubstituteInfo(listOwner, elementNode, super.getLinkDeclaration(), editorContext)); + } + } + } + @Override + public EditorCell createSeparatorCell(EditorContext editorContext, SNode prevNode, SNode nextNode) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, this.getOwner(), ","); + editorCell.setSelectable(false); + Style style = new StyleImpl(); + style.set(StyleAttributes.LAYOUT_CONSTRAINT, ""); + style.set(StyleAttributes.PUNCTUATION_LEFT, true); + editorCell.getStyle().putAll(style); + editorCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteNode(prevNode)); + editorCell.setAction(CellActionType.DELETE, new CellAction_DeleteNode(prevNode)); + return editorCell; + } + } + private EditorCell createConstant_szrfqn_e0(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "]"); + editorCell.setCellId("Constant_szrfqn_e0"); + Style style = new StyleImpl(); + BaseLanguageStyle_StyleSheet.apply_RightBracket(style, editorCell); + editorCell.getStyle().putAll(style); + editorCell.setDefaultText(""); + return editorCell; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_Actions.java new file mode 100644 index 000000000000..1d036b3b95aa --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_Actions.java @@ -0,0 +1,47 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.openapi.editor.cells.EditorCell; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.openapi.editor.EditorContext; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.cells.AbstractCellAction; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.editor.runtime.selection.SelectionUtil; +import jetbrains.mps.openapi.editor.selection.SelectionManager; + +public class QueryExpression_Actions { + public static void setCellActions(EditorCell editorCell, SNode node, EditorContext context) { + editorCell.setAction(CellActionType.DELETE, new QueryExpression_Actions.QueryExpression_Actions_DELETE(node)); + editorCell.setAction(CellActionType.BACKSPACE, new QueryExpression_Actions.QueryExpression_Actions_BACKSPACE(node)); + } + public static class QueryExpression_Actions_DELETE extends AbstractCellAction { + /*package*/ SNode myNode; + public QueryExpression_Actions_DELETE(SNode node) { + this.myNode = node; + } + public void execute(EditorContext editorContext) { + this.execute_internal(editorContext, this.myNode); + } + public void execute_internal(EditorContext editorContext, SNode node) { + ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).clear(); + SelectionUtil.selectLabelCellAnSetCaret(editorContext, node, SelectionManager.LAST_CELL, -1); + } + } + public static class QueryExpression_Actions_BACKSPACE extends AbstractCellAction { + /*package*/ SNode myNode; + public QueryExpression_Actions_BACKSPACE(SNode node) { + this.myNode = node; + } + public void execute(EditorContext editorContext) { + this.execute_internal(editorContext, this.myNode); + } + public void execute_internal(EditorContext editorContext, SNode node) { + ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).clear(); + SelectionUtil.selectLabelCellAnSetCaret(editorContext, node, SelectionManager.LAST_CELL, -1); + } + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_Editor.java new file mode 100644 index 000000000000..98942d7fcc60 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_Editor.java @@ -0,0 +1,26 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.nodeEditor.DefaultNodeEditor; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import jetbrains.mps.openapi.editor.EditorContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.editor.runtime.cells.BigCellUtil; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; + +public class QueryExpression_Editor extends DefaultNodeEditor { + public EditorCell createEditorCell(EditorContext editorContext, SNode node) { + return this.createComponent_8t0fqe_a(editorContext, node); + } + private EditorCell createComponent_8t0fqe_a(EditorContext editorContext, SNode node) { + EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent"); + EditorCell bigCell = BigCellUtil.findBigCell(editorCell, node); + if (bigCell != null) { + bigCell.setBig(true); + } + editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); + return editorCell; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_EditorComponent.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_EditorComponent.java new file mode 100644 index 000000000000..a8a8fdc11956 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_EditorComponent.java @@ -0,0 +1,127 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.openapi.editor.descriptor.ConceptEditorComponent; +import java.util.Collection; +import java.util.Collections; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import jetbrains.mps.openapi.editor.EditorContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; +import jetbrains.mps.openapi.editor.style.Style; +import jetbrains.mps.editor.runtime.style.StyleImpl; +import jetbrains.mps.editor.runtime.style.StyleAttributes; +import jetbrains.mps.nodeEditor.cellMenu.CompositeSubstituteInfo; +import jetbrains.mps.nodeEditor.cellMenu.BasicCellContext; +import jetbrains.mps.nodeEditor.cellMenu.SubstituteInfoPartExt; +import jetbrains.mps.lang.editor.generator.internal.AbstractCellMenuPart_ReplaceNode_CustomNodeConcept; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; +import jetbrains.mps.baseLanguage.collections.editor.Collections_Style_StyleSheet; +import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; +import org.jetbrains.mps.openapi.language.SContainmentLink; +import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; + +public class QueryExpression_EditorComponent implements ConceptEditorComponent { + public Collection getContextHints() { + return Collections.emptyList(); + } + public EditorCell createEditorCell(EditorContext editorContext, SNode node) { + return this.createCollection_adikco_a(editorContext, node); + } + private EditorCell createCollection_adikco_a(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); + editorCell.setCellId("Collection_adikco_a"); + editorCell.addEditorCell(this.createComponent_adikco_a0(editorContext, node)); + if (renderingCondition_adikco_a1a(node, editorContext)) { + editorCell.addEditorCell(this.createCollection_adikco_b0(editorContext, node)); + } + return editorCell; + } + private EditorCell createComponent_adikco_a0(EditorContext editorContext, SNode node) { + EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); + Style style = new StyleImpl(); + style.set(StyleAttributes.AUTO_DELETABLE, 0, true); + editorCell.getStyle().putAll(style); + editorCell.addKeyMap(new QueryExpression_KeyMap()); + editorCell.setSubstituteInfo(new CompositeSubstituteInfo(editorContext, new BasicCellContext(node), new SubstituteInfoPartExt[]{new QueryExpression_EditorComponent.ReplaceWith_QueryExpression_cellMenu_adikco_a0a0()})); + return editorCell; + } + public static class ReplaceWith_QueryExpression_cellMenu_adikco_a0a0 extends AbstractCellMenuPart_ReplaceNode_CustomNodeConcept { + public ReplaceWith_QueryExpression_cellMenu_adikco_a0a0() { + } + public String getReplacementConceptName() { + return "jetbrains.mps.lang.smodel.query.structure.QueryExpression"; + } + } + private EditorCell createCollection_adikco_b0(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); + editorCell.setCellId("Collection_adikco_b0"); + Style style = new StyleImpl(); + style.set(StyleAttributes.SELECTABLE, 0, false); + editorCell.getStyle().putAll(style); + editorCell.addEditorCell(this.createConstant_adikco_a1a(editorContext, node)); + editorCell.addEditorCell(this.createRefNode_adikco_b1a(editorContext, node)); + editorCell.addEditorCell(this.createConstant_adikco_c1a(editorContext, node)); + return editorCell; + } + private static boolean renderingCondition_adikco_a1a(SNode node, EditorContext editorContext) { + return ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).isNotEmpty(); + } + private EditorCell createConstant_adikco_a1a(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "<"); + editorCell.setCellId("Constant_adikco_a1a"); + Style style = new StyleImpl(); + Collections_Style_StyleSheet.apply_LeftAngleBracket(style, editorCell); + editorCell.getStyle().putAll(style); + editorCell.setDefaultText(""); + return editorCell; + } + private EditorCell createRefNode_adikco_b1a(EditorContext editorContext, SNode node) { + SingleRoleCellProvider provider = new QueryExpression_EditorComponent.parameterSingleRoleHandler_adikco_b1a(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), editorContext); + return provider.createCell(); + } + private class parameterSingleRoleHandler_adikco_b1a extends SingleRoleCellProvider { + public parameterSingleRoleHandler_adikco_b1a(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { + super(ownerNode, containmentLink, context); + } + public EditorCell createChildCell(EditorContext editorContext, SNode child) { + EditorCell editorCell = super.createChildCell(editorContext, child); + installCellInfo(child, editorCell); + return editorCell; + } + public void installCellInfo(SNode child, EditorCell editorCell) { + editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); + if (editorCell.getRole() == null) { + editorCell.setRole("parameter"); + } + } + + + @Override + protected EditorCell createEmptyCell() { + EditorCell editorCell = super.createEmptyCell(); + editorCell.setCellId("empty_parameter"); + installCellInfo(null, editorCell); + return editorCell; + } + + protected String getNoTargetText() { + return ""; + } + + } + private EditorCell createConstant_adikco_c1a(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, ">"); + editorCell.setCellId("Constant_adikco_c1a"); + Style style = new StyleImpl(); + Collections_Style_StyleSheet.apply_RightAngleBracket(style, editorCell); + editorCell.getStyle().putAll(style); + QueryExpression_Actions.setCellActions(editorCell, node, editorContext); + editorCell.setDefaultText(""); + return editorCell; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_KeyMap.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_KeyMap.java new file mode 100644 index 000000000000..a374cac9d436 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryExpression_KeyMap.java @@ -0,0 +1,62 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.editor.runtime.cells.KeyMapImpl; +import jetbrains.mps.openapi.editor.cells.KeyMapAction; +import jetbrains.mps.editor.runtime.cells.KeyMapActionImpl; +import jetbrains.mps.openapi.editor.EditorContext; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import java.util.List; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.internal.collections.runtime.Sequence; +import jetbrains.mps.smodel.behaviour.BehaviorReflection; +import jetbrains.mps.smodel.action.SNodeFactoryOperations; + +public class QueryExpression_KeyMap extends KeyMapImpl { + public QueryExpression_KeyMap() { + this.setApplicableToEveryModel(false); + KeyMapAction action; + action = new QueryExpression_KeyMap.QueryExpression_KeyMap_Action0(); + this.putAction("any", "<", action); + } + public static class QueryExpression_KeyMap_Action0 extends KeyMapActionImpl { + public QueryExpression_KeyMap_Action0() { + this.setShownInPopupMenu(false); + } + public boolean isMenuAlwaysShown() { + return false; + } + public boolean canExecute(final EditorContext editorContext) { + EditorCell contextCell = editorContext.getContextCell(); + if ((contextCell == null)) { + return false; + } + SNode contextNode = contextCell.getSNode(); + if (contextNode == null) { + return false; + } + if (!(SNodeOperations.isInstanceOf(contextNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.lang.smodel.query.structure.QueryExpression")))) { + return false; + } + return this.canExecute_internal(editorContext, contextNode, this.getSelectedNodes(editorContext)); + } + public void execute(final EditorContext editorContext) { + EditorCell contextCell = editorContext.getContextCell(); + this.execute_internal(editorContext, contextCell.getSNode(), this.getSelectedNodes(editorContext)); + } + private boolean canExecute_internal(final EditorContext editorContext, final SNode node, final List selectedNodes) { + return ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).isEmpty() && Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class>) ((Class) Object.class), SNodeOperations.asSConcept(SNodeOperations.getConceptDeclaration(node)), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).isNotEmpty(); + } + private void execute_internal(final EditorContext editorContext, final SNode node, final List selectedNodes) { + SNodeFactoryOperations.addNewChild(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), SNodeFactoryOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.lang.smodel.query.structure.QueryParameter"))); + } + public String getKeyStroke() { + return " <"; + } + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterList_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterList_Editor.java new file mode 100644 index 000000000000..9993456c2513 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterList_Editor.java @@ -0,0 +1,90 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.nodeEditor.DefaultNodeEditor; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import jetbrains.mps.openapi.editor.EditorContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; +import jetbrains.mps.nodeEditor.cellProviders.AbstractCellListHandler; +import jetbrains.mps.nodeEditor.cellLayout.CellLayout_Indent; +import jetbrains.mps.lang.editor.cellProviders.RefNodeListHandler; +import jetbrains.mps.smodel.action.NodeFactoryManager; +import jetbrains.mps.nodeEditor.cellActions.CellAction_DeleteNode; +import jetbrains.mps.lang.editor.cellProviders.RefNodeListHandlerElementKeyMap; +import jetbrains.mps.openapi.editor.cells.DefaultSubstituteInfo; +import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; +import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; +import jetbrains.mps.openapi.editor.style.Style; +import jetbrains.mps.editor.runtime.style.StyleImpl; +import jetbrains.mps.editor.runtime.style.StyleAttributes; + +public class QueryParameterList_Editor extends DefaultNodeEditor { + public EditorCell createEditorCell(EditorContext editorContext, SNode node) { + return this.createCollection_3efoba_a(editorContext, node); + } + private EditorCell createCollection_3efoba_a(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); + editorCell.setCellId("Collection_3efoba_a"); + editorCell.setBig(true); + editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); + editorCell.addEditorCell(this.createRefNodeList_3efoba_a0(editorContext, node)); + return editorCell; + } + private EditorCell createRefNodeList_3efoba_a0(EditorContext editorContext, SNode node) { + AbstractCellListHandler handler = new QueryParameterList_Editor.parameterListHandler_3efoba_a0(node, "parameter", editorContext); + EditorCell_Collection editorCell = handler.createCells(editorContext, new CellLayout_Indent(), false); + editorCell.setCellId("refNodeList_parameter"); + editorCell.setRole(handler.getElementRole()); + return editorCell; + } + private static class parameterListHandler_3efoba_a0 extends RefNodeListHandler { + public parameterListHandler_3efoba_a0(SNode ownerNode, String childRole, EditorContext context) { + super(ownerNode, childRole, context, false); + } + public SNode createNodeToInsert(EditorContext editorContext) { + SNode listOwner = super.getOwner(); + return NodeFactoryManager.createNode(listOwner, editorContext, super.getElementRole()); + } + public EditorCell createNodeCell(EditorContext editorContext, SNode elementNode) { + EditorCell elementCell = super.createNodeCell(editorContext, elementNode); + this.installElementCellActions(this.getOwner(), elementNode, elementCell, editorContext); + return elementCell; + } + public EditorCell createEmptyCell(EditorContext editorContext) { + EditorCell emptyCell = null; + emptyCell = super.createEmptyCell(editorContext); + this.installElementCellActions(super.getOwner(), null, emptyCell, editorContext); + return emptyCell; + } + public void installElementCellActions(SNode listOwner, SNode elementNode, EditorCell elementCell, EditorContext editorContext) { + if (elementCell.getUserObject(AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET) == null) { + elementCell.putUserObject(AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET, AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET); + if (elementNode != null) { + elementCell.setAction(CellActionType.DELETE, new CellAction_DeleteNode(elementNode)); + elementCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteNode(elementNode)); + QueryParameter_Actions.setCellActions(elementCell, elementNode, editorContext); + elementCell.addKeyMap(new RefNodeListHandlerElementKeyMap(this, ",")); + } + if (elementCell.getSubstituteInfo() == null || elementCell.getSubstituteInfo() instanceof DefaultSubstituteInfo) { + elementCell.setSubstituteInfo(new DefaultChildSubstituteInfo(listOwner, elementNode, super.getLinkDeclaration(), editorContext)); + } + } + } + @Override + public EditorCell createSeparatorCell(EditorContext editorContext, SNode prevNode, SNode nextNode) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, this.getOwner(), ","); + editorCell.setSelectable(false); + Style style = new StyleImpl(); + style.set(StyleAttributes.LAYOUT_CONSTRAINT, ""); + style.set(StyleAttributes.PUNCTUATION_LEFT, true); + editorCell.getStyle().putAll(style); + editorCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteNode(prevNode)); + editorCell.setAction(CellActionType.DELETE, new CellAction_DeleteNode(prevNode)); + return editorCell; + } + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterScopeValue_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterScopeValue_Actions.java new file mode 100644 index 000000000000..baae3d3cbbba --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterScopeValue_Actions.java @@ -0,0 +1,63 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.openapi.editor.cells.EditorCell; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.openapi.editor.EditorContext; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.cells.AbstractCellAction; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.openapi.editor.cells.CellAction; + +public class QueryParameterScopeValue_Actions { + public static void setCellActions(EditorCell editorCell, SNode node, EditorContext context) { + editorCell.setAction(CellActionType.DELETE, new QueryParameterScopeValue_Actions.QueryParameterScopeValue_Actions_DELETE(node)); + editorCell.setAction(CellActionType.BACKSPACE, new QueryParameterScopeValue_Actions.QueryParameterScopeValue_Actions_BACKSPACE(node)); + } + public static class QueryParameterScopeValue_Actions_DELETE extends AbstractCellAction { + /*package*/ SNode myNode; + public QueryParameterScopeValue_Actions_DELETE(SNode node) { + this.myNode = node; + } + public void execute(EditorContext editorContext) { + this.execute_internal(editorContext, this.myNode); + } + public void execute_internal(EditorContext editorContext, SNode node) { + if (!(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value")))), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.lang.smodel.query.structure.ScopeParameter")))) { + SLinkOperations.setTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.lang.smodel.query.structure.ScopeParameter")))); + return; + } + CellAction action = editorContext.getEditorComponent().findNodeCell(node).getAction(CellActionType.DELETE); + if (action != null && action.canExecute(editorContext)) { + action.execute(editorContext); + return; + } + SNodeOperations.deleteNode(node); + } + } + public static class QueryParameterScopeValue_Actions_BACKSPACE extends AbstractCellAction { + /*package*/ SNode myNode; + public QueryParameterScopeValue_Actions_BACKSPACE(SNode node) { + this.myNode = node; + } + public void execute(EditorContext editorContext) { + this.execute_internal(editorContext, this.myNode); + } + public void execute_internal(EditorContext editorContext, SNode node) { + if (!(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value")))), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.lang.smodel.query.structure.ScopeParameter")))) { + SLinkOperations.setTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.lang.smodel.query.structure.ScopeParameter")))); + return; + } + CellAction action = editorContext.getEditorComponent().findNodeCell(node).getAction(CellActionType.DELETE); + if (action != null && action.canExecute(editorContext)) { + action.execute(editorContext); + return; + } + SNodeOperations.deleteNode(node); + } + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterScope_Editor.java new file mode 100644 index 000000000000..ca13ea8d22b7 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameterScope_Editor.java @@ -0,0 +1,92 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.nodeEditor.DefaultNodeEditor; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import jetbrains.mps.openapi.editor.EditorContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; +import jetbrains.mps.openapi.editor.style.Style; +import jetbrains.mps.editor.runtime.style.StyleImpl; +import jetbrains.mps.editor.runtime.style.StyleAttributes; +import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; +import jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet; +import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.language.SContainmentLink; +import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; +import jetbrains.mps.editor.runtime.style.FocusPolicy; + +public class QueryParameterScope_Editor extends DefaultNodeEditor { + public EditorCell createEditorCell(EditorContext editorContext, SNode node) { + return this.createCollection_5iann0_a(editorContext, node); + } + private EditorCell createCollection_5iann0_a(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); + editorCell.setCellId("Collection_5iann0_a"); + editorCell.setBig(true); + editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); + editorCell.addEditorCell(this.createComponent_5iann0_a0(editorContext, node)); + editorCell.addEditorCell(this.createConstant_5iann0_b0(editorContext, node)); + editorCell.addEditorCell(this.createRefNode_5iann0_c0(editorContext, node)); + return editorCell; + } + private EditorCell createComponent_5iann0_a0(EditorContext editorContext, SNode node) { + EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); + Style style = new StyleImpl(); + style.set(StyleAttributes.AUTO_DELETABLE, 0, true); + editorCell.getStyle().putAll(style); + QueryParameter_Actions.setCellActions(editorCell, node, editorContext); + return editorCell; + } + private EditorCell createConstant_5iann0_b0(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "="); + editorCell.setCellId("EQ"); + Style style = new StyleImpl(); + BaseLanguageStyle_StyleSheet.apply_Operator(style, editorCell); + editorCell.getStyle().putAll(style); + editorCell.setDefaultText(""); + return editorCell; + } + private EditorCell createRefNode_5iann0_c0(EditorContext editorContext, SNode node) { + SingleRoleCellProvider provider = new QueryParameterScope_Editor.valueSingleRoleHandler_5iann0_c0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), editorContext); + return provider.createCell(); + } + private class valueSingleRoleHandler_5iann0_c0 extends SingleRoleCellProvider { + public valueSingleRoleHandler_5iann0_c0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { + super(ownerNode, containmentLink, context); + } + public EditorCell createChildCell(EditorContext editorContext, SNode child) { + EditorCell editorCell = super.createChildCell(editorContext, child); + installCellInfo(child, editorCell); + return editorCell; + } + public void installCellInfo(SNode child, EditorCell editorCell) { + editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); + if (editorCell.getRole() == null) { + editorCell.setRole("value"); + } + if (true) { + editorCell.getStyle().set(StyleAttributes.FOCUS_POLICY, FocusPolicy.ATTRACTS_FOCUS); + } + QueryParameterScopeValue_Actions.setCellActions(editorCell, myOwnerNode, myEditorContext); + } + + + @Override + protected EditorCell createEmptyCell() { + EditorCell editorCell = super.createEmptyCell(); + editorCell.setCellId("empty_value"); + installCellInfo(null, editorCell); + return editorCell; + } + + protected String getNoTargetText() { + return ""; + } + + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameter_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameter_Actions.java new file mode 100644 index 000000000000..80b82422a627 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameter_Actions.java @@ -0,0 +1,70 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.openapi.editor.cells.EditorCell; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.openapi.editor.EditorContext; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.cells.AbstractCellAction; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; +import jetbrains.mps.editor.runtime.selection.SelectionUtil; + +public class QueryParameter_Actions { + public static void setCellActions(EditorCell editorCell, SNode node, EditorContext context) { + editorCell.setAction(CellActionType.DELETE, new QueryParameter_Actions.QueryParameter_Actions_DELETE(node)); + editorCell.setAction(CellActionType.BACKSPACE, new QueryParameter_Actions.QueryParameter_Actions_BACKSPACE(node)); + } + public static class QueryParameter_Actions_DELETE extends AbstractCellAction { + /*package*/ SNode myNode; + public QueryParameter_Actions_DELETE(SNode node) { + this.myNode = node; + } + public void execute(EditorContext editorContext) { + this.execute_internal(editorContext, this.myNode); + } + public void execute_internal(EditorContext editorContext, SNode node) { + SNode parameterList = SNodeOperations.as(SNodeOperations.getParent(node), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList")); + if (parameterList != null && ListSequence.fromList(SLinkOperations.getChildren(parameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).count() == 1 && !(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(node)), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.lang.smodel.query.structure.QueryParameter")))) { + SNodeOperations.replaceWithNewChild(node, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.lang.smodel.query.structure.QueryParameter")); + return; + } + + SNodeOperations.deleteNode(node); + if (parameterList != null && ListSequence.fromList(SLinkOperations.getChildren(parameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).isEmpty()) { + SNode queryExpression = SNodeOperations.as(SNodeOperations.getParent(parameterList), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.lang.smodel.query.structure.QueryExpression")); + if (queryExpression != null) { + SelectionUtil.selectLabelCellAnSetCaret(editorContext, queryExpression, "ALIAS_EDITOR_COMPONENT", -1); + } + } + } + } + public static class QueryParameter_Actions_BACKSPACE extends AbstractCellAction { + /*package*/ SNode myNode; + public QueryParameter_Actions_BACKSPACE(SNode node) { + this.myNode = node; + } + public void execute(EditorContext editorContext) { + this.execute_internal(editorContext, this.myNode); + } + public void execute_internal(EditorContext editorContext, SNode node) { + SNode parameterList = SNodeOperations.as(SNodeOperations.getParent(node), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList")); + if (parameterList != null && ListSequence.fromList(SLinkOperations.getChildren(parameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).count() == 1 && !(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(node)), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.lang.smodel.query.structure.QueryParameter")))) { + SNodeOperations.replaceWithNewChild(node, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.lang.smodel.query.structure.QueryParameter")); + return; + } + + SNodeOperations.deleteNode(node); + if (parameterList != null && ListSequence.fromList(SLinkOperations.getChildren(parameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).isEmpty()) { + SNode queryExpression = SNodeOperations.as(SNodeOperations.getParent(parameterList), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.lang.smodel.query.structure.QueryExpression")); + if (queryExpression != null) { + SelectionUtil.selectLabelCellAnSetCaret(editorContext, queryExpression, "ALIAS_EDITOR_COMPONENT", -1); + } + } + } + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameter_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameter_Editor.java new file mode 100644 index 000000000000..0b40e356ba8d --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/QueryParameter_Editor.java @@ -0,0 +1,36 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.nodeEditor.DefaultNodeEditor; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import jetbrains.mps.openapi.editor.EditorContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.editor.runtime.cells.BigCellUtil; +import jetbrains.mps.openapi.editor.style.Style; +import jetbrains.mps.editor.runtime.style.StyleImpl; +import jetbrains.mps.editor.runtime.style.StyleAttributes; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; + +public class QueryParameter_Editor extends DefaultNodeEditor { + public EditorCell createEditorCell(EditorContext editorContext, SNode node) { + return this.createComponent_pp9zo5_a(editorContext, node); + } + private EditorCell createComponent_pp9zo5_a(EditorContext editorContext, SNode node) { + EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); + EditorCell bigCell = BigCellUtil.findBigCell(editorCell, node); + if (bigCell != null) { + bigCell.setBig(true); + } + Style style = new StyleImpl(); + style.set(StyleAttributes.AUTO_DELETABLE, 0, QueryParameter_Editor._StyleParameter_QueryFunction_pp9zo5_a0a((editorCell == null ? null : editorCell.getContext()), (editorCell == null ? null : editorCell.getSNode()))); + editorCell.getStyle().putAll(style); + editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); + return editorCell; + } + private static boolean _StyleParameter_QueryFunction_pp9zo5_a0a(EditorContext editorContext, SNode node) { + return SNodeOperations.getNextSibling(node) == null && SNodeOperations.getPrevSibling(node) == null; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ScopeParameter_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ScopeParameter_Editor.java new file mode 100644 index 000000000000..b9da37a3669f --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ScopeParameter_Editor.java @@ -0,0 +1,55 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.nodeEditor.DefaultNodeEditor; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import jetbrains.mps.openapi.editor.EditorContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.editor.runtime.cells.BigCellUtil; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.nodeEditor.cells.EditorCell_Error; +import jetbrains.mps.openapi.editor.style.Style; +import jetbrains.mps.editor.runtime.style.StyleImpl; +import jetbrains.mps.editor.runtime.style.StyleAttributes; + +public class ScopeParameter_Editor extends DefaultNodeEditor { + public EditorCell createEditorCell(EditorContext editorContext, SNode node) { + return this.createAlternation_pzkiaj_a(editorContext, node); + } + private EditorCell createAlternation_pzkiaj_a(EditorContext editorContext, SNode node) { + boolean alternationCondition = true; + alternationCondition = ScopeParameter_Editor.renderingCondition_pzkiaj_a0(node, editorContext); + EditorCell editorCell = null; + if (alternationCondition) { + editorCell = this.createError_pzkiaj_a0(editorContext, node); + } else { + editorCell = this.createComponent_pzkiaj_a0(editorContext, node); + } + EditorCell bigCell = BigCellUtil.findBigCell(editorCell, node); + if (bigCell != null) { + bigCell.setBig(true); + } + editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); + return editorCell; + } + private static boolean renderingCondition_pzkiaj_a0(SNode node, EditorContext editorContext) { + return SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(node)), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.lang.smodel.query.structure.ScopeParameter")); + } + private EditorCell createError_pzkiaj_a0(EditorContext editorContext, SNode node) { + EditorCell_Error editorCell = new EditorCell_Error(editorContext, node, ""); + editorCell.setCellId("Error_pzkiaj_a0"); + return editorCell; + } + private EditorCell createComponent_pzkiaj_a0(EditorContext editorContext, SNode node) { + EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); + Style style = new StyleImpl(); + style.set(StyleAttributes.AUTO_DELETABLE, 0, true); + editorCell.getStyle().putAll(style); + return editorCell; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ShowExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ShowExpression_Editor.java new file mode 100644 index 000000000000..5d8bb36c1eec --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ShowExpression_Editor.java @@ -0,0 +1,68 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.nodeEditor.DefaultNodeEditor; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import jetbrains.mps.openapi.editor.EditorContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; +import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.language.SContainmentLink; +import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; + +public class ShowExpression_Editor extends DefaultNodeEditor { + public EditorCell createEditorCell(EditorContext editorContext, SNode node) { + return this.createCollection_rowo1n_a(editorContext, node); + } + private EditorCell createCollection_rowo1n_a(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); + editorCell.setCellId("Collection_rowo1n_a"); + editorCell.setBig(true); + editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); + editorCell.addEditorCell(this.createComponent_rowo1n_a0(editorContext, node)); + editorCell.addEditorCell(this.createRefNode_rowo1n_b0(editorContext, node)); + return editorCell; + } + private EditorCell createComponent_rowo1n_a0(EditorContext editorContext, SNode node) { + EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); + return editorCell; + } + private EditorCell createRefNode_rowo1n_b0(EditorContext editorContext, SNode node) { + SingleRoleCellProvider provider = new ShowExpression_Editor.objectSingleRoleHandler_rowo1n_b0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), editorContext); + return provider.createCell(); + } + private class objectSingleRoleHandler_rowo1n_b0 extends SingleRoleCellProvider { + public objectSingleRoleHandler_rowo1n_b0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { + super(ownerNode, containmentLink, context); + } + public EditorCell createChildCell(EditorContext editorContext, SNode child) { + EditorCell editorCell = super.createChildCell(editorContext, child); + installCellInfo(child, editorCell); + return editorCell; + } + public void installCellInfo(SNode child, EditorCell editorCell) { + editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); + if (editorCell.getRole() == null) { + editorCell.setRole("object"); + } + } + + + @Override + protected EditorCell createEmptyCell() { + EditorCell editorCell = super.createEmptyCell(); + editorCell.setCellId("empty_object"); + installCellInfo(null, editorCell); + return editorCell; + } + + protected String getNoTargetText() { + return ""; + } + + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/UsagesExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/UsagesExpression_Editor.java new file mode 100644 index 000000000000..230d2a7a79a9 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/UsagesExpression_Editor.java @@ -0,0 +1,92 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.nodeEditor.DefaultNodeEditor; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import jetbrains.mps.openapi.editor.EditorContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; +import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; +import jetbrains.mps.openapi.editor.style.Style; +import jetbrains.mps.editor.runtime.style.StyleImpl; +import jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet; +import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.language.SContainmentLink; +import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; + +public class UsagesExpression_Editor extends DefaultNodeEditor { + public EditorCell createEditorCell(EditorContext editorContext, SNode node) { + return this.createCollection_ikz501_a(editorContext, node); + } + private EditorCell createCollection_ikz501_a(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); + editorCell.setCellId("Collection_ikz501_a"); + editorCell.setBig(true); + editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); + editorCell.addEditorCell(this.createComponent_ikz501_a0(editorContext, node)); + editorCell.addEditorCell(this.createConstant_ikz501_b0(editorContext, node)); + editorCell.addEditorCell(this.createRefNode_ikz501_c0(editorContext, node)); + editorCell.addEditorCell(this.createConstant_ikz501_d0(editorContext, node)); + return editorCell; + } + private EditorCell createComponent_ikz501_a0(EditorContext editorContext, SNode node) { + EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent"); + return editorCell; + } + private EditorCell createConstant_ikz501_b0(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "("); + editorCell.setCellId("Constant_ikz501_b0"); + Style style = new StyleImpl(); + BaseLanguageStyle_StyleSheet.apply_LeftParenAfterName(style, editorCell); + editorCell.getStyle().putAll(style); + editorCell.setDefaultText(""); + return editorCell; + } + private EditorCell createRefNode_ikz501_c0(EditorContext editorContext, SNode node) { + SingleRoleCellProvider provider = new UsagesExpression_Editor.nodeSingleRoleHandler_ikz501_c0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL, 0x75bb0160f191d6ecL, "node"), editorContext); + return provider.createCell(); + } + private class nodeSingleRoleHandler_ikz501_c0 extends SingleRoleCellProvider { + public nodeSingleRoleHandler_ikz501_c0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { + super(ownerNode, containmentLink, context); + } + public EditorCell createChildCell(EditorContext editorContext, SNode child) { + EditorCell editorCell = super.createChildCell(editorContext, child); + installCellInfo(child, editorCell); + return editorCell; + } + public void installCellInfo(SNode child, EditorCell editorCell) { + editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); + if (editorCell.getRole() == null) { + editorCell.setRole("node"); + } + } + + + @Override + protected EditorCell createEmptyCell() { + EditorCell editorCell = super.createEmptyCell(); + editorCell.setCellId("empty_node"); + installCellInfo(null, editorCell); + return editorCell; + } + + protected String getNoTargetText() { + return ""; + } + + } + private EditorCell createConstant_ikz501_d0(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, ")"); + editorCell.setCellId("Constant_ikz501_d0"); + Style style = new StyleImpl(); + BaseLanguageStyle_StyleSheet.apply_RightParen(style, editorCell); + editorCell.getStyle().putAll(style); + editorCell.setDefaultText(""); + return editorCell; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/WithStatement_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/WithStatement_Editor.java new file mode 100644 index 000000000000..523ddd4de63b --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/WithStatement_Editor.java @@ -0,0 +1,185 @@ +package jetbrains.mps.lang.smodel.query.editor; + +/*Generated by MPS */ + +import jetbrains.mps.nodeEditor.DefaultNodeEditor; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import jetbrains.mps.openapi.editor.EditorContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; +import jetbrains.mps.openapi.editor.style.Style; +import jetbrains.mps.editor.runtime.style.StyleImpl; +import jetbrains.mps.editor.runtime.style.StyleAttributes; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; +import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; +import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.language.SContainmentLink; +import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; +import jetbrains.mps.nodeEditor.MPSFonts; +import jetbrains.mps.nodeEditor.BlockCells; +import jetbrains.mps.nodeEditor.cells.EditorCell_Indent; + +public class WithStatement_Editor extends DefaultNodeEditor { + public EditorCell createEditorCell(EditorContext editorContext, SNode node) { + return this.createCollection_4f6do1_a(editorContext, node); + } + private EditorCell createCollection_4f6do1_a(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createVertical(editorContext, node); + editorCell.setCellId("Collection_4f6do1_a"); + editorCell.setBig(true); + Style style = new StyleImpl(); + style.set(StyleAttributes.SELECTABLE, 0, false); + editorCell.getStyle().putAll(style); + editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); + editorCell.addEditorCell(this.createCollection_4f6do1_a0(editorContext, node)); + editorCell.addEditorCell(this.createCollection_4f6do1_b0(editorContext, node)); + if (renderingCondition_4f6do1_a2a(node, editorContext)) { + editorCell.addEditorCell(this.createConstant_4f6do1_c0(editorContext, node)); + } + return editorCell; + } + private EditorCell createCollection_4f6do1_a0(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createHorizontal(editorContext, node); + editorCell.setCellId("Collection_4f6do1_a0"); + Style style = new StyleImpl(); + style.set(StyleAttributes.SELECTABLE, 0, false); + editorCell.getStyle().putAll(style); + editorCell.addEditorCell(this.createCollection_4f6do1_a0a(editorContext, node)); + if (renderingCondition_4f6do1_a1a0(node, editorContext)) { + editorCell.addEditorCell(this.createConstant_4f6do1_b0a(editorContext, node)); + } + return editorCell; + } + private EditorCell createCollection_4f6do1_a0a(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createHorizontal(editorContext, node); + editorCell.setCellId("Collection_4f6do1_a0a"); + editorCell.addEditorCell(this.createConstant_4f6do1_a0a0(editorContext, node)); + editorCell.addEditorCell(this.createRefNode_4f6do1_b0a0(editorContext, node)); + editorCell.addEditorCell(this.createConstant_4f6do1_c0a0(editorContext, node)); + return editorCell; + } + private EditorCell createConstant_4f6do1_a0a0(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "with"); + editorCell.setCellId("Constant_4f6do1_a0a0"); + editorCell.setDefaultText(""); + return editorCell; + } + private EditorCell createRefNode_4f6do1_b0a0(EditorContext editorContext, SNode node) { + SingleRoleCellProvider provider = new WithStatement_Editor.scopeSingleRoleHandler_4f6do1_b0a0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope"), editorContext); + return provider.createCell(); + } + private class scopeSingleRoleHandler_4f6do1_b0a0 extends SingleRoleCellProvider { + public scopeSingleRoleHandler_4f6do1_b0a0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { + super(ownerNode, containmentLink, context); + } + public EditorCell createChildCell(EditorContext editorContext, SNode child) { + EditorCell editorCell = super.createChildCell(editorContext, child); + installCellInfo(child, editorCell); + return editorCell; + } + public void installCellInfo(SNode child, EditorCell editorCell) { + editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); + if (editorCell.getRole() == null) { + editorCell.setRole("scope"); + } + } + + + @Override + protected EditorCell createEmptyCell() { + EditorCell editorCell = super.createEmptyCell(); + editorCell.setCellId("empty_scope"); + installCellInfo(null, editorCell); + return editorCell; + } + + protected String getNoTargetText() { + return ""; + } + + } + private EditorCell createConstant_4f6do1_c0a0(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "do"); + editorCell.setCellId("Constant_4f6do1_c0a0"); + editorCell.setDefaultText(""); + return editorCell; + } + private EditorCell createConstant_4f6do1_b0a(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "{"); + editorCell.setCellId("Constant_4f6do1_b0a"); + Style style = new StyleImpl(); + style.set(StyleAttributes.MATCHING_LABEL, 0, "brace"); + style.set(StyleAttributes.INDENT_LAYOUT_NO_WRAP, 0, true); + style.set(StyleAttributes.FONT_STYLE, 0, MPSFonts.PLAIN); + editorCell.getStyle().putAll(style); + editorCell.setDefaultText(""); + return editorCell; + } + private static boolean renderingCondition_4f6do1_a1a0(SNode node, EditorContext editorContext) { + return BlockCells.useBraces(); + } + private EditorCell createCollection_4f6do1_b0(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createHorizontal(editorContext, node); + editorCell.setCellId("Collection_4f6do1_b0"); + Style style = new StyleImpl(); + style.set(StyleAttributes.SELECTABLE, 0, false); + editorCell.getStyle().putAll(style); + editorCell.addEditorCell(this.createIndentCell_4f6do1_a1a(editorContext, node)); + editorCell.addEditorCell(this.createRefNode_4f6do1_b1a(editorContext, node)); + return editorCell; + } + private EditorCell createIndentCell_4f6do1_a1a(EditorContext editorContext, SNode node) { + EditorCell_Indent editorCell = new EditorCell_Indent(editorContext, node); + return editorCell; + } + private EditorCell createRefNode_4f6do1_b1a(EditorContext editorContext, SNode node) { + SingleRoleCellProvider provider = new WithStatement_Editor.stmtsSingleRoleHandler_4f6do1_b1a(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts"), editorContext); + return provider.createCell(); + } + private class stmtsSingleRoleHandler_4f6do1_b1a extends SingleRoleCellProvider { + public stmtsSingleRoleHandler_4f6do1_b1a(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { + super(ownerNode, containmentLink, context); + } + public EditorCell createChildCell(EditorContext editorContext, SNode child) { + EditorCell editorCell = super.createChildCell(editorContext, child); + installCellInfo(child, editorCell); + return editorCell; + } + public void installCellInfo(SNode child, EditorCell editorCell) { + editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); + if (editorCell.getRole() == null) { + editorCell.setRole("stmts"); + } + } + + + @Override + protected EditorCell createEmptyCell() { + EditorCell editorCell = super.createEmptyCell(); + editorCell.setCellId("empty_stmts"); + installCellInfo(null, editorCell); + return editorCell; + } + + protected String getNoTargetText() { + return ""; + } + + } + private EditorCell createConstant_4f6do1_c0(EditorContext editorContext, SNode node) { + EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "}"); + editorCell.setCellId("Constant_4f6do1_c0"); + Style style = new StyleImpl(); + style.set(StyleAttributes.MATCHING_LABEL, 0, "brace"); + style.set(StyleAttributes.INDENT_LAYOUT_NO_WRAP, 0, true); + style.set(StyleAttributes.FONT_STYLE, 0, MPSFonts.PLAIN); + editorCell.getStyle().putAll(style); + editorCell.setDefaultText(""); + return editorCell; + } + private static boolean renderingCondition_4f6do1_a2a(SNode node, EditorContext editorContext) { + return BlockCells.useBraces(); + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/trace.info new file mode 100644 index 000000000000..38b442ae6b43 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/trace.info @@ -0,0 +1,2025 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java new file mode 100644 index 000000000000..70228adc897a --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java @@ -0,0 +1,99 @@ +package jetbrains.mps.lang.smodel.query.structure; + +/*Generated by MPS */ + +import jetbrains.mps.smodel.runtime.BaseStructureAspectDescriptor; +import jetbrains.mps.smodel.runtime.ConceptDescriptor; +import jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder; +import jetbrains.mps.smodel.adapter.ids.MetaIdFactory; +import java.util.Collection; +import java.util.Arrays; +import org.jetbrains.annotations.Nullable; + +public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { + + /*package*/ final ConceptDescriptor myConceptCustomScope = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.CustomScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L)).super_("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759611770126L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"scope"}, new boolean[]{false}).alias("custom", "? extends SearchScope").create(); + /*package*/ final ConceptDescriptor myConceptExpressionHelpProvider = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).interface_().parents("jetbrains.mps.lang.smodel.query.structure.HelpProvider").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).create(); + /*package*/ final ConceptDescriptor myConceptGlobalScope = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.GlobalScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add42L)).super_("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).alias("global", "").create(); + /*package*/ final ConceptDescriptor myConceptHelpProvider = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.HelpProvider", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).interface_().create(); + /*package*/ final ConceptDescriptor myConceptInstancesExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.InstancesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(7738379549910147342L, "conceptArg", MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x118f285e4f7L), false, false, false)).children(new String[]{"conceptArg"}, new boolean[]{false}).alias("#instances", "instances of a concept in scope").create(); + /*package*/ final ConceptDescriptor myConceptModelScope = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ModelScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL)).super_("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759608408143L, "model", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, true, false)).children(new String[]{"model"}, new boolean[]{true}).alias("models", "").create(); + /*package*/ final ConceptDescriptor myConceptModelsExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ModelsExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675beab2dL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#models", "all models in scope").create(); + /*package*/ final ConceptDescriptor myConceptModulesExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ModulesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675cc2262L)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#modules", "all modules in scope").create(); + /*package*/ final ConceptDescriptor myConceptModulesScope = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ModulesScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL)).super_("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759607928680L, "module", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, true, false)).children(new String[]{"module"}, new boolean[]{true}).alias("modules", "").create(); + /*package*/ final ConceptDescriptor myConceptNodesExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.NodesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x272b1214886bd08eL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#nodes", "all nodes in scope").create(); + /*package*/ final ConceptDescriptor myConceptOperationHelpProvider = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.OperationHelpProvider", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).interface_().parents("jetbrains.mps.lang.smodel.query.structure.HelpProvider").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).create(); + /*package*/ final ConceptDescriptor myConceptProjectExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ProjectExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0xa721a59126bb908L)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#project", "the current project").create(); + /*package*/ final ConceptDescriptor myConceptProjectScope = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ProjectScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L)).super_("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).alias("project", "").create(); + /*package*/ final ConceptDescriptor myConceptQueryExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.QueryExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).childDescriptors(new ConceptDescriptorBuilder.Link(4307205004132279624L, "parameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L), false, false, false)).children(new String[]{"parameter"}, new boolean[]{false}).abstract_().create(); + /*package*/ final ConceptDescriptor myConceptQueryParameter = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.QueryParameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).abstract_().create(); + /*package*/ final ConceptDescriptor myConceptQueryParameterIncludeReadOnly = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L)).super_("jetbrains.mps.lang.smodel.query.structure.QueryParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).parents("jetbrains.mps.lang.smodel.query.structure.QueryParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).alias("r/o+", "include read only").create(); + /*package*/ final ConceptDescriptor myConceptQueryParameterList = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.QueryParameterList", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).childDescriptors(new ConceptDescriptorBuilder.Link(4307205004141421222L, "parameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L), true, true, false)).children(new String[]{"parameter"}, new boolean[]{true}).alias("< .. >", "").create(); + /*package*/ final ConceptDescriptor myConceptQueryParameterScope = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).parents("jetbrains.mps.lang.smodel.query.structure.QueryParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).childDescriptors(new ConceptDescriptorBuilder.Link(4307205004134707081L, "value", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL), false, false, false)).children(new String[]{"value"}, new boolean[]{false}).alias("scope", "used search scope").create(); + /*package*/ final ConceptDescriptor myConceptReferencesExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x57bda059470950bdL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#references", "all references in scope").create(); + /*package*/ final ConceptDescriptor myConceptScopeParameter = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ScopeParameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).abstract_().create(); + /*package*/ final ConceptDescriptor myConceptShowExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ShowExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).childDescriptors(new ConceptDescriptorBuilder.Link(7600370246423275637L, "object", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"object"}, new boolean[]{false}).alias("#show", "show in usage view").create(); + /*package*/ final ConceptDescriptor myConceptUsagesExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.UsagesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(8483375838963816172L, "node", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"node"}, new boolean[]{false}).alias("#usages", "direct references to a node in scope").create(); + /*package*/ final ConceptDescriptor myConceptWithStatement = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.WithStatement", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL)).super_("jetbrains.mps.baseLanguage.structure.Statement").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).parents("jetbrains.mps.baseLanguage.structure.Statement").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).childDescriptors(new ConceptDescriptorBuilder.Link(4234138103881610892L, "stmts", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false), new ConceptDescriptorBuilder.Link(4234138103881610935L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"stmts", "scope"}, new boolean[]{false, false}).alias("with", "").create(); + + @Override + public Collection getDescriptors() { + return Arrays.asList(myConceptCustomScope, myConceptExpressionHelpProvider, myConceptGlobalScope, myConceptHelpProvider, myConceptInstancesExpression, myConceptModelScope, myConceptModelsExpression, myConceptModulesExpression, myConceptModulesScope, myConceptNodesExpression, myConceptOperationHelpProvider, myConceptProjectExpression, myConceptProjectScope, myConceptQueryExpression, myConceptQueryParameter, myConceptQueryParameterIncludeReadOnly, myConceptQueryParameterList, myConceptQueryParameterScope, myConceptReferencesExpression, myConceptScopeParameter, myConceptShowExpression, myConceptUsagesExpression, myConceptWithStatement); + } + + @Override + @Nullable + public ConceptDescriptor getDescriptor(String conceptFqName) { + switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0bb, conceptFqName)) { + case 0: + return myConceptCustomScope; + case 1: + return myConceptExpressionHelpProvider; + case 2: + return myConceptGlobalScope; + case 3: + return myConceptHelpProvider; + case 4: + return myConceptInstancesExpression; + case 5: + return myConceptModelScope; + case 6: + return myConceptModelsExpression; + case 7: + return myConceptModulesExpression; + case 8: + return myConceptModulesScope; + case 9: + return myConceptNodesExpression; + case 10: + return myConceptOperationHelpProvider; + case 11: + return myConceptProjectExpression; + case 12: + return myConceptProjectScope; + case 13: + return myConceptQueryExpression; + case 14: + return myConceptQueryParameter; + case 15: + return myConceptQueryParameterIncludeReadOnly; + case 16: + return myConceptQueryParameterList; + case 17: + return myConceptQueryParameterScope; + case 18: + return myConceptReferencesExpression; + case 19: + return myConceptScopeParameter; + case 20: + return myConceptShowExpression; + case 21: + return myConceptUsagesExpression; + case 22: + return myConceptWithStatement; + default: + return null; + } + } + private static String[] stringSwitchCases_1htk8d_a0a0bb = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider", "jetbrains.mps.lang.smodel.query.structure.GlobalScope", "jetbrains.mps.lang.smodel.query.structure.HelpProvider", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModelsExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.NodesExpression", "jetbrains.mps.lang.smodel.query.structure.OperationHelpProvider", "jetbrains.mps.lang.smodel.query.structure.ProjectExpression", "jetbrains.mps.lang.smodel.query.structure.ProjectScope", "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "jetbrains.mps.lang.smodel.query.structure.QueryParameter", "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", "jetbrains.mps.lang.smodel.query.structure.ScopeParameter", "jetbrains.mps.lang.smodel.query.structure.ShowExpression", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"}; +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info new file mode 100644 index 000000000000..430d1b646f85 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/trace.info new file mode 100644 index 000000000000..f97bab381259 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/trace.info @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java new file mode 100644 index 000000000000..437b7ea3432b --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java @@ -0,0 +1,64 @@ +package jetbrains.mps.lang.smodel.query.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.BaseHelginsDescriptor; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.NonTypesystemRule_Runtime; + +public class TypesystemDescriptor extends BaseHelginsDescriptor { + public TypesystemDescriptor() { + { + InferenceRule_Runtime inferenceRule = new typeof_CustomScope_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_InstancesExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_ModelScopeLiteral_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_ModelsExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_ModuleScopeLiteral_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_ModulesExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_NodesExpresiion_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_ProjectExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_ReferencesExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_ScopeProvider_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_ShowExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_UsagesExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + NonTypesystemRule_Runtime nonTypesystemRule = new check_QueryDuplicatedParameters_NonTypesystemRule(); + this.myNonTypesystemRules.add(nonTypesystemRule); + } + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java new file mode 100644 index 000000000000..bbe4cfa90de6 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java @@ -0,0 +1,65 @@ +package jetbrains.mps.lang.smodel.query.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractNonTypesystemRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.NonTypesystemRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.language.SConcept; +import jetbrains.mps.internal.collections.runtime.Sequence; +import jetbrains.mps.internal.collections.runtime.ISelector; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.internal.collections.runtime.ISequence; +import jetbrains.mps.internal.collections.runtime.IWhereFilter; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; +import jetbrains.mps.errors.messageTargets.MessageTarget; +import jetbrains.mps.errors.messageTargets.NodeMessageTarget; +import jetbrains.mps.errors.IErrorReporter; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations; +import org.jetbrains.mps.openapi.language.SAbstractConcept; + +public class check_QueryDuplicatedParameters_NonTypesystemRule extends AbstractNonTypesystemRule_Runtime implements NonTypesystemRule_Runtime { + public check_QueryDuplicatedParameters_NonTypesystemRule() { + } + public void applyRule(final SNode queryParameterList, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + final Iterable parameters = SLinkOperations.getChildren(queryParameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter")); + Iterable parameterConcepts = Sequence.fromIterable(parameters).select(new ISelector() { + public SConcept select(SNode it) { + return SNodeOperations.getConcept(it); + } + }).distinct(); + Iterable> groupedByConcepts = Sequence.fromIterable(parameterConcepts).select(new ISelector>() { + public ISequence select(final SConcept c) { + return Sequence.fromIterable(parameters).where(new IWhereFilter() { + public boolean accept(SNode p) { + return SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(p)), SNodeOperations.asSConcept(c)); + } + }); + } + }); + + for (Iterable group : Sequence.fromIterable(groupedByConcepts)) { + if (Sequence.fromIterable(group).count() > 1) { + for (SNode other : Sequence.fromIterable(group).tail(Sequence.fromIterable(group).count() - 1)) { + { + MessageTarget errorTarget = new NodeMessageTarget(); + IErrorReporter _reporter_2309309498 = typeCheckingContext.reportTypeError(other, "Duplicated parameter: " + SPropertyOperations.getString(SNodeOperations.getConceptDeclaration(Sequence.fromIterable(group).first()), MetaAdapterFactory.getProperty(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0x1103553c5ffL, 0x46ab0ad5826c74caL, "conceptAlias")), "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "2284201910212797905", null, errorTarget); + } + } + } + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info new file mode 100644 index 000000000000..e6f92960f58e --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info @@ -0,0 +1,1074 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_CustomScope_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_CustomScope_InferenceRule.java new file mode 100644 index 000000000000..3b482aaba144 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_CustomScope_InferenceRule.java @@ -0,0 +1,46 @@ +package jetbrains.mps.lang.smodel.query.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; +import jetbrains.mps.smodel.SReference; + +public class typeof_CustomScope_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_CustomScope_InferenceRule() { + } + public void applyRule(final SNode customScope, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + if (!(typeCheckingContext.isSingleTypeComputation())) { + { + SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(customScope, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, 0x307931d0f985950eL, "scope")); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "3492877759611777799", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "3492877759611770308", true), (SNode) _quotation_createNode_c5uzhx_a0a0b(), true, true, _info_12389875345); + } + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, "jetbrains.mps.lang.smodel.query.structure.CustomScope"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_c5uzhx_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SearchScope"))); + return quotedNode_1; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_InstancesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_InstancesExpression_InferenceRule.java new file mode 100644 index 000000000000..4fe30339ef40 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_InstancesExpression_InferenceRule.java @@ -0,0 +1,119 @@ +package jetbrains.mps.lang.smodel.query.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.typesystem.inference.EquationInfo; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; +import org.jetbrains.mps.openapi.model.SNodeAccessUtil; + +public class typeof_InstancesExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_InstancesExpression_InferenceRule() { + } + public void applyRule(final SNode instancesExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + { + SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7057947030084340457", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7057947030084340460", true), (SNode) _quotation_createNode_dwt96n_a0a0b(), false, true, _info_12389875345); + } + + { + SNode _nodeToCheck_1029348928467 = instancesExpression; + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "473081947984804985", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "473081947984804988", true), (SNode) _quotation_createNode_dwt96n_a0c0b(), false, true, _info_12389875345); + } + if (SNodeOperations.isInstanceOf(SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x11885c0d945L, "jetbrains.mps.lang.smodel.structure.PoundExpression"))) { + { + final SNode conceptParameterType = typeCheckingContext.typeOf(SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")), "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874024291279", true); + typeCheckingContext.whenConcrete(conceptParameterType, new Runnable() { + public void run() { + if (SNodeOperations.isInstanceOf(typeCheckingContext.getExpandedNode(conceptParameterType), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x5cab42cd97571ceeL, "jetbrains.mps.lang.smodel.structure.SConceptType"))) { + SNode conceptType = SNodeOperations.cast(typeCheckingContext.getExpandedNode(conceptParameterType), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x5cab42cd97571ceeL, "jetbrains.mps.lang.smodel.structure.SConceptType")); + if (SLinkOperations.getTarget(conceptType, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x5cab42cd97571ceeL, 0x5cab42cd97571cefL, "conceptDeclaraton")) == null) { + { + SNode _nodeToCheck_1029348928467 = instancesExpression; + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874024608968", 0, null); + typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874024608970", true), (SNode) _quotation_createNode_dwt96n_a0a0b0a0a0d0b(), _info_12389875345); + } + } else { + { + SNode _nodeToCheck_1029348928467 = instancesExpression; + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874024291267", 0, null); + typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874024291269", true), (SNode) _quotation_createNode_dwt96n_a0a0a1a0a0a3a1(SLinkOperations.getTarget(conceptType, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x5cab42cd97571ceeL, 0x5cab42cd97571cefL, "conceptDeclaraton"))), _info_12389875345); + } + } + } + } + }, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874024291258", false, false); + } + } else if (SNodeOperations.isInstanceOf(SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"))) { + { + SNode _nodeToCheck_1029348928467 = instancesExpression; + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "4693937538539160493", 0, null); + typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "4693937538539160495", true), (SNode) _quotation_createNode_dwt96n_a0a0a3a1(SLinkOperations.getTarget(SNodeOperations.cast(SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference")), MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"))), _info_12389875345); + } + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.lang.smodel.query.structure.InstancesExpression"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_dwt96n_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x5cab42cd97571ceeL, "jetbrains.mps.lang.smodel.structure.SConceptType"), null, null, false); + return quotedNode_1; + } + private static SNode _quotation_createNode_dwt96n_a0c0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_dwt96n_a0a0b0a0a0d0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_dwt96n_a0a0a1a0a0a3a1(Object parameter_1) { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_2 = null; + SNode quotedNode_3 = null; + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + SNodeAccessUtil.setReferenceTarget(quotedNode_3, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, 0x1090e46ca51L, "concept"), (SNode) parameter_1); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_3); + return quotedNode_2; + } + private static SNode _quotation_createNode_dwt96n_a0a0a3a1(Object parameter_1) { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_2 = null; + SNode quotedNode_3 = null; + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + SNodeAccessUtil.setReferenceTarget(quotedNode_3, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, 0x1090e46ca51L, "concept"), (SNode) parameter_1); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_3); + return quotedNode_2; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModelScopeLiteral_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModelScopeLiteral_InferenceRule.java new file mode 100644 index 000000000000..96cb833af6b8 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModelScopeLiteral_InferenceRule.java @@ -0,0 +1,47 @@ +package jetbrains.mps.lang.smodel.query.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; + +public class typeof_ModelScopeLiteral_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_ModelScopeLiteral_InferenceRule() { + } + public void applyRule(final SNode modelScopeLiteral, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + for (SNode elem : ListSequence.fromList(SLinkOperations.getChildren(modelScopeLiteral, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL, 0x307931d0f952484fL, "model")))) { + if (!(typeCheckingContext.isSingleTypeComputation())) { + { + SNode _nodeToCheck_1029348928467 = elem; + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "3492877759611330834", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "3492877759611330836", true), (SNode) _quotation_createNode_hadfae_a0a0a0b(), true, true, _info_12389875345); + } + } + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL, "jetbrains.mps.lang.smodel.query.structure.ModelScope"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_hadfae_a0a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + return quotedNode_1; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModelsExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModelsExpression_InferenceRule.java new file mode 100644 index 000000000000..2a92317f0435 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModelsExpression_InferenceRule.java @@ -0,0 +1,44 @@ +package jetbrains.mps.lang.smodel.query.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; + +public class typeof_ModelsExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_ModelsExpression_InferenceRule() { + } + public void applyRule(final SNode modelsExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + { + SNode _nodeToCheck_1029348928467 = modelsExpression; + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874027864625", 0, null); + typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874027864139", true), (SNode) _quotation_createNode_i8e9pf_a0a0b(), _info_12389875345); + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675beab2dL, "jetbrains.mps.lang.smodel.query.structure.ModelsExpression"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_i8e9pf_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java new file mode 100644 index 000000000000..a3865380ba38 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java @@ -0,0 +1,49 @@ +package jetbrains.mps.lang.smodel.query.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; +import jetbrains.mps.smodel.SReference; + +public class typeof_ModuleScopeLiteral_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_ModuleScopeLiteral_InferenceRule() { + } + public void applyRule(final SNode moduleScopeLiteral, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + for (SNode elem : ListSequence.fromList(SLinkOperations.getChildren(moduleScopeLiteral, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL, 0x307931d0f94af768L, "module")))) { + if (!(typeCheckingContext.isSingleTypeComputation())) { + { + SNode _nodeToCheck_1029348928467 = elem; + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "3492877759608999063", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "3492877759608999069", true), (SNode) _quotation_createNode_51ub11_a0a0a0b(), true, true, _info_12389875345); + } + } + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL, "jetbrains.mps.lang.smodel.query.structure.ModulesScope"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_51ub11_a0a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + return quotedNode_1; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModulesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModulesExpression_InferenceRule.java new file mode 100644 index 000000000000..997f99519c6a --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ModulesExpression_InferenceRule.java @@ -0,0 +1,46 @@ +package jetbrains.mps.lang.smodel.query.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; +import jetbrains.mps.smodel.SReference; + +public class typeof_ModulesExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_ModulesExpression_InferenceRule() { + } + public void applyRule(final SNode modulesExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + { + SNode _nodeToCheck_1029348928467 = modulesExpression; + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874028745824", 0, null); + typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6864030874028745375", true), (SNode) _quotation_createNode_2y0lxf_a0a0b(), _info_12389875345); + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675cc2262L, "jetbrains.mps.lang.smodel.query.structure.ModulesExpression"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_2y0lxf_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_NodesExpresiion_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_NodesExpresiion_InferenceRule.java new file mode 100644 index 000000000000..a43dea28aef2 --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_NodesExpresiion_InferenceRule.java @@ -0,0 +1,44 @@ +package jetbrains.mps.lang.smodel.query.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; + +public class typeof_NodesExpresiion_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_NodesExpresiion_InferenceRule() { + } + public void applyRule(final SNode nodesExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + { + SNode _nodeToCheck_1029348928467 = nodesExpression; + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6322385757205373104", 0, null); + typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6322385757205373115", true), (SNode) _quotation_createNode_4xyjb1_a0a0b(), _info_12389875345); + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x272b1214886bd08eL, "jetbrains.mps.lang.smodel.query.structure.NodesExpression"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_4xyjb1_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ProjectExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ProjectExpression_InferenceRule.java new file mode 100644 index 000000000000..30b507be4c1b --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ProjectExpression_InferenceRule.java @@ -0,0 +1,43 @@ +package jetbrains.mps.lang.smodel.query.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; +import jetbrains.mps.smodel.SReference; + +public class typeof_ProjectExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_ProjectExpression_InferenceRule() { + } + public void applyRule(final SNode projectExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + { + SNode _nodeToCheck_1029348928467 = projectExpression; + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "752693057587763729", 0, null); + typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "752693057587762707", true), (SNode) _quotation_createNode_osiggc_a0a0b(), _info_12389875345); + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0xa721a59126bb908L, "jetbrains.mps.lang.smodel.query.structure.ProjectExpression"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_osiggc_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)"), facade.createNodeId("~Project"))); + return quotedNode_1; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ReferencesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ReferencesExpression_InferenceRule.java new file mode 100644 index 000000000000..957b7011d72f --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ReferencesExpression_InferenceRule.java @@ -0,0 +1,44 @@ +package jetbrains.mps.lang.smodel.query.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; + +public class typeof_ReferencesExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_ReferencesExpression_InferenceRule() { + } + public void applyRule(final SNode referencesExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + { + SNode _nodeToCheck_1029348928467 = referencesExpression; + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6322385757205641653", 0, null); + typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "6322385757205641659", true), (SNode) _quotation_createNode_bx15pu_a0a0b(), _info_12389875345); + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x57bda059470950bdL, "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_bx15pu_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ScopeProvider_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ScopeProvider_InferenceRule.java new file mode 100644 index 000000000000..a8c2cb30905a --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ScopeProvider_InferenceRule.java @@ -0,0 +1,73 @@ +package jetbrains.mps.lang.smodel.query.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; +import jetbrains.mps.smodel.SReference; + +public class typeof_ScopeProvider_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_ScopeProvider_InferenceRule() { + } + public void applyRule(final SNode scopeProvider, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + { + SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(scopeProvider, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope")); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "4234138103881642865", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "4234138103881614549", true), (SNode) _quotation_createNode_jkxe46_a0a0b(), false, false, _info_12389875345); + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, "jetbrains.mps.lang.smodel.query.structure.WithStatement"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_jkxe46_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + SNode quotedNode_3 = null; + SNode quotedNode_4 = null; + SNode quotedNode_5 = null; + SNode quotedNode_6 = null; + SNode quotedNode_7 = null; + SNode quotedNode_8 = null; + SNode quotedNode_9 = null; + SNode quotedNode_10 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, "jetbrains.mps.lang.typesystem.structure.JoinType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_8); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_2); + quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_3); + quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_9); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_4); + quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_5.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_5, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_5); + quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_10.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_10, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_6.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_10); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_6); + quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_7.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_7, facade.createModelReference("6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)"), facade.createNodeId("~Project"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_7); + return quotedNode_1; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ShowExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ShowExpression_InferenceRule.java new file mode 100644 index 000000000000..7ae1da2366ac --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ShowExpression_InferenceRule.java @@ -0,0 +1,81 @@ +package jetbrains.mps.lang.smodel.query.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.typesystem.inference.EquationInfo; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; +import jetbrains.mps.smodel.SReference; + +public class typeof_ShowExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_ShowExpression_InferenceRule() { + } + public void applyRule(final SNode showExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + { + SNode _nodeToCheck_1029348928467 = showExpression; + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7600370246417176611", 0, null); + typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7600370246417176148", true), (SNode) _quotation_createNode_jy8svg_a0a0b(), _info_12389875345); + } + if (!(typeCheckingContext.isSingleTypeComputation())) { + { + SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(showExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object")); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7600370246423284446", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7600370246423276130", true), (SNode) _quotation_createNode_jy8svg_a0b0b(), true, true, _info_12389875345); + } + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, "jetbrains.mps.lang.smodel.query.structure.ShowExpression"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_jy8svg_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc6bf96dL, "jetbrains.mps.baseLanguage.structure.VoidType"), null, null, false); + return quotedNode_1; + } + private static SNode _quotation_createNode_jy8svg_a0b0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + SNode quotedNode_3 = null; + SNode quotedNode_4 = null; + SNode quotedNode_5 = null; + SNode quotedNode_6 = null; + SNode quotedNode_7 = null; + SNode quotedNode_8 = null; + SNode quotedNode_9 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, "jetbrains.mps.lang.typesystem.structure.JoinType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_6); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_2); + quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_7); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_3); + quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_8); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_4); + quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_9.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_9, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_9); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_5); + return quotedNode_1; + } +} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_UsagesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_UsagesExpression_InferenceRule.java new file mode 100644 index 000000000000..611e6a9fc0ed --- /dev/null +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_UsagesExpression_InferenceRule.java @@ -0,0 +1,58 @@ +package jetbrains.mps.lang.smodel.query.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.typesystem.inference.EquationInfo; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; + +public class typeof_UsagesExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_UsagesExpression_InferenceRule() { + } + public void applyRule(final SNode expr, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + { + SNode _nodeToCheck_1029348928467 = expr; + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7738379549905488875", 0, null); + typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7738379549905488404", true), (SNode) _quotation_createNode_qth3vr_a0a0b(), _info_12389875345); + } + if (!(typeCheckingContext.isSingleTypeComputation())) { + { + SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(expr, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL, 0x75bb0160f191d6ecL, "node")); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "473081947995054364", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "473081947995054370", true), (SNode) _quotation_createNode_qth3vr_a0b0b(), true, true, _info_12389875345); + } + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL, "jetbrains.mps.lang.smodel.query.structure.UsagesExpression"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_qth3vr_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x62e1df06bd2172b2L, "jetbrains.mps.baseLanguage.collections.structure.CollectionType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x4eec26fcbaf8c39bL, 0x4eec26fcbaf8c39cL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_qth3vr_a0b0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + return quotedNode_1; + } +} diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java index 90ad867b5ffc..afc2c2882ce2 100644 --- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java +++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java @@ -110,14 +110,14 @@ private static SNode _quotation_createNode_flklsf_a0c0a(Object parameter_1) { SNodeAccessUtil.setProperty(quotedNode_4, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "context"); SNodeAccessUtil.setProperty(quotedNode_4, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37a7f6eL, 0x111f9e9f00cL, "isFinal"), "true"); quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_8.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_8, facade.createModelReference("r:c51f26da-d1ec-4385-9c6f-4c7001d1fcfa(jetbrains.mps.command.base.runtime)"), facade.createNodeId("351968380915666545"))); + quotedNode_8.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_8, facade.createModelReference("r:c850086f-d3f3-45ec-9f36-eb1065226b81(jetbrains.mps.console.blCommand.runtime)"), facade.createNodeId("351968380915666545"))); quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_8); quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1feL, "parameter"), quotedNode_4); quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e94L, "jetbrains.mps.baseLanguage.structure.ParameterDeclaration"), null, null, false); SNodeAccessUtil.setProperty(quotedNode_5, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "console"); SNodeAccessUtil.setProperty(quotedNode_5, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37a7f6eL, 0x111f9e9f00cL, "isFinal"), "true"); quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_9.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_9, facade.createModelReference("r:c51f26da-d1ec-4385-9c6f-4c7001d1fcfa(jetbrains.mps.command.base.runtime)"), facade.createNodeId("6852607286009617748"))); + quotedNode_9.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_9, facade.createModelReference("r:c850086f-d3f3-45ec-9f36-eb1065226b81(jetbrains.mps.console.blCommand.runtime)"), facade.createNodeId("6852607286009617748"))); quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_9); quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1feL, "parameter"), quotedNode_5); quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10af9581ff1L, "jetbrains.mps.baseLanguage.structure.PublicVisibility"), null, null, false); @@ -126,21 +126,21 @@ private static SNode _quotation_createNode_flklsf_a0c0a(Object parameter_1) { quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, "jetbrains.mps.baseLanguage.structure.TryCatchStatement"), null, null, false); quotedNode_11 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); quotedNode_13 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); - quotedNode_16 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b2a9377L, "jetbrains.mps.console.blCommand.structure.PrintExpression"), null, null, false); - quotedNode_19 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, "jetbrains.mps.console.blCommand.structure.ShowExpression"), null, null, false); + quotedNode_16 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b2a9377L, "jetbrains.mps.console.base.structure.PrintExpression"), null, null, false); + quotedNode_19 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, "jetbrains.mps.lang.smodel.query.structure.ShowExpression"), null, null, false); quotedNode_21 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); - quotedNode_25 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.console.blCommand.structure.InstancesExpression"), null, null, false); + quotedNode_24 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.lang.smodel.query.structure.InstancesExpression"), null, null, false); quotedNode_27 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"), null, null, false); SNodeAccessUtil.setReferenceTarget(quotedNode_27, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"), (SNode) parameter_1); - quotedNode_25.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), quotedNode_27); - quotedNode_28 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.console.blCommand.structure.QueryParameterList"), null, null, false); - quotedNode_30 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope"), null, null, false); - quotedNode_33 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.console.blCommand.structure.ProjectScope"), null, null, false); + quotedNode_24.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), quotedNode_27); + quotedNode_28 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList"), null, null, false); + quotedNode_30 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope"), null, null, false); + quotedNode_33 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.lang.smodel.query.structure.ProjectScope"), null, null, false); quotedNode_30.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), quotedNode_33); quotedNode_28.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), quotedNode_30); - quotedNode_25.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_28); - quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_25); - quotedNode_26 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x117e3fd45c4L, "jetbrains.mps.baseLanguage.collections.structure.WhereOperation"), null, null, false); + quotedNode_24.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_28); + quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_24); + quotedNode_25 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x117e3fd45c4L, "jetbrains.mps.baseLanguage.collections.structure.WhereOperation"), null, null, false); quotedNode_29 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); SNodeAccessUtil.setProperty(quotedNode_29, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); quotedNode_31 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); @@ -150,10 +150,10 @@ private static SNode _quotation_createNode_flklsf_a0c0a(Object parameter_1) { quotedNode_34 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); quotedNode_32.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_34); quotedNode_29.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_32); - quotedNode_26.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_29); - quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_26); + quotedNode_25.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_29); + quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_25); quotedNode_19.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), quotedNode_21); - quotedNode_16.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"), quotedNode_19); + quotedNode_16.addChild(quotedNode_19); quotedNode_13.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_16); quotedNode_11.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_13); quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, 0x10f383e83d4L, "body"), quotedNode_11); @@ -161,29 +161,27 @@ private static SNode _quotation_createNode_flklsf_a0c0a(Object parameter_1) { quotedNode_14 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc67c7efL, "jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration"), null, null, false); SNodeAccessUtil.setProperty(quotedNode_14, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "throwable"); quotedNode_17 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_17.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_17, facade.createModelReference("6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)"), facade.createNodeId("~Throwable"))); + quotedNode_17.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_17, facade.createModelReference("6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang()"), facade.createNodeId("~Throwable"))); quotedNode_14.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_17); quotedNode_12.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, 0x10f39a6a2f1L, "throwable"), quotedNode_14); quotedNode_15 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); quotedNode_18 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); - quotedNode_20 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfbbebabf09L, "jetbrains.mps.baseLanguage.structure.StaticMethodCall"), null, null, false); - quotedNode_20.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), quotedNode_20, facade.createModelReference("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)"), facade.createNodeId("2699636778862353917"))); - quotedNode_20.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfbbebabf09L, 0x10a7588b546L, "classConcept"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfbbebabf09L, 0x10a7588b546L, "classConcept"), quotedNode_20, facade.createModelReference("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)"), facade.createNodeId("313482946808721508"))); + quotedNode_20 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); quotedNode_22 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); - quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_22); - quotedNode_23 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); - quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_23); - quotedNode_24 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); - quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_24); + quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_22); + quotedNode_23 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x118154a6332L, "jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation"), null, null, false); + quotedNode_23.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), quotedNode_23, facade.createModelReference("r:c850086f-d3f3-45ec-9f36-eb1065226b81(jetbrains.mps.console.blCommand.runtime)"), facade.createNodeId("4598452390225734979"))); + quotedNode_26 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); + quotedNode_23.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_26); + quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_23); quotedNode_18.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_20); quotedNode_15.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_18); quotedNode_12.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, 0x10f39a6a2f2L, "catchBody"), quotedNode_15); quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, 0x10f39a8ba1fL, "catchClause"), quotedNode_12); quotedNode_7.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_10); quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1ffL, "body"), quotedNode_7); - quotedNode_22.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_4); - quotedNode_23.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_5); - quotedNode_24.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_14); + quotedNode_22.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_5); + quotedNode_26.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_14); return quotedNode_2; } } diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java index ed020f2e46ad..f021a8c6278a 100644 --- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java +++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java @@ -116,14 +116,14 @@ private static SNode _quotation_createNode_nwjg5s_a0b0a(Object parameter_1) { SNodeAccessUtil.setProperty(quotedNode_4, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "context"); SNodeAccessUtil.setProperty(quotedNode_4, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37a7f6eL, 0x111f9e9f00cL, "isFinal"), "true"); quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_8.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_8, facade.createModelReference("r:c51f26da-d1ec-4385-9c6f-4c7001d1fcfa(jetbrains.mps.command.base.runtime)"), facade.createNodeId("351968380915666545"))); + quotedNode_8.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_8, facade.createModelReference("r:c850086f-d3f3-45ec-9f36-eb1065226b81(jetbrains.mps.console.blCommand.runtime)"), facade.createNodeId("351968380915666545"))); quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_8); quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1feL, "parameter"), quotedNode_4); quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e94L, "jetbrains.mps.baseLanguage.structure.ParameterDeclaration"), null, null, false); SNodeAccessUtil.setProperty(quotedNode_5, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "console"); SNodeAccessUtil.setProperty(quotedNode_5, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37a7f6eL, 0x111f9e9f00cL, "isFinal"), "true"); quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_9.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_9, facade.createModelReference("r:c51f26da-d1ec-4385-9c6f-4c7001d1fcfa(jetbrains.mps.command.base.runtime)"), facade.createNodeId("6852607286009617748"))); + quotedNode_9.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_9, facade.createModelReference("r:c850086f-d3f3-45ec-9f36-eb1065226b81(jetbrains.mps.console.blCommand.runtime)"), facade.createNodeId("6852607286009617748"))); quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_9); quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1feL, "parameter"), quotedNode_5); quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10af9581ff1L, "jetbrains.mps.baseLanguage.structure.PublicVisibility"), null, null, false); @@ -132,21 +132,21 @@ private static SNode _quotation_createNode_nwjg5s_a0b0a(Object parameter_1) { quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, "jetbrains.mps.baseLanguage.structure.TryCatchStatement"), null, null, false); quotedNode_11 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); quotedNode_13 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); - quotedNode_16 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b2a9377L, "jetbrains.mps.console.blCommand.structure.PrintExpression"), null, null, false); + quotedNode_16 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b2a9377L, "jetbrains.mps.console.base.structure.PrintExpression"), null, null, false); quotedNode_19 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); quotedNode_21 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); - quotedNode_26 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.console.blCommand.structure.InstancesExpression"), null, null, false); - quotedNode_29 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.console.blCommand.structure.QueryParameterList"), null, null, false); - quotedNode_34 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope"), null, null, false); - quotedNode_38 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.console.blCommand.structure.ProjectScope"), null, null, false); + quotedNode_25 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.lang.smodel.query.structure.InstancesExpression"), null, null, false); + quotedNode_29 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList"), null, null, false); + quotedNode_34 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope"), null, null, false); + quotedNode_38 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.lang.smodel.query.structure.ProjectScope"), null, null, false); quotedNode_34.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), quotedNode_38); quotedNode_29.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), quotedNode_34); - quotedNode_26.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_29); + quotedNode_25.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_29); quotedNode_30 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"), null, null, false); SNodeAccessUtil.setReferenceTarget(quotedNode_30, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"), (SNode) parameter_1); - quotedNode_26.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), quotedNode_30); - quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_26); - quotedNode_27 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x117e3fd45c4L, "jetbrains.mps.baseLanguage.collections.structure.WhereOperation"), null, null, false); + quotedNode_25.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), quotedNode_30); + quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_25); + quotedNode_26 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x117e3fd45c4L, "jetbrains.mps.baseLanguage.collections.structure.WhereOperation"), null, null, false); quotedNode_31 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); SNodeAccessUtil.setProperty(quotedNode_31, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); quotedNode_35 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); @@ -161,22 +161,22 @@ private static SNode _quotation_createNode_nwjg5s_a0b0a(Object parameter_1) { quotedNode_40 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); quotedNode_36.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_40); quotedNode_31.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_36); - quotedNode_27.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_31); - quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_27); + quotedNode_26.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_31); + quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_26); quotedNode_19.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_21); quotedNode_22 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x20fd2063d7de993eL, "jetbrains.mps.console.scripts.structure.RefactorOperation"), null, null, false); - quotedNode_28 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_28, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); + quotedNode_27 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_27, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); quotedNode_32 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); - quotedNode_28.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf0522fL, "body"), quotedNode_32); + quotedNode_27.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf0522fL, "body"), quotedNode_32); quotedNode_33 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x118374464e4L, "jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration"), null, null, false); SNodeAccessUtil.setProperty(quotedNode_33, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "node"); quotedNode_37 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); quotedNode_33.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_37); - quotedNode_28.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_33); - quotedNode_22.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_28); + quotedNode_27.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_33); + quotedNode_22.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_27); quotedNode_19.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_22); - quotedNode_16.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"), quotedNode_19); + quotedNode_16.addChild(quotedNode_19); quotedNode_13.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_16); quotedNode_11.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_13); quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, 0x10f383e83d4L, "body"), quotedNode_11); @@ -184,29 +184,27 @@ private static SNode _quotation_createNode_nwjg5s_a0b0a(Object parameter_1) { quotedNode_14 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc67c7efL, "jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration"), null, null, false); SNodeAccessUtil.setProperty(quotedNode_14, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "throwable"); quotedNode_17 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_17.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_17, facade.createModelReference("6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)"), facade.createNodeId("~Throwable"))); + quotedNode_17.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_17, facade.createModelReference("6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang()"), facade.createNodeId("~Throwable"))); quotedNode_14.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_17); quotedNode_12.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, 0x10f39a6a2f1L, "throwable"), quotedNode_14); quotedNode_15 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); quotedNode_18 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); - quotedNode_20 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfbbebabf09L, "jetbrains.mps.baseLanguage.structure.StaticMethodCall"), null, null, false); - quotedNode_20.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), quotedNode_20, facade.createModelReference("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)"), facade.createNodeId("2699636778862353917"))); - quotedNode_20.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfbbebabf09L, 0x10a7588b546L, "classConcept"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfbbebabf09L, 0x10a7588b546L, "classConcept"), quotedNode_20, facade.createModelReference("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)"), facade.createNodeId("313482946808721508"))); + quotedNode_20 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); quotedNode_23 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); - quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_23); - quotedNode_24 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); - quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_24); - quotedNode_25 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); - quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_25); + quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_23); + quotedNode_24 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x118154a6332L, "jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation"), null, null, false); + quotedNode_24.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), quotedNode_24, facade.createModelReference("r:c850086f-d3f3-45ec-9f36-eb1065226b81(jetbrains.mps.console.blCommand.runtime)"), facade.createNodeId("4598452390225734979"))); + quotedNode_28 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); + quotedNode_24.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_28); + quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_24); quotedNode_18.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_20); quotedNode_15.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_18); quotedNode_12.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, 0x10f39a6a2f2L, "catchBody"), quotedNode_15); quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, 0x10f39a8ba1fL, "catchClause"), quotedNode_12); quotedNode_7.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_10); quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1ffL, "body"), quotedNode_7); - quotedNode_23.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_4); - quotedNode_24.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_5); - quotedNode_25.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_14); + quotedNode_23.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_5); + quotedNode_28.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_14); return quotedNode_2; } } diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info index c1f7bcb8ef8e..a70f8fab7cac 100644 --- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info +++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info @@ -76,15 +76,15 @@ - - + + - - + + @@ -92,8 +92,8 @@ - - + + @@ -119,38 +119,36 @@ - - + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + @@ -161,12 +159,10 @@ - - - - - - + + + + @@ -185,6 +181,8 @@ + + @@ -195,39 +193,39 @@ + + - - + + - - - - - - + + + + - - + + - - - - - - - + + + + + + + @@ -238,9 +236,8 @@ - - - + + @@ -258,6 +255,7 @@ + @@ -269,27 +267,27 @@ + - + - - + - + - + - - - - + + + + @@ -325,10 +323,10 @@ - + - + @@ -422,15 +420,15 @@ - - + + - - + + @@ -438,8 +436,8 @@ - - + + @@ -482,38 +480,36 @@ - - + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + @@ -526,12 +522,10 @@ - - - - - - + + + + @@ -556,6 +550,8 @@ + + @@ -568,43 +564,43 @@ + + - - + + - - - - + + - - + + - - + + - - - - - - - + + + + + + + @@ -616,9 +612,8 @@ - - - + + @@ -638,6 +633,7 @@ + @@ -650,29 +646,29 @@ + - + - - + - + - + - - - - + + + + @@ -715,10 +711,10 @@ - + - + diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies index efd3bbed66c5..9eb7d6f79402 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies @@ -2,12 +2,25 @@ + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated index db11d1ae6efb..b2a1fdde44ff 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java index 1a7166607814..1ee6afde58f4 100644 --- a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java +++ b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java @@ -3,21 +3,113 @@ /*Generated by MPS */ import jetbrains.mps.generator.runtime.Generated; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext; +import jetbrains.mps.generator.template.BaseMappingRuleContext; +import jetbrains.mps.typesystem.inference.TypeChecker; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.lang.typesystem.runtime.HUtil; +import jetbrains.mps.internal.collections.runtime.ListSequence; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.generator.template.PropertyMacroContext; +import jetbrains.mps.smodel.behaviour.BehaviorReflection; +import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext; import jetbrains.mps.generator.template.SourceSubstituteMacroNodesContext; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; +import jetbrains.mps.smodel.SReference; @Generated public class QueriesGenerated { + public static boolean baseMappingRule_Condition_3395429865810138642(final BaseMappingRuleContext _context) { + return TypeChecker.getInstance().getSubtypingManager().isSubtype(TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), _quotation_createNode_x583g4_b0a0a0()); + } + public static boolean baseMappingRule_Condition_7600370246419375459(final BaseMappingRuleContext _context) { + return TypeChecker.getInstance().getSubtypingManager().isSubtype(TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), _quotation_createNode_x583g4_b0a0a1()); + } + public static boolean baseMappingRule_Condition_7600370246421231722(final BaseMappingRuleContext _context) { + SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); + return TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0a0b0c()) || TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0a0b0c_0()) || TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0a1a2()) || TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0b0c()); + } + public static boolean baseMappingRule_Condition_3856122757887589572(final BaseMappingRuleContext _context) { + SNode functionType = TypeChecker.getInstance().getRuntimeSupport().coerce_(TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), HUtil.createMatchingPatternByConcept(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174a4d19ffL, "jetbrains.mps.baseLanguage.closures.structure.FunctionType")), false); + return functionType != null; + } + public static boolean baseMappingRule_Condition_3786816536599965790(final BaseMappingRuleContext _context) { + return ListSequence.fromList(SNodeOperations.getNodeDescendants(_context.getNode(), MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b2a9377L, "jetbrains.mps.console.base.structure.PrintExpression"), false, new SAbstractConcept[]{})).isEmpty(); + } + public static Object propertyMacro_GetPropertyValue_6690111761723079789(final PropertyMacroContext _context) { + return "closure : " + BehaviorReflection.invokeVirtual(String.class, TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), "virtual_getPresentation_1213877396640", new Object[]{}); + } public static SNode sourceNodeQuery_1583916890562946186(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL, 0x15fb34051f725bb1L, "commandHolder")), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL, 0x4e27160acb44924L, "command")); } public static SNode sourceNodeQuery_7600370246429485751(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression")); } + public static SNode sourceNodeQuery_3395429865810287239(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + } + public static SNode sourceNodeQuery_9010839353951768772(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + } + public static SNode sourceNodeQuery_7600370246429334103(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + } + public static SNode sourceNodeQuery_7600370246419387223(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + } public static Iterable sourceNodesQuery_5336086527852932024(final SourceSubstituteMacroNodesContext _context) { return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement")); } + private static SNode _quotation_createNode_x583g4_b0a0a0() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc6bf96dL, "jetbrains.mps.baseLanguage.structure.VoidType"), null, null, false); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a0a1() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a0a0b0c() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a0a0b0c_0() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a0a1a2() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a0b0c() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } } diff --git a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info index ce29c5b55f71..1bbf1e639414 100644 --- a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info +++ b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info @@ -1,27 +1,168 @@ + + + + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index 721f74af64d2..7f1a84e23de9 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -2,7 +2,6 @@ - @@ -12,20 +11,33 @@ + + + + + - + + + + + + + + + @@ -42,12 +54,17 @@ + + + + + @@ -62,15 +79,33 @@ + + + + + + + + + + + + + + + + + + @@ -82,6 +117,11 @@ + + + + + @@ -99,6 +139,9 @@ + + + @@ -107,25 +150,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -138,6 +240,10 @@ + + + + @@ -146,12 +252,22 @@ - + + + + + + + + + + + @@ -325,5 +441,388 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/jetbrains.mps.console.base.mpl b/plugins/console/lang/base/jetbrains.mps.console.base.mpl index 2d11a5d2a72c..0200ff72c769 100644 --- a/plugins/console/lang/base/jetbrains.mps.console.base.mpl +++ b/plugins/console/lang/base/jetbrains.mps.console.base.mpl @@ -21,6 +21,10 @@ de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures) + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) + 504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -41,7 +45,9 @@ + + diff --git a/plugins/console/lang/base/languageModels/actions.mps b/plugins/console/lang/base/languageModels/actions.mps index c8991a504fed..245750c614f3 100644 --- a/plugins/console/lang/base/languageModels/actions.mps +++ b/plugins/console/lang/base/languageModels/actions.mps @@ -14,6 +14,10 @@ + + + + @@ -27,12 +31,17 @@ + + + + + @@ -79,6 +88,14 @@ + + + + + + + + @@ -90,6 +107,8 @@ + + @@ -99,6 +118,9 @@ + + + @@ -106,6 +128,13 @@ + + + + + + + @@ -252,5 +281,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index 03ea78969c50..2cf47c4ac435 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -2718,5 +2718,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/languageModels/editor.mps b/plugins/console/lang/base/languageModels/editor.mps index 7657fe52ca21..c96752bb6226 100644 --- a/plugins/console/lang/base/languageModels/editor.mps +++ b/plugins/console/lang/base/languageModels/editor.mps @@ -34,10 +34,16 @@ + + + + + + @@ -91,6 +97,7 @@ + @@ -860,5 +867,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/languageModels/structure.mps b/plugins/console/lang/base/languageModels/structure.mps index 6da5634ac175..d94fc6eb5ee3 100644 --- a/plugins/console/lang/base/languageModels/structure.mps +++ b/plugins/console/lang/base/languageModels/structure.mps @@ -334,5 +334,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/languageModels/typesystem.mps b/plugins/console/lang/base/languageModels/typesystem.mps index e3bb638e7458..3a3d5fa12d22 100644 --- a/plugins/console/lang/base/languageModels/typesystem.mps +++ b/plugins/console/lang/base/languageModels/typesystem.mps @@ -2,7 +2,276 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/dependencies index d075c6e4dd99..c51b51fbaba7 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/dependencies +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/dependencies @@ -1,5 +1,15 @@ + + + + + + + + + + @@ -37,5 +47,13 @@ + + + + + + + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/generated index 788a5719394d..b9dc970e8192 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/actions/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies index db6e9d00d1ca..06891aa5d153 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies @@ -1,5 +1,17 @@ + + + + + + + + + + + + @@ -62,6 +74,11 @@ + + + + + @@ -96,11 +113,11 @@ - - + + @@ -207,10 +224,10 @@ - - + + @@ -388,6 +405,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated index dc99b01edb34..94c107da7bb4 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated index 13d35b033332..7c7b10b445db 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/constraints/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/dependencies index 8ce10bad74da..7efe45859dc0 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/dependencies +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/dependencies @@ -6,13 +6,15 @@ - + + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/dependencies index cf9ec1766952..e95a8ec208e9 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/dependencies +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/dependencies @@ -1,5 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -122,6 +152,7 @@ + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/generated index 6442ba3af02e..9806d1726c69 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/editor/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated index 139e2a1cee80..efa637e2d11a 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated index 6dfd8a209ba0..f6a4205db175 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/dependencies index 71ea00a877b6..c0d71c65161e 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/dependencies +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/dependencies @@ -1,3 +1,94 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated index 15a85ca957b7..99f3077b2b1c 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java index de38637264d6..079cd0eb505e 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/Language.java @@ -10,12 +10,14 @@ import jetbrains.mps.generator.runtime.TemplateUtil; import jetbrains.mps.smodel.runtime.ILanguageAspect; import jetbrains.mps.openapi.actions.descriptor.ActionAspectDescriptor; -import jetbrains.mps.actions.descriptor.AbstractActionAspectDescriptor; +import jetbrains.mps.console.base.actions.ActionAspectDescriptorImpl; import jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor; import jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor; import jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor; import jetbrains.mps.console.base.editor.EditorAspectDescriptorImpl; import jetbrains.mps.smodel.runtime.StructureAspectDescriptor; +import jetbrains.mps.lang.typesystem.runtime.IHelginsDescriptor; +import jetbrains.mps.console.base.typesystem.TypesystemDescriptor; public class Language extends LanguageRuntime { public static String MODULE_REF = "de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base)"; @@ -36,7 +38,7 @@ public SLanguageId getId() { } @Override protected String[] getExtendedLanguageIDs() { - return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.baseLanguage", "jetbrains.mps.console.blCommand"}; + return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.baseLanguage", "jetbrains.mps.lang.smodel.query"}; } @Override public Collection getGenerators() { @@ -45,7 +47,7 @@ public Collection getGenerators() { @Override protected T createAspect(Class aspectClass) { if (aspectClass == ActionAspectDescriptor.class) { - return (T) new AbstractActionAspectDescriptor() {}; + return (T) new ActionAspectDescriptorImpl(); } if (aspectClass == BehaviorAspectDescriptor.class) { return (T) new jetbrains.mps.console.base.behavior.BehaviorAspectDescriptor(); @@ -59,6 +61,9 @@ protected T createAspect(Class aspectClass) { if (aspectClass == StructureAspectDescriptor.class) { return (T) new jetbrains.mps.console.base.structure.StructureAspectDescriptor(); } + if (aspectClass == IHelginsDescriptor.class) { + return (T) new TypesystemDescriptor(); + } return super.createAspect(aspectClass); diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/ActionAspectDescriptorImpl.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/ActionAspectDescriptorImpl.java new file mode 100644 index 000000000000..2aca673e1eb7 --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/ActionAspectDescriptorImpl.java @@ -0,0 +1,26 @@ +package jetbrains.mps.console.base.actions; + +/*Generated by MPS */ + +import jetbrains.mps.openapi.actions.descriptor.ActionAspectDescriptor; +import java.util.Collection; +import jetbrains.mps.openapi.actions.descriptor.NodeFactory; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import java.util.Arrays; +import java.util.Collections; + +public class ActionAspectDescriptorImpl implements ActionAspectDescriptor { + private static final String LANGUAGE_FQ_NAME = "jetbrains.mps.console.base"; + + public Collection getFactories(SAbstractConcept concept) { + if (LANGUAGE_FQ_NAME.equals(concept.getLanguage().getQualifiedName())) { + switch (Arrays.binarySearch(stringSwitchCases_tpto26_a0a0a0c, concept.getName())) { + case 0: + return Collections.singletonList(new printStatement_NodeFactories.NodeFactory_7284872370241013667()); + default: + } + } + return Collections.emptyList(); + } + private static String[] stringSwitchCases_tpto26_a0a0a0c = new String[]{"AbstractPrintExpression"}; +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/printStatement_NodeFactories.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/printStatement_NodeFactories.java new file mode 100644 index 000000000000..d05478a246a1 --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/printStatement_NodeFactories.java @@ -0,0 +1,20 @@ +package jetbrains.mps.console.base.actions; + +/*Generated by MPS */ + +import jetbrains.mps.openapi.actions.descriptor.NodeFactory; +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.model.SModel; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; + +public class printStatement_NodeFactories { + public static class NodeFactory_7284872370241013667 implements NodeFactory { + public void setup(SNode newNode, SNode sampleNode, SNode enclosingNode, SModel model) { + if (SNodeOperations.isInstanceOf(sampleNode, MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, "jetbrains.mps.console.base.structure.AbstractPrintExpression"))) { + SLinkOperations.setTarget(newNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"), SLinkOperations.getTarget(SNodeOperations.cast(sampleNode, MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, "jetbrains.mps.console.base.structure.AbstractPrintExpression")), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); + } + } + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/trace.info index 917908453328..5b4be1b7ba93 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/actions/trace.info @@ -8,6 +8,9 @@ + + + @@ -123,5 +126,22 @@ + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/AbstractPrintExpression_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/AbstractPrintExpression_Behavior.java new file mode 100644 index 000000000000..5323b6bdc8f2 --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/AbstractPrintExpression_Behavior.java @@ -0,0 +1,14 @@ +package jetbrains.mps.console.base.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; + +public class AbstractPrintExpression_Behavior { + public static void init(SNode thisNode) { + } + public static boolean virtual_legalAsStatement_1262430001741498032(SAbstractConcept thisConcept) { + return true; + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/AbstractPrintExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/AbstractPrintExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..b097385829c3 --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/AbstractPrintExpression_BehaviorDescriptor.java @@ -0,0 +1,18 @@ +package jetbrains.mps.console.base.behavior; + +/*Generated by MPS */ + +import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; +import org.jetbrains.mps.openapi.language.SConcept; + +public abstract class AbstractPrintExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor { + public AbstractPrintExpression_BehaviorDescriptor() { + } + public boolean virtual_legalAsStatement_1262430001741498032(SConcept thisConcept) { + return AbstractPrintExpression_Behavior.virtual_legalAsStatement_1262430001741498032(thisConcept); + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.console.base.structure.AbstractPrintExpression"; + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java index cceeadadaad9..d5d6c7ace8f3 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java @@ -29,11 +29,11 @@ public BehaviorDescriptor getDescriptor(String fqName) { return new HelpCommand_BehaviorDescriptor(); case 3: return new ConsoleRoot_BehaviorDescriptor(); - case 16: + case 21: return new Response_BehaviorDescriptor(); case 12: return new NodeResponseItem_BehaviorDescriptor(); - case 17: + case 22: return new TextResponseItem_BehaviorDescriptor(); case 9: return new NewLineResponseItem_BehaviorDescriptor(); @@ -47,9 +47,19 @@ public BehaviorDescriptor getDescriptor(String fqName) { return new BLCommand_BehaviorDescriptor(); case 1: return new BLExpression_BehaviorDescriptor(); + case 16: + return new PrintExpression_BehaviorDescriptor(); + case 17: + return new PrintNodeExpression_BehaviorDescriptor(); + case 18: + return new PrintNodeReferenceExpression_BehaviorDescriptor(); + case 19: + return new PrintSequenceExpression_BehaviorDescriptor(); + case 20: + return new PrintTextExpression_BehaviorDescriptor(); default: return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName); } } - private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.TextResponseItem"}; + private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.PrintExpression", "jetbrains.mps.console.base.structure.PrintNodeExpression", "jetbrains.mps.console.base.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.base.structure.PrintSequenceExpression", "jetbrains.mps.console.base.structure.PrintTextExpression", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.TextResponseItem"}; } diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java index 515a7327c6de..67ef7aeb7189 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java @@ -3,33 +3,33 @@ /*Generated by MPS */ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; -import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_BehaviorDescriptor; +import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior; import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.console.blCommand.runtime.ConsoleContext; import jetbrains.mps.console.blCommand.runtime.ConsoleStream; -public abstract class Command_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements ConsoleHelpProvider_BehaviorDescriptor { +public abstract class Command_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements HelpProvider_BehaviorDescriptor { public Command_BehaviorDescriptor() { } public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); + return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); } public String virtual_getGroup_6928665434441162387(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); + return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); } public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); + return HelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); } public String virtual_getKind_7006261637493126084(SConcept thisConcept) { return Command_Behavior.virtual_getKind_7006261637493126084(thisConcept); } public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); + return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); } public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); + return HelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); } @Override public String getConceptFqName() { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java index 7d8e6db581d0..bdab00ba1b13 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java @@ -34,7 +34,7 @@ public static void init(SNode thisNode) { } public static void virtual_doExecute_3321948346081469500(SNode thisNode, ConsoleContext context, ConsoleStream console) { if ((SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")) == null)) { - Iterable constructions = ListSequence.fromList(SConceptOperations.getAllSubConcepts(MetaAdapterFactory.getInterfaceConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L, "jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider").getDeclarationNode(), ((BaseConsoleTab) context.getOutputWindow()).getConsoleModel())).where(new IWhereFilter() { + Iterable constructions = ListSequence.fromList(SConceptOperations.getAllSubConcepts(MetaAdapterFactory.getInterfaceConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L, "jetbrains.mps.lang.smodel.query.structure.HelpProvider").getDeclarationNode(), ((BaseConsoleTab) context.getOutputWindow()).getConsoleModel())).where(new IWhereFilter() { public boolean accept(SNode it) { return SNodeOperations.isInstanceOf(SNodeOperations.asNode(it), MetaAdapterFactory.getConcept(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0xf979ba0450L, "jetbrains.mps.lang.structure.structure.ConceptDeclaration")) && AbstractConceptDeclaration_Behavior.call_isDefaultSubstitutable_7429110134803670673(SNodeOperations.asNode(it)); } @@ -108,7 +108,7 @@ public Integer combine(Integer it, Integer s) { } console.addText("Constructions available in console:\n\n"); console.addText(output.toString()); - } else if (AbstractConceptDeclaration_Behavior.call_isSubconceptOf_8134325418312549386(SLinkOperations.getTarget(SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")), MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L, 0x60279080c2f3f8d6L, "command")), SNodeOperations.getNode("r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.console.blCommand.structure)", "473081947981012231"))) { + } else if (AbstractConceptDeclaration_Behavior.call_isSubconceptOf_8134325418312549386(SLinkOperations.getTarget(SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")), MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L, 0x60279080c2f3f8d6L, "command")), SNodeOperations.getNode("r:935ba0ee-7291-4caa-a807-d76e8fc69391(jetbrains.mps.lang.smodel.query.structure)", "473081947981012231"))) { String helpPage; try { SNode chp = (SNode) (SNode) SLinkOperations.getTarget(SLinkOperations.getTarget(thisNode, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L, 0x60279080c2f4192bL, "target")), MetaAdapterFactory.getReferenceLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L, 0x60279080c2f3f8d6L, "command")); diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java index b7430011cf05..f10ffa91e308 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java @@ -2,30 +2,30 @@ /*Generated by MPS */ -import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_BehaviorDescriptor; +import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.console.blCommand.runtime.ConsoleContext; import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_Behavior; +import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior; -public class HelpCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements ConsoleHelpProvider_BehaviorDescriptor { +public class HelpCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements HelpProvider_BehaviorDescriptor { public HelpCommand_BehaviorDescriptor() { } public void virtual_doExecute_3321948346081469500(SNode thisNode, ConsoleContext context, ConsoleStream console) { HelpCommand_Behavior.virtual_doExecute_3321948346081469500(thisNode, context, console); } public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); + return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); } public String virtual_getGroup_6928665434441162387(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); + return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); } public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { return HelpCommand_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); } public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); + return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); } public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) { return HelpCommand_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintExpression_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintExpression_Behavior.java new file mode 100644 index 000000000000..576a3b95a79b --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintExpression_Behavior.java @@ -0,0 +1,14 @@ +package jetbrains.mps.console.base.behavior; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.language.SAbstractConcept; + +public class PrintExpression_Behavior { + public static void init(SNode thisNode) { + } + public static String virtual_getShortHelp_473081947982699339(SAbstractConcept thisConcept) { + return "print into the console window"; + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..cb11f9bf3d40 --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintExpression_BehaviorDescriptor.java @@ -0,0 +1,35 @@ +package jetbrains.mps.console.base.behavior; + +/*Generated by MPS */ + +import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor; +import org.jetbrains.mps.openapi.language.SConcept; +import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior; +import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior; + +public class PrintExpression_BehaviorDescriptor extends AbstractPrintExpression_BehaviorDescriptor implements ExpressionHelpProvider_BehaviorDescriptor { + public PrintExpression_BehaviorDescriptor() { + } + public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { + return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); + } + public String virtual_getGroup_6928665434441162387(SConcept thisConcept) { + return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); + } + public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { + return HelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); + } + public String virtual_getKind_7006261637493126084(SConcept thisConcept) { + return ExpressionHelpProvider_Behavior.virtual_getKind_7006261637493126084(thisConcept); + } + public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) { + return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); + } + public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) { + return PrintExpression_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.console.base.structure.PrintExpression"; + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintNodeExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintNodeExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..d53acec00c60 --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintNodeExpression_BehaviorDescriptor.java @@ -0,0 +1,13 @@ +package jetbrains.mps.console.base.behavior; + +/*Generated by MPS */ + + +public class PrintNodeExpression_BehaviorDescriptor extends AbstractPrintExpression_BehaviorDescriptor { + public PrintNodeExpression_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.console.base.structure.PrintNodeExpression"; + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..09d785fd4e2a --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java @@ -0,0 +1,13 @@ +package jetbrains.mps.console.base.behavior; + +/*Generated by MPS */ + + +public class PrintNodeReferenceExpression_BehaviorDescriptor extends AbstractPrintExpression_BehaviorDescriptor { + public PrintNodeReferenceExpression_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.console.base.structure.PrintNodeReferenceExpression"; + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintSequenceExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintSequenceExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..7d505d815d26 --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintSequenceExpression_BehaviorDescriptor.java @@ -0,0 +1,13 @@ +package jetbrains.mps.console.base.behavior; + +/*Generated by MPS */ + + +public class PrintSequenceExpression_BehaviorDescriptor extends AbstractPrintExpression_BehaviorDescriptor { + public PrintSequenceExpression_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.console.base.structure.PrintSequenceExpression"; + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintTextExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintTextExpression_BehaviorDescriptor.java new file mode 100644 index 000000000000..5a753f4d301f --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/PrintTextExpression_BehaviorDescriptor.java @@ -0,0 +1,13 @@ +package jetbrains.mps.console.base.behavior; + +/*Generated by MPS */ + + +public class PrintTextExpression_BehaviorDescriptor extends AbstractPrintExpression_BehaviorDescriptor { + public PrintTextExpression_BehaviorDescriptor() { + } + @Override + public String getConceptFqName() { + return "jetbrains.mps.console.base.structure.PrintTextExpression"; + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info index 33d12a8c784e..699a2e86898e 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info @@ -14,6 +14,9 @@ + + + @@ -21,7 +24,7 @@ - + @@ -86,6 +89,21 @@ + + + + + + + + + + + + + + + @@ -394,6 +412,22 @@ + + + + + + + + + + + + + + + + @@ -597,7 +631,7 @@ - + @@ -750,6 +784,22 @@ + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java index 3eb7ce2757e1..8db45403187b 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/constraints/HelpConceptReference_Constraints.java @@ -56,7 +56,7 @@ public SNodeReference getSearchScopeValidatorNode() { } @Override public Scope createScope(final IOperationContext operationContext, final ReferenceConstraintsContext _context) { - return new FilteringScope(new SubconceptsScope(MetaAdapterFactory.getInterfaceConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L, "jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider").getDeclarationNode(), _context.getModel()) { + return new FilteringScope(new SubconceptsScope(MetaAdapterFactory.getInterfaceConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L, "jetbrains.mps.lang.smodel.query.structure.HelpProvider").getDeclarationNode(), _context.getModel()) { public String getName(SNode child) { return BehaviorReflection.invokeVirtualStatic(String.class, SNodeOperations.asSConcept(((SNode) child)), "virtual_getShortDisplayString_7006261637493126103", new Object[]{}); } diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/AbstractPrintExpression_Actions.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/AbstractPrintExpression_Actions.java new file mode 100644 index 000000000000..0ce398e39139 --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/AbstractPrintExpression_Actions.java @@ -0,0 +1,43 @@ +package jetbrains.mps.console.base.editor; + +/*Generated by MPS */ + +import jetbrains.mps.openapi.editor.cells.EditorCell; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.openapi.editor.EditorContext; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.cells.AbstractCellAction; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; + +public class AbstractPrintExpression_Actions { + public static void setCellActions(EditorCell editorCell, SNode node, EditorContext context) { + editorCell.setAction(CellActionType.DELETE, new AbstractPrintExpression_Actions.AbstractPrintExpression_Actions_DELETE(node)); + editorCell.setAction(CellActionType.BACKSPACE, new AbstractPrintExpression_Actions.AbstractPrintExpression_Actions_BACKSPACE(node)); + } + public static class AbstractPrintExpression_Actions_DELETE extends AbstractCellAction { + /*package*/ SNode myNode; + public AbstractPrintExpression_Actions_DELETE(SNode node) { + this.myNode = node; + } + public void execute(EditorContext editorContext) { + this.execute_internal(editorContext, this.myNode); + } + public void execute_internal(EditorContext editorContext, SNode node) { + SNodeOperations.replaceWithAnother(node, SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); + } + } + public static class AbstractPrintExpression_Actions_BACKSPACE extends AbstractCellAction { + /*package*/ SNode myNode; + public AbstractPrintExpression_Actions_BACKSPACE(SNode node) { + this.myNode = node; + } + public void execute(EditorContext editorContext) { + this.execute_internal(editorContext, this.myNode); + } + public void execute_internal(EditorContext editorContext, SNode node) { + SNodeOperations.replaceWithAnother(node, SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); + } + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/AbstractPrintExpression_Editor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/AbstractPrintExpression_Editor.java new file mode 100644 index 000000000000..49c30cbd4807 --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/AbstractPrintExpression_Editor.java @@ -0,0 +1,81 @@ +package jetbrains.mps.console.base.editor; + +/*Generated by MPS */ + +import jetbrains.mps.nodeEditor.DefaultNodeEditor; +import jetbrains.mps.openapi.editor.cells.EditorCell; +import jetbrains.mps.openapi.editor.EditorContext; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; +import jetbrains.mps.openapi.editor.cells.CellActionType; +import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; +import jetbrains.mps.nodeEditor.cellMenu.CompositeSubstituteInfo; +import jetbrains.mps.nodeEditor.cellMenu.BasicCellContext; +import jetbrains.mps.nodeEditor.cellMenu.SubstituteInfoPartExt; +import jetbrains.mps.lang.editor.generator.internal.AbstractCellMenuPart_ReplaceNode_CustomNodeConcept; +import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.language.SContainmentLink; +import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; + +public class AbstractPrintExpression_Editor extends DefaultNodeEditor { + public EditorCell createEditorCell(EditorContext editorContext, SNode node) { + return this.createCollection_9ckmec_a(editorContext, node); + } + private EditorCell createCollection_9ckmec_a(EditorContext editorContext, SNode node) { + EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); + editorCell.setCellId("Collection_9ckmec_a"); + editorCell.setBig(true); + editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); + editorCell.addEditorCell(this.createComponent_9ckmec_a0(editorContext, node)); + editorCell.addEditorCell(this.createRefNode_9ckmec_b0(editorContext, node)); + return editorCell; + } + private EditorCell createComponent_9ckmec_a0(EditorContext editorContext, SNode node) { + EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); + AbstractPrintExpression_Actions.setCellActions(editorCell, node, editorContext); + editorCell.setSubstituteInfo(new CompositeSubstituteInfo(editorContext, new BasicCellContext(node), new SubstituteInfoPartExt[]{new AbstractPrintExpression_Editor.ReplaceWith_AbstractPrintExpression_cellMenu_9ckmec_a0a0()})); + return editorCell; + } + public static class ReplaceWith_AbstractPrintExpression_cellMenu_9ckmec_a0a0 extends AbstractCellMenuPart_ReplaceNode_CustomNodeConcept { + public ReplaceWith_AbstractPrintExpression_cellMenu_9ckmec_a0a0() { + } + public String getReplacementConceptName() { + return "jetbrains.mps.console.base.structure.AbstractPrintExpression"; + } + } + private EditorCell createRefNode_9ckmec_b0(EditorContext editorContext, SNode node) { + SingleRoleCellProvider provider = new AbstractPrintExpression_Editor.objectSingleRoleHandler_9ckmec_b0(node, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"), editorContext); + return provider.createCell(); + } + private class objectSingleRoleHandler_9ckmec_b0 extends SingleRoleCellProvider { + public objectSingleRoleHandler_9ckmec_b0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { + super(ownerNode, containmentLink, context); + } + public EditorCell createChildCell(EditorContext editorContext, SNode child) { + EditorCell editorCell = super.createChildCell(editorContext, child); + installCellInfo(child, editorCell); + return editorCell; + } + public void installCellInfo(SNode child, EditorCell editorCell) { + editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); + if (editorCell.getRole() == null) { + editorCell.setRole("object"); + } + } + + + @Override + protected EditorCell createEmptyCell() { + EditorCell editorCell = super.createEmptyCell(); + editorCell.setCellId("empty_object"); + installCellInfo(null, editorCell); + return editorCell; + } + + protected String getNoTargetText() { + return ""; + } + + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/EditorAspectDescriptorImpl.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/EditorAspectDescriptorImpl.java index 7e93ecbeda92..4e055a92b97c 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/EditorAspectDescriptorImpl.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/EditorAspectDescriptorImpl.java @@ -15,38 +15,40 @@ public class EditorAspectDescriptorImpl implements EditorAspectDescriptor { public Collection getEditors(ConceptDescriptor descriptor) { switch (Arrays.binarySearch(stringSwitchCases_xbvbvu_a0a0b, descriptor.getConceptFqName())) { case 0: - return Collections.singletonList(new BLCommand_Editor()); + return Collections.singletonList(new AbstractPrintExpression_Editor()); case 1: - return Collections.singletonList(new BLExpression_Editor()); + return Collections.singletonList(new BLCommand_Editor()); case 2: - return Collections.singletonList(new CommandHolder_Editor()); + return Collections.singletonList(new BLExpression_Editor()); case 3: - return Collections.singletonList(new ConsoleRoot_Editor()); + return Collections.singletonList(new CommandHolder_Editor()); case 4: - return Collections.singletonList(new ExceptionHolder_Editor()); + return Collections.singletonList(new ConsoleRoot_Editor()); case 5: - return Collections.singletonList(new HelpCommand_Editor()); + return Collections.singletonList(new ExceptionHolder_Editor()); case 6: - return Collections.singletonList(new HelpConceptReference_Editor()); + return Collections.singletonList(new HelpCommand_Editor()); case 7: - return Collections.singletonList(new History_Editor()); + return Collections.singletonList(new HelpConceptReference_Editor()); case 8: - return Collections.singletonList(new IClickable_Editor()); + return Collections.singletonList(new History_Editor()); case 9: - return Collections.singletonList(new INodeWithReference_Editor()); + return Collections.singletonList(new IClickable_Editor()); case 10: - return Collections.singletonList(new InterpretedCommand_Editor()); + return Collections.singletonList(new INodeWithReference_Editor()); case 11: - return Collections.singletonList(new NewLineResponseItem_Editor()); + return Collections.singletonList(new InterpretedCommand_Editor()); case 12: - return Collections.singletonList(new NodeResponseItem_Editor()); + return Collections.singletonList(new NewLineResponseItem_Editor()); case 13: - return Collections.singletonList(new OutputConsoleRoot_Editor()); + return Collections.singletonList(new NodeResponseItem_Editor()); case 14: - return Collections.singletonList(new PastedNodeReference_Editor()); + return Collections.singletonList(new OutputConsoleRoot_Editor()); case 15: - return Collections.singletonList(new Response_Editor()); + return Collections.singletonList(new PastedNodeReference_Editor()); case 16: + return Collections.singletonList(new Response_Editor()); + case 17: return Collections.singletonList(new TextResponseItem_Editor()); default: } @@ -70,6 +72,6 @@ public Collection getEditorComponents(ConceptDescriptor } - private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference", "jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.TextResponseItem"}; + private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.base.structure.AbstractPrintExpression", "jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference", "jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.TextResponseItem"}; private static String[] stringSwitchCases_xbvbvu_a0a0c = new String[]{"jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference"}; } diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/trace.info index f96250858512..90dd1e7a0cc2 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/editor/trace.info @@ -12,7 +12,7 @@ - + @@ -1884,6 +1884,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1966,6 +2022,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java index 51113e9e293e..551305fadabe 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java @@ -12,14 +12,15 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { + /*package*/ final ConceptDescriptor myConceptAbstractPrintExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.AbstractPrintExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).childDescriptors(new ConceptDescriptorBuilder.Link(8365379837260461921L, "object", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"object"}, new boolean[]{false}).abstract_().create(); /*package*/ final ConceptDescriptor myConceptBLCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.BLCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L)).super_("jetbrains.mps.console.base.structure.GeneratedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).parents("jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.baseLanguage.structure.IMethodLike", "jetbrains.mps.baseLanguage.structure.IStatementListContainer").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L), MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x1208f458d37L), MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11750ef8265L)).childDescriptors(new ConceptDescriptorBuilder.Link(1769790395579689573L, "body", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false)).children(new String[]{"body"}, new boolean[]{false}).alias("{", "baseLanguage statements").create(); /*package*/ final ConceptDescriptor myConceptBLExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.BLExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L)).super_("jetbrains.mps.console.base.structure.GeneratedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).parents("jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.lang.core.structure.IWrapper").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x11c6fd75034L)).childDescriptors(new ConceptDescriptorBuilder.Link(7656298970878093890L, "expression", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"expression"}, new boolean[]{false}).alias("", "baseLanguage expression").create(); - /*package*/ final ConceptDescriptor myConceptCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.Command", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).abstract_().create(); + /*package*/ final ConceptDescriptor myConceptCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.Command", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.lang.smodel.query.structure.HelpProvider").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).abstract_().create(); /*package*/ final ConceptDescriptor myConceptCommandHolder = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.CommandHolder", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.lang.core.structure.INamedConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L)).childDescriptors(new ConceptDescriptorBuilder.Link(351968380916615460L, "command", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL), true, false, false)).children(new String[]{"command"}, new boolean[]{false}).create(); /*package*/ final ConceptDescriptor myConceptConsoleRoot = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ConsoleRoot", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).childDescriptors(new ConceptDescriptorBuilder.Link(1583916890557930415L, "history", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xa835f28c1aa02beL), false, false, false), new ConceptDescriptorBuilder.Link(1583916890557930417L, "commandHolder", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL), false, false, false)).children(new String[]{"history", "commandHolder"}, new boolean[]{false, false}).create(); /*package*/ final ConceptDescriptor myConceptExceptionHolder = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ExceptionHolder", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5b02f032bc93b714L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.IClickable").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L)).propertyDescriptors(new ConceptDescriptorBuilder.Prop(6558068108108282025L, "stackTrace")).properties("stackTrace").create(); /*package*/ final ConceptDescriptor myConceptGeneratedCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.GeneratedCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).super_("jetbrains.mps.console.base.structure.Command").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).parents("jetbrains.mps.console.base.structure.Command").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL)).abstract_().create(); - /*package*/ final ConceptDescriptor myConceptHelpCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HelpCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).childDescriptors(new ConceptDescriptorBuilder.Link(6928665434433788203L, "target", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L), true, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("?", "help").create(); + /*package*/ final ConceptDescriptor myConceptHelpCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HelpCommand", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x690b986730a1f80L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.lang.smodel.query.structure.HelpProvider").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).childDescriptors(new ConceptDescriptorBuilder.Link(6928665434433788203L, "target", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L), true, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("?", "help").create(); /*package*/ final ConceptDescriptor myConceptHelpConceptReference = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HelpConceptReference", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x60279080c2f3b209L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(6928665434433779926L, "command", MetaIdFactory.conceptId(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0xf979ba0450L), false)).references("command").create(); /*package*/ final ConceptDescriptor myConceptHistory = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.History", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xa835f28c1aa02beL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).childDescriptors(new ConceptDescriptorBuilder.Link(7195119950189425818L, "item", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL), true, true, false)).children(new String[]{"item"}, new boolean[]{true}).create(); /*package*/ final ConceptDescriptor myConceptHistoryItem = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.HistoryItem", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL)).interface_().create(); @@ -35,74 +36,91 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { /*package*/ final ConceptDescriptor myConceptNodeWithClosure = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.NodeWithClosure", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xf6d4d958ec2f2c6L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.IClickable").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L)).create(); /*package*/ final ConceptDescriptor myConceptOutputConsoleRoot = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.OutputConsoleRoot", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x131ec6f2097ff75fL)).super_("jetbrains.mps.console.base.structure.ConsoleRoot").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL)).parents("jetbrains.mps.console.base.structure.ConsoleRoot").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL)).create(); /*package*/ final ConceptDescriptor myConceptPastedNodeReference = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PastedNodeReference", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x51132a123c89fa7eL)).super_("jetbrains.mps.lang.smodel.structure.AbstractNodeRefExpression").super_(MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x319fd776da5d8e3cL)).parents("jetbrains.mps.lang.smodel.structure.AbstractNodeRefExpression", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault", "jetbrains.mps.console.base.structure.INodeWithReference").parentIds(MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x319fd776da5d8e3cL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x36ac6f29ae8c1fb5L)).alias("pastedNodeRef", "").create(); + /*package*/ final ConceptDescriptor myConceptPrintExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PrintExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b2a9377L)).super_("jetbrains.mps.console.base.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.base.structure.AbstractPrintExpression", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).alias("#print", "smart print depending on content").create(); + /*package*/ final ConceptDescriptor myConceptPrintNodeExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PrintNodeExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4c7a26b31bd03b59L)).super_("jetbrains.mps.console.base.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.base.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).alias("#printNode", "print node copy").create(); + /*package*/ final ConceptDescriptor myConceptPrintNodeReferenceExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PrintNodeReferenceExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd9bddcL)).super_("jetbrains.mps.console.base.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.base.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).alias("#printNodeRef", "print reference to the node").create(); + /*package*/ final ConceptDescriptor myConceptPrintSequenceExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PrintSequenceExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b7db64fL)).super_("jetbrains.mps.console.base.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.base.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).alias("#printSequence", "print size with link to usages view").create(); + /*package*/ final ConceptDescriptor myConceptPrintTextExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PrintTextExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x7417cca3eb1feca9L)).super_("jetbrains.mps.console.base.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.base.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).alias("#printText", "print as string").create(); /*package*/ final ConceptDescriptor myConceptResponse = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.Response", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171a5ba02L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).childDescriptors(new ConceptDescriptorBuilder.Link(5637103006919120621L, "item", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b3583cL), true, true, false)).children(new String[]{"item"}, new boolean[]{true}).create(); /*package*/ final ConceptDescriptor myConceptResponseItem = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ResponseItem", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b3583cL)).interface_().create(); /*package*/ final ConceptDescriptor myConceptTextResponseItem = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.TextResponseItem", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b35c38L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.ResponseItem").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b3583cL)).propertyDescriptors(new ConceptDescriptorBuilder.Prop(5637103006919122193L, "text")).properties("text").create(); @Override public Collection getDescriptors() { - return Arrays.asList(myConceptBLCommand, myConceptBLExpression, myConceptCommand, myConceptCommandHolder, myConceptConsoleRoot, myConceptExceptionHolder, myConceptGeneratedCommand, myConceptHelpCommand, myConceptHelpConceptReference, myConceptHistory, myConceptHistoryItem, myConceptIActionHolder, myConceptIClickable, myConceptINodeWithReference, myConceptInterpretedCommand, myConceptModifiedCommandHistoryItem, myConceptNewLineResponseItem, myConceptNodeReferencePresentation, myConceptNodeReferenceString, myConceptNodeResponseItem, myConceptNodeWithClosure, myConceptOutputConsoleRoot, myConceptPastedNodeReference, myConceptResponse, myConceptResponseItem, myConceptTextResponseItem); + return Arrays.asList(myConceptAbstractPrintExpression, myConceptBLCommand, myConceptBLExpression, myConceptCommand, myConceptCommandHolder, myConceptConsoleRoot, myConceptExceptionHolder, myConceptGeneratedCommand, myConceptHelpCommand, myConceptHelpConceptReference, myConceptHistory, myConceptHistoryItem, myConceptIActionHolder, myConceptIClickable, myConceptINodeWithReference, myConceptInterpretedCommand, myConceptModifiedCommandHistoryItem, myConceptNewLineResponseItem, myConceptNodeReferencePresentation, myConceptNodeReferenceString, myConceptNodeResponseItem, myConceptNodeWithClosure, myConceptOutputConsoleRoot, myConceptPastedNodeReference, myConceptPrintExpression, myConceptPrintNodeExpression, myConceptPrintNodeReferenceExpression, myConceptPrintSequenceExpression, myConceptPrintTextExpression, myConceptResponse, myConceptResponseItem, myConceptTextResponseItem); } @Override @Nullable public ConceptDescriptor getDescriptor(String conceptFqName) { - switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0eb, conceptFqName)) { + switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0kb, conceptFqName)) { case 0: - return myConceptBLCommand; + return myConceptAbstractPrintExpression; case 1: - return myConceptBLExpression; + return myConceptBLCommand; case 2: - return myConceptCommand; + return myConceptBLExpression; case 3: - return myConceptCommandHolder; + return myConceptCommand; case 4: - return myConceptConsoleRoot; + return myConceptCommandHolder; case 5: - return myConceptExceptionHolder; + return myConceptConsoleRoot; case 6: - return myConceptGeneratedCommand; + return myConceptExceptionHolder; case 7: - return myConceptHelpCommand; + return myConceptGeneratedCommand; case 8: - return myConceptHelpConceptReference; + return myConceptHelpCommand; case 9: - return myConceptHistory; + return myConceptHelpConceptReference; case 10: - return myConceptHistoryItem; + return myConceptHistory; case 11: - return myConceptIActionHolder; + return myConceptHistoryItem; case 12: - return myConceptIClickable; + return myConceptIActionHolder; case 13: - return myConceptINodeWithReference; + return myConceptIClickable; case 14: - return myConceptInterpretedCommand; + return myConceptINodeWithReference; case 15: - return myConceptModifiedCommandHistoryItem; + return myConceptInterpretedCommand; case 16: - return myConceptNewLineResponseItem; + return myConceptModifiedCommandHistoryItem; case 17: - return myConceptNodeReferencePresentation; + return myConceptNewLineResponseItem; case 18: - return myConceptNodeReferenceString; + return myConceptNodeReferencePresentation; case 19: - return myConceptNodeResponseItem; + return myConceptNodeReferenceString; case 20: - return myConceptNodeWithClosure; + return myConceptNodeResponseItem; case 21: - return myConceptOutputConsoleRoot; + return myConceptNodeWithClosure; case 22: - return myConceptPastedNodeReference; + return myConceptOutputConsoleRoot; case 23: - return myConceptResponse; + return myConceptPastedNodeReference; case 24: - return myConceptResponseItem; + return myConceptPrintExpression; case 25: + return myConceptPrintNodeExpression; + case 26: + return myConceptPrintNodeReferenceExpression; + case 27: + return myConceptPrintSequenceExpression; + case 28: + return myConceptPrintTextExpression; + case 29: + return myConceptResponse; + case 30: + return myConceptResponseItem; + case 31: return myConceptTextResponseItem; default: return null; } } - private static String[] stringSwitchCases_1htk8d_a0a0eb = new String[]{"jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.Command", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.console.base.structure.IActionHolder", "jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference", "jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.ResponseItem", "jetbrains.mps.console.base.structure.TextResponseItem"}; + private static String[] stringSwitchCases_1htk8d_a0a0kb = new String[]{"jetbrains.mps.console.base.structure.AbstractPrintExpression", "jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.Command", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.console.base.structure.IActionHolder", "jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference", "jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.PrintExpression", "jetbrains.mps.console.base.structure.PrintNodeExpression", "jetbrains.mps.console.base.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.base.structure.PrintSequenceExpression", "jetbrains.mps.console.base.structure.PrintTextExpression", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.ResponseItem", "jetbrains.mps.console.base.structure.TextResponseItem"}; } diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info index d163e3b26a9b..39179d82aac8 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info @@ -2,7 +2,7 @@ - + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/trace.info index e0060249d3fb..a86f127b0c97 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/trace.info @@ -2,8 +2,7 @@ - - + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/TypesystemDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/TypesystemDescriptor.java new file mode 100644 index 000000000000..9e9669491bb7 --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/TypesystemDescriptor.java @@ -0,0 +1,35 @@ +package jetbrains.mps.console.base.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.BaseHelginsDescriptor; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; + +public class TypesystemDescriptor extends BaseHelginsDescriptor { + public TypesystemDescriptor() { + { + InferenceRule_Runtime inferenceRule = new typeof_AbstractPrintExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_PrintExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_PrintNodeExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_PrintNodeReferenceExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_PrintSequenceExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + { + InferenceRule_Runtime inferenceRule = new typeof_PrintTextExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/trace.info index 78624c872225..c40972ace466 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/trace.info @@ -1,3 +1,400 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_AbstractPrintExpression_InferenceRule.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_AbstractPrintExpression_InferenceRule.java new file mode 100644 index 000000000000..0b847cc288ac --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_AbstractPrintExpression_InferenceRule.java @@ -0,0 +1,41 @@ +package jetbrains.mps.console.base.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; + +public class typeof_AbstractPrintExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_AbstractPrintExpression_InferenceRule() { + } + public void applyRule(final SNode abstractPrintExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + { + SNode _nodeToCheck_1029348928467 = abstractPrintExpression; + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "7656298970878399354", 0, null); + typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "7656298970878398907", true), (SNode) _quotation_createNode_5i9h05_a0a0b(), _info_12389875345); + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, "jetbrains.mps.console.base.structure.AbstractPrintExpression"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_5i9h05_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc6bf96dL, "jetbrains.mps.baseLanguage.structure.VoidType"), null, null, false); + return quotedNode_1; + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintExpression_InferenceRule.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintExpression_InferenceRule.java new file mode 100644 index 000000000000..5540a7cd890c --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintExpression_InferenceRule.java @@ -0,0 +1,50 @@ +package jetbrains.mps.console.base.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; +import jetbrains.mps.smodel.SReference; + +public class typeof_PrintExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_PrintExpression_InferenceRule() { + } + public void applyRule(final SNode printExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + { + SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printExpression, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "7600370246421664444", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "7600370246421664447", true), (SNode) _quotation_createNode_nk4iqe_a0a0b(), false, true, _info_12389875345); + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b2a9377L, "jetbrains.mps.console.base.structure.PrintExpression"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_nk4iqe_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + SNode quotedNode_3 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, "jetbrains.mps.lang.typesystem.structure.JoinType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)"), facade.createNodeId("~Object"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_2); + quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc6bf96dL, "jetbrains.mps.baseLanguage.structure.VoidType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_3); + return quotedNode_1; + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintNodeExpression_InferenceRule.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintNodeExpression_InferenceRule.java new file mode 100644 index 000000000000..b186b28db94c --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintNodeExpression_InferenceRule.java @@ -0,0 +1,44 @@ +package jetbrains.mps.console.base.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; + +public class typeof_PrintNodeExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_PrintNodeExpression_InferenceRule() { + } + public void applyRule(final SNode printNodeExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + if (!(typeCheckingContext.isSingleTypeComputation())) { + { + SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printNodeExpression, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "5510759644748858657", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "5510759644748858662", true), (SNode) _quotation_createNode_j9pmav_a0a0b(), true, false, _info_12389875345); + } + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4c7a26b31bd03b59L, "jetbrains.mps.console.base.structure.PrintNodeExpression"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_j9pmav_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + return quotedNode_1; + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java new file mode 100644 index 000000000000..99a016bc68b7 --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java @@ -0,0 +1,44 @@ +package jetbrains.mps.console.base.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; + +public class typeof_PrintNodeReferenceExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_PrintNodeReferenceExpression_InferenceRule() { + } + public void applyRule(final SNode printNodeReferenceExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + if (!(typeCheckingContext.isSingleTypeComputation())) { + { + SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printNodeReferenceExpression, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "6852607286009512877", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "6852607286009511978", true), (SNode) _quotation_createNode_t5gmh8_a0a0b(), true, false, _info_12389875345); + } + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd9bddcL, "jetbrains.mps.console.base.structure.PrintNodeReferenceExpression"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_t5gmh8_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + return quotedNode_1; + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintSequenceExpression_InferenceRule.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintSequenceExpression_InferenceRule.java new file mode 100644 index 000000000000..88ef902ee953 --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintSequenceExpression_InferenceRule.java @@ -0,0 +1,68 @@ +package jetbrains.mps.console.base.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; +import jetbrains.mps.smodel.SReference; + +public class typeof_PrintSequenceExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_PrintSequenceExpression_InferenceRule() { + } + public void applyRule(final SNode printSequenceExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + { + SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printSequenceExpression, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "3856122757887347236", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "3856122757887347250", true), (SNode) _quotation_createNode_u62o5j_a0a0b(), false, true, _info_12389875345); + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b7db64fL, "jetbrains.mps.console.base.structure.PrintSequenceExpression"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_u62o5j_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + SNode quotedNode_3 = null; + SNode quotedNode_4 = null; + SNode quotedNode_5 = null; + SNode quotedNode_6 = null; + SNode quotedNode_7 = null; + SNode quotedNode_8 = null; + SNode quotedNode_9 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, "jetbrains.mps.lang.typesystem.structure.JoinType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_6); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_2); + quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_7); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_3); + quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_8); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_4); + quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_9.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_9, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_9); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_5); + return quotedNode_1; + } +} diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintTextExpression_InferenceRule.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintTextExpression_InferenceRule.java new file mode 100644 index 000000000000..a15c63d0272e --- /dev/null +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_PrintTextExpression_InferenceRule.java @@ -0,0 +1,44 @@ +package jetbrains.mps.console.base.typesystem; + +/*Generated by MPS */ + +import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; +import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; +import org.jetbrains.mps.openapi.model.SNode; +import jetbrains.mps.typesystem.inference.TypeCheckingContext; +import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.typesystem.inference.EquationInfo; +import org.jetbrains.mps.openapi.language.SAbstractConcept; +import org.jetbrains.mps.openapi.persistence.PersistenceFacade; +import jetbrains.mps.smodel.SModelUtil_new; +import jetbrains.mps.smodel.SReference; + +public class typeof_PrintTextExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { + public typeof_PrintTextExpression_InferenceRule() { + } + public void applyRule(final SNode printTextExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { + { + SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printTextExpression, MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "7600370246421665039", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "7600370246421665042", true), (SNode) _quotation_createNode_tqzol9_a0a0b(), false, true, _info_12389875345); + } + } + public SAbstractConcept getApplicableConcept() { + return MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x7417cca3eb1feca9L, "jetbrains.mps.console.base.structure.PrintTextExpression"); + } + public IsApplicableStatus isApplicableAndPattern(SNode argument) { + return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); + } + public boolean overrides() { + return false; + } + private static SNode _quotation_createNode_tqzol9_a0a0b() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)"), facade.createNodeId("~Object"))); + return quotedNode_1; + } +} diff --git a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated index 54a6bbc0c3b9..137fd2e04c94 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated +++ b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies index fe9b41ec6202..45b049235dca 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies @@ -14,8 +14,8 @@ - + @@ -94,10 +94,10 @@ - - - + + + @@ -318,9 +318,9 @@ - - - + + + @@ -520,7 +520,7 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated index d7a102136b94..15495bbf227c 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/generated index 39857df36a52..916ca9fa6568 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated index 16a9a0400642..dc1411fa25ad 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/structure/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/structure/generated index 667f49f02ed2..368f60775841 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/structure/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/Language.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/Language.java index 1d8e9e66d8c8..b0185bcc43c9 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/Language.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/Language.java @@ -38,7 +38,7 @@ public SLanguageId getId() { } @Override protected String[] getExtendedLanguageIDs() { - return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.console.base", "jetbrains.mps.baseLanguage", "jetbrains.mps.console.blCommand"}; + return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.console.base", "jetbrains.mps.baseLanguage", "jetbrains.mps.lang.smodel.query"}; } @Override public Collection getGenerators() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/AbsractMake_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/AbsractMake_BehaviorDescriptor.java index 575bda6bfdcb..297a65e4b526 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/AbsractMake_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/AbsractMake_BehaviorDescriptor.java @@ -2,7 +2,7 @@ /*Generated by MPS */ -import jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor; +import jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; import org.jetbrains.mps.openapi.model.SNode; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java index a48e6ac04649..684c4c46ae4e 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/CallActionExpression_BehaviorDescriptor.java @@ -3,31 +3,31 @@ /*Generated by MPS */ import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; -import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor; +import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_Behavior; -import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior; +import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior; +import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior; -public class CallActionExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor { +public class CallActionExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ExpressionHelpProvider_BehaviorDescriptor { public CallActionExpression_BehaviorDescriptor() { } public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); + return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); } public String virtual_getGroup_6928665434441162387(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); + return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); } public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); + return HelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); } public String virtual_getKind_7006261637493126084(SConcept thisConcept) { - return ConsoleExpression_Behavior.virtual_getKind_7006261637493126084(thisConcept); + return ExpressionHelpProvider_Behavior.virtual_getKind_7006261637493126084(thisConcept); } public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); + return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); } public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); + return HelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); } public boolean virtual_legalAsStatement_1262430001741498032(SConcept thisConcept) { return CallActionExpression_Behavior.virtual_legalAsStatement_1262430001741498032(thisConcept); diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java index 0f587035b355..d58f550217dd 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/OfAspectOperation_BehaviorDescriptor.java @@ -3,31 +3,31 @@ /*Generated by MPS */ import jetbrains.mps.baseLanguage.collections.behavior.SequenceOperation_BehaviorDescriptor; -import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_BehaviorDescriptor; +import jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_Behavior; -import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_Behavior; +import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior; +import jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_Behavior; -public class OfAspectOperation_BehaviorDescriptor extends SequenceOperation_BehaviorDescriptor implements ConsoleOperation_BehaviorDescriptor { +public class OfAspectOperation_BehaviorDescriptor extends SequenceOperation_BehaviorDescriptor implements OperationHelpProvider_BehaviorDescriptor { public OfAspectOperation_BehaviorDescriptor() { } public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); + return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); } public String virtual_getGroup_6928665434441162387(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); + return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); } public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); + return HelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); } public String virtual_getKind_7006261637493126084(SConcept thisConcept) { - return ConsoleOperation_Behavior.virtual_getKind_7006261637493126084(thisConcept); + return OperationHelpProvider_Behavior.virtual_getKind_7006261637493126084(thisConcept); } public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); + return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); } public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); + return HelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); } @Override public String getConceptFqName() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/WithDependencies_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/WithDependencies_BehaviorDescriptor.java index 474804dd5257..bb51bcf3d3dc 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/WithDependencies_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/WithDependencies_BehaviorDescriptor.java @@ -2,7 +2,7 @@ /*Generated by MPS */ -import jetbrains.mps.console.blCommand.behavior.QueryParameter_BehaviorDescriptor; +import jetbrains.mps.lang.smodel.query.behavior.QueryParameter_BehaviorDescriptor; public class WithDependencies_BehaviorDescriptor extends QueryParameter_BehaviorDescriptor { public WithDependencies_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/AbsractMake_Editor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/AbsractMake_Editor.java index 777f06ea834a..67ba6884cc3a 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/AbsractMake_Editor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/AbsractMake_Editor.java @@ -33,7 +33,7 @@ private EditorCell createCollection_uaz3qu_a(EditorContext editorContext, SNode return editorCell; } private EditorCell createComponent_uaz3qu_a0(EditorContext editorContext, SNode node) { - EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent"); + EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.smodel.query.editor.QueryExpression_EditorComponent"); return editorCell; } private EditorCell createCollection_uaz3qu_b0(EditorContext editorContext, SNode node) { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/StructureAspectDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/StructureAspectDescriptor.java index 076c1586a248..b5771e0fe327 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/StructureAspectDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/StructureAspectDescriptor.java @@ -12,11 +12,11 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { - /*package*/ final ConceptDescriptor myConceptAbsractMake = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.AbsractMake", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(2840424593984889584L, "argument", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), true, false, false)).children(new String[]{"argument"}, new boolean[]{false}).abstract_().create(); + /*package*/ final ConceptDescriptor myConceptAbsractMake = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.AbsractMake", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(2840424593984889584L, "argument", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), true, false, false)).children(new String[]{"argument"}, new boolean[]{false}).abstract_().create(); /*package*/ final ConceptDescriptor myConceptActionCallDeclaredParameter = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ActionCallDeclaredParameter", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587a7L)).super_("jetbrains.mps.console.ideCommands.structure.ActionCallParameter").super_(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587abL)).parents("jetbrains.mps.console.ideCommands.structure.ActionCallParameter").parentIds(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587abL)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(5582028874769074088L, "declaration", MetaIdFactory.conceptId(0x28f9e4973b424291L, 0xaeba0a1039153ab1L, 0x11b737a6b7cL), false)).references("declaration").create(); /*package*/ final ConceptDescriptor myConceptActionCallGlobalParameter = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ActionCallGlobalParameter", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587a9L)).super_("jetbrains.mps.console.ideCommands.structure.ActionCallParameter").super_(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587abL)).parents("jetbrains.mps.console.ideCommands.structure.ActionCallParameter").parentIds(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587abL)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(5582028874769074090L, "declaration", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf93c84351fL), false)).references("declaration").create(); /*package*/ final ConceptDescriptor myConceptActionCallParameter = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ActionCallParameter", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587abL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).childDescriptors(new ConceptDescriptorBuilder.Link(5582028874769074092L, "value", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"value"}, new boolean[]{false}).abstract_().create(); - /*package*/ final ConceptDescriptor myConceptCallActionExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.CallActionExpression", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587adL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(5582028874769074094L, "action", MetaIdFactory.conceptId(0x28f9e4973b424291L, 0xaeba0a1039153ab1L, 0x1181ca87c38L), false)).references("action").childDescriptors(new ConceptDescriptorBuilder.Link(5582028874769074095L, "parameter", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587abL), true, true, false)).children(new String[]{"parameter"}, new boolean[]{true}).alias("#callAction", "call an IDE action with custom parameters").create(); + /*package*/ final ConceptDescriptor myConceptCallActionExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.CallActionExpression", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587adL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(5582028874769074094L, "action", MetaIdFactory.conceptId(0x28f9e4973b424291L, 0xaeba0a1039153ab1L, 0x1181ca87c38L), false)).references("action").childDescriptors(new ConceptDescriptorBuilder.Link(5582028874769074095L, "parameter", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587abL), true, true, false)).children(new String[]{"parameter"}, new boolean[]{true}).alias("#callAction", "call an IDE action with custom parameters").create(); /*package*/ final ConceptDescriptor myConceptClean = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.Clean", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e74f88509L)).super_("jetbrains.mps.console.ideCommands.structure.AbsractMake").super_(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL)).parents("jetbrains.mps.console.ideCommands.structure.AbsractMake").parentIds(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL)).alias("#clean", "clean files *.generated").create(); /*package*/ final ConceptDescriptor myConceptClickableGenerator = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ClickableGenerator", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x360b134fc0467d73L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.IClickable").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x2095ece53bb9f5b0L)).propertyDescriptors(new ConceptDescriptorBuilder.Prop(3894227536041893247L, "moduleId")).properties("moduleId").create(); /*package*/ final ConceptDescriptor myConceptGlobalStatisticTarget = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.GlobalStatisticTarget", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579cb8L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.ideCommands.structure.IStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.INodeSetReference").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579cb2L), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4843e803da101441L)).alias("global", "").create(); @@ -28,7 +28,7 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { /*package*/ final ConceptDescriptor myConceptModelStatisticsTarget = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ModelStatisticsTarget", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a5cad96L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.ideCommands.structure.IStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.INodeSetReference").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579cb2L), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4843e803da101441L)).childDescriptors(new ConceptDescriptorBuilder.Link(7490254719523007897L, "target", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x6c8954f469900928L), false, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("model", "").create(); /*package*/ final ConceptDescriptor myConceptModuleProperties = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ModuleProperties", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587b3L)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).childDescriptors(new ConceptDescriptorBuilder.Link(5582028874769074100L, "targetModule", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"targetModule"}, new boolean[]{false}).alias("#moduleProperties", "").create(); /*package*/ final ConceptDescriptor myConceptNodeReference = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.NodeReference", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x6c8954f4699443afL)).super_("jetbrains.mps.lang.smodel.structure.NodeRefExpression").super_(MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x11be716563cL)).parents("jetbrains.mps.lang.smodel.structure.NodeRefExpression").parentIds(MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x11be716563cL)).alias("node", "").create(); - /*package*/ final ConceptDescriptor myConceptOfAspectOperation = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.OfAspectOperation", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x5252d9021b8b45a8L)).super_("jetbrains.mps.baseLanguage.collections.structure.SequenceOperation").super_(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c26c9a2d9L)).parents("jetbrains.mps.baseLanguage.collections.structure.SequenceOperation", "jetbrains.mps.console.blCommand.structure.ConsoleOperation").parentIds(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c26c9a2d9L), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(5932042262275696048L, "requestedAspect", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfc367388b3L), false)).references("requestedAspect").alias("ofAspect", "filter models by their aspect").create(); + /*package*/ final ConceptDescriptor myConceptOfAspectOperation = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.OfAspectOperation", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x5252d9021b8b45a8L)).super_("jetbrains.mps.baseLanguage.collections.structure.SequenceOperation").super_(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c26c9a2d9L)).parents("jetbrains.mps.baseLanguage.collections.structure.SequenceOperation", "jetbrains.mps.lang.smodel.query.structure.OperationHelpProvider").parentIds(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c26c9a2d9L), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(5932042262275696048L, "requestedAspect", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xfc367388b3L), false)).references("requestedAspect").alias("ofAspect", "filter models by their aspect").create(); /*package*/ final ConceptDescriptor myConceptProjectStatisticsTarget = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ProjectStatisticsTarget", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579e36L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.ideCommands.structure.IStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.INodeSetReference").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579cb2L), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4843e803da101441L)).alias("project", "").create(); /*package*/ final ConceptDescriptor myConceptRebuildProjectCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.RebuildProjectCommand", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191df02L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).childDescriptors(new ConceptDescriptorBuilder.Link(8483375838963818243L, "model", MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x7c3f2da20e92b62L), false, false, false)).children(new String[]{"model"}, new boolean[]{false}).abstract_().alias("#rebuild project", "clean and make").create(); /*package*/ final ConceptDescriptor myConceptRemoveGenSources = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.RemoveGenSources", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a11bL)).super_("jetbrains.mps.console.ideCommands.structure.AbsractMake").super_(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL)).parents("jetbrains.mps.console.ideCommands.structure.AbsractMake").parentIds(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL)).alias("#removeGenSources", "remove source_gen").create(); @@ -37,7 +37,7 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { /*package*/ final ConceptDescriptor myConceptStatCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.StatCommand", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a558c98L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).childDescriptors(new ConceptDescriptorBuilder.Link(7490254719522675891L, "target", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579cb2L), false, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("#stat", "display useful statistics").create(); /*package*/ final ConceptDescriptor myConceptSubtreeStatisticsTarget = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x1cf75b72b0b3962bL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.ideCommands.structure.IStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.INodeSetReference").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579cb2L), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4843e803da101441L)).childDescriptors(new ConceptDescriptorBuilder.Link(2087237500458473158L, "target", MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x319fd776da5d8e3cL), false, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("node", "").create(); /*package*/ final ConceptDescriptor myConceptUnloadModelsCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.UnloadModelsCommand", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191ddffL)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).abstract_().alias("#unload models", "").create(); - /*package*/ final ConceptDescriptor myConceptWithDependencies = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.WithDependencies", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x826e97ca237a1b1L)).super_("jetbrains.mps.console.blCommand.structure.QueryParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).parents("jetbrains.mps.console.blCommand.structure.QueryParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).alias("withDependencies", "").create(); + /*package*/ final ConceptDescriptor myConceptWithDependencies = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.WithDependencies", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x826e97ca237a1b1L)).super_("jetbrains.mps.lang.smodel.query.structure.QueryParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).parents("jetbrains.mps.lang.smodel.query.structure.QueryParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).alias("withDependencies", "").create(); @Override public Collection getDescriptors() { diff --git a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated index 7cfc040c0397..703526b38f96 100644 --- a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated +++ b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies index 0cb1a7992562..9fd98364693d 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies @@ -20,9 +20,9 @@ - + @@ -37,10 +37,10 @@ - - - + + + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated index 6a22957786d0..b36bedc852a4 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/editor/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/editor/generated index 9e9ca72c0b54..df4390860d4b 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/editor/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/editor/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated index b06b4b5c79a0..1a8a8e08187b 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/structure/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/structure/generated index 30859178a858..d88e5a1b1fb7 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/structure/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/Language.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/Language.java index e5a0e26b5b2c..ff979c8e6ccc 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/Language.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/Language.java @@ -35,7 +35,7 @@ public SLanguageId getId() { } @Override protected String[] getExtendedLanguageIDs() { - return new String[]{"jetbrains.mps.console.base", "jetbrains.mps.console.blCommand"}; + return new String[]{"jetbrains.mps.console.base", "jetbrains.mps.lang.smodel.query"}; } @Override public Collection getGenerators() { diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ConsoleModelExpression_BehaviorDescriptor.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ConsoleModelExpression_BehaviorDescriptor.java index dbe2266d82c9..cc833b3c08a8 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ConsoleModelExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ConsoleModelExpression_BehaviorDescriptor.java @@ -2,7 +2,7 @@ /*Generated by MPS */ -import jetbrains.mps.console.blCommand.behavior.QueryExpression_BehaviorDescriptor; +import jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor; import jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; import org.jetbrains.mps.openapi.model.SNode; diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java index 82afa9c9c1b5..81fe1e03f5da 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/InternalMode_BehaviorDescriptor.java @@ -3,29 +3,29 @@ /*Generated by MPS */ import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; -import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_BehaviorDescriptor; +import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_Behavior; -import jetbrains.mps.console.blCommand.behavior.ConsoleExpression_Behavior; +import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior; +import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior; import org.jetbrains.mps.openapi.model.SNode; -public class InternalMode_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor { +public class InternalMode_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ExpressionHelpProvider_BehaviorDescriptor { public InternalMode_BehaviorDescriptor() { } public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); + return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); } public String virtual_getGroup_6928665434441162387(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); + return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); } public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); + return HelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); } public String virtual_getKind_7006261637493126084(SConcept thisConcept) { - return ConsoleExpression_Behavior.virtual_getKind_7006261637493126084(thisConcept); + return ExpressionHelpProvider_Behavior.virtual_getKind_7006261637493126084(thisConcept); } public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); + return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); } public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) { return InternalMode_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/structure/StructureAspectDescriptor.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/structure/StructureAspectDescriptor.java index d51352c3a2cc..d926536a9e17 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/structure/StructureAspectDescriptor.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/structure/StructureAspectDescriptor.java @@ -12,8 +12,8 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { - /*package*/ final ConceptDescriptor myConceptConsoleModelExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.internalCommands.structure.ConsoleModelExpression", MetaIdFactory.conceptId(0x995a73947f764b8bL, 0xa929c53448708106L, 0x4d7759afcea851bdL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).alias("#consoleModel", "").create(); - /*package*/ final ConceptDescriptor myConceptInternalMode = new ConceptDescriptorBuilder("jetbrains.mps.console.internalCommands.structure.InternalMode", MetaIdFactory.conceptId(0x995a73947f764b8bL, 0xa929c53448708106L, 0x7a89354654722219L)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).alias("#internalMode", "").create(); + /*package*/ final ConceptDescriptor myConceptConsoleModelExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.internalCommands.structure.ConsoleModelExpression", MetaIdFactory.conceptId(0x995a73947f764b8bL, 0xa929c53448708106L, 0x4d7759afcea851bdL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).alias("#consoleModel", "").create(); + /*package*/ final ConceptDescriptor myConceptInternalMode = new ConceptDescriptorBuilder("jetbrains.mps.console.internalCommands.structure.InternalMode", MetaIdFactory.conceptId(0x995a73947f764b8bL, 0xa929c53448708106L, 0x7a89354654722219L)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).alias("#internalMode", "").create(); /*package*/ final ConceptDescriptor myConceptReloadClassesCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.internalCommands.structure.ReloadClassesCommand", MetaIdFactory.conceptId(0x995a73947f764b8bL, 0xa929c53448708106L, 0x75bb0160f191dd31L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).alias("#reloadClasses", "").create(); /*package*/ final ConceptDescriptor myConceptShowRepositoryCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.internalCommands.structure.ShowRepositoryCommand", MetaIdFactory.conceptId(0x995a73947f764b8bL, 0xa929c53448708106L, 0x75bb0160f191df0cL)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).abstract_().alias("#show repository", "").create(); diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies index a06f051daf4e..dfda808d8157 100644 --- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies +++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/dependencies @@ -52,10 +52,10 @@ - - - + + + diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated index 9db280e095be..d941b491f46a 100644 --- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated +++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated index f0d700e2dec9..0e1f2d071e9f 100644 --- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated +++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/structure/generated b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/structure/generated index 975a30144a3d..d551e19ae64b 100644 --- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/structure/generated +++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/Language.java b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/Language.java index c61bd0202228..86d97b7fe5c0 100644 --- a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/Language.java +++ b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/Language.java @@ -37,7 +37,7 @@ public SLanguageId getId() { } @Override protected String[] getExtendedLanguageIDs() { - return new String[]{"jetbrains.mps.console.base", "jetbrains.mps.console.blCommand"}; + return new String[]{"jetbrains.mps.console.base", "jetbrains.mps.lang.smodel.query"}; } @Override public Collection getGenerators() { diff --git a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java index d198cb7ea362..f6bec7384a6f 100644 --- a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java +++ b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/behavior/RefactorOperation_BehaviorDescriptor.java @@ -3,28 +3,28 @@ /*Generated by MPS */ import jetbrains.mps.baseLanguage.collections.behavior.InternalSequenceOperation_BehaviorDescriptor; -import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_BehaviorDescriptor; +import jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.console.blCommand.behavior.ConsoleHelpProvider_Behavior; -import jetbrains.mps.console.blCommand.behavior.ConsoleOperation_Behavior; +import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior; +import jetbrains.mps.lang.smodel.query.behavior.OperationHelpProvider_Behavior; -public class RefactorOperation_BehaviorDescriptor extends InternalSequenceOperation_BehaviorDescriptor implements ConsoleOperation_BehaviorDescriptor { +public class RefactorOperation_BehaviorDescriptor extends InternalSequenceOperation_BehaviorDescriptor implements OperationHelpProvider_BehaviorDescriptor { public RefactorOperation_BehaviorDescriptor() { } public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); + return HelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); } public String virtual_getGroup_6928665434441162387(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); + return HelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); } public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { return RefactorOperation_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); } public String virtual_getKind_7006261637493126084(SConcept thisConcept) { - return ConsoleOperation_Behavior.virtual_getKind_7006261637493126084(thisConcept); + return OperationHelpProvider_Behavior.virtual_getKind_7006261637493126084(thisConcept); } public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); + return HelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); } public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) { return RefactorOperation_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); diff --git a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/structure/StructureAspectDescriptor.java b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/structure/StructureAspectDescriptor.java index 702f0db6e6cb..bcf6737440d4 100644 --- a/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/structure/StructureAspectDescriptor.java +++ b/plugins/console/lang/scripts/source_gen/jetbrains/mps/console/scripts/structure/StructureAspectDescriptor.java @@ -15,7 +15,7 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { /*package*/ final ConceptDescriptor myConceptAbstractConsoleScript = new ConceptDescriptorBuilder("jetbrains.mps.console.scripts.structure.AbstractConsoleScript", MetaIdFactory.conceptId(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x1811ccc46ac3f6d9L)).interface_().parents("jetbrains.mps.baseLanguage.structure.IValidIdentifier").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11a3afa8c0dL)).create(); /*package*/ final ConceptDescriptor myConceptConsoleScript = new ConceptDescriptorBuilder("jetbrains.mps.console.scripts.structure.ConsoleScript", MetaIdFactory.conceptId(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x1811ccc46ac3f6deL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.scripts.structure.AbstractConsoleScript").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x1811ccc46ac3f6d9L)).childDescriptors(new ConceptDescriptorBuilder.Link(1734392475491235551L, "command", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f1fb64db424879fL), true, true, false)).children(new String[]{"command"}, new boolean[]{true}).create(); /*package*/ final ConceptDescriptor myConceptExecute = new ConceptDescriptorBuilder("jetbrains.mps.console.scripts.structure.Execute", MetaIdFactory.conceptId(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x1811ccc46ac3dc6aL)).super_("jetbrains.mps.console.base.structure.GeneratedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).parents("jetbrains.mps.console.base.structure.GeneratedCommand").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c71L)).referenceDescriptors(new ConceptDescriptorBuilder.Ref(1734392475491228779L, "script", MetaIdFactory.conceptId(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x1811ccc46ac3f6d9L), false)).references("script").alias("#exec", "execute a script").create(); - /*package*/ final ConceptDescriptor myConceptRefactorOperation = new ConceptDescriptorBuilder("jetbrains.mps.console.scripts.structure.RefactorOperation", MetaIdFactory.conceptId(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x20fd2063d7de993eL)).super_("jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation").super_(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL)).parents("jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation", "jetbrains.mps.console.blCommand.structure.ConsoleOperation").parentIds(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).alias("refactor", "perform changes on selected nodes").create(); + /*package*/ final ConceptDescriptor myConceptRefactorOperation = new ConceptDescriptorBuilder("jetbrains.mps.console.scripts.structure.RefactorOperation", MetaIdFactory.conceptId(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x20fd2063d7de993eL)).super_("jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation").super_(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL)).parents("jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation", "jetbrains.mps.lang.smodel.query.structure.OperationHelpProvider").parentIds(MetaIdFactory.conceptId(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).alias("refactor", "perform changes on selected nodes").create(); @Override public Collection getDescriptors() { diff --git a/plugins/console/models/jetbrains/mps/console/tool.mps b/plugins/console/models/jetbrains/mps/console/tool.mps index 0d55f99cbba7..978fa51fd8a3 100644 --- a/plugins/console/models/jetbrains/mps/console/tool.mps +++ b/plugins/console/models/jetbrains/mps/console/tool.mps @@ -68,7 +68,6 @@ - diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated index 4d8cef95ce98..0b6c81c45ebf 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated @@ -1,3 +1,3 @@ - + From 7b7e6d0ddde359c71caf7f9e2d37ea73f718cfbb Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Tue, 25 Aug 2015 21:52:35 +0300 Subject: [PATCH 31/52] fix console.base generator model broken during refactoring --- .../jetbrains/mps/lang/smodel/query/generated | 2 +- .../mps/console/actions/plugin/dependencies | 2 - .../FindInstancesByCondition_Action.java | 125 +-- .../ModifyInstancesByCondition_Action.java | 159 +--- .../mps/console/actions/plugin/trace.info | 858 ++++++------------ .../base/generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 28 +- 7 files changed, 362 insertions(+), 814 deletions(-) diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated index 9b132155cdd4..33c3909e60bb 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/dependencies b/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/dependencies index 6a4e6995a27e..f26cc58ca89e 100644 --- a/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/dependencies +++ b/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/dependencies @@ -37,7 +37,6 @@ - @@ -64,7 +63,6 @@ - diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java index afc2c2882ce2..9692d54ecaef 100644 --- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java +++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java @@ -22,7 +22,6 @@ import org.jetbrains.mps.openapi.persistence.PersistenceFacade; import jetbrains.mps.smodel.SModelUtil_new; import org.jetbrains.mps.openapi.model.SNodeAccessUtil; -import jetbrains.mps.smodel.SReference; public class FindInstancesByCondition_Action extends BaseAction { private static final Icon ICON = null; @@ -82,106 +81,34 @@ private static SNode _quotation_createNode_flklsf_a0c0a(Object parameter_1) { SNode quotedNode_12 = null; SNode quotedNode_13 = null; SNode quotedNode_14 = null; - SNode quotedNode_15 = null; - SNode quotedNode_16 = null; - SNode quotedNode_17 = null; - SNode quotedNode_18 = null; - SNode quotedNode_19 = null; - SNode quotedNode_20 = null; - SNode quotedNode_21 = null; - SNode quotedNode_22 = null; - SNode quotedNode_23 = null; - SNode quotedNode_24 = null; - SNode quotedNode_25 = null; - SNode quotedNode_26 = null; - SNode quotedNode_27 = null; - SNode quotedNode_28 = null; - SNode quotedNode_29 = null; - SNode quotedNode_30 = null; - SNode quotedNode_31 = null; - SNode quotedNode_32 = null; - SNode quotedNode_33 = null; - SNode quotedNode_34 = null; quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, "jetbrains.mps.console.base.structure.BLExpression"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_2, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "execute"); - quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc6bf96dL, "jetbrains.mps.baseLanguage.structure.VoidType"), null, null, false); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1fdL, "returnType"), quotedNode_3); - quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e94L, "jetbrains.mps.baseLanguage.structure.ParameterDeclaration"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_4, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "context"); - SNodeAccessUtil.setProperty(quotedNode_4, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37a7f6eL, 0x111f9e9f00cL, "isFinal"), "true"); - quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_8.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_8, facade.createModelReference("r:c850086f-d3f3-45ec-9f36-eb1065226b81(jetbrains.mps.console.blCommand.runtime)"), facade.createNodeId("351968380915666545"))); - quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_8); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1feL, "parameter"), quotedNode_4); - quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e94L, "jetbrains.mps.baseLanguage.structure.ParameterDeclaration"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_5, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "console"); - SNodeAccessUtil.setProperty(quotedNode_5, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37a7f6eL, 0x111f9e9f00cL, "isFinal"), "true"); - quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_9.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_9, facade.createModelReference("r:c850086f-d3f3-45ec-9f36-eb1065226b81(jetbrains.mps.console.blCommand.runtime)"), facade.createNodeId("6852607286009617748"))); - quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_9); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1feL, "parameter"), quotedNode_5); - quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10af9581ff1L, "jetbrains.mps.baseLanguage.structure.PublicVisibility"), null, null, false); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x112670d273fL, 0x112670d886aL, "visibility"), quotedNode_6); - quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); - quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, "jetbrains.mps.baseLanguage.structure.TryCatchStatement"), null, null, false); + quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, "jetbrains.mps.lang.smodel.query.structure.ShowExpression"), null, null, false); + quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); + quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.lang.smodel.query.structure.InstancesExpression"), null, null, false); + quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"), null, null, false); + SNodeAccessUtil.setReferenceTarget(quotedNode_7, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"), (SNode) parameter_1); + quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), quotedNode_7); + quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList"), null, null, false); + quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope"), null, null, false); + quotedNode_13 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.lang.smodel.query.structure.ProjectScope"), null, null, false); + quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), quotedNode_13); + quotedNode_8.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), quotedNode_10); + quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_8); + quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_5); + quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x117e3fd45c4L, "jetbrains.mps.baseLanguage.collections.structure.WhereOperation"), null, null, false); + quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_9, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); quotedNode_11 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); - quotedNode_13 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); - quotedNode_16 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b2a9377L, "jetbrains.mps.console.base.structure.PrintExpression"), null, null, false); - quotedNode_19 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, "jetbrains.mps.lang.smodel.query.structure.ShowExpression"), null, null, false); - quotedNode_21 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); - quotedNode_24 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.lang.smodel.query.structure.InstancesExpression"), null, null, false); - quotedNode_27 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"), null, null, false); - SNodeAccessUtil.setReferenceTarget(quotedNode_27, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"), (SNode) parameter_1); - quotedNode_24.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), quotedNode_27); - quotedNode_28 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList"), null, null, false); - quotedNode_30 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope"), null, null, false); - quotedNode_33 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.lang.smodel.query.structure.ProjectScope"), null, null, false); - quotedNode_30.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), quotedNode_33); - quotedNode_28.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), quotedNode_30); - quotedNode_24.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_28); - quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_24); - quotedNode_25 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x117e3fd45c4L, "jetbrains.mps.baseLanguage.collections.structure.WhereOperation"), null, null, false); - quotedNode_29 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_29, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); - quotedNode_31 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); - quotedNode_29.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf0522fL, "body"), quotedNode_31); - quotedNode_32 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x118374464e4L, "jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_32, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "node"); - quotedNode_34 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); - quotedNode_32.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_34); - quotedNode_29.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_32); - quotedNode_25.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_29); - quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_25); - quotedNode_19.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), quotedNode_21); - quotedNode_16.addChild(quotedNode_19); - quotedNode_13.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_16); - quotedNode_11.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_13); - quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, 0x10f383e83d4L, "body"), quotedNode_11); - quotedNode_12 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, "jetbrains.mps.baseLanguage.structure.CatchClause"), null, null, false); - quotedNode_14 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc67c7efL, "jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_14, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "throwable"); - quotedNode_17 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_17.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_17, facade.createModelReference("6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang()"), facade.createNodeId("~Throwable"))); - quotedNode_14.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_17); - quotedNode_12.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, 0x10f39a6a2f1L, "throwable"), quotedNode_14); - quotedNode_15 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); - quotedNode_18 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); - quotedNode_20 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); - quotedNode_22 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); - quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_22); - quotedNode_23 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x118154a6332L, "jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation"), null, null, false); - quotedNode_23.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), quotedNode_23, facade.createModelReference("r:c850086f-d3f3-45ec-9f36-eb1065226b81(jetbrains.mps.console.blCommand.runtime)"), facade.createNodeId("4598452390225734979"))); - quotedNode_26 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); - quotedNode_23.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_26); - quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_23); - quotedNode_18.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_20); - quotedNode_15.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_18); - quotedNode_12.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, 0x10f39a6a2f2L, "catchBody"), quotedNode_15); - quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, 0x10f39a8ba1fL, "catchClause"), quotedNode_12); - quotedNode_7.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_10); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1ffL, "body"), quotedNode_7); - quotedNode_22.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_5); - quotedNode_26.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_14); + quotedNode_9.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf0522fL, "body"), quotedNode_11); + quotedNode_12 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x118374464e4L, "jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_12, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "node"); + quotedNode_14 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); + quotedNode_12.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_14); + quotedNode_9.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_12); + quotedNode_6.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_9); + quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_6); + quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), quotedNode_4); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), quotedNode_3); return quotedNode_2; } } diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java index f021a8c6278a..0924730f8a39 100644 --- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java +++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java @@ -22,7 +22,6 @@ import org.jetbrains.mps.openapi.persistence.PersistenceFacade; import jetbrains.mps.smodel.SModelUtil_new; import org.jetbrains.mps.openapi.model.SNodeAccessUtil; -import jetbrains.mps.smodel.SReference; public class ModifyInstancesByCondition_Action extends BaseAction { private static final Icon ICON = null; @@ -88,123 +87,51 @@ private static SNode _quotation_createNode_nwjg5s_a0b0a(Object parameter_1) { SNode quotedNode_19 = null; SNode quotedNode_20 = null; SNode quotedNode_21 = null; - SNode quotedNode_22 = null; - SNode quotedNode_23 = null; - SNode quotedNode_24 = null; - SNode quotedNode_25 = null; - SNode quotedNode_26 = null; - SNode quotedNode_27 = null; - SNode quotedNode_28 = null; - SNode quotedNode_29 = null; - SNode quotedNode_30 = null; - SNode quotedNode_31 = null; - SNode quotedNode_32 = null; - SNode quotedNode_33 = null; - SNode quotedNode_34 = null; - SNode quotedNode_35 = null; - SNode quotedNode_36 = null; - SNode quotedNode_37 = null; - SNode quotedNode_38 = null; - SNode quotedNode_39 = null; - SNode quotedNode_40 = null; - SNode quotedNode_41 = null; quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, "jetbrains.mps.console.base.structure.BLExpression"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_2, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "execute"); - quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc6bf96dL, "jetbrains.mps.baseLanguage.structure.VoidType"), null, null, false); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1fdL, "returnType"), quotedNode_3); - quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e94L, "jetbrains.mps.baseLanguage.structure.ParameterDeclaration"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_4, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "context"); - SNodeAccessUtil.setProperty(quotedNode_4, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37a7f6eL, 0x111f9e9f00cL, "isFinal"), "true"); - quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_8.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_8, facade.createModelReference("r:c850086f-d3f3-45ec-9f36-eb1065226b81(jetbrains.mps.console.blCommand.runtime)"), facade.createNodeId("351968380915666545"))); - quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_8); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1feL, "parameter"), quotedNode_4); - quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e94L, "jetbrains.mps.baseLanguage.structure.ParameterDeclaration"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_5, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "console"); - SNodeAccessUtil.setProperty(quotedNode_5, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37a7f6eL, 0x111f9e9f00cL, "isFinal"), "true"); - quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_9.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_9, facade.createModelReference("r:c850086f-d3f3-45ec-9f36-eb1065226b81(jetbrains.mps.console.blCommand.runtime)"), facade.createNodeId("6852607286009617748"))); - quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_9); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1feL, "parameter"), quotedNode_5); - quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10af9581ff1L, "jetbrains.mps.baseLanguage.structure.PublicVisibility"), null, null, false); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x112670d273fL, 0x112670d886aL, "visibility"), quotedNode_6); - quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); - quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, "jetbrains.mps.baseLanguage.structure.TryCatchStatement"), null, null, false); - quotedNode_11 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); - quotedNode_13 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); - quotedNode_16 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b2a9377L, "jetbrains.mps.console.base.structure.PrintExpression"), null, null, false); - quotedNode_19 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); - quotedNode_21 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); - quotedNode_25 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.lang.smodel.query.structure.InstancesExpression"), null, null, false); - quotedNode_29 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList"), null, null, false); - quotedNode_34 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope"), null, null, false); - quotedNode_38 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.lang.smodel.query.structure.ProjectScope"), null, null, false); - quotedNode_34.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), quotedNode_38); - quotedNode_29.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), quotedNode_34); - quotedNode_25.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_29); - quotedNode_30 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"), null, null, false); - SNodeAccessUtil.setReferenceTarget(quotedNode_30, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"), (SNode) parameter_1); - quotedNode_25.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), quotedNode_30); - quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_25); - quotedNode_26 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x117e3fd45c4L, "jetbrains.mps.baseLanguage.collections.structure.WhereOperation"), null, null, false); - quotedNode_31 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_31, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); - quotedNode_35 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); - quotedNode_39 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); - quotedNode_41 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_41, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "true"); - quotedNode_39.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_41); - quotedNode_35.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_39); - quotedNode_31.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf0522fL, "body"), quotedNode_35); - quotedNode_36 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x118374464e4L, "jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_36, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "node"); - quotedNode_40 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); - quotedNode_36.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_40); - quotedNode_31.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_36); - quotedNode_26.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_31); - quotedNode_21.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_26); - quotedNode_19.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_21); - quotedNode_22 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x20fd2063d7de993eL, "jetbrains.mps.console.scripts.structure.RefactorOperation"), null, null, false); - quotedNode_27 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_27, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); - quotedNode_32 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); - quotedNode_27.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf0522fL, "body"), quotedNode_32); - quotedNode_33 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x118374464e4L, "jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_33, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "node"); - quotedNode_37 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); - quotedNode_33.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_37); - quotedNode_27.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_33); - quotedNode_22.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_27); - quotedNode_19.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_22); - quotedNode_16.addChild(quotedNode_19); - quotedNode_13.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_16); - quotedNode_11.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_13); - quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, 0x10f383e83d4L, "body"), quotedNode_11); - quotedNode_12 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, "jetbrains.mps.baseLanguage.structure.CatchClause"), null, null, false); - quotedNode_14 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc67c7efL, "jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_14, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "throwable"); - quotedNode_17 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_17.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_17, facade.createModelReference("6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang()"), facade.createNodeId("~Throwable"))); - quotedNode_14.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_17); - quotedNode_12.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, 0x10f39a6a2f1L, "throwable"), quotedNode_14); + quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); + quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); + quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.lang.smodel.query.structure.InstancesExpression"), null, null, false); + quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList"), null, null, false); + quotedNode_14 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope"), null, null, false); + quotedNode_18 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.lang.smodel.query.structure.ProjectScope"), null, null, false); + quotedNode_14.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), quotedNode_18); + quotedNode_9.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), quotedNode_14); + quotedNode_6.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_9); + quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"), null, null, false); + SNodeAccessUtil.setReferenceTarget(quotedNode_10, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"), (SNode) parameter_1); + quotedNode_6.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), quotedNode_10); + quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_6); + quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x117e3fd45c4L, "jetbrains.mps.baseLanguage.collections.structure.WhereOperation"), null, null, false); + quotedNode_11 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_11, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); quotedNode_15 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); - quotedNode_18 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); - quotedNode_20 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); - quotedNode_23 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); - quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_23); - quotedNode_24 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x118154a6332L, "jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation"), null, null, false); - quotedNode_24.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301adL, "baseMethodDeclaration"), quotedNode_24, facade.createModelReference("r:c850086f-d3f3-45ec-9f36-eb1065226b81(jetbrains.mps.console.blCommand.runtime)"), facade.createNodeId("4598452390225734979"))); - quotedNode_28 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, "jetbrains.mps.baseLanguage.structure.VariableReference"), null, null, false); - quotedNode_24.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x11857355952L, 0xf8c78301aeL, "actualArgument"), quotedNode_28); - quotedNode_20.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_24); - quotedNode_18.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_20); - quotedNode_15.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_18); - quotedNode_12.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f39a56e2fL, 0x10f39a6a2f2L, "catchBody"), quotedNode_15); - quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10f383e6771L, 0x10f39a8ba1fL, "catchClause"), quotedNode_12); - quotedNode_7.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_10); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b1fcL, 0xf8cc56b1ffL, "body"), quotedNode_7); - quotedNode_23.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_5); - quotedNode_28.setReferenceTarget(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c77f1e98L, 0xf8cc6bf960L, "variableDeclaration"), quotedNode_14); + quotedNode_19 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, "jetbrains.mps.baseLanguage.structure.ExpressionStatement"), null, null, false); + quotedNode_21 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_21, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "true"); + quotedNode_19.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b213L, 0xf8cc56b214L, "expression"), quotedNode_21); + quotedNode_15.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement"), quotedNode_19); + quotedNode_11.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf0522fL, "body"), quotedNode_15); + quotedNode_16 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x118374464e4L, "jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_16, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "node"); + quotedNode_20 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); + quotedNode_16.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_20); + quotedNode_11.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_16); + quotedNode_7.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_11); + quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_7); + quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46a4416L, "operand"), quotedNode_4); + quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf26691d20def4c06L, 0xaec62cb90c4af0a4L, 0x20fd2063d7de993eL, "jetbrains.mps.console.scripts.structure.RefactorOperation"), null, null, false); + quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, "jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_8, MetaAdapterFactory.getProperty(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0xc5cbfc0eeac457bL, "forceMultiLine"), "true"); + quotedNode_12 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, "jetbrains.mps.baseLanguage.structure.StatementList"), null, null, false); + quotedNode_8.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf0522fL, "body"), quotedNode_12); + quotedNode_13 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x118374464e4L, "jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration"), null, null, false); + SNodeAccessUtil.setProperty(quotedNode_13, MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name"), "node"); + quotedNode_17 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x431d52a5d09a4ea9L, "jetbrains.mps.baseLanguage.structure.UndefinedType"), null, null, false); + quotedNode_13.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x450368d90ce15bc3L, 0x4ed4d318133c80ceL, "type"), quotedNode_17); + quotedNode_8.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_13); + quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_8); + quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_5); + quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), quotedNode_3); return quotedNode_2; } } diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info index a70f8fab7cac..5a575e1c56ef 100644 --- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info +++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info @@ -15,307 +15,155 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - + + + - + - - - - - - - - - + + + + + - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - @@ -323,10 +171,10 @@ - + - + @@ -353,34 +201,35 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + @@ -391,284 +240,151 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - + + + + + - - - - + + - - - - - - - - - - - + + + + + + + - - - - - - - - - + + + + @@ -683,38 +399,18 @@ - - - - - - - - - - - - - - - - - - - - - + - + diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated index b2a1fdde44ff..c82ef91ab5e1 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index 7f1a84e23de9..91d58c5d1f20 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -135,7 +135,6 @@ - @@ -260,19 +259,21 @@ - - - + + + + + + - - + + - @@ -516,7 +517,7 @@ - + @@ -532,7 +533,7 @@ - + @@ -554,7 +555,7 @@ - + @@ -663,7 +664,7 @@ - + @@ -720,7 +721,7 @@ - + @@ -756,7 +757,7 @@ - + @@ -798,7 +799,6 @@ - From 347cd8ad1d84ce903d5de3b189e1fe102c58c0b0 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Wed, 26 Aug 2015 18:37:29 +0300 Subject: [PATCH 32/52] fix models, show expression moved to ideCommands --- .../query/generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 167 +-- .../query/generator/template/main/trace.info | 1076 +++++++---------- .../generator/template/main@generator.mps | 337 ------ .../mps/lang/smodel/query/behavior.mps | 37 - .../mps/lang/smodel/query/editor.mps | 13 - .../mps/lang/smodel/query/structure.mps | 16 - .../mps/lang/smodel/query/typesystem.mps | 60 - .../lang/smodel/query/behavior/dependencies | 18 - .../mps/lang/smodel/query/behavior/generated | 2 +- .../mps/lang/smodel/query/editor/dependencies | 16 - .../mps/lang/smodel/query/editor/generated | 2 +- .../jetbrains/mps/lang/smodel/query/generated | 2 +- .../mps/lang/smodel/query/structure/generated | 2 +- .../lang/smodel/query/typesystem/dependencies | 15 - .../lang/smodel/query/typesystem/generated | 2 +- .../behavior/BehaviorAspectDescriptor.java | 8 +- .../mps/lang/smodel/query/behavior/trace.info | 27 +- .../editor/EditorAspectDescriptorImpl.java | 6 +- .../mps/lang/smodel/query/editor/trace.info | 96 +- .../structure/StructureAspectDescriptor.java | 11 +- .../lang/smodel/query/structure/trace.info | 2 +- .../typesystem/TypesystemDescriptor.java | 4 - .../lang/smodel/query/typesystem/trace.info | 133 +- .../mps/console/actions/platform.mps | 27 +- .../mps/console/actions/plugin/generated | 2 +- .../FindInstancesByCondition_Action.java | 4 +- .../mps/console/actions/plugin/trace.info | 10 +- .../generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 109 ++ .../generator/template/main/trace.info | 511 +++++--- .../generator/template/main@generator.mps | 372 +++++- .../jetbrains.mps.console.ideCommands.mpl | 3 + .../ideCommands/languageModels/behavior.mps | 37 + .../ideCommands/languageModels/editor.mps | 13 + .../ideCommands/languageModels/structure.mps | 20 +- .../ideCommands/languageModels/typesystem.mps | 60 + .../console/ideCommands/behavior/dependencies | 18 + .../console/ideCommands/behavior/generated | 2 +- .../console/ideCommands/editor/dependencies | 16 + .../mps/console/ideCommands/editor/generated | 2 +- .../mps/console/ideCommands/generated | 2 +- .../console/ideCommands/structure/generated | 2 +- .../ideCommands/typesystem/dependencies | 15 + .../console/ideCommands/typesystem/generated | 2 +- .../behavior/BehaviorAspectDescriptor.java | 12 +- .../behavior/ShowExpression_Behavior.java | 2 +- .../ShowExpression_BehaviorDescriptor.java | 7 +- .../console/ideCommands/behavior/trace.info | 27 +- .../editor/EditorAspectDescriptorImpl.java | 8 +- .../editor/ShowExpression_Editor.java | 4 +- .../mps/console/ideCommands/editor/trace.info | 96 +- .../structure/StructureAspectDescriptor.java | 17 +- .../console/ideCommands/structure/trace.info | 2 +- .../typesystem/TypesystemDescriptor.java | 4 + .../console/ideCommands/typesystem/trace.info | 133 +- .../typeof_ShowExpression_InferenceRule.java | 14 +- .../generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 5 +- ...jetbrains.mps.console.internalCommands.mpl | 2 +- .../mps/console/internalCommands/generated | 2 +- .../structure/pluginSolution/plugin/generated | 2 +- 62 files changed, 1828 insertions(+), 1794 deletions(-) rename {languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query => plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands}/behavior/ShowExpression_Behavior.java (91%) rename {languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query => plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands}/behavior/ShowExpression_BehaviorDescriptor.java (81%) rename {languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query => plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands}/editor/ShowExpression_Editor.java (96%) rename {languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query => plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands}/typesystem/typeof_ShowExpression_InferenceRule.java (85%) diff --git a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated index 3a37753c1684..36d9a1c38421 100644 --- a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated +++ b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java index 0803c3c2135e..f2b6d197ea0f 100644 --- a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java +++ b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java @@ -39,66 +39,34 @@ public static Object propertyMacro_GetPropertyValue_9010839353952736697(final Pr } return null; } - public static Object referenceMacro_GetReferent_3501374812264730107(final ReferenceMacroContext _context) { - SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a1())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263258755"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a1())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263262593"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a1())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263265578"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a1())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263268620"); - } - return null; - } - public static Object referenceMacro_GetReferent_7600370246425972944(final ReferenceMacroContext _context) { - SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a2())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a2())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a2())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632137"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a2())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632254"); - } - return null; - } public static Object referenceMacro_GetReferent_1597470200014435807(final ReferenceMacroContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a3())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a1())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a3())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a1())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a3())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a1())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632137"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a3())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a1())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632254"); } return null; } public static Object referenceMacro_GetReferent_3501374812263511250(final ReferenceMacroContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a4())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a2())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263258755"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a4())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a2())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263262593"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a4())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a2())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263265578"); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a4())) { + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a2())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263268620"); } return null; @@ -106,9 +74,6 @@ public static Object referenceMacro_GetReferent_3501374812263511250(final Refere public static SNode sourceNodeQuery_4598452390226163566(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); } - public static SNode sourceNodeQuery_3501374812264728764(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object")); - } public static SNode sourceNodeQuery_4307205004144966846(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); } @@ -149,7 +114,7 @@ public SNode select(SNode it) { return SNodeOperations.cast(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope")); } }); - return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0r() : SLinkOperations.getTarget(Sequence.fromIterable(results).first(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"))); + return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0o() : SLinkOperations.getTarget(Sequence.fromIterable(results).first(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"))); } public static SNode sourceNodeQuery_4307205004142895894(final SourceSubstituteMacroNodeContext _context) { Iterable results = ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).where(new IWhereFilter() { @@ -157,21 +122,21 @@ public boolean accept(SNode it) { return SNodeOperations.isInstanceOf(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly")); } }); - return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0s_0() : _quotation_createNode_x583g4_a0b0s()); + return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0p_0() : _quotation_createNode_x583g4_a0b0p()); } public static SNode sourceNodeQuery_3501374812261883521(final SourceSubstituteMacroNodeContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a91())) { - return _quotation_createNode_x583g4_a0a1a91(); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a61())) { + return _quotation_createNode_x583g4_a0a1a61(); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a91())) { - return _quotation_createNode_x583g4_a0a2a91(); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a61())) { + return _quotation_createNode_x583g4_a0a2a61(); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a91())) { - return _quotation_createNode_x583g4_a0a3a91(); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a61())) { + return _quotation_createNode_x583g4_a0a3a61(); } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a91())) { - return _quotation_createNode_x583g4_a0a4a91(); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a61())) { + return _quotation_createNode_x583g4_a0a4a61(); } return null; } @@ -304,108 +269,34 @@ private static SNode _quotation_createNode_x583g4_b0a4a2() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a1a3() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a2a3() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a3a3() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a4a3() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a1a4() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a2a4() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a3a4() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a4a4() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_a0b0r() { + private static SNode _quotation_createNode_x583g4_a0b0o() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf940cd6167L, "jetbrains.mps.baseLanguage.structure.NullLiteral"), null, null, false); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0b0s() { + private static SNode _quotation_createNode_x583g4_a0b0p() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false); SNodeAccessUtil.setProperty(quotedNode_1, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "true"); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0b0s_0() { + private static SNode _quotation_createNode_x583g4_a0b0p_0() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false); SNodeAccessUtil.setProperty(quotedNode_1, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "false"); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0a1a91() { + private static SNode _quotation_createNode_x583g4_a0a1a61() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference"))); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a1a91() { + private static SNode _quotation_createNode_x583g4_b0a1a61() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -414,14 +305,14 @@ private static SNode _quotation_createNode_x583g4_b0a1a91() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0a2a91() { + private static SNode _quotation_createNode_x583g4_a0a2a61() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference"))); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a2a91() { + private static SNode _quotation_createNode_x583g4_b0a2a61() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -430,14 +321,14 @@ private static SNode _quotation_createNode_x583g4_b0a2a91() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0a3a91() { + private static SNode _quotation_createNode_x583g4_a0a3a61() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SModelReference"))); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a3a91() { + private static SNode _quotation_createNode_x583g4_b0a3a61() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; @@ -446,14 +337,14 @@ private static SNode _quotation_createNode_x583g4_b0a3a91() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0a4a91() { + private static SNode _quotation_createNode_x583g4_a0a4a61() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModuleReference"))); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_b0a4a91() { + private static SNode _quotation_createNode_x583g4_b0a4a61() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; SNode quotedNode_2 = null; diff --git a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info index ba952053c7a4..5d07bbdd14ce 100644 --- a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info +++ b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info @@ -9,347 +9,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - - - - + + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -360,472 +158,472 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - + - - - - + + + + - - - - + + + + - - + + diff --git a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index 746f2c05fcce..e2b9cebf9d82 100644 --- a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -281,12 +281,6 @@ - - - - - - @@ -416,337 +410,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps index ba602bb87a8a..0f1d816df5fd 100644 --- a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps +++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps @@ -674,43 +674,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/editor.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/editor.mps index ace917afaf79..9026b96d05f8 100644 --- a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/editor.mps +++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/editor.mps @@ -256,19 +256,6 @@ - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps index 9fa368fcb1e8..53bcc60f7401 100644 --- a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps +++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps @@ -57,22 +57,6 @@ - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps index 29084c1b0a6d..d86e9ce4f66e 100644 --- a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps +++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps @@ -61,7 +61,6 @@ - @@ -829,65 +828,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies index 50108270709f..baff6946adf2 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies @@ -17,7 +17,6 @@ - @@ -253,23 +252,6 @@ - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated index 0d2c14b77232..42eef2f2747c 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/dependencies index 886a5e0c35a8..7c66d72ba06e 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/dependencies +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/dependencies @@ -40,7 +40,6 @@ - @@ -285,21 +284,6 @@ - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/generated index d41ee5c43d21..4ca32627e140 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/editor/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated index 33c3909e60bb..d77fd7b177a4 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated index 1b6918d84c71..da15067d163a 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies index ceae553871b9..fdf3ca76145f 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies @@ -12,7 +12,6 @@ - @@ -176,20 +175,6 @@ - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated index 1b6adc319546..1b72c78bb098 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java index 57fe52ef46f9..c19d15147376 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java @@ -11,10 +11,8 @@ public BehaviorAspectDescriptor() { } public BehaviorDescriptor getDescriptor(String fqName) { switch (Arrays.binarySearch(stringSwitchCases_846f5o_a0a0b, fqName)) { - case 15: - return new UsagesExpression_BehaviorDescriptor(); case 14: - return new ShowExpression_BehaviorDescriptor(); + return new UsagesExpression_BehaviorDescriptor(); case 2: return new InstancesExpression_BehaviorDescriptor(); case 8: @@ -43,11 +41,11 @@ public BehaviorDescriptor getDescriptor(String fqName) { return new ModelScope_BehaviorDescriptor(); case 0: return new CustomScope_BehaviorDescriptor(); - case 16: + case 15: return new WithStatement_BehaviorDescriptor(); default: return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName); } } - private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.GlobalScope", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModelsExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.NodesExpression", "jetbrains.mps.lang.smodel.query.structure.ProjectExpression", "jetbrains.mps.lang.smodel.query.structure.ProjectScope", "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", "jetbrains.mps.lang.smodel.query.structure.ShowExpression", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"}; + private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.GlobalScope", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModelsExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.NodesExpression", "jetbrains.mps.lang.smodel.query.structure.ProjectExpression", "jetbrains.mps.lang.smodel.query.structure.ProjectScope", "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"}; } diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info index 63899847c877..7db891ec4043 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info @@ -8,7 +8,7 @@ - + @@ -70,9 +70,6 @@ - - - @@ -80,28 +77,6 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/EditorAspectDescriptorImpl.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/EditorAspectDescriptorImpl.java index 239e3eda0c65..ebd62fdeaa5d 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/EditorAspectDescriptorImpl.java +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/EditorAspectDescriptorImpl.java @@ -33,10 +33,8 @@ public Collection getEditors(ConceptDescriptor descriptor) { case 8: return Collections.singletonList(new ScopeParameter_Editor()); case 9: - return Collections.singletonList(new ShowExpression_Editor()); - case 10: return Collections.singletonList(new UsagesExpression_Editor()); - case 11: + case 10: return Collections.singletonList(new WithStatement_Editor()); default: } @@ -55,6 +53,6 @@ public Collection getEditorComponents(ConceptDescriptor } - private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "jetbrains.mps.lang.smodel.query.structure.QueryParameter", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ScopeParameter", "jetbrains.mps.lang.smodel.query.structure.ShowExpression", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"}; + private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "jetbrains.mps.lang.smodel.query.structure.QueryParameter", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ScopeParameter", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"}; private static String[] stringSwitchCases_xbvbvu_a0a0c = new String[]{"jetbrains.mps.lang.smodel.query.structure.QueryExpression"}; } diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/trace.info index 38b442ae6b43..eb957540f106 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/trace.info +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/trace.info @@ -13,101 +13,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java index 70228adc897a..e980d25e7036 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java @@ -32,19 +32,18 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { /*package*/ final ConceptDescriptor myConceptQueryParameterScope = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).parents("jetbrains.mps.lang.smodel.query.structure.QueryParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).childDescriptors(new ConceptDescriptorBuilder.Link(4307205004134707081L, "value", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL), false, false, false)).children(new String[]{"value"}, new boolean[]{false}).alias("scope", "used search scope").create(); /*package*/ final ConceptDescriptor myConceptReferencesExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x57bda059470950bdL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#references", "all references in scope").create(); /*package*/ final ConceptDescriptor myConceptScopeParameter = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ScopeParameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).abstract_().create(); - /*package*/ final ConceptDescriptor myConceptShowExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ShowExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).childDescriptors(new ConceptDescriptorBuilder.Link(7600370246423275637L, "object", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"object"}, new boolean[]{false}).alias("#show", "show in usage view").create(); /*package*/ final ConceptDescriptor myConceptUsagesExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.UsagesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(8483375838963816172L, "node", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"node"}, new boolean[]{false}).alias("#usages", "direct references to a node in scope").create(); /*package*/ final ConceptDescriptor myConceptWithStatement = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.WithStatement", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL)).super_("jetbrains.mps.baseLanguage.structure.Statement").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).parents("jetbrains.mps.baseLanguage.structure.Statement").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).childDescriptors(new ConceptDescriptorBuilder.Link(4234138103881610892L, "stmts", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false), new ConceptDescriptorBuilder.Link(4234138103881610935L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"stmts", "scope"}, new boolean[]{false, false}).alias("with", "").create(); @Override public Collection getDescriptors() { - return Arrays.asList(myConceptCustomScope, myConceptExpressionHelpProvider, myConceptGlobalScope, myConceptHelpProvider, myConceptInstancesExpression, myConceptModelScope, myConceptModelsExpression, myConceptModulesExpression, myConceptModulesScope, myConceptNodesExpression, myConceptOperationHelpProvider, myConceptProjectExpression, myConceptProjectScope, myConceptQueryExpression, myConceptQueryParameter, myConceptQueryParameterIncludeReadOnly, myConceptQueryParameterList, myConceptQueryParameterScope, myConceptReferencesExpression, myConceptScopeParameter, myConceptShowExpression, myConceptUsagesExpression, myConceptWithStatement); + return Arrays.asList(myConceptCustomScope, myConceptExpressionHelpProvider, myConceptGlobalScope, myConceptHelpProvider, myConceptInstancesExpression, myConceptModelScope, myConceptModelsExpression, myConceptModulesExpression, myConceptModulesScope, myConceptNodesExpression, myConceptOperationHelpProvider, myConceptProjectExpression, myConceptProjectScope, myConceptQueryExpression, myConceptQueryParameter, myConceptQueryParameterIncludeReadOnly, myConceptQueryParameterList, myConceptQueryParameterScope, myConceptReferencesExpression, myConceptScopeParameter, myConceptUsagesExpression, myConceptWithStatement); } @Override @Nullable public ConceptDescriptor getDescriptor(String conceptFqName) { - switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0bb, conceptFqName)) { + switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0ab, conceptFqName)) { case 0: return myConceptCustomScope; case 1: @@ -86,14 +85,12 @@ public ConceptDescriptor getDescriptor(String conceptFqName) { case 19: return myConceptScopeParameter; case 20: - return myConceptShowExpression; - case 21: return myConceptUsagesExpression; - case 22: + case 21: return myConceptWithStatement; default: return null; } } - private static String[] stringSwitchCases_1htk8d_a0a0bb = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider", "jetbrains.mps.lang.smodel.query.structure.GlobalScope", "jetbrains.mps.lang.smodel.query.structure.HelpProvider", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModelsExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.NodesExpression", "jetbrains.mps.lang.smodel.query.structure.OperationHelpProvider", "jetbrains.mps.lang.smodel.query.structure.ProjectExpression", "jetbrains.mps.lang.smodel.query.structure.ProjectScope", "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "jetbrains.mps.lang.smodel.query.structure.QueryParameter", "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", "jetbrains.mps.lang.smodel.query.structure.ScopeParameter", "jetbrains.mps.lang.smodel.query.structure.ShowExpression", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"}; + private static String[] stringSwitchCases_1htk8d_a0a0ab = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider", "jetbrains.mps.lang.smodel.query.structure.GlobalScope", "jetbrains.mps.lang.smodel.query.structure.HelpProvider", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModelsExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.NodesExpression", "jetbrains.mps.lang.smodel.query.structure.OperationHelpProvider", "jetbrains.mps.lang.smodel.query.structure.ProjectExpression", "jetbrains.mps.lang.smodel.query.structure.ProjectScope", "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "jetbrains.mps.lang.smodel.query.structure.QueryParameter", "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", "jetbrains.mps.lang.smodel.query.structure.ScopeParameter", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"}; } diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info index 430d1b646f85..e995e7dc9957 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info @@ -2,7 +2,7 @@ - + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java index 437b7ea3432b..3a15f5ccd81b 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java @@ -48,10 +48,6 @@ public TypesystemDescriptor() { InferenceRule_Runtime inferenceRule = new typeof_ScopeProvider_InferenceRule(); this.myInferenceRules.add(inferenceRule); } - { - InferenceRule_Runtime inferenceRule = new typeof_ShowExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } { InferenceRule_Runtime inferenceRule = new typeof_UsagesExpression_InferenceRule(); this.myInferenceRules.add(inferenceRule); diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info index e6f92960f58e..ea7e964d711c 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info @@ -12,7 +12,7 @@ - + @@ -666,137 +666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps b/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps index dfe3049cf257..0f6fa03248e9 100644 --- a/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps +++ b/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps @@ -5,7 +5,7 @@ - + @@ -13,6 +13,7 @@ + @@ -151,6 +152,11 @@ + + + + + @@ -206,23 +212,20 @@ - - - - - + + - + - + - + - + @@ -237,8 +240,8 @@ - - + + diff --git a/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated b/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated index ba0d2ad6d52a..1a3db2638b65 100644 --- a/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated +++ b/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java index 9692d54ecaef..c220b5aff489 100644 --- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java +++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java @@ -82,7 +82,7 @@ private static SNode _quotation_createNode_flklsf_a0c0a(Object parameter_1) { SNode quotedNode_13 = null; SNode quotedNode_14 = null; quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, "jetbrains.mps.console.base.structure.BLExpression"), null, null, false); - quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, "jetbrains.mps.lang.smodel.query.structure.ShowExpression"), null, null, false); + quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, "jetbrains.mps.console.ideCommands.structure.ShowExpression"), null, null, false); quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, "jetbrains.mps.baseLanguage.structure.DotExpression"), null, null, false); quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.lang.smodel.query.structure.InstancesExpression"), null, null, false); quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"), null, null, false); @@ -107,7 +107,7 @@ private static SNode _quotation_createNode_flklsf_a0c0a(Object parameter_1) { quotedNode_9.addChild(MetaAdapterFactory.getContainmentLink(0xfd3920347849419dL, 0x907112563d152375L, 0x1174bed3125L, 0x1174bf02c34L, "parameter"), quotedNode_12); quotedNode_6.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x1188372895aL, 0x11883748452L, "closure"), quotedNode_9); quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x116b46a08c4L, 0x116b46b36c4L, "operation"), quotedNode_6); - quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), quotedNode_4); + quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), quotedNode_4); quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6a40a3596560a9d9L, 0x6a40a3596560aa42L, "expression"), quotedNode_3); return quotedNode_2; } diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info index 5a575e1c56ef..f54addf421de 100644 --- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info +++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info @@ -49,8 +49,8 @@ - - + + @@ -107,8 +107,8 @@ - - + + @@ -152,7 +152,7 @@ - + diff --git a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated index 137fd2e04c94..ccf01e5213fe 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated +++ b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java index 71cd059896d0..fcf55f56d1e4 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java +++ b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java @@ -61,6 +61,38 @@ public static Object referenceMacro_GetReferent_5582028874769201340(final Refere public static Object referenceMacro_GetReferent_5932042262276049107(final ReferenceMacroContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getReferenceLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x5252d9021b8b45a8L, 0x5252d9021b8c25b0L, "requestedAspect")); } + public static Object referenceMacro_GetReferent_3501374812264730107(final ReferenceMacroContext _context) { + SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"))); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a31())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263258755"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a31())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263262593"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a31())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263265578"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a31())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263268620"); + } + return null; + } + public static Object referenceMacro_GetReferent_7600370246425972944(final ReferenceMacroContext _context) { + SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"))); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a41())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a41())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a41())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632137"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a41())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632254"); + } + return null; + } public static boolean ifMacro_Condition_4615018937607135820(final IfMacroContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL, 0x276b371e77c0a2f0L, "argument")) != null; } @@ -106,6 +138,9 @@ public static SNode sourceNodeQuery_4615018937607279093(final SourceSubstituteMa public static SNode sourceNodeQuery_4615018937607279112(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL, 0x276b371e77c0a2f0L, "argument")); } + public static SNode sourceNodeQuery_3501374812264728764(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object")); + } public static Iterable sourceNodesQuery_5582028874769201358(final SourceSubstituteMacroNodesContext _context) { return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4d7759afce9587adL, 0x4d7759afce9587afL, "parameter")); } @@ -173,4 +208,78 @@ private static SNode _quotation_createNode_x583g4_b0a0a7() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } + private static SNode _quotation_createNode_x583g4_b0a1a31() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a2a31() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a3a31() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a4a31() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a1a41() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a2a41() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a3a41() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a4a41() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } } diff --git a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info index ecc5bcec8db8..66143076f4e1 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info +++ b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info @@ -2,241 +2,444 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - + + - - + + - - + + - - - - - + + + + + - - + + - - + + - - + + - - - - - + + + + + - - - - + + + + - + diff --git a/plugins/console/lang/ideCommands/generator/template/main@generator.mps b/plugins/console/lang/ideCommands/generator/template/main@generator.mps index ab7a74757ade..889b89e5f14c 100644 --- a/plugins/console/lang/ideCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/ideCommands/generator/template/main@generator.mps @@ -2,12 +2,17 @@ - - - + + + + + + + + @@ -28,7 +33,8 @@ - + + @@ -71,6 +77,9 @@ + + + @@ -87,6 +96,10 @@ + + + + @@ -96,6 +109,13 @@ + + + + + + + @@ -220,11 +240,16 @@ + + + + + @@ -263,6 +288,7 @@ + @@ -285,6 +311,7 @@ + @@ -320,6 +347,12 @@ + + + + + + @@ -1311,5 +1344,336 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl index 8baeb1a88316..f81f128d64af 100644 --- a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl +++ b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl @@ -27,6 +27,9 @@ c7567052-205c-4a15-80b0-7a32b32a9656(jetbrains.mps.console.ideCommands.runtime) 019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) + 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/ideCommands/languageModels/behavior.mps b/plugins/console/lang/ideCommands/languageModels/behavior.mps index 553e048c3e6d..6b12f08a8e2f 100644 --- a/plugins/console/lang/ideCommands/languageModels/behavior.mps +++ b/plugins/console/lang/ideCommands/languageModels/behavior.mps @@ -2546,5 +2546,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/ideCommands/languageModels/editor.mps b/plugins/console/lang/ideCommands/languageModels/editor.mps index 1c78ad197203..374f8f172bda 100644 --- a/plugins/console/lang/ideCommands/languageModels/editor.mps +++ b/plugins/console/lang/ideCommands/languageModels/editor.mps @@ -445,5 +445,18 @@ + + + + + + + + + + + + + diff --git a/plugins/console/lang/ideCommands/languageModels/structure.mps b/plugins/console/lang/ideCommands/languageModels/structure.mps index c2842ec38ae7..4424140ca28d 100644 --- a/plugins/console/lang/ideCommands/languageModels/structure.mps +++ b/plugins/console/lang/ideCommands/languageModels/structure.mps @@ -262,7 +262,7 @@ - + @@ -348,7 +348,23 @@ - + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/ideCommands/languageModels/typesystem.mps b/plugins/console/lang/ideCommands/languageModels/typesystem.mps index 042d275da43b..5cbe2be2daab 100644 --- a/plugins/console/lang/ideCommands/languageModels/typesystem.mps +++ b/plugins/console/lang/ideCommands/languageModels/typesystem.mps @@ -154,6 +154,7 @@ + @@ -1085,5 +1086,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies index 45b049235dca..ca2169737f34 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies @@ -78,6 +78,7 @@ + @@ -417,6 +418,23 @@ + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated index 15495bbf227c..65aea21a6efd 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/dependencies b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/dependencies index 8f0367509a4f..3ef36b9ee637 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/dependencies +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/dependencies @@ -116,6 +116,7 @@ + @@ -274,6 +275,21 @@ + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/generated index 916ca9fa6568..eff4de860544 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/editor/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated index dc1411fa25ad..5055f1a6e36c 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/structure/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/structure/generated index 368f60775841..0895b1f947eb 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/structure/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/dependencies b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/dependencies index 4236e3b6ff70..57a9b4f28f3d 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/dependencies +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/dependencies @@ -10,6 +10,7 @@ + @@ -166,5 +167,19 @@ + + + + + + + + + + + + + + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/generated index c91ce89fd7bf..fb8f8b00d060 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/typesystem/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/BehaviorAspectDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/BehaviorAspectDescriptor.java index 1de03dea60c2..5c41574a97a1 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/BehaviorAspectDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/BehaviorAspectDescriptor.java @@ -11,7 +11,7 @@ public BehaviorAspectDescriptor() { } public BehaviorDescriptor getDescriptor(String fqName) { switch (Arrays.binarySearch(stringSwitchCases_846f5o_a0a0b, fqName)) { - case 17: + case 18: return new StatCommand_BehaviorDescriptor(); case 5: return new GlobalStatisticTarget_BehaviorDescriptor(); @@ -21,13 +21,13 @@ public BehaviorDescriptor getDescriptor(String fqName) { return new ModelStatisticsTarget_BehaviorDescriptor(); case 15: return new ShowBrokenReferences_BehaviorDescriptor(); - case 18: + case 19: return new SubtreeStatisticsTarget_BehaviorDescriptor(); case 8: return new ModelReference_BehaviorDescriptor(); case 11: return new NodeReference_BehaviorDescriptor(); - case 16: + case 17: return new ShowGenPlan_BehaviorDescriptor(); case 4: return new ClickableGenerator_BehaviorDescriptor(); @@ -43,7 +43,7 @@ public BehaviorDescriptor getDescriptor(String fqName) { return new ModuleProperties_BehaviorDescriptor(); case 6: return new Make_BehaviorDescriptor(); - case 19: + case 20: return new WithDependencies_BehaviorDescriptor(); case 3: return new Clean_BehaviorDescriptor(); @@ -51,9 +51,11 @@ public BehaviorDescriptor getDescriptor(String fqName) { return new RemoveGenSources_BehaviorDescriptor(); case 12: return new OfAspectOperation_BehaviorDescriptor(); + case 16: + return new ShowExpression_BehaviorDescriptor(); default: return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName); } } - private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.ideCommands.structure.ActionCallDeclaredParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallGlobalParameter", "jetbrains.mps.console.ideCommands.structure.CallActionExpression", "jetbrains.mps.console.ideCommands.structure.Clean", "jetbrains.mps.console.ideCommands.structure.ClickableGenerator", "jetbrains.mps.console.ideCommands.structure.GlobalStatisticTarget", "jetbrains.mps.console.ideCommands.structure.Make", "jetbrains.mps.console.ideCommands.structure.ModelProperties", "jetbrains.mps.console.ideCommands.structure.ModelReference", "jetbrains.mps.console.ideCommands.structure.ModelStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ModuleProperties", "jetbrains.mps.console.ideCommands.structure.NodeReference", "jetbrains.mps.console.ideCommands.structure.OfAspectOperation", "jetbrains.mps.console.ideCommands.structure.ProjectStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.RemoveGenSources", "jetbrains.mps.console.ideCommands.structure.ShowBrokenReferences", "jetbrains.mps.console.ideCommands.structure.ShowGenPlan", "jetbrains.mps.console.ideCommands.structure.StatCommand", "jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.WithDependencies"}; + private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.ideCommands.structure.ActionCallDeclaredParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallGlobalParameter", "jetbrains.mps.console.ideCommands.structure.CallActionExpression", "jetbrains.mps.console.ideCommands.structure.Clean", "jetbrains.mps.console.ideCommands.structure.ClickableGenerator", "jetbrains.mps.console.ideCommands.structure.GlobalStatisticTarget", "jetbrains.mps.console.ideCommands.structure.Make", "jetbrains.mps.console.ideCommands.structure.ModelProperties", "jetbrains.mps.console.ideCommands.structure.ModelReference", "jetbrains.mps.console.ideCommands.structure.ModelStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ModuleProperties", "jetbrains.mps.console.ideCommands.structure.NodeReference", "jetbrains.mps.console.ideCommands.structure.OfAspectOperation", "jetbrains.mps.console.ideCommands.structure.ProjectStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.RemoveGenSources", "jetbrains.mps.console.ideCommands.structure.ShowBrokenReferences", "jetbrains.mps.console.ideCommands.structure.ShowExpression", "jetbrains.mps.console.ideCommands.structure.ShowGenPlan", "jetbrains.mps.console.ideCommands.structure.StatCommand", "jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.WithDependencies"}; } diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ShowExpression_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowExpression_Behavior.java similarity index 91% rename from languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ShowExpression_Behavior.java rename to plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowExpression_Behavior.java index cf76896f8e54..729ea9e5d9db 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ShowExpression_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowExpression_Behavior.java @@ -1,4 +1,4 @@ -package jetbrains.mps.lang.smodel.query.behavior; +package jetbrains.mps.console.ideCommands.behavior; /*Generated by MPS */ diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ShowExpression_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowExpression_BehaviorDescriptor.java similarity index 81% rename from languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ShowExpression_BehaviorDescriptor.java rename to plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowExpression_BehaviorDescriptor.java index 0e00b5b3e433..c410a8632b28 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ShowExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowExpression_BehaviorDescriptor.java @@ -1,9 +1,12 @@ -package jetbrains.mps.lang.smodel.query.behavior; +package jetbrains.mps.console.ideCommands.behavior; /*Generated by MPS */ import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; +import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_BehaviorDescriptor; import org.jetbrains.mps.openapi.language.SConcept; +import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior; +import jetbrains.mps.lang.smodel.query.behavior.ExpressionHelpProvider_Behavior; public class ShowExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ExpressionHelpProvider_BehaviorDescriptor { public ShowExpression_BehaviorDescriptor() { @@ -31,6 +34,6 @@ public boolean virtual_legalAsStatement_1262430001741498032(SConcept thisConcept } @Override public String getConceptFqName() { - return "jetbrains.mps.lang.smodel.query.structure.ShowExpression"; + return "jetbrains.mps.console.ideCommands.structure.ShowExpression"; } } diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info index a49a92560d55..0f9453ec8db5 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info @@ -28,7 +28,7 @@ - + @@ -81,6 +81,9 @@ + + + @@ -365,6 +368,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/EditorAspectDescriptorImpl.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/EditorAspectDescriptorImpl.java index dc2d476c9f48..b9ad1ae4272e 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/EditorAspectDescriptorImpl.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/EditorAspectDescriptorImpl.java @@ -41,10 +41,12 @@ public Collection getEditors(ConceptDescriptor descriptor) { case 12: return Collections.singletonList(new ShowBrokenReferences_Editor()); case 13: - return Collections.singletonList(new ShowGenPlan_Editor()); + return Collections.singletonList(new ShowExpression_Editor()); case 14: - return Collections.singletonList(new StatCommand_Editor()); + return Collections.singletonList(new ShowGenPlan_Editor()); case 15: + return Collections.singletonList(new StatCommand_Editor()); + case 16: return Collections.singletonList(new SubtreeStatisticsTarget_Editor()); default: } @@ -55,5 +57,5 @@ public Collection getEditorComponents(ConceptDescriptor } - private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.ideCommands.structure.AbsractMake", "jetbrains.mps.console.ideCommands.structure.ActionCallDeclaredParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallGlobalParameter", "jetbrains.mps.console.ideCommands.structure.CallActionExpression", "jetbrains.mps.console.ideCommands.structure.GlobalStatisticTarget", "jetbrains.mps.console.ideCommands.structure.ModelProperties", "jetbrains.mps.console.ideCommands.structure.ModelReference", "jetbrains.mps.console.ideCommands.structure.ModelStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ModuleProperties", "jetbrains.mps.console.ideCommands.structure.NodeReference", "jetbrains.mps.console.ideCommands.structure.OfAspectOperation", "jetbrains.mps.console.ideCommands.structure.ProjectStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ShowBrokenReferences", "jetbrains.mps.console.ideCommands.structure.ShowGenPlan", "jetbrains.mps.console.ideCommands.structure.StatCommand", "jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget"}; + private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.ideCommands.structure.AbsractMake", "jetbrains.mps.console.ideCommands.structure.ActionCallDeclaredParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallGlobalParameter", "jetbrains.mps.console.ideCommands.structure.CallActionExpression", "jetbrains.mps.console.ideCommands.structure.GlobalStatisticTarget", "jetbrains.mps.console.ideCommands.structure.ModelProperties", "jetbrains.mps.console.ideCommands.structure.ModelReference", "jetbrains.mps.console.ideCommands.structure.ModelStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ModuleProperties", "jetbrains.mps.console.ideCommands.structure.NodeReference", "jetbrains.mps.console.ideCommands.structure.OfAspectOperation", "jetbrains.mps.console.ideCommands.structure.ProjectStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ShowBrokenReferences", "jetbrains.mps.console.ideCommands.structure.ShowExpression", "jetbrains.mps.console.ideCommands.structure.ShowGenPlan", "jetbrains.mps.console.ideCommands.structure.StatCommand", "jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget"}; } diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ShowExpression_Editor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/ShowExpression_Editor.java similarity index 96% rename from languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ShowExpression_Editor.java rename to plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/ShowExpression_Editor.java index 5d8bb36c1eec..e85cd7369bba 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/editor/ShowExpression_Editor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/ShowExpression_Editor.java @@ -1,4 +1,4 @@ -package jetbrains.mps.lang.smodel.query.editor; +package jetbrains.mps.console.ideCommands.editor; /*Generated by MPS */ @@ -32,7 +32,7 @@ private EditorCell createComponent_rowo1n_a0(EditorContext editorContext, SNode return editorCell; } private EditorCell createRefNode_rowo1n_b0(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new ShowExpression_Editor.objectSingleRoleHandler_rowo1n_b0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), editorContext); + SingleRoleCellProvider provider = new ShowExpression_Editor.objectSingleRoleHandler_rowo1n_b0(node, MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), editorContext); return provider.createCell(); } private class objectSingleRoleHandler_rowo1n_b0 extends SingleRoleCellProvider { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/trace.info b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/trace.info index 9531d69418aa..1e44e341e29d 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/trace.info +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/editor/trace.info @@ -12,7 +12,101 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/StructureAspectDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/StructureAspectDescriptor.java index b5771e0fe327..76c16f3be51a 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/StructureAspectDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/StructureAspectDescriptor.java @@ -33,6 +33,7 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { /*package*/ final ConceptDescriptor myConceptRebuildProjectCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.RebuildProjectCommand", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191df02L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).childDescriptors(new ConceptDescriptorBuilder.Link(8483375838963818243L, "model", MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x7c3f2da20e92b62L), false, false, false)).children(new String[]{"model"}, new boolean[]{false}).abstract_().alias("#rebuild project", "clean and make").create(); /*package*/ final ConceptDescriptor myConceptRemoveGenSources = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.RemoveGenSources", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a11bL)).super_("jetbrains.mps.console.ideCommands.structure.AbsractMake").super_(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL)).parents("jetbrains.mps.console.ideCommands.structure.AbsractMake").parentIds(MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL)).alias("#removeGenSources", "remove source_gen").create(); /*package*/ final ConceptDescriptor myConceptShowBrokenReferences = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ShowBrokenReferences", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x1cf75b72b0ac828cL)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).childDescriptors(new ConceptDescriptorBuilder.Link(2087237500458009229L, "target", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4843e803da101441L), false, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("#showBrokenRefs", "show broken references").create(); + /*package*/ final ConceptDescriptor myConceptShowExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ShowExpression", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).childDescriptors(new ConceptDescriptorBuilder.Link(7600370246423275637L, "object", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"object"}, new boolean[]{false}).alias("#show", "show in usage view").create(); /*package*/ final ConceptDescriptor myConceptShowGenPlan = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.ShowGenPlan", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x61f2dd6de47f85e4L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).childDescriptors(new ConceptDescriptorBuilder.Link(7057947030097725050L, "targetModel", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x6c8954f469900928L), false, false, false)).children(new String[]{"targetModel"}, new boolean[]{false}).alias("#showGenPlan", "show the generation plan").create(); /*package*/ final ConceptDescriptor myConceptStatCommand = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.StatCommand", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a558c98L)).super_("jetbrains.mps.console.base.structure.InterpretedCommand").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).parents("jetbrains.mps.console.base.structure.InterpretedCommand").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x188f8efcef689c65L)).childDescriptors(new ConceptDescriptorBuilder.Link(7490254719522675891L, "target", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579cb2L), false, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("#stat", "display useful statistics").create(); /*package*/ final ConceptDescriptor myConceptSubtreeStatisticsTarget = new ConceptDescriptorBuilder("jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget", MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x1cf75b72b0b3962bL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.ideCommands.structure.IStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.INodeSetReference").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x67f2bafb7a579cb2L), MetaIdFactory.conceptId(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x4843e803da101441L)).childDescriptors(new ConceptDescriptorBuilder.Link(2087237500458473158L, "target", MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x319fd776da5d8e3cL), false, false, false)).children(new String[]{"target"}, new boolean[]{false}).alias("node", "").create(); @@ -41,13 +42,13 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { @Override public Collection getDescriptors() { - return Arrays.asList(myConceptAbsractMake, myConceptActionCallDeclaredParameter, myConceptActionCallGlobalParameter, myConceptActionCallParameter, myConceptCallActionExpression, myConceptClean, myConceptClickableGenerator, myConceptGlobalStatisticTarget, myConceptINodeSetReference, myConceptIStatisticsTarget, myConceptMake, myConceptModelProperties, myConceptModelReference, myConceptModelStatisticsTarget, myConceptModuleProperties, myConceptNodeReference, myConceptOfAspectOperation, myConceptProjectStatisticsTarget, myConceptRebuildProjectCommand, myConceptRemoveGenSources, myConceptShowBrokenReferences, myConceptShowGenPlan, myConceptStatCommand, myConceptSubtreeStatisticsTarget, myConceptUnloadModelsCommand, myConceptWithDependencies); + return Arrays.asList(myConceptAbsractMake, myConceptActionCallDeclaredParameter, myConceptActionCallGlobalParameter, myConceptActionCallParameter, myConceptCallActionExpression, myConceptClean, myConceptClickableGenerator, myConceptGlobalStatisticTarget, myConceptINodeSetReference, myConceptIStatisticsTarget, myConceptMake, myConceptModelProperties, myConceptModelReference, myConceptModelStatisticsTarget, myConceptModuleProperties, myConceptNodeReference, myConceptOfAspectOperation, myConceptProjectStatisticsTarget, myConceptRebuildProjectCommand, myConceptRemoveGenSources, myConceptShowBrokenReferences, myConceptShowExpression, myConceptShowGenPlan, myConceptStatCommand, myConceptSubtreeStatisticsTarget, myConceptUnloadModelsCommand, myConceptWithDependencies); } @Override @Nullable public ConceptDescriptor getDescriptor(String conceptFqName) { - switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0eb, conceptFqName)) { + switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0fb, conceptFqName)) { case 0: return myConceptAbsractMake; case 1: @@ -91,18 +92,20 @@ public ConceptDescriptor getDescriptor(String conceptFqName) { case 20: return myConceptShowBrokenReferences; case 21: - return myConceptShowGenPlan; + return myConceptShowExpression; case 22: - return myConceptStatCommand; + return myConceptShowGenPlan; case 23: - return myConceptSubtreeStatisticsTarget; + return myConceptStatCommand; case 24: - return myConceptUnloadModelsCommand; + return myConceptSubtreeStatisticsTarget; case 25: + return myConceptUnloadModelsCommand; + case 26: return myConceptWithDependencies; default: return null; } } - private static String[] stringSwitchCases_1htk8d_a0a0eb = new String[]{"jetbrains.mps.console.ideCommands.structure.AbsractMake", "jetbrains.mps.console.ideCommands.structure.ActionCallDeclaredParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallGlobalParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallParameter", "jetbrains.mps.console.ideCommands.structure.CallActionExpression", "jetbrains.mps.console.ideCommands.structure.Clean", "jetbrains.mps.console.ideCommands.structure.ClickableGenerator", "jetbrains.mps.console.ideCommands.structure.GlobalStatisticTarget", "jetbrains.mps.console.ideCommands.structure.INodeSetReference", "jetbrains.mps.console.ideCommands.structure.IStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.Make", "jetbrains.mps.console.ideCommands.structure.ModelProperties", "jetbrains.mps.console.ideCommands.structure.ModelReference", "jetbrains.mps.console.ideCommands.structure.ModelStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ModuleProperties", "jetbrains.mps.console.ideCommands.structure.NodeReference", "jetbrains.mps.console.ideCommands.structure.OfAspectOperation", "jetbrains.mps.console.ideCommands.structure.ProjectStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.RebuildProjectCommand", "jetbrains.mps.console.ideCommands.structure.RemoveGenSources", "jetbrains.mps.console.ideCommands.structure.ShowBrokenReferences", "jetbrains.mps.console.ideCommands.structure.ShowGenPlan", "jetbrains.mps.console.ideCommands.structure.StatCommand", "jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.UnloadModelsCommand", "jetbrains.mps.console.ideCommands.structure.WithDependencies"}; + private static String[] stringSwitchCases_1htk8d_a0a0fb = new String[]{"jetbrains.mps.console.ideCommands.structure.AbsractMake", "jetbrains.mps.console.ideCommands.structure.ActionCallDeclaredParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallGlobalParameter", "jetbrains.mps.console.ideCommands.structure.ActionCallParameter", "jetbrains.mps.console.ideCommands.structure.CallActionExpression", "jetbrains.mps.console.ideCommands.structure.Clean", "jetbrains.mps.console.ideCommands.structure.ClickableGenerator", "jetbrains.mps.console.ideCommands.structure.GlobalStatisticTarget", "jetbrains.mps.console.ideCommands.structure.INodeSetReference", "jetbrains.mps.console.ideCommands.structure.IStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.Make", "jetbrains.mps.console.ideCommands.structure.ModelProperties", "jetbrains.mps.console.ideCommands.structure.ModelReference", "jetbrains.mps.console.ideCommands.structure.ModelStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.ModuleProperties", "jetbrains.mps.console.ideCommands.structure.NodeReference", "jetbrains.mps.console.ideCommands.structure.OfAspectOperation", "jetbrains.mps.console.ideCommands.structure.ProjectStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.RebuildProjectCommand", "jetbrains.mps.console.ideCommands.structure.RemoveGenSources", "jetbrains.mps.console.ideCommands.structure.ShowBrokenReferences", "jetbrains.mps.console.ideCommands.structure.ShowExpression", "jetbrains.mps.console.ideCommands.structure.ShowGenPlan", "jetbrains.mps.console.ideCommands.structure.StatCommand", "jetbrains.mps.console.ideCommands.structure.SubtreeStatisticsTarget", "jetbrains.mps.console.ideCommands.structure.UnloadModelsCommand", "jetbrains.mps.console.ideCommands.structure.WithDependencies"}; } diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/trace.info b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/trace.info index 959230a05570..a5cafde6c9b8 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/trace.info +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/structure/trace.info @@ -2,7 +2,7 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/TypesystemDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/TypesystemDescriptor.java index 58f45d2c0030..b77507e6b4b1 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/TypesystemDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/TypesystemDescriptor.java @@ -32,6 +32,10 @@ public TypesystemDescriptor() { InferenceRule_Runtime inferenceRule = new typeof_OfAspectOperation_InferenceRule(); this.myInferenceRules.add(inferenceRule); } + { + InferenceRule_Runtime inferenceRule = new typeof_ShowExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } { NonTypesystemRule_Runtime nonTypesystemRule = new check_CallActionDuplicatedParameters_NonTypesystemRule(); this.myNonTypesystemRules.add(nonTypesystemRule); diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/trace.info b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/trace.info index 6efdf3cbee49..aaabc88ec2c0 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/trace.info +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/trace.info @@ -12,7 +12,7 @@ - + @@ -685,6 +685,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ShowExpression_InferenceRule.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/typeof_ShowExpression_InferenceRule.java similarity index 85% rename from languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ShowExpression_InferenceRule.java rename to plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/typeof_ShowExpression_InferenceRule.java index 7ae1da2366ac..2e54f198d513 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ShowExpression_InferenceRule.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/typesystem/typeof_ShowExpression_InferenceRule.java @@ -1,4 +1,4 @@ -package jetbrains.mps.lang.smodel.query.typesystem; +package jetbrains.mps.console.ideCommands.typesystem; /*Generated by MPS */ @@ -21,19 +21,19 @@ public typeof_ShowExpression_InferenceRule() { public void applyRule(final SNode showExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { { SNode _nodeToCheck_1029348928467 = showExpression; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7600370246417176611", 0, null); - typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7600370246417176148", true), (SNode) _quotation_createNode_jy8svg_a0a0b(), _info_12389875345); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:71e81c80-d7fe-47f3-91de-9281cfae8376(jetbrains.mps.console.ideCommands.typesystem)", "7600370246417176611", 0, null); + typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:71e81c80-d7fe-47f3-91de-9281cfae8376(jetbrains.mps.console.ideCommands.typesystem)", "7600370246417176148", true), (SNode) _quotation_createNode_jy8svg_a0a0b(), _info_12389875345); } if (!(typeCheckingContext.isSingleTypeComputation())) { { - SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(showExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object")); - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7600370246423284446", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "7600370246423276130", true), (SNode) _quotation_createNode_jy8svg_a0b0b(), true, true, _info_12389875345); + SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(showExpression, MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object")); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:71e81c80-d7fe-47f3-91de-9281cfae8376(jetbrains.mps.console.ideCommands.typesystem)", "7600370246423284446", 0, null); + typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:71e81c80-d7fe-47f3-91de-9281cfae8376(jetbrains.mps.console.ideCommands.typesystem)", "7600370246423276130", true), (SNode) _quotation_createNode_jy8svg_a0b0b(), true, true, _info_12389875345); } } } public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, "jetbrains.mps.lang.smodel.query.structure.ShowExpression"); + return MetaAdapterFactory.getConcept(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, "jetbrains.mps.console.ideCommands.structure.ShowExpression"); } public IsApplicableStatus isApplicableAndPattern(SNode argument) { return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); diff --git a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated index 703526b38f96..1372dfc7fdd9 100644 --- a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated +++ b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/generator/template/main@generator.mps b/plugins/console/lang/internalCommands/generator/template/main@generator.mps index 9a63a06f834c..4e283ae746d7 100644 --- a/plugins/console/lang/internalCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/internalCommands/generator/template/main@generator.mps @@ -16,10 +16,7 @@ - - - - + diff --git a/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl b/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl index 49933bc12bad..fb86da8daac8 100644 --- a/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl +++ b/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl @@ -27,7 +27,7 @@ 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query) 995a7394-7f76-4b8b-a929-c53448708106(jetbrains.mps.console.internalCommands) 1a497c57-0f1a-4016-8042-2ff7591fe612(jetbrains.mps.console.internalCommands.runtime) - 6fb4a3e0-f45c-4c38-af7f-455c3d239ecd(jetbrains.mps.command.base.runtime) + 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated index 1a8a8e08187b..7b66aadaa719 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated index 5d940c6218dc..e59996d90bc5 100644 --- a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated +++ b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated @@ -1,3 +1,3 @@ - + From b71ccce9ebd0634b14dce95ab1524b3e0358c2e9 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Wed, 26 Aug 2015 18:54:59 +0300 Subject: [PATCH 33/52] QueryExecutionContext to get rid of console tabs in core --- .../mps/console/blCommand/runtime.mps | 35 +- .../mps/lang/smodel/query/runtime/util.mps | 15 +- .../console/blCommand/runtime/dependencies | 5 +- .../mps/console/blCommand/runtime/generated | 2 +- .../blCommand/runtime/util/dependencies | 49 --- .../console/blCommand/runtime/util/generated | 3 - .../smodel/query/runtime/util/dependencies | 2 +- .../lang/smodel/query/runtime/util/generated | 2 +- .../blCommand/runtime/ConsoleContext.java | 4 +- .../runtime/QueryExecutionContext.java | 9 + .../mps/console/blCommand/runtime/trace.info | 19 +- .../blCommand/runtime/util/CommandUtil.java | 262 ------------ .../console/blCommand/runtime/util/trace.info | 380 ------------------ .../query/runtime/util/CommandUtil.java | 6 +- .../lang/smodel/query/runtime/util/trace.info | 8 +- 15 files changed, 67 insertions(+), 734 deletions(-) delete mode 100644 languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies delete mode 100644 languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated create mode 100644 languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/QueryExecutionContext.java delete mode 100644 languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java delete mode 100644 languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info diff --git a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/console/blCommand/runtime.mps b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/console/blCommand/runtime.mps index d52ce325bfaa..3277f4a9625d 100644 --- a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/console/blCommand/runtime.mps +++ b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/console/blCommand/runtime.mps @@ -1,7 +1,11 @@ - + + + + + @@ -36,7 +40,9 @@ - + + + @@ -76,15 +82,6 @@ - - - - - - - - - @@ -95,6 +92,9 @@ + + + @@ -163,5 +163,18 @@ + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps index 0e18e809315f..5bda27e8df2e 100644 --- a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps +++ b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps @@ -24,7 +24,7 @@ - + @@ -1202,11 +1202,11 @@ - - + + - + @@ -1255,11 +1255,10 @@ - + - - - + + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies index 0355761d0eeb..9b750b2b1f41 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies @@ -4,7 +4,7 @@ - + @@ -12,5 +12,8 @@ + + + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated index 4d4c9b459426..31631d46c1e5 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies deleted file mode 100644 index 7e536cef9ca4..000000000000 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/dependencies +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated deleted file mode 100644 index c397765b4a62..000000000000 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/util/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies index 9a7a7734512a..4d7fb1cbe1a0 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies @@ -11,8 +11,8 @@ - + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated index 119348ef3b9f..3d44de185c14 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java index f3d0523b1a68..2d787f4e72aa 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java @@ -3,10 +3,8 @@ /*Generated by MPS */ import jetbrains.mps.project.Project; -import org.jetbrains.mps.openapi.module.SearchScope; -public interface ConsoleContext { +public interface ConsoleContext extends QueryExecutionContext { public Project getProject(); - public SearchScope getDefaultSearchscope(); public CommandOutputWindow getOutputWindow(); } diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/QueryExecutionContext.java b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/QueryExecutionContext.java new file mode 100644 index 000000000000..970ee7d9c274 --- /dev/null +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/QueryExecutionContext.java @@ -0,0 +1,9 @@ +package jetbrains.mps.console.blCommand.runtime; + +/*Generated by MPS */ + +import org.jetbrains.mps.openapi.module.SearchScope; + +public interface QueryExecutionContext { + public SearchScope getDefaultSearchScope(); +} diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info index ae89ea3359b9..f9dec8fe08bf 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info @@ -1,15 +1,20 @@ + + + + + + + - - - - - - - + + + + + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java deleted file mode 100644 index 2fdcaee33081..000000000000 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/util/CommandUtil.java +++ /dev/null @@ -1,262 +0,0 @@ -package jetbrains.mps.console.blCommand.runtime.util; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.module.SearchScope; -import jetbrains.mps.internal.collections.runtime.Sequence; -import jetbrains.mps.internal.collections.runtime.ITranslator2; -import org.jetbrains.mps.openapi.model.SModel; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SModelOperations; -import org.jetbrains.mps.openapi.model.SReference; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import org.jetbrains.mps.openapi.module.SModule; -import java.util.Collection; -import java.util.Set; -import jetbrains.mps.findUsages.FindUsagesManager; -import java.util.Collections; -import jetbrains.mps.progress.EmptyProgressMonitor; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.project.Project; -import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes; -import jetbrains.mps.ide.findusages.model.SearchResults; -import jetbrains.mps.ide.project.ProjectHelper; -import org.apache.log4j.Level; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; -import org.jetbrains.mps.openapi.model.SNodeReference; -import org.jetbrains.mps.openapi.module.SRepository; -import jetbrains.mps.internal.collections.runtime.IWhereFilter; -import jetbrains.mps.internal.collections.runtime.IVisitor; -import jetbrains.mps.ide.findusages.model.SearchResult; -import org.jetbrains.mps.openapi.model.SModelReference; -import org.jetbrains.mps.openapi.module.SModuleReference; -import org.jetbrains.annotations.Nullable; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.project.EditableFilteringScope; -import jetbrains.mps.ide.findusages.model.scopes.ModelsScope; -import jetbrains.mps.ide.findusages.model.scopes.ModulesScope; -import java.util.Iterator; -import jetbrains.mps.ide.findusages.model.scopes.ProjectScope; -import org.apache.log4j.Logger; -import org.apache.log4j.LogManager; -import jetbrains.mps.ide.findusages.view.UsagesViewTool; - -public class CommandUtil { - public static Iterable nodes(SearchScope scope) { - return Sequence.fromIterable(models(scope)).translate(new ITranslator2() { - public Iterable translate(SModel it) { - return SModelOperations.nodes(it, null); - } - }); - } - - public static Iterable references(SearchScope scope) { - return Sequence.fromIterable(nodes(scope)).translate(new ITranslator2() { - public Iterable translate(SNode it) { - return SNodeOperations.getReferences(it); - } - }); - } - - public static Iterable models(SearchScope scope) { - return (Iterable) scope.getModels(); - } - - public static Iterable modules(SearchScope scope) { - return scope.getModules(); - } - - public static Collection usages(SearchScope scope, SNode node) { - return (Set) FindUsagesManager.getInstance().findUsages(scope, Collections.singleton(node), new EmptyProgressMonitor()); - } - - public static Collection instances(SearchScope scope, SAbstractConcept concept) { - return FindUsagesManager.getInstance().findInstances(scope, Collections.singleton(concept), false, new EmptyProgressMonitor()); - } - - public static void show(Project p, _FunctionTypes._return_P0_E0 results) { - try { - check_1pinza_a0a0a0m(ProjectHelper.toIdeaProject(p)).show(results.invoke(), "No results to show"); - } catch (Exception e) { - if (LOG.isEnabledFor(Level.WARN)) { - LOG.warn("Exception in showing custom console result", e); - } - } - } - - public static void printSequence(ConsoleStream console, final Project project, final _FunctionTypes._return_P0_E0 results, int resultsCount, String resultDescription) { - if (resultsCount == 0) { - console.addText("empty sequence"); - } else { - console.addClosure(new _FunctionTypes._void_P0_E0() { - public void invoke() { - CommandUtil.show(project, results); - } - }, resultsCount + " " + resultDescription); - } - } - - public static _FunctionTypes._return_P0_E0 nodesToResults(final Iterable nodes, final SRepository repository) { - return new _FunctionTypes._return_P0_E0>() { - public SearchResults invoke() { - final SearchResults res = new SearchResults(); - Sequence.fromIterable(nodes).where(new IWhereFilter() { - public boolean accept(SNodeReference it) { - return check_1pinza_a0a0a0a0b0a0a61(it, repository) != null; - } - }).visitAll(new IVisitor() { - public void visit(SNodeReference it) { - res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a61(it, repository), "usage")); - } - }); - return res; - } - }; - } - - public static _FunctionTypes._return_P0_E0 modelsToResults(final Iterable models, final SRepository repository) { - return new _FunctionTypes._return_P0_E0>() { - public SearchResults invoke() { - final SearchResults res = new SearchResults(); - Sequence.fromIterable(models).where(new IWhereFilter() { - public boolean accept(SModelReference it) { - return check_1pinza_a0a0a0a0b0a0a81(it, repository) != null; - } - }).visitAll(new IVisitor() { - public void visit(SModelReference it) { - res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a81(it, repository), "usage")); - } - }); - return res; - } - }; - } - - public static _FunctionTypes._return_P0_E0 modulesToResults(final Iterable modules, final SRepository repository) { - return new _FunctionTypes._return_P0_E0>() { - public SearchResults invoke() { - final SearchResults res = new SearchResults(); - Sequence.fromIterable(modules).where(new IWhereFilter() { - public boolean accept(SModuleReference it) { - return check_1pinza_a0a0a0a0b0a0a02(it, repository) != null; - } - }).visitAll(new IVisitor() { - public void visit(SModuleReference it) { - res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a02(it, repository), "usage")); - } - }); - return res; - } - }; - - } - - public static SNodeReference getNodeReference(SNode aNode) { - return check_1pinza_a0a22(aNode); - } - public static SNodeReference getReferenceReference(SReference aReference) { - return check_1pinza_a0a32(check_1pinza_a0a0x(aReference)); - } - public static SModelReference getModelReference(SModel aModel) { - return check_1pinza_a0a42(aModel); - } - public static SModuleReference getModuleReference(SModule aModule) { - return check_1pinza_a0a52(aModule); - } - - public static SearchScope createConsoleScope(@Nullable final SearchScope baseScope, final boolean includeReadOnly, final ConsoleContext context) { - SearchScope scope = (baseScope == null ? context.getDefaultSearchscope() : baseScope); - return (includeReadOnly ? scope : new EditableFilteringScope(scope)); - } - - public static SearchScope createScope(SModel model) { - return new ModelsScope(model); - } - public static SearchScope createScope(SModule module) { - return new ModulesScope(module); - } - public static SearchScope createScope(Iterable modelsAndModules) { - Iterator it = modelsAndModules.iterator(); - if (!(it.hasNext())) { - return new ModelsScope(); - } - return (it.next() instanceof SModule ? new ModulesScope(modelsAndModules) : new ModelsScope(modelsAndModules)); - } - public static SearchScope createScope(Project project) { - return new ProjectScope(project); - } - - protected static Logger LOG = LogManager.getLogger(CommandUtil.class); - private static UsagesViewTool check_1pinza_a0a0a0m(com.intellij.openapi.project.Project checkedDotOperand) { - if (null != checkedDotOperand) { - return checkedDotOperand.getComponent(UsagesViewTool.class); - } - return null; - } - private static SNode check_1pinza_a0a0a0a0b0a0a61(SNodeReference checkedDotOperand, SRepository repository) { - if (null != checkedDotOperand) { - return checkedDotOperand.resolve(repository); - } - return null; - } - private static SNode check_1pinza_a0a0a0a0a0b0a0a61(SNodeReference checkedDotOperand, SRepository repository) { - if (null != checkedDotOperand) { - return checkedDotOperand.resolve(repository); - } - return null; - } - private static SModel check_1pinza_a0a0a0a0b0a0a81(SModelReference checkedDotOperand, SRepository repository) { - if (null != checkedDotOperand) { - return checkedDotOperand.resolve(repository); - } - return null; - } - private static SModel check_1pinza_a0a0a0a0a0b0a0a81(SModelReference checkedDotOperand, SRepository repository) { - if (null != checkedDotOperand) { - return checkedDotOperand.resolve(repository); - } - return null; - } - private static SModule check_1pinza_a0a0a0a0b0a0a02(SModuleReference checkedDotOperand, SRepository repository) { - if (null != checkedDotOperand) { - return checkedDotOperand.resolve(repository); - } - return null; - } - private static SModule check_1pinza_a0a0a0a0a0b0a0a02(SModuleReference checkedDotOperand, SRepository repository) { - if (null != checkedDotOperand) { - return checkedDotOperand.resolve(repository); - } - return null; - } - private static SNodeReference check_1pinza_a0a22(SNode checkedDotOperand) { - if (null != checkedDotOperand) { - return checkedDotOperand.getReference(); - } - return null; - } - private static SNodeReference check_1pinza_a0a32(SNode checkedDotOperand) { - if (null != checkedDotOperand) { - return checkedDotOperand.getReference(); - } - return null; - } - private static SNode check_1pinza_a0a0x(SReference checkedDotOperand) { - if (null != checkedDotOperand) { - return checkedDotOperand.getSourceNode(); - } - return null; - } - private static SModelReference check_1pinza_a0a42(SModel checkedDotOperand) { - if (null != checkedDotOperand) { - return checkedDotOperand.getReference(); - } - return null; - } - private static SModuleReference check_1pinza_a0a52(SModule checkedDotOperand) { - if (null != checkedDotOperand) { - return checkedDotOperand.getModuleReference(); - } - return null; - } -} diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info deleted file mode 100644 index c01875bfcfa8..000000000000 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/util/trace.info +++ /dev/null @@ -1,380 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java index e2ecd8d62656..75b0370123c3 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java @@ -31,7 +31,7 @@ import org.jetbrains.mps.openapi.model.SModelReference; import org.jetbrains.mps.openapi.module.SModuleReference; import org.jetbrains.annotations.Nullable; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.blCommand.runtime.QueryExecutionContext; import jetbrains.mps.project.EditableFilteringScope; import jetbrains.mps.ide.findusages.model.scopes.ModelsScope; import jetbrains.mps.ide.findusages.model.scopes.ModulesScope; @@ -164,8 +164,8 @@ public static SModuleReference getModuleReference(SModule aModule) { return check_1pinza_a0a52(aModule); } - public static SearchScope createConsoleScope(@Nullable final SearchScope baseScope, final boolean includeReadOnly, final ConsoleContext context) { - SearchScope scope = (baseScope == null ? context.getDefaultSearchscope() : baseScope); + public static SearchScope createConsoleScope(@Nullable final SearchScope baseScope, final boolean includeReadOnly, QueryExecutionContext context) { + SearchScope scope = (baseScope == null ? context.getDefaultSearchScope() : baseScope); return (includeReadOnly ? scope : new EditableFilteringScope(scope)); } diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info index 469a22cdb0ab..edecc475994a 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info @@ -39,7 +39,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -249,7 +249,7 @@ - + From 16cca363a6ae17e1334b28c2f8e548bee95c4cfc Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Wed, 26 Aug 2015 19:45:01 +0300 Subject: [PATCH 34/52] got rid of ConsoleOutputWindow, QueryExecutionContext introduced --- .../generator/template/main/dependencies | 5 - .../query/generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 270 +--- .../query/generator/template/main/trace.info | 633 ++-------- .../generator/template/main@generator.mps | 934 +------------- .../jetbrains.mps.lang.smodel.query.mpl | 2 + ...etbrains.mps.lang.smodel.query.runtime.msd | 1 + .../mps/console/blCommand/runtime.mps | 126 +- .../mps/lang/smodel/query/runtime/util.mps | 116 +- .../console/blCommand/runtime/dependencies | 12 - .../mps/console/blCommand/runtime/generated | 2 +- .../smodel/query/runtime/util/dependencies | 2 - .../lang/smodel/query/runtime/util/generated | 2 +- .../runtime/CommandOutputWindow.java | 8 - .../mps/console/blCommand/runtime/trace.info | 42 - .../query/runtime/util/CommandUtil.java | 54 +- .../lang/smodel/query/runtime/util/trace.info | 496 ++++---- .../base/generator/template/main/dependencies | 1 + .../base/generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 253 ++++ .../base/generator/template/main/trace.info | 701 +++++++++-- .../generator/template/main@generator.mps | 818 +++++++++++- .../lang/base/jetbrains.mps.console.base.mpl | 2 + .../lang/base/languageModels/behavior.mps | 50 +- .../mps/console/base/behavior/dependencies | 28 +- .../mps/console/base/behavior/generated | 2 +- .../jetbrains/mps/console/base/generated | 2 +- .../behavior/Command_BehaviorDescriptor.java | 4 +- .../behavior/GeneratedCommand_Behavior.java | 4 +- .../GeneratedCommand_BehaviorDescriptor.java | 4 +- .../base/behavior/HelpCommand_Behavior.java | 4 +- .../HelpCommand_BehaviorDescriptor.java | 4 +- .../behavior/InterpretedCommand_Behavior.java | 4 +- ...InterpretedCommand_BehaviorDescriptor.java | 4 +- .../mps/console/base/behavior/trace.info | 6 +- .../generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 34 +- .../mps/console/ideCommands/util.mps | 38 +- .../ideCommands/languageModels/behavior.mps | 66 +- .../console/ideCommands/behavior/dependencies | 64 +- .../console/ideCommands/behavior/generated | 2 +- .../mps/console/ideCommands/generated | 2 +- .../mps/console/ideCommands/util/dependencies | 4 +- .../mps/console/ideCommands/util/generated | 2 +- .../GlobalStatisticTarget_Behavior.java | 2 +- ...balStatisticTarget_BehaviorDescriptor.java | 2 +- .../behavior/INodeSetReference_Behavior.java | 2 +- .../INodeSetReference_BehaviorDescriptor.java | 2 +- .../behavior/IStatisticsTarget_Behavior.java | 2 +- .../IStatisticsTarget_BehaviorDescriptor.java | 2 +- .../ModelStatisticsTarget_Behavior.java | 2 +- ...elStatisticsTarget_BehaviorDescriptor.java | 2 +- .../ProjectStatisticsTarget_Behavior.java | 2 +- ...ctStatisticsTarget_BehaviorDescriptor.java | 2 +- .../RebuildProjectCommand_Behavior.java | 4 +- ...uildProjectCommand_BehaviorDescriptor.java | 4 +- .../ShowBrokenReferences_Behavior.java | 4 +- ...owBrokenReferences_BehaviorDescriptor.java | 4 +- .../behavior/ShowGenPlan_Behavior.java | 4 +- .../ShowGenPlan_BehaviorDescriptor.java | 4 +- .../behavior/StatCommand_Behavior.java | 4 +- .../StatCommand_BehaviorDescriptor.java | 4 +- .../SubtreeStatisticsTarget_Behavior.java | 2 +- ...eeStatisticsTarget_BehaviorDescriptor.java | 2 +- .../UnloadModelsCommand_Behavior.java | 4 +- ...nloadModelsCommand_BehaviorDescriptor.java | 4 +- .../console/ideCommands/behavior/trace.info | 30 +- .../console/ideCommands/util/OutputUtils.java | 2 +- .../ideCommands/util/PartitioningHelper.java | 2 +- .../mps/console/ideCommands/util/trace.info | 6 +- .../generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 6 +- .../languageModels/behavior.mps | 10 +- .../internalCommands/behavior/dependencies | 16 +- .../internalCommands/behavior/generated | 2 +- .../mps/console/internalCommands/generated | 2 +- .../ReloadClassesCommand_Behavior.java | 4 +- ...loadClassesCommand_BehaviorDescriptor.java | 4 +- .../ShowRepositoryCommand_Behavior.java | 4 +- ...wRepositoryCommand_BehaviorDescriptor.java | 4 +- .../internalCommands/behavior/trace.info | 4 +- .../console/scripts/generator/main/generated | 2 +- .../generator/template/main@generator.mps | 9 +- .../mps/console/scripts/runtime/util.mps | 15 +- .../console/scripts/runtime/util/dependencies | 2 +- .../console/scripts/runtime/util/generated | 2 +- .../scripts/runtime/util/ScriptsUtil.java | 2 +- .../console/scripts/runtime/util/trace.info | 6 +- .../models/jetbrains/mps/console/tool.mps | 237 +++- .../jetbrains/mps/console/tool/dependencies | 20 +- .../jetbrains/mps/console/tool/generated | 2 +- .../mps/console/tool/BaseConsoleTab.java | 22 +- .../mps/console/tool}/ConsoleContext.java | 5 +- .../mps/console/tool}/ConsoleStream.java | 5 +- .../jetbrains/mps/console/tool/trace.info | 1103 +++++++++-------- 95 files changed, 3159 insertions(+), 3249 deletions(-) delete mode 100644 languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/CommandOutputWindow.java rename {languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime => plugins/console/source_gen/jetbrains/mps/console/tool}/ConsoleContext.java (51%) rename {languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime => plugins/console/source_gen/jetbrains/mps/console/tool}/ConsoleStream.java (58%) diff --git a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/dependencies b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/dependencies index f2cdfc48f936..c97df7c86551 100644 --- a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/dependencies +++ b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/dependencies @@ -2,10 +2,7 @@ - - - @@ -15,9 +12,7 @@ - - diff --git a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated index 36d9a1c38421..df5a111f0bef 100644 --- a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated +++ b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java index f2b6d197ea0f..9f88e056abae 100644 --- a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java +++ b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/QueriesGenerated.java @@ -3,77 +3,22 @@ /*Generated by MPS */ import jetbrains.mps.generator.runtime.Generated; -import jetbrains.mps.generator.template.PropertyMacroContext; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeChecker; +import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.generator.template.ReferenceMacroContext; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext; import jetbrains.mps.internal.collections.runtime.ListSequence; import jetbrains.mps.internal.collections.runtime.IWhereFilter; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; import jetbrains.mps.internal.collections.runtime.ISelector; import jetbrains.mps.internal.collections.runtime.Sequence; import jetbrains.mps.generator.template.SourceSubstituteMacroNodesContext; import org.jetbrains.mps.openapi.persistence.PersistenceFacade; import jetbrains.mps.smodel.SModelUtil_new; -import jetbrains.mps.smodel.SReference; import org.jetbrains.mps.openapi.model.SNodeAccessUtil; @Generated public class QueriesGenerated { - public static Object propertyMacro_GetPropertyValue_9010839353952736697(final PropertyMacroContext _context) { - SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a0())) { - return "nodes"; - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a0())) { - return "references"; - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a0())) { - return "models"; - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a0())) { - return "modules"; - } - return null; - } - public static Object referenceMacro_GetReferent_1597470200014435807(final ReferenceMacroContext _context) { - SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a1())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a1())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a1())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632137"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a1())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632254"); - } - return null; - } - public static Object referenceMacro_GetReferent_3501374812263511250(final ReferenceMacroContext _context) { - SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a2())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263258755"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a2())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263262593"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a2())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263265578"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a2())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263268620"); - } - return null; - } - public static SNode sourceNodeQuery_4598452390226163566(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - } public static SNode sourceNodeQuery_4307205004144966846(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); } @@ -86,12 +31,6 @@ public static SNode sourceNodeQuery_4307205004144963070(final SourceSubstituteMa public static SNode sourceNodeQuery_5582028874771414574(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")); } - public static SNode sourceNodeQuery_5510759644748879578(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - } - public static SNode sourceNodeQuery_6134217374019005717(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - } public static SNode sourceNodeQuery_4307205004143195962(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); } @@ -114,7 +53,7 @@ public SNode select(SNode it) { return SNodeOperations.cast(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope")); } }); - return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0o() : SLinkOperations.getTarget(Sequence.fromIterable(results).first(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"))); + return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0i() : SLinkOperations.getTarget(Sequence.fromIterable(results).first(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"))); } public static SNode sourceNodeQuery_4307205004142895894(final SourceSubstituteMacroNodeContext _context) { Iterable results = ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).where(new IWhereFilter() { @@ -122,26 +61,7 @@ public boolean accept(SNode it) { return SNodeOperations.isInstanceOf(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly")); } }); - return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0p_0() : _quotation_createNode_x583g4_a0b0p()); - } - public static SNode sourceNodeQuery_3501374812261883521(final SourceSubstituteMacroNodeContext _context) { - SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a61())) { - return _quotation_createNode_x583g4_a0a1a61(); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a61())) { - return _quotation_createNode_x583g4_a0a2a61(); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a61())) { - return _quotation_createNode_x583g4_a0a3a61(); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a61())) { - return _quotation_createNode_x583g4_a0a4a61(); - } - return null; - } - public static SNode sourceNodeQuery_9010839353952788840(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0j_0() : _quotation_createNode_x583g4_a0b0j()); } public static SNode sourceNodeQuery_3492877759612269969(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, 0x307931d0f985950eL, "scope")); @@ -158,200 +78,24 @@ public static Iterable sourceNodesQuery_3492877759611137837(final SourceS public static Iterable sourceNodesQuery_1964420931776045744(final SourceSubstituteMacroNodesContext _context) { return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement")); } - private static SNode _quotation_createNode_x583g4_b0a1a0() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a2a0() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a3a0() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a4a0() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a1a1() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a2a1() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a3a1() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a4a1() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a1a2() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a2a2() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a3a2() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a4a2() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_a0b0o() { + private static SNode _quotation_createNode_x583g4_a0b0i() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf940cd6167L, "jetbrains.mps.baseLanguage.structure.NullLiteral"), null, null, false); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0b0p() { + private static SNode _quotation_createNode_x583g4_a0b0j() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false); SNodeAccessUtil.setProperty(quotedNode_1, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "true"); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0b0p_0() { + private static SNode _quotation_createNode_x583g4_a0b0j_0() { PersistenceFacade facade = PersistenceFacade.getInstance(); SNode quotedNode_1 = null; quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false); SNodeAccessUtil.setProperty(quotedNode_1, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "false"); return quotedNode_1; } - private static SNode _quotation_createNode_x583g4_a0a1a61() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference"))); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a1a61() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_a0a2a61() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference"))); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a2a61() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_a0a3a61() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SModelReference"))); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a3a61() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_a0a4a61() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModuleReference"))); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a4a61() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } } diff --git a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info index 5d07bbdd14ce..9a352624eefd 100644 --- a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info +++ b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/lang/smodel/query/generator/template/main/trace.info @@ -2,628 +2,155 @@ - - + - - - - + + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - - - - + + + + - - - - - - - - - + + + - - - - - - - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + - - - - - - - - - - + + + + diff --git a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index e2b9cebf9d82..7a5c0de4830a 100644 --- a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -26,7 +26,7 @@ - + @@ -45,9 +45,6 @@ - - - @@ -55,9 +52,6 @@ - - - @@ -81,17 +75,12 @@ - - - - - @@ -112,10 +101,6 @@ - - - - @@ -152,60 +137,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -225,36 +183,17 @@ - - - - - - - - - - - - - - - - - - - @@ -354,62 +293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -423,13 +306,13 @@ - + - + @@ -495,13 +378,13 @@ - + - + @@ -568,13 +451,13 @@ - + - + @@ -585,7 +468,7 @@ - + @@ -595,136 +478,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -738,13 +491,13 @@ - + - + @@ -794,13 +547,13 @@ - + - + @@ -850,13 +603,13 @@ - + - + @@ -906,13 +659,13 @@ - + - + @@ -962,13 +715,13 @@ - + - + @@ -1161,13 +914,13 @@ - + - + @@ -1197,13 +950,13 @@ - + - + @@ -1217,7 +970,7 @@ - + @@ -1229,593 +982,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1829,13 +995,13 @@ - + - + @@ -1889,13 +1055,13 @@ - + - + @@ -1937,13 +1103,13 @@ - + - + @@ -1993,36 +1159,19 @@ - - + + - + - - - - - - - - - - - - - - - - - - + @@ -2052,23 +1201,6 @@ - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl b/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl index e6fd4ebf3978..15008fa53bf2 100644 --- a/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl +++ b/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl @@ -27,6 +27,7 @@ 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -39,6 +40,7 @@ + diff --git a/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd b/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd index 462a07aba41e..58777b3e8d4f 100644 --- a/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd +++ b/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd @@ -18,6 +18,7 @@ 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console) diff --git a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/console/blCommand/runtime.mps b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/console/blCommand/runtime.mps index 3277f4a9625d..ea82aaa4f367 100644 --- a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/console/blCommand/runtime.mps +++ b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/console/blCommand/runtime.mps @@ -13,156 +13,32 @@ - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps index 5bda27e8df2e..84f0afa85c8b 100644 --- a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps +++ b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps @@ -25,12 +25,10 @@ + - - - @@ -70,7 +68,6 @@ - @@ -85,7 +82,6 @@ - @@ -102,7 +98,6 @@ - @@ -112,10 +107,6 @@ - - - - @@ -557,111 +548,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies index 9b750b2b1f41..00876bb428c8 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies @@ -1,17 +1,5 @@ - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated index 31631d46c1e5..18b908912fde 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies index 4d7fb1cbe1a0..ea8e190f723d 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies @@ -5,13 +5,11 @@ - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated index 3d44de185c14..2ae34c789055 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/CommandOutputWindow.java b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/CommandOutputWindow.java deleted file mode 100644 index c75d73b38736..000000000000 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/CommandOutputWindow.java +++ /dev/null @@ -1,8 +0,0 @@ -package jetbrains.mps.console.blCommand.runtime; - -/*Generated by MPS */ - - -public interface CommandOutputWindow { - public void activate(); -} diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info index f9dec8fe08bf..0c30b527537f 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info @@ -8,47 +8,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java index 75b0370123c3..4cc70311e507 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java @@ -22,7 +22,6 @@ import jetbrains.mps.ide.findusages.model.SearchResults; import jetbrains.mps.ide.project.ProjectHelper; import org.apache.log4j.Level; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import org.jetbrains.mps.openapi.model.SNodeReference; import org.jetbrains.mps.openapi.module.SRepository; import jetbrains.mps.internal.collections.runtime.IWhereFilter; @@ -84,17 +83,6 @@ public static void show(Project p, _FunctionTypes._return_P0_E0 results, int resultsCount, String resultDescription) { - if (resultsCount == 0) { - console.addText("empty sequence"); - } else { - console.addClosure(new _FunctionTypes._void_P0_E0() { - public void invoke() { - CommandUtil.show(project, results); - } - }, resultsCount + " " + resultDescription); - } - } public static _FunctionTypes._return_P0_E0 nodesToResults(final Iterable nodes, final SRepository repository) { return new _FunctionTypes._return_P0_E0>() { @@ -102,11 +90,11 @@ public SearchResults invoke() { final SearchResults res = new SearchResults(); Sequence.fromIterable(nodes).where(new IWhereFilter() { public boolean accept(SNodeReference it) { - return check_1pinza_a0a0a0a0b0a0a61(it, repository) != null; + return check_1pinza_a0a0a0a0b0a0a51(it, repository) != null; } }).visitAll(new IVisitor() { public void visit(SNodeReference it) { - res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a61(it, repository), "usage")); + res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a51(it, repository), "usage")); } }); return res; @@ -120,11 +108,11 @@ public SearchResults invoke() { final SearchResults res = new SearchResults(); Sequence.fromIterable(models).where(new IWhereFilter() { public boolean accept(SModelReference it) { - return check_1pinza_a0a0a0a0b0a0a81(it, repository) != null; + return check_1pinza_a0a0a0a0b0a0a71(it, repository) != null; } }).visitAll(new IVisitor() { public void visit(SModelReference it) { - res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a81(it, repository), "usage")); + res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a71(it, repository), "usage")); } }); return res; @@ -138,11 +126,11 @@ public SearchResults invoke() { final SearchResults res = new SearchResults(); Sequence.fromIterable(modules).where(new IWhereFilter() { public boolean accept(SModuleReference it) { - return check_1pinza_a0a0a0a0b0a0a02(it, repository) != null; + return check_1pinza_a0a0a0a0b0a0a91(it, repository) != null; } }).visitAll(new IVisitor() { public void visit(SModuleReference it) { - res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a02(it, repository), "usage")); + res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a91(it, repository), "usage")); } }); return res; @@ -152,16 +140,16 @@ public void visit(SModuleReference it) { } public static SNodeReference getNodeReference(SNode aNode) { - return check_1pinza_a0a22(aNode); + return check_1pinza_a0a12(aNode); } public static SNodeReference getReferenceReference(SReference aReference) { - return check_1pinza_a0a32(check_1pinza_a0a0x(aReference)); + return check_1pinza_a0a22(check_1pinza_a0a0w(aReference)); } public static SModelReference getModelReference(SModel aModel) { - return check_1pinza_a0a42(aModel); + return check_1pinza_a0a32(aModel); } public static SModuleReference getModuleReference(SModule aModule) { - return check_1pinza_a0a52(aModule); + return check_1pinza_a0a42(aModule); } public static SearchScope createConsoleScope(@Nullable final SearchScope baseScope, final boolean includeReadOnly, QueryExecutionContext context) { @@ -193,67 +181,67 @@ private static UsagesViewTool check_1pinza_a0a0a0m(com.intellij.openapi.project. } return null; } - private static SNode check_1pinza_a0a0a0a0b0a0a61(SNodeReference checkedDotOperand, SRepository repository) { + private static SNode check_1pinza_a0a0a0a0b0a0a51(SNodeReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SNode check_1pinza_a0a0a0a0a0b0a0a61(SNodeReference checkedDotOperand, SRepository repository) { + private static SNode check_1pinza_a0a0a0a0a0b0a0a51(SNodeReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SModel check_1pinza_a0a0a0a0b0a0a81(SModelReference checkedDotOperand, SRepository repository) { + private static SModel check_1pinza_a0a0a0a0b0a0a71(SModelReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SModel check_1pinza_a0a0a0a0a0b0a0a81(SModelReference checkedDotOperand, SRepository repository) { + private static SModel check_1pinza_a0a0a0a0a0b0a0a71(SModelReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SModule check_1pinza_a0a0a0a0b0a0a02(SModuleReference checkedDotOperand, SRepository repository) { + private static SModule check_1pinza_a0a0a0a0b0a0a91(SModuleReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SModule check_1pinza_a0a0a0a0a0b0a0a02(SModuleReference checkedDotOperand, SRepository repository) { + private static SModule check_1pinza_a0a0a0a0a0b0a0a91(SModuleReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SNodeReference check_1pinza_a0a22(SNode checkedDotOperand) { + private static SNodeReference check_1pinza_a0a12(SNode checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getReference(); } return null; } - private static SNodeReference check_1pinza_a0a32(SNode checkedDotOperand) { + private static SNodeReference check_1pinza_a0a22(SNode checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getReference(); } return null; } - private static SNode check_1pinza_a0a0x(SReference checkedDotOperand) { + private static SNode check_1pinza_a0a0w(SReference checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getSourceNode(); } return null; } - private static SModelReference check_1pinza_a0a42(SModel checkedDotOperand) { + private static SModelReference check_1pinza_a0a32(SModel checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getReference(); } return null; } - private static SModuleReference check_1pinza_a0a52(SModule checkedDotOperand) { + private static SModuleReference check_1pinza_a0a42(SModule checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getModuleReference(); } diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info index edecc475994a..3253539e25e0 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info @@ -12,368 +12,348 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - - - - - - - - + - + - + - - - - - - - + + + + + + + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies index 9eb7d6f79402..d47f4271d4de 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/dependencies @@ -7,6 +7,7 @@ + diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated index c82ef91ab5e1..90fff1860c4c 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java index 1ee6afde58f4..7058fe610f8d 100644 --- a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java +++ b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java @@ -14,6 +14,7 @@ import org.jetbrains.mps.openapi.language.SAbstractConcept; import jetbrains.mps.generator.template.PropertyMacroContext; import jetbrains.mps.smodel.behaviour.BehaviorReflection; +import jetbrains.mps.generator.template.ReferenceMacroContext; import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext; import jetbrains.mps.generator.template.SourceSubstituteMacroNodesContext; import org.jetbrains.mps.openapi.persistence.PersistenceFacade; @@ -42,6 +43,54 @@ public static boolean baseMappingRule_Condition_3786816536599965790(final BaseMa public static Object propertyMacro_GetPropertyValue_6690111761723079789(final PropertyMacroContext _context) { return "closure : " + BehaviorReflection.invokeVirtual(String.class, TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), "virtual_getPresentation_1213877396640", new Object[]{}); } + public static Object propertyMacro_GetPropertyValue_9010839353952736697(final PropertyMacroContext _context) { + SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a6())) { + return "nodes"; + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a6())) { + return "references"; + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a6())) { + return "models"; + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a6())) { + return "modules"; + } + return null; + } + public static Object referenceMacro_GetReferent_1597470200014435807(final ReferenceMacroContext _context) { + SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a7())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a7())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a7())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632137"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a7())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632254"); + } + return null; + } + public static Object referenceMacro_GetReferent_3501374812263511250(final ReferenceMacroContext _context) { + SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a8())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263258755"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a8())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263262593"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a8())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263265578"); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a8())) { + return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263268620"); + } + return null; + } public static SNode sourceNodeQuery_1583916890562946186(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x15fb34051f725a2cL, 0x15fb34051f725bb1L, "commandHolder")), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e27160acb4484bL, 0x4e27160acb44924L, "command")); } @@ -60,6 +109,34 @@ public static SNode sourceNodeQuery_7600370246429334103(final SourceSubstituteMa public static SNode sourceNodeQuery_7600370246419387223(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); } + public static SNode sourceNodeQuery_6134217374019005717(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + } + public static SNode sourceNodeQuery_4598452390226163566(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + } + public static SNode sourceNodeQuery_3501374812261883521(final SourceSubstituteMacroNodeContext _context) { + SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a71())) { + return _quotation_createNode_x583g4_a0a1a71(); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a71())) { + return _quotation_createNode_x583g4_a0a2a71(); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a71())) { + return _quotation_createNode_x583g4_a0a3a71(); + } + if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a71())) { + return _quotation_createNode_x583g4_a0a4a71(); + } + return null; + } + public static SNode sourceNodeQuery_9010839353952788840(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + } + public static SNode sourceNodeQuery_5510759644748879578(final SourceSubstituteMacroNodeContext _context) { + return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); + } public static Iterable sourceNodesQuery_5336086527852932024(final SourceSubstituteMacroNodesContext _context) { return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4bd43869e610f3e9L, 0x188f8efcef6cea65L, "body")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement")); } @@ -112,4 +189,180 @@ private static SNode _quotation_createNode_x583g4_b0a0b0c() { quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); return quotedNode_1; } + private static SNode _quotation_createNode_x583g4_b0a1a6() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a2a6() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a3a6() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a4a6() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a1a7() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a2a7() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a3a7() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a4a7() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a1a8() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a2a8() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a3a8() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a4a8() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_a0a1a71() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference"))); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a1a71() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_a0a2a71() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference"))); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a2a71() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_a0a3a71() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SModelReference"))); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a3a71() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_a0a4a71() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModuleReference"))); + return quotedNode_1; + } + private static SNode _quotation_createNode_x583g4_b0a4a71() { + PersistenceFacade facade = PersistenceFacade.getInstance(); + SNode quotedNode_1 = null; + SNode quotedNode_2 = null; + quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); + quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); + quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); + quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); + return quotedNode_1; + } } diff --git a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info index 1bbf1e639414..acbf9c5d6af2 100644 --- a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info +++ b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info @@ -2,167 +2,640 @@ + - + + + + + + + - - + + - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - + - - - - + + + + - + - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index 91d58c5d1f20..f78624ba52ba 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -30,6 +30,9 @@ + + + @@ -38,6 +41,7 @@ + @@ -58,6 +62,9 @@ + + + @@ -178,8 +185,12 @@ + + + + @@ -221,9 +232,16 @@ + + + + + + + @@ -243,6 +261,10 @@ + + + + @@ -251,12 +273,26 @@ + + + + + + + + + + + + + + @@ -323,7 +359,7 @@ - + @@ -346,14 +382,14 @@ - + - + @@ -397,7 +433,7 @@ - + @@ -824,5 +860,779 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/jetbrains.mps.console.base.mpl b/plugins/console/lang/base/jetbrains.mps.console.base.mpl index 0200ff72c769..f36b151af254 100644 --- a/plugins/console/lang/base/jetbrains.mps.console.base.mpl +++ b/plugins/console/lang/base/jetbrains.mps.console.base.mpl @@ -25,6 +25,8 @@ 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409) + 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) + 9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index 2cf47c4ac435..b64155ae62b0 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -375,14 +375,14 @@ - + - + @@ -436,7 +436,7 @@ - + @@ -463,7 +463,7 @@ - + @@ -1185,13 +1185,13 @@ - + - + @@ -1304,7 +1304,7 @@ - + @@ -1326,13 +1326,13 @@ - + - + @@ -1359,13 +1359,13 @@ - + - + @@ -1435,7 +1435,7 @@ - + @@ -1444,7 +1444,7 @@ - + @@ -1455,7 +1455,7 @@ - + @@ -1587,13 +1587,13 @@ - + - + @@ -2140,7 +2140,7 @@ - + @@ -2153,7 +2153,7 @@ - + @@ -2189,11 +2189,11 @@ - + - + @@ -2279,7 +2279,7 @@ - + @@ -2311,7 +2311,7 @@ - + @@ -2348,7 +2348,7 @@ - + @@ -2358,13 +2358,13 @@ - + - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies index 06891aa5d153..d479b84ade1a 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies @@ -113,8 +113,8 @@ - - + + @@ -161,9 +161,9 @@ - - + + @@ -179,8 +179,8 @@ - - + + @@ -196,9 +196,9 @@ - - + + @@ -224,8 +224,8 @@ - - + + @@ -279,8 +279,8 @@ - - + + @@ -290,8 +290,8 @@ - - + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated index 94c107da7bb4..ec12a6a612c7 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated index efa637e2d11a..737e770ca4c7 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java index 67ef7aeb7189..a091fe0df318 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/Command_BehaviorDescriptor.java @@ -7,8 +7,8 @@ import org.jetbrains.mps.openapi.language.SConcept; import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; public abstract class Command_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements HelpProvider_BehaviorDescriptor { public Command_BehaviorDescriptor() { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java index 343005256b29..f24121bf0537 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; import com.intellij.openapi.application.ApplicationManager; import org.jetbrains.mps.openapi.model.SModel; import jetbrains.mps.console.tool.BaseConsoleTab; diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_BehaviorDescriptor.java index ec805edc98c7..5969a43eac10 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/GeneratedCommand_BehaviorDescriptor.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; public abstract class GeneratedCommand_BehaviorDescriptor extends Command_BehaviorDescriptor { public GeneratedCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java index bdab00ba1b13..7b63001e0370 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; import jetbrains.mps.internal.collections.runtime.ListSequence; diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java index f10ffa91e308..06a5b207087a 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/HelpCommand_BehaviorDescriptor.java @@ -4,8 +4,8 @@ import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; import org.jetbrains.mps.openapi.language.SConcept; import jetbrains.mps.lang.smodel.query.behavior.HelpProvider_Behavior; diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_Behavior.java index 81d896d1839f..b9be24a66c40 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_Behavior.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; import jetbrains.mps.smodel.behaviour.BehaviorReflection; public class InterpretedCommand_Behavior { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_BehaviorDescriptor.java index dcf5a11c137a..95ea58b1ff64 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/InterpretedCommand_BehaviorDescriptor.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; public abstract class InterpretedCommand_BehaviorDescriptor extends Command_BehaviorDescriptor { public InterpretedCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info index 699a2e86898e..46e55b9891a6 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info @@ -150,7 +150,7 @@ - + @@ -333,7 +333,7 @@ - + @@ -505,7 +505,7 @@ - + diff --git a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated index ccf01e5213fe..9f4737be9ca6 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated +++ b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/generator/template/main@generator.mps b/plugins/console/lang/ideCommands/generator/template/main@generator.mps index 889b89e5f14c..84a351545269 100644 --- a/plugins/console/lang/ideCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/ideCommands/generator/template/main@generator.mps @@ -366,13 +366,13 @@ - + - + @@ -663,13 +663,13 @@ - + - + @@ -683,7 +683,7 @@ - + @@ -817,13 +817,13 @@ - + - + @@ -837,7 +837,7 @@ - + @@ -935,13 +935,13 @@ - + - + @@ -955,7 +955,7 @@ - + @@ -1280,13 +1280,13 @@ - + - + @@ -1357,13 +1357,13 @@ - + - + @@ -1377,7 +1377,7 @@ - + @@ -1543,7 +1543,7 @@ - + diff --git a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps index 63c7c3403623..6078d884463b 100644 --- a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps +++ b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps @@ -211,7 +211,7 @@ - + @@ -238,7 +238,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -312,7 +312,7 @@ - + @@ -374,7 +374,7 @@ - + @@ -745,7 +745,7 @@ - + @@ -809,7 +809,7 @@ - + @@ -971,7 +971,7 @@ - + @@ -984,7 +984,7 @@ - + @@ -997,7 +997,7 @@ - + @@ -1012,7 +1012,7 @@ - + @@ -1027,7 +1027,7 @@ - + @@ -1063,7 +1063,7 @@ - + @@ -1241,7 +1241,7 @@ - + @@ -1417,7 +1417,7 @@ - + @@ -1430,7 +1430,7 @@ - + @@ -1505,7 +1505,7 @@ - + @@ -1550,7 +1550,7 @@ - + @@ -1563,7 +1563,7 @@ - + diff --git a/plugins/console/lang/ideCommands/languageModels/behavior.mps b/plugins/console/lang/ideCommands/languageModels/behavior.mps index 6b12f08a8e2f..5c19116c8f30 100644 --- a/plugins/console/lang/ideCommands/languageModels/behavior.mps +++ b/plugins/console/lang/ideCommands/languageModels/behavior.mps @@ -324,13 +324,13 @@ - + - + @@ -351,13 +351,13 @@ - + - + @@ -403,13 +403,13 @@ - + - + @@ -437,7 +437,7 @@ - + @@ -558,7 +558,7 @@ - + @@ -643,7 +643,7 @@ - + @@ -788,7 +788,7 @@ - + @@ -898,7 +898,7 @@ - + @@ -927,7 +927,7 @@ - + @@ -945,7 +945,7 @@ - + @@ -1005,7 +1005,7 @@ - + @@ -1186,7 +1186,7 @@ - + @@ -1216,7 +1216,7 @@ - + @@ -1280,7 +1280,7 @@ - + @@ -1377,7 +1377,7 @@ - + @@ -1400,7 +1400,7 @@ - + @@ -1413,7 +1413,7 @@ - + @@ -1450,7 +1450,7 @@ - + @@ -1512,7 +1512,7 @@ - + @@ -1525,7 +1525,7 @@ - + @@ -1538,7 +1538,7 @@ - + @@ -1551,13 +1551,13 @@ - + - + @@ -1584,7 +1584,7 @@ - + @@ -1803,7 +1803,7 @@ - + @@ -1826,7 +1826,7 @@ - + @@ -1865,7 +1865,7 @@ - + @@ -1899,7 +1899,7 @@ - + @@ -1923,13 +1923,13 @@ - + - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies index ca2169737f34..5688e3ccdfc8 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/dependencies @@ -157,7 +157,7 @@ - + @@ -175,10 +175,10 @@ - + @@ -186,12 +186,12 @@ - + - + @@ -199,7 +199,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -265,8 +265,8 @@ - + @@ -283,10 +283,10 @@ - + @@ -334,7 +334,7 @@ - + @@ -350,27 +350,27 @@ - + - - + + - - + + @@ -393,8 +393,8 @@ - - + + @@ -412,9 +412,9 @@ - - + + @@ -436,10 +436,10 @@ - - + + @@ -451,9 +451,9 @@ - - + + @@ -464,9 +464,9 @@ - - + + @@ -476,9 +476,9 @@ - - + + @@ -492,7 +492,7 @@ - + @@ -509,27 +509,27 @@ - + - - + + - - + + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated index 65aea21a6efd..5218c5af9e47 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated index 5055f1a6e36c..96366d006d44 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/dependencies b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/dependencies index 8e2ea1961beb..01bb21e700f8 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/dependencies +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/dependencies @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated index 08dd506bf3ff..d4153512a739 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_Behavior.java index c124bb868ff3..491ce58fe18d 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleContext; import java.util.List; import jetbrains.mps.internal.collections.runtime.ListSequence; import java.util.ArrayList; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_BehaviorDescriptor.java index 35a53addd4cc..1c9f5b549ee7 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/GlobalStatisticTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleContext; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; public class GlobalStatisticTarget_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements IStatisticsTarget_BehaviorDescriptor, INodeSetReference_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_Behavior.java index 38749385518b..fe31e402118e 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_Behavior.java @@ -3,7 +3,7 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleContext; public class INodeSetReference_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_BehaviorDescriptor.java index ead4f556af35..d7001878a0fd 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/INodeSetReference_BehaviorDescriptor.java @@ -3,7 +3,7 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleContext; public interface INodeSetReference_BehaviorDescriptor { public Iterable virtual_getNodes_5207260697411458163(SNode thisNode, ConsoleContext context); diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_Behavior.java index 412e8dcaa72c..07a77fde0fc0 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleContext; public class IStatisticsTarget_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_BehaviorDescriptor.java index c2d78729c460..774d7b3efffe 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/IStatisticsTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleContext; public interface IStatisticsTarget_BehaviorDescriptor { public Iterable> virtual_getStat_7490254719527247609(SNode thisNode, ConsoleContext context); diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_Behavior.java index 3c090476011f..be43ce9cbb4d 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleContext; import jetbrains.mps.smodel.behaviour.BehaviorReflection; import jetbrains.mps.util.IterableUtil; import jetbrains.mps.util.SNodeOperations; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_BehaviorDescriptor.java index 127ee181f677..ad2a47719a57 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ModelStatisticsTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleContext; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; public class ModelStatisticsTarget_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements IStatisticsTarget_BehaviorDescriptor, INodeSetReference_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_Behavior.java index 9e06a7a1b47a..7c9c6887434b 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleContext; import java.util.List; import jetbrains.mps.internal.collections.runtime.ListSequence; import java.util.ArrayList; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_BehaviorDescriptor.java index ed0e8d31cdc3..7f487a93a3b5 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ProjectStatisticsTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleContext; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; public class ProjectStatisticsTarget_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements IStatisticsTarget_BehaviorDescriptor, INodeSetReference_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_Behavior.java index e91b2a0c5cbe..49e111895209 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; public class RebuildProjectCommand_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_BehaviorDescriptor.java index d41cd1738a2c..7b53f44bf4e7 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/RebuildProjectCommand_BehaviorDescriptor.java @@ -5,8 +5,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; public abstract class RebuildProjectCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements IDontSubstituteByDefault_BehaviorDescriptor { public RebuildProjectCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_Behavior.java index 453ca19cff3f..f813ecbee9ce 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; import org.jetbrains.mps.openapi.model.SReference; import jetbrains.mps.internal.collections.runtime.Sequence; import jetbrains.mps.smodel.behaviour.BehaviorReflection; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_BehaviorDescriptor.java index 06b4cac12861..1396b5dc2bca 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowBrokenReferences_BehaviorDescriptor.java @@ -4,8 +4,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; public class ShowBrokenReferences_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor { public ShowBrokenReferences_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_Behavior.java index 5e770935c446..97d1064b0682 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; import org.jetbrains.mps.openapi.model.SModel; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_BehaviorDescriptor.java index 9673fad7aa51..e36c3f5b98f9 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/ShowGenPlan_BehaviorDescriptor.java @@ -4,8 +4,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; public class ShowGenPlan_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor { public ShowGenPlan_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_Behavior.java index 5b1d96d0d931..a2f1de931c46 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; import jetbrains.mps.console.ideCommands.util.OutputUtils; import jetbrains.mps.smodel.behaviour.BehaviorReflection; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_BehaviorDescriptor.java index 409d214e7d1a..97850ef5d45d 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/StatCommand_BehaviorDescriptor.java @@ -4,8 +4,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; public class StatCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor { public StatCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_Behavior.java index c1abc4362d1c..1bd8ec19a450 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_Behavior.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleContext; import jetbrains.mps.smodel.behaviour.BehaviorReflection; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_BehaviorDescriptor.java index 7792b84c22d1..76a0b556fc80 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/SubtreeStatisticsTarget_BehaviorDescriptor.java @@ -4,7 +4,7 @@ import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleContext; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; public class SubtreeStatisticsTarget_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor implements IStatisticsTarget_BehaviorDescriptor, INodeSetReference_BehaviorDescriptor { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_Behavior.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_Behavior.java index b14c0bffe1e8..8aabcb6963fc 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_Behavior.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; public class UnloadModelsCommand_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_BehaviorDescriptor.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_BehaviorDescriptor.java index 692922de36cd..2b882f1df09e 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/UnloadModelsCommand_BehaviorDescriptor.java @@ -5,8 +5,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; public abstract class UnloadModelsCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements IDontSubstituteByDefault_BehaviorDescriptor { public UnloadModelsCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info index 0f9453ec8db5..a71b4b140176 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/behavior/trace.info @@ -120,7 +120,7 @@ - + @@ -169,9 +169,9 @@ - + - + @@ -394,7 +394,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -549,7 +549,7 @@ - + @@ -570,7 +570,7 @@ - + @@ -608,7 +608,7 @@ - + @@ -626,7 +626,7 @@ - + @@ -653,9 +653,9 @@ - + - + @@ -703,9 +703,9 @@ - + - + @@ -758,8 +758,8 @@ - - + + diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/OutputUtils.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/OutputUtils.java index cb2a747d0db6..a61c700bd918 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/OutputUtils.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/OutputUtils.java @@ -2,7 +2,7 @@ /*Generated by MPS */ -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleStream; import jetbrains.mps.baseLanguage.tuples.runtime.Tuples; import jetbrains.mps.internal.collections.runtime.Sequence; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/PartitioningHelper.java b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/PartitioningHelper.java index 0d844744a24c..374129050b0f 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/PartitioningHelper.java +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/PartitioningHelper.java @@ -4,7 +4,7 @@ import org.jetbrains.mps.openapi.model.SModel; import jetbrains.mps.ide.messages.MessagesViewTool; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleStream; import jetbrains.mps.generator.impl.plan.GenerationPlan; import java.util.Map; import jetbrains.mps.generator.runtime.TemplateMappingPriorityRule; diff --git a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/trace.info b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/trace.info index a4f56718514e..b82eab7addc5 100644 --- a/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/trace.info +++ b/plugins/console/lang/ideCommands/source_gen/jetbrains/mps/console/ideCommands/util/trace.info @@ -101,7 +101,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -204,7 +204,7 @@ - + diff --git a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated index 1372dfc7fdd9..4c0ac08e32e4 100644 --- a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated +++ b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/generator/template/main@generator.mps b/plugins/console/lang/internalCommands/generator/template/main@generator.mps index 4e283ae746d7..9bf5d3433bda 100644 --- a/plugins/console/lang/internalCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/internalCommands/generator/template/main@generator.mps @@ -204,13 +204,13 @@ - + - + @@ -225,7 +225,7 @@ - + diff --git a/plugins/console/lang/internalCommands/languageModels/behavior.mps b/plugins/console/lang/internalCommands/languageModels/behavior.mps index 30b5029bc12b..a6c2fd966be4 100644 --- a/plugins/console/lang/internalCommands/languageModels/behavior.mps +++ b/plugins/console/lang/internalCommands/languageModels/behavior.mps @@ -139,7 +139,7 @@ - + @@ -150,13 +150,13 @@ - + - + @@ -193,13 +193,13 @@ - + - + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies index 9fd98364693d..4eee9e2c9189 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/dependencies @@ -49,8 +49,8 @@ - - + + @@ -59,25 +59,25 @@ - - + + - - + + - - + + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated index b36bedc852a4..8088002d424f 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated index 7b66aadaa719..7a2aa97cd0ce 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_Behavior.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_Behavior.java index d1432410349d..1723abd0528c 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_Behavior.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; import jetbrains.mps.classloading.ClassLoaderManager; import jetbrains.mps.progress.EmptyProgressMonitor; import org.jetbrains.mps.openapi.language.SAbstractConcept; diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_BehaviorDescriptor.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_BehaviorDescriptor.java index 8f449a644fca..30fad16723c9 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ReloadClassesCommand_BehaviorDescriptor.java @@ -4,8 +4,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; import org.jetbrains.mps.openapi.language.SConcept; public class ReloadClassesCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor { diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_Behavior.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_Behavior.java index 006a9fe26950..c7bff75c4ecd 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_Behavior.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_Behavior.java @@ -3,8 +3,8 @@ /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; public class ShowRepositoryCommand_Behavior { public static void init(SNode thisNode) { diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_BehaviorDescriptor.java b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_BehaviorDescriptor.java index 19b50638f94f..2d6a624cd9f5 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_BehaviorDescriptor.java +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/ShowRepositoryCommand_BehaviorDescriptor.java @@ -5,8 +5,8 @@ import jetbrains.mps.console.base.behavior.InterpretedCommand_BehaviorDescriptor; import jetbrains.mps.lang.core.behavior.IDontSubstituteByDefault_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; +import jetbrains.mps.console.tool.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleStream; public abstract class ShowRepositoryCommand_BehaviorDescriptor extends InterpretedCommand_BehaviorDescriptor implements IDontSubstituteByDefault_BehaviorDescriptor { public ShowRepositoryCommand_BehaviorDescriptor() { diff --git a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/trace.info b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/trace.info index 690ad33b38c2..9f0ad6f2a782 100644 --- a/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/trace.info +++ b/plugins/console/lang/internalCommands/source_gen/jetbrains/mps/console/internalCommands/behavior/trace.info @@ -49,7 +49,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated b/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated index 0cc011c8f290..1e7ad6408d74 100644 --- a/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated +++ b/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scripts/generator/template/main@generator.mps b/plugins/console/lang/scripts/generator/template/main@generator.mps index e182b922e10f..b110042c3088 100644 --- a/plugins/console/lang/scripts/generator/template/main@generator.mps +++ b/plugins/console/lang/scripts/generator/template/main@generator.mps @@ -10,6 +10,7 @@ + @@ -184,13 +185,13 @@ - + - + @@ -246,13 +247,13 @@ - + - + diff --git a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps index 347ab9202909..717ff403757d 100644 --- a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps +++ b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps @@ -24,7 +24,6 @@ - @@ -279,7 +278,7 @@ - + @@ -323,7 +322,7 @@ - + @@ -377,7 +376,7 @@ - + @@ -413,7 +412,7 @@ - + @@ -616,11 +615,11 @@ - + - + @@ -648,7 +647,7 @@ - + diff --git a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies index 639d6ce03b0d..15fb336bd8c8 100644 --- a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies +++ b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/dependencies @@ -9,8 +9,8 @@ - + diff --git a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated index 28899da0d7b9..ea01f0fec544 100644 --- a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated +++ b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java b/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java index 69ed6e7bbc2d..1131b2dda8af 100644 --- a/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java +++ b/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/ScriptsUtil.java @@ -2,7 +2,7 @@ /*Generated by MPS */ -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; +import jetbrains.mps.console.tool.ConsoleContext; import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.smodel.behaviour.BehaviorReflection; import javax.swing.SwingUtilities; diff --git a/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/trace.info b/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/trace.info index b2872398bd97..22994e64f25d 100644 --- a/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/trace.info +++ b/plugins/console/lang/scriptsRuntime/source_gen/jetbrains/mps/console/scripts/runtime/util/trace.info @@ -41,16 +41,16 @@ - + - + - + diff --git a/plugins/console/models/jetbrains/mps/console/tool.mps b/plugins/console/models/jetbrains/mps/console/tool.mps index 978fa51fd8a3..847289c2ef18 100644 --- a/plugins/console/models/jetbrains/mps/console/tool.mps +++ b/plugins/console/models/jetbrains/mps/console/tool.mps @@ -3,7 +3,6 @@ - @@ -12,6 +11,7 @@ + @@ -69,6 +69,9 @@ + + + @@ -246,6 +249,7 @@ + @@ -311,6 +315,9 @@ + + + @@ -5776,7 +5783,7 @@ - + @@ -5804,7 +5811,7 @@ - + @@ -5825,8 +5832,8 @@ - - + + @@ -5844,7 +5851,7 @@ - + @@ -6199,7 +6206,7 @@ - + @@ -6633,6 +6640,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6640,7 +6737,7 @@ - + @@ -7771,9 +7868,6 @@ - - - @@ -8581,5 +8675,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies index c883662c5a48..78be97e5daf0 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies @@ -44,11 +44,12 @@ - - + + + @@ -61,6 +62,7 @@ + @@ -100,7 +102,11 @@ - + + + + + @@ -126,6 +132,14 @@ + + + + + + + + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated index 0b6c81c45ebf..ec83564c2fd0 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java b/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java index d2985197b07c..ee7f5edf0d4d 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java @@ -4,7 +4,6 @@ import javax.swing.JPanel; import com.intellij.openapi.Disposable; -import jetbrains.mps.console.blCommand.runtime.CommandOutputWindow; import org.jetbrains.mps.openapi.model.SModel; import org.jetbrains.mps.openapi.model.SNode; import com.intellij.openapi.fileEditor.FileEditor; @@ -59,20 +58,20 @@ import jetbrains.mps.baseLanguage.closures.runtime.Wrappers; import com.intellij.util.Base64Converter; import jetbrains.mps.persistence.PersistenceUtil; -import jetbrains.mps.console.blCommand.runtime.ConsoleContext; import jetbrains.mps.project.Project; import org.jetbrains.mps.openapi.module.SearchScope; import jetbrains.mps.ide.findusages.model.scopes.ProjectScope; import org.jetbrains.mps.openapi.language.SAbstractConcept; import org.jetbrains.mps.openapi.model.SReference; import jetbrains.mps.internal.collections.runtime.Sequence; -import jetbrains.mps.console.blCommand.runtime.ConsoleStream; import java.util.Scanner; import java.io.StringWriter; import java.io.PrintWriter; import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations; import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes; import jetbrains.mps.console.actions.ClosureHoldingNodeUtil; +import jetbrains.mps.ide.findusages.model.SearchResults; +import jetbrains.mps.lang.smodel.query.runtime.util.CommandUtil; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.actionSystem.MouseShortcut; import java.awt.event.MouseEvent; @@ -89,7 +88,7 @@ import org.jetbrains.mps.openapi.model.SModelReference; import jetbrains.mps.smodel.SModelUtil_new; -public abstract class BaseConsoleTab extends JPanel implements Disposable, CommandOutputWindow { +public abstract class BaseConsoleTab extends JPanel implements Disposable { protected ConsoleTool myTool; protected SModel myModel; protected SNode myRoot; @@ -290,10 +289,10 @@ protected ConsoleContext getConsoleContext() { public Project getProject() { return ProjectHelper.toMPSProject(myTool.getProject()); } - public SearchScope getDefaultSearchscope() { + public SearchScope getDefaultSearchScope() { return new ProjectScope(getProject()); } - public CommandOutputWindow getOutputWindow() { + public BaseConsoleTab getOutputWindow() { return BaseConsoleTab.this; } }; @@ -363,6 +362,17 @@ public void addClosure(_FunctionTypes._void_P0_E0 closure, String text) { ClosureHoldingNodeUtil.getInstance().register(nodeWithClosure, closure); addNode(nodeWithClosure); } + public void addSequence(final Project project, final _FunctionTypes._return_P0_E0 results, int resultsCount, String resultDescription) { + if (resultsCount == 0) { + addText("empty sequence"); + } else { + addClosure(new _FunctionTypes._void_P0_E0() { + public void invoke() { + CommandUtil.show(project, results); + } + }, resultsCount + " " + resultDescription); + } + } }; } diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java similarity index 51% rename from languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java rename to plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java index 2d787f4e72aa..129a272eacfb 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleContext.java +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java @@ -1,10 +1,11 @@ -package jetbrains.mps.console.blCommand.runtime; +package jetbrains.mps.console.tool; /*Generated by MPS */ +import jetbrains.mps.console.blCommand.runtime.QueryExecutionContext; import jetbrains.mps.project.Project; public interface ConsoleContext extends QueryExecutionContext { public Project getProject(); - public CommandOutputWindow getOutputWindow(); + public BaseConsoleTab getOutputWindow(); } diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleStream.java b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleStream.java similarity index 58% rename from languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleStream.java rename to plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleStream.java index f8176105da12..d4d86a9a8734 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/ConsoleStream.java +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleStream.java @@ -1,9 +1,11 @@ -package jetbrains.mps.console.blCommand.runtime; +package jetbrains.mps.console.tool; /*Generated by MPS */ import org.jetbrains.mps.openapi.model.SNode; import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes; +import jetbrains.mps.project.Project; +import jetbrains.mps.ide.findusages.model.SearchResults; public interface ConsoleStream { public void addText(String text); @@ -11,4 +13,5 @@ public interface ConsoleStream { public void addNodeRef(SNode node); public void addException(Throwable t); public void addClosure(_FunctionTypes._void_P0_E0 closure, String text); + public void addSequence(Project project, _FunctionTypes._return_P0_E0 results, int resultsCount, String resultDescription); } diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info b/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info index 5e3cca232455..12093e66f7e9 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info @@ -325,6 +325,15 @@ + + + + + + + + + @@ -486,683 +495,735 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - + - + - - - - + + + + - + - + - + - + - - - - - - + + + + + + - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - + + - - - - + + + + - + - - - - - - - - - + + + + + + + + + - - - - + + + + - + - + - + + - + - - - - - - + + + + + + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - - - - - + + + + + - - - - + + + + - - - + + + - - - - + + + + + - - - + + + - - + + + + + + + + - + - + - - + + - + - - + + - + - - + + - - - - + + + + - - + + - + - + - + - + - - - - + + + + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 0fd6c736d0ec74c49bc7144881743b0c6142e02f Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Wed, 26 Aug 2015 19:47:33 +0300 Subject: [PATCH 35/52] remove model self-import, make --- .../source_gen.caches/jetbrains/mps/lang/smodel/query/generated | 2 +- .../base/source_gen.caches/jetbrains/mps/console/base/generated | 2 +- plugins/console/models/jetbrains/mps/console/tool.mps | 1 - .../source_gen.caches/jetbrains/mps/console/tool/generated | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated index d77fd7b177a4..34f0c8eb7f24 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated index 737e770ca4c7..3f9cc4bc1039 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/models/jetbrains/mps/console/tool.mps b/plugins/console/models/jetbrains/mps/console/tool.mps index 847289c2ef18..3ac3cd60c87b 100644 --- a/plugins/console/models/jetbrains/mps/console/tool.mps +++ b/plugins/console/models/jetbrains/mps/console/tool.mps @@ -69,7 +69,6 @@ - diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated index ec83564c2fd0..a47ded1a3f05 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated @@ -1,3 +1,3 @@ - + From ab5ee11d59d2b61b00a7344980465a8270a6560e Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Wed, 26 Aug 2015 20:00:50 +0300 Subject: [PATCH 36/52] fix idea modules: smodel.query runtime is a part of mps-core --- core/mps-core/mps-core.iml | 3 +++ plugins/console/console.iml | 1 + 2 files changed, 4 insertions(+) diff --git a/core/mps-core/mps-core.iml b/core/mps-core/mps-core.iml index 29fedafd66f5..5c2fbc3ac630 100644 --- a/core/mps-core/mps-core.iml +++ b/core/mps-core/mps-core.iml @@ -7,6 +7,9 @@ + + + diff --git a/plugins/console/console.iml b/plugins/console/console.iml index 7f9449dcb847..b6c08901bae5 100644 --- a/plugins/console/console.iml +++ b/plugins/console/console.iml @@ -23,5 +23,6 @@ + \ No newline at end of file From 9a33626e017c85cf4f54b167aa44bba7927569ea Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 27 Aug 2015 00:38:15 +0300 Subject: [PATCH 37/52] fixing dependencies problems --- .../query/generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 130 ++++-------------- .../jetbrains.mps.lang.smodel.query.mpl | 1 - ...etbrains.mps.lang.smodel.query.runtime.msd | 1 - .../jetbrains/mps/lang/smodel/query/generated | 2 +- .../base/generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 16 +-- 7 files changed, 37 insertions(+), 117 deletions(-) diff --git a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated index df5a111f0bef..b4b7e0994750 100644 --- a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated +++ b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index 7a5c0de4830a..11e4a1abc323 100644 --- a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -305,14 +305,8 @@ - - - - - - - - + + @@ -377,14 +371,8 @@ - - - - - - - - + + @@ -450,14 +438,8 @@ - - - - - - - - + + @@ -490,14 +472,8 @@ - - - - - - - - + + @@ -546,14 +522,8 @@ - - - - - - - - + + @@ -602,14 +572,8 @@ - - - - - - - - + + @@ -658,14 +622,8 @@ - - - - - - - - + + @@ -714,14 +672,8 @@ - - - - - - - - + + @@ -913,14 +865,8 @@ - - - - - - - - + + @@ -949,14 +895,8 @@ - - - - - - - - + + @@ -994,14 +934,8 @@ - - - - - - - - + + @@ -1054,14 +988,8 @@ - - - - - - - - + + @@ -1102,14 +1030,8 @@ - - - - - - - - + + diff --git a/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl b/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl index 15008fa53bf2..a55350629a31 100644 --- a/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl +++ b/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl @@ -27,7 +27,6 @@ 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd b/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd index 58777b3e8d4f..462a07aba41e 100644 --- a/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd +++ b/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd @@ -18,7 +18,6 @@ 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console) diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated index 34f0c8eb7f24..d77fd7b177a4 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated index 90fff1860c4c..4bf805bf3a96 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index f78624ba52ba..21061b84a668 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -837,26 +837,26 @@ - - + + - - + + - - + + - - + + From 6a2848dd1177e0c7d2d54765d14f194bf309c7c7 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 27 Aug 2015 00:56:21 +0300 Subject: [PATCH 38/52] rename s.q.runtime model, create idea module for this MPS module --- .idea/modules.xml | 1 + core/mps-core/mps-core.iml | 6 ++++++ .../smodel/query/generator/template/main/generated | 2 +- .../commands/generator/template/main@generator.mps | 2 +- .../blCommand => lang/smodel/query}/runtime.mps | 2 +- .../jetbrains/mps/lang/smodel/query/runtime/util.mps | 2 +- .../smodel.query/runtime/smodelquery-runtime.iml | 11 +++++++++++ .../mps/lang/smodel/query/runtime/dependencies | 7 +++++++ .../jetbrains/mps/lang/smodel/query/runtime/generated | 3 +++ .../mps/lang/smodel/query/runtime/util/dependencies | 2 +- .../mps/lang/smodel/query/runtime/util/generated | 2 +- .../smodel/query}/runtime/QueryExecutionContext.java | 2 +- .../smodel/query}/runtime/trace.info | 4 ++-- .../lang/smodel/query/runtime/util/CommandUtil.java | 2 +- .../mps/lang/smodel/query/runtime/util/trace.info | 2 +- plugins/console/console.iml | 1 + .../console/base/generator/template/main/generated | 2 +- .../lang/generator/template/main@generator.mps | 2 +- plugins/console/lang/base/languageModels/behavior.mps | 2 +- .../jetbrains/mps/console/base/behavior/generated | 2 +- .../jetbrains/mps/console/base/generated | 2 +- .../ideCommands/generator/template/main/generated | 2 +- .../ideCommands/generator/template/main@generator.mps | 2 +- .../jetbrains/mps/console/ideCommands/util.mps | 2 +- .../lang/ideCommands/languageModels/behavior.mps | 2 +- .../mps/console/ideCommands/behavior/generated | 2 +- .../jetbrains/mps/console/ideCommands/generated | 2 +- .../jetbrains/mps/console/ideCommands/util/generated | 2 +- .../generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 2 +- .../lang/internalCommands/languageModels/behavior.mps | 2 +- .../mps/console/internalCommands/behavior/generated | 2 +- .../jetbrains/mps/console/internalCommands/generated | 2 +- .../mps/console/scripts/generator/main/generated | 2 +- .../scripts/generator/template/main@generator.mps | 2 +- .../jetbrains/mps/console/scripts/runtime/util.mps | 2 +- .../mps/console/scripts/runtime/util/generated | 2 +- plugins/console/models/jetbrains/mps/console/tool.mps | 2 +- .../jetbrains/mps/console/tool/dependencies | 2 +- .../jetbrains/mps/console/tool/generated | 2 +- .../jetbrains/mps/console/tool/ConsoleContext.java | 2 +- 41 files changed, 65 insertions(+), 36 deletions(-) rename languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/{console/blCommand => lang/smodel/query}/runtime.mps (99%) create mode 100644 languages/languageDesign/smodel.query/runtime/smodelquery-runtime.iml create mode 100644 languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/dependencies create mode 100644 languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/generated rename languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/{console/blCommand => lang/smodel/query}/runtime/QueryExecutionContext.java (77%) rename languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/{console/blCommand => lang/smodel/query}/runtime/trace.info (82%) diff --git a/.idea/modules.xml b/.idea/modules.xml index fbe343500966..4763cd8a2d9a 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -73,6 +73,7 @@ + diff --git a/core/mps-core/mps-core.iml b/core/mps-core/mps-core.iml index 5c2fbc3ac630..85c03971a2e6 100644 --- a/core/mps-core/mps-core.iml +++ b/core/mps-core/mps-core.iml @@ -24,5 +24,11 @@ + + + + + + \ No newline at end of file diff --git a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated index b4b7e0994750..b15da94ee0e9 100644 --- a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated +++ b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index 11e4a1abc323..9bab055fe164 100644 --- a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -24,7 +24,7 @@ - + diff --git a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/console/blCommand/runtime.mps b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime.mps similarity index 99% rename from languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/console/blCommand/runtime.mps rename to languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime.mps index ea82aaa4f367..b4ad92ca0071 100644 --- a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/console/blCommand/runtime.mps +++ b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime.mps @@ -1,5 +1,5 @@ - + diff --git a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps index 84f0afa85c8b..4303a8ffb0a1 100644 --- a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps +++ b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps @@ -24,7 +24,7 @@ - + diff --git a/languages/languageDesign/smodel.query/runtime/smodelquery-runtime.iml b/languages/languageDesign/smodel.query/runtime/smodelquery-runtime.iml new file mode 100644 index 000000000000..abe680ed4513 --- /dev/null +++ b/languages/languageDesign/smodel.query/runtime/smodelquery-runtime.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/dependencies b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/dependencies new file mode 100644 index 000000000000..412b30be9f1e --- /dev/null +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/dependencies @@ -0,0 +1,7 @@ + + + + + + + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/generated b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/generated new file mode 100644 index 000000000000..8b346fd12bf0 --- /dev/null +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/generated @@ -0,0 +1,3 @@ + + + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies index ea8e190f723d..24745b0cf573 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies @@ -10,7 +10,6 @@ - @@ -25,6 +24,7 @@ + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated index 2ae34c789055..f950c7b5f746 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/QueryExecutionContext.java b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/QueryExecutionContext.java similarity index 77% rename from languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/QueryExecutionContext.java rename to languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/QueryExecutionContext.java index 970ee7d9c274..ef95c8cc4c05 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/QueryExecutionContext.java +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/QueryExecutionContext.java @@ -1,4 +1,4 @@ -package jetbrains.mps.console.blCommand.runtime; +package jetbrains.mps.lang.smodel.query.runtime; /*Generated by MPS */ diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/trace.info similarity index 82% rename from languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info rename to languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/trace.info index 0c30b527537f..420838c9e4cb 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/console/blCommand/runtime/trace.info +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/trace.info @@ -1,11 +1,11 @@ - + - + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java index 4cc70311e507..f25aca961c51 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java @@ -30,7 +30,7 @@ import org.jetbrains.mps.openapi.model.SModelReference; import org.jetbrains.mps.openapi.module.SModuleReference; import org.jetbrains.annotations.Nullable; -import jetbrains.mps.console.blCommand.runtime.QueryExecutionContext; +import jetbrains.mps.lang.smodel.query.runtime.QueryExecutionContext; import jetbrains.mps.project.EditableFilteringScope; import jetbrains.mps.ide.findusages.model.scopes.ModelsScope; import jetbrains.mps.ide.findusages.model.scopes.ModulesScope; diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info index 3253539e25e0..28d66d674e60 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info @@ -104,7 +104,7 @@ - + diff --git a/plugins/console/console.iml b/plugins/console/console.iml index b6c08901bae5..895b876bb056 100644 --- a/plugins/console/console.iml +++ b/plugins/console/console.iml @@ -24,5 +24,6 @@ + \ No newline at end of file diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated index 4bf805bf3a96..0fd99a4ab30f 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index 21061b84a668..52f09100e138 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -24,7 +24,7 @@ - + diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index b64155ae62b0..077e5751c0e8 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -32,7 +32,7 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated index ec12a6a612c7..7b5d3a329b76 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated index 3f9cc4bc1039..1c8458ff0862 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated index 9f4737be9ca6..85546fad40c5 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated +++ b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/generator/template/main@generator.mps b/plugins/console/lang/ideCommands/generator/template/main@generator.mps index 84a351545269..c39fce595c06 100644 --- a/plugins/console/lang/ideCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/ideCommands/generator/template/main@generator.mps @@ -33,7 +33,7 @@ - + diff --git a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps index 6078d884463b..17c3e3316716 100644 --- a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps +++ b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps @@ -20,7 +20,7 @@ - + diff --git a/plugins/console/lang/ideCommands/languageModels/behavior.mps b/plugins/console/lang/ideCommands/languageModels/behavior.mps index 5c19116c8f30..fd1e4078a0a1 100644 --- a/plugins/console/lang/ideCommands/languageModels/behavior.mps +++ b/plugins/console/lang/ideCommands/languageModels/behavior.mps @@ -37,7 +37,7 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated index 5218c5af9e47..fe4ffd99f950 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated index 96366d006d44..8c7e974bdc68 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated index d4153512a739..968a2e6d1c71 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated index 4c0ac08e32e4..ed623496a113 100644 --- a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated +++ b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/generator/template/main@generator.mps b/plugins/console/lang/internalCommands/generator/template/main@generator.mps index 9bf5d3433bda..d60480e33f76 100644 --- a/plugins/console/lang/internalCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/internalCommands/generator/template/main@generator.mps @@ -16,7 +16,7 @@ - + diff --git a/plugins/console/lang/internalCommands/languageModels/behavior.mps b/plugins/console/lang/internalCommands/languageModels/behavior.mps index a6c2fd966be4..33cbe1870ec6 100644 --- a/plugins/console/lang/internalCommands/languageModels/behavior.mps +++ b/plugins/console/lang/internalCommands/languageModels/behavior.mps @@ -16,7 +16,7 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated index 8088002d424f..43396b2f3029 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated index 7a2aa97cd0ce..23e7340d7a5e 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated b/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated index 1e7ad6408d74..36c9d262d1a7 100644 --- a/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated +++ b/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scripts/generator/template/main@generator.mps b/plugins/console/lang/scripts/generator/template/main@generator.mps index b110042c3088..d2ef654c730c 100644 --- a/plugins/console/lang/scripts/generator/template/main@generator.mps +++ b/plugins/console/lang/scripts/generator/template/main@generator.mps @@ -9,7 +9,7 @@ - + diff --git a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps index 717ff403757d..89c6e71a76a5 100644 --- a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps +++ b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps @@ -24,7 +24,7 @@ - + diff --git a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated index ea01f0fec544..7eef856e9b1e 100644 --- a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated +++ b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/models/jetbrains/mps/console/tool.mps b/plugins/console/models/jetbrains/mps/console/tool.mps index 3ac3cd60c87b..13ccc31b2940 100644 --- a/plugins/console/models/jetbrains/mps/console/tool.mps +++ b/plugins/console/models/jetbrains/mps/console/tool.mps @@ -68,7 +68,7 @@ - + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies index 78be97e5daf0..f8d3c16978f0 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies @@ -106,7 +106,7 @@ - + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated index a47ded1a3f05..79b30cf5e68b 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java index 129a272eacfb..296c0b1ef03d 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java @@ -2,7 +2,7 @@ /*Generated by MPS */ -import jetbrains.mps.console.blCommand.runtime.QueryExecutionContext; +import jetbrains.mps.lang.smodel.query.runtime.QueryExecutionContext; import jetbrains.mps.project.Project; public interface ConsoleContext extends QueryExecutionContext { From 7fe70d657b76aca2b9af8bc6f4496fbe9848665c Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 27 Aug 2015 01:06:42 +0300 Subject: [PATCH 39/52] move project-expressions to console.base, fix genpriorities --- .../query/generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 86 ------------------ .../jetbrains.mps.lang.smodel.query.mpl | 44 +-------- .../mps/lang/smodel/query/behavior.mps | 25 ------ .../mps/lang/smodel/query/structure.mps | 13 --- .../mps/lang/smodel/query/typesystem.mps | 26 ------ .../lang/smodel/query/behavior/dependencies | 23 ----- .../mps/lang/smodel/query/behavior/generated | 2 +- .../jetbrains/mps/lang/smodel/query/generated | 2 +- .../mps/lang/smodel/query/structure/generated | 2 +- .../lang/smodel/query/typesystem/dependencies | 14 --- .../lang/smodel/query/typesystem/generated | 2 +- .../behavior/BehaviorAspectDescriptor.java | 18 ++-- .../mps/lang/smodel/query/behavior/trace.info | 24 +---- .../structure/StructureAspectDescriptor.java | 28 +++--- .../lang/smodel/query/structure/trace.info | 2 +- .../typesystem/TypesystemDescriptor.java | 4 - .../lang/smodel/query/typesystem/trace.info | 54 +---------- .../mps/console/actions/platform.mps | 6 +- .../mps/console/actions/plugin/generated | 2 +- .../FindInstancesByCondition_Action.java | 2 +- .../ModifyInstancesByCondition_Action.java | 2 +- .../mps/console/actions/plugin/trace.info | 8 +- .../base/generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 90 +++++++++++++++++++ .../lang/base/languageModels/behavior.mps | 25 ++++++ .../lang/base/languageModels/structure.mps | 19 +++- .../lang/base/languageModels/typesystem.mps | 27 ++++++ .../mps/console/base/behavior/dependencies | 23 +++++ .../mps/console/base/behavior/generated | 2 +- .../jetbrains/mps/console/base/generated | 2 +- .../mps/console/base/structure/generated | 2 +- .../mps/console/base/typesystem/dependencies | 14 +++ .../mps/console/base/typesystem/generated | 2 +- .../behavior/BehaviorAspectDescriptor.java | 10 ++- .../behavior/ProjectExpression_Behavior.java | 2 +- .../ProjectExpression_BehaviorDescriptor.java | 5 +- .../ProjectScope_BehaviorDescriptor.java | 5 +- .../mps/console/base/behavior/trace.info | 24 ++++- .../structure/StructureAspectDescriptor.java | 16 ++-- .../mps/console/base/structure/trace.info | 2 +- .../base/typesystem/TypesystemDescriptor.java | 4 + .../mps/console/base/typesystem/trace.info | 54 ++++++++++- ...ypeof_ProjectExpression_InferenceRule.java | 8 +- .../generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 5 +- .../jetbrains.mps.console.ideCommands.mpl | 31 +------ .../mps/console/ideCommands/generated | 2 +- 48 files changed, 354 insertions(+), 415 deletions(-) rename {languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query => plugins/console/lang/base/source_gen/jetbrains/mps/console/base}/behavior/ProjectExpression_Behavior.java (87%) rename {languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query => plugins/console/lang/base/source_gen/jetbrains/mps/console/base}/behavior/ProjectExpression_BehaviorDescriptor.java (72%) rename {languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query => plugins/console/lang/base/source_gen/jetbrains/mps/console/base}/behavior/ProjectScope_BehaviorDescriptor.java (53%) rename {languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query => plugins/console/lang/base/source_gen/jetbrains/mps/console/base}/typesystem/typeof_ProjectExpression_InferenceRule.java (80%) diff --git a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated index b15da94ee0e9..082097fd879c 100644 --- a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated +++ b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index 9bab055fe164..2a194d8acdc7 100644 --- a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -34,7 +34,6 @@ - @@ -214,12 +213,6 @@ - - - - - - @@ -268,12 +261,6 @@ - - - - - - @@ -426,40 +413,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -883,45 +836,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl b/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl index a55350629a31..d4d76b7c0918 100644 --- a/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl +++ b/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl @@ -50,49 +50,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps index 0f1d816df5fd..ec8e42e9467c 100644 --- a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps +++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/behavior.mps @@ -649,31 +649,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps index 53bcc60f7401..47daa2911367 100644 --- a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps +++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/structure.mps @@ -70,13 +70,6 @@ - - - - - - - @@ -173,12 +166,6 @@ - - - - - - diff --git a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps index d86e9ce4f66e..48641addd9cf 100644 --- a/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps +++ b/languages/languageDesign/smodel.query/languageModels/jetbrains/mps/lang/smodel/query/typesystem.mps @@ -496,32 +496,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies index baff6946adf2..b0eb41f5c1a0 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/dependencies @@ -11,8 +11,6 @@ - - @@ -156,27 +154,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated index 42eef2f2747c..04c3bdc97e6e 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated index d77fd7b177a4..245bac09f2fc 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated index da15067d163a..5c0c3598e34f 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies index fdf3ca76145f..89a9a52e6dee 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/dependencies @@ -9,7 +9,6 @@ - @@ -136,19 +135,6 @@ - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated index 1b72c78bb098..b6825fae113c 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/typesystem/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java index c19d15147376..34eb8a92fb75 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/BehaviorAspectDescriptor.java @@ -11,41 +11,37 @@ public BehaviorAspectDescriptor() { } public BehaviorDescriptor getDescriptor(String fqName) { switch (Arrays.binarySearch(stringSwitchCases_846f5o_a0a0b, fqName)) { - case 14: + case 12: return new UsagesExpression_BehaviorDescriptor(); case 2: return new InstancesExpression_BehaviorDescriptor(); - case 8: - return new ProjectExpression_BehaviorDescriptor(); case 7: return new NodesExpression_BehaviorDescriptor(); - case 13: + case 11: return new ReferencesExpression_BehaviorDescriptor(); case 4: return new ModelsExpression_BehaviorDescriptor(); case 5: return new ModulesExpression_BehaviorDescriptor(); - case 11: + case 9: return new QueryParameterList_BehaviorDescriptor(); - case 10: + case 8: return new QueryParameterIncludeReadOnly_BehaviorDescriptor(); - case 12: + case 10: return new QueryParameterScope_BehaviorDescriptor(); case 1: return new GlobalScope_BehaviorDescriptor(); - case 9: - return new ProjectScope_BehaviorDescriptor(); case 6: return new ModulesScope_BehaviorDescriptor(); case 3: return new ModelScope_BehaviorDescriptor(); case 0: return new CustomScope_BehaviorDescriptor(); - case 15: + case 13: return new WithStatement_BehaviorDescriptor(); default: return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName); } } - private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.GlobalScope", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModelsExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.NodesExpression", "jetbrains.mps.lang.smodel.query.structure.ProjectExpression", "jetbrains.mps.lang.smodel.query.structure.ProjectScope", "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"}; + private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.GlobalScope", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModelsExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.NodesExpression", "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"}; } diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info index 7db891ec4043..216383caac7c 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/trace.info @@ -8,7 +8,7 @@ - + @@ -43,12 +43,6 @@ - - - - - - @@ -325,21 +319,5 @@ - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java index e980d25e7036..5bed3964d6c0 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/StructureAspectDescriptor.java @@ -23,8 +23,6 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { /*package*/ final ConceptDescriptor myConceptModulesScope = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ModulesScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL)).super_("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759607928680L, "module", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, true, false)).children(new String[]{"module"}, new boolean[]{true}).alias("modules", "").create(); /*package*/ final ConceptDescriptor myConceptNodesExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.NodesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x272b1214886bd08eL)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#nodes", "all nodes in scope").create(); /*package*/ final ConceptDescriptor myConceptOperationHelpProvider = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.OperationHelpProvider", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).interface_().parents("jetbrains.mps.lang.smodel.query.structure.HelpProvider").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).create(); - /*package*/ final ConceptDescriptor myConceptProjectExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ProjectExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0xa721a59126bb908L)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#project", "the current project").create(); - /*package*/ final ConceptDescriptor myConceptProjectScope = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.ProjectScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L)).super_("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).alias("project", "").create(); /*package*/ final ConceptDescriptor myConceptQueryExpression = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.QueryExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).childDescriptors(new ConceptDescriptorBuilder.Link(4307205004132279624L, "parameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L), false, false, false)).children(new String[]{"parameter"}, new boolean[]{false}).abstract_().create(); /*package*/ final ConceptDescriptor myConceptQueryParameter = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.QueryParameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).abstract_().create(); /*package*/ final ConceptDescriptor myConceptQueryParameterIncludeReadOnly = new ConceptDescriptorBuilder("jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L)).super_("jetbrains.mps.lang.smodel.query.structure.QueryParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).parents("jetbrains.mps.lang.smodel.query.structure.QueryParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).alias("r/o+", "include read only").create(); @@ -37,13 +35,13 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { @Override public Collection getDescriptors() { - return Arrays.asList(myConceptCustomScope, myConceptExpressionHelpProvider, myConceptGlobalScope, myConceptHelpProvider, myConceptInstancesExpression, myConceptModelScope, myConceptModelsExpression, myConceptModulesExpression, myConceptModulesScope, myConceptNodesExpression, myConceptOperationHelpProvider, myConceptProjectExpression, myConceptProjectScope, myConceptQueryExpression, myConceptQueryParameter, myConceptQueryParameterIncludeReadOnly, myConceptQueryParameterList, myConceptQueryParameterScope, myConceptReferencesExpression, myConceptScopeParameter, myConceptUsagesExpression, myConceptWithStatement); + return Arrays.asList(myConceptCustomScope, myConceptExpressionHelpProvider, myConceptGlobalScope, myConceptHelpProvider, myConceptInstancesExpression, myConceptModelScope, myConceptModelsExpression, myConceptModulesExpression, myConceptModulesScope, myConceptNodesExpression, myConceptOperationHelpProvider, myConceptQueryExpression, myConceptQueryParameter, myConceptQueryParameterIncludeReadOnly, myConceptQueryParameterList, myConceptQueryParameterScope, myConceptReferencesExpression, myConceptScopeParameter, myConceptUsagesExpression, myConceptWithStatement); } @Override @Nullable public ConceptDescriptor getDescriptor(String conceptFqName) { - switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0ab, conceptFqName)) { + switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0y, conceptFqName)) { case 0: return myConceptCustomScope; case 1: @@ -67,30 +65,26 @@ public ConceptDescriptor getDescriptor(String conceptFqName) { case 10: return myConceptOperationHelpProvider; case 11: - return myConceptProjectExpression; - case 12: - return myConceptProjectScope; - case 13: return myConceptQueryExpression; - case 14: + case 12: return myConceptQueryParameter; - case 15: + case 13: return myConceptQueryParameterIncludeReadOnly; - case 16: + case 14: return myConceptQueryParameterList; - case 17: + case 15: return myConceptQueryParameterScope; - case 18: + case 16: return myConceptReferencesExpression; - case 19: + case 17: return myConceptScopeParameter; - case 20: + case 18: return myConceptUsagesExpression; - case 21: + case 19: return myConceptWithStatement; default: return null; } } - private static String[] stringSwitchCases_1htk8d_a0a0ab = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider", "jetbrains.mps.lang.smodel.query.structure.GlobalScope", "jetbrains.mps.lang.smodel.query.structure.HelpProvider", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModelsExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.NodesExpression", "jetbrains.mps.lang.smodel.query.structure.OperationHelpProvider", "jetbrains.mps.lang.smodel.query.structure.ProjectExpression", "jetbrains.mps.lang.smodel.query.structure.ProjectScope", "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "jetbrains.mps.lang.smodel.query.structure.QueryParameter", "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", "jetbrains.mps.lang.smodel.query.structure.ScopeParameter", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"}; + private static String[] stringSwitchCases_1htk8d_a0a0y = new String[]{"jetbrains.mps.lang.smodel.query.structure.CustomScope", "jetbrains.mps.lang.smodel.query.structure.ExpressionHelpProvider", "jetbrains.mps.lang.smodel.query.structure.GlobalScope", "jetbrains.mps.lang.smodel.query.structure.HelpProvider", "jetbrains.mps.lang.smodel.query.structure.InstancesExpression", "jetbrains.mps.lang.smodel.query.structure.ModelScope", "jetbrains.mps.lang.smodel.query.structure.ModelsExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesExpression", "jetbrains.mps.lang.smodel.query.structure.ModulesScope", "jetbrains.mps.lang.smodel.query.structure.NodesExpression", "jetbrains.mps.lang.smodel.query.structure.OperationHelpProvider", "jetbrains.mps.lang.smodel.query.structure.QueryExpression", "jetbrains.mps.lang.smodel.query.structure.QueryParameter", "jetbrains.mps.lang.smodel.query.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.lang.smodel.query.structure.QueryParameterList", "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope", "jetbrains.mps.lang.smodel.query.structure.ReferencesExpression", "jetbrains.mps.lang.smodel.query.structure.ScopeParameter", "jetbrains.mps.lang.smodel.query.structure.UsagesExpression", "jetbrains.mps.lang.smodel.query.structure.WithStatement"}; } diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info index e995e7dc9957..82a285c78b60 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/structure/trace.info @@ -2,7 +2,7 @@ - + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java index 3a15f5ccd81b..b6f8eca610d8 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/TypesystemDescriptor.java @@ -36,10 +36,6 @@ public TypesystemDescriptor() { InferenceRule_Runtime inferenceRule = new typeof_NodesExpresiion_InferenceRule(); this.myInferenceRules.add(inferenceRule); } - { - InferenceRule_Runtime inferenceRule = new typeof_ProjectExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } { InferenceRule_Runtime inferenceRule = new typeof_ReferencesExpression_InferenceRule(); this.myInferenceRules.add(inferenceRule); diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info index ea7e964d711c..504e1419e8a1 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/trace.info @@ -12,7 +12,7 @@ - + @@ -614,58 +614,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps b/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps index 0f6fa03248e9..2ddf14576bf3 100644 --- a/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps +++ b/plugins/console/actions/models/jetbrains/mps/console/actions/platform.mps @@ -153,8 +153,8 @@ - - + + @@ -225,7 +225,6 @@ - @@ -243,6 +242,7 @@ + diff --git a/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated b/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated index 1a3db2638b65..4bfec6a910cc 100644 --- a/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated +++ b/plugins/console/actions/source_gen.caches/jetbrains/mps/console/actions/plugin/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java index c220b5aff489..49dbea9e614b 100644 --- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java +++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/FindInstancesByCondition_Action.java @@ -90,7 +90,7 @@ private static SNode _quotation_createNode_flklsf_a0c0a(Object parameter_1) { quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), quotedNode_7); quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList"), null, null, false); quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope"), null, null, false); - quotedNode_13 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.lang.smodel.query.structure.ProjectScope"), null, null, false); + quotedNode_13 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x3bc64421763adda2L, "jetbrains.mps.console.base.structure.ProjectScope"), null, null, false); quotedNode_10.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), quotedNode_13); quotedNode_8.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), quotedNode_10); quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_8); diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java index 0924730f8a39..6829dc2ee535 100644 --- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java +++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/ModifyInstancesByCondition_Action.java @@ -93,7 +93,7 @@ private static SNode _quotation_createNode_nwjg5s_a0b0a(Object parameter_1) { quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.lang.smodel.query.structure.InstancesExpression"), null, null, false); quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.lang.smodel.query.structure.QueryParameterList"), null, null, false); quotedNode_14 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.lang.smodel.query.structure.QueryParameterScope"), null, null, false); - quotedNode_18 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L, "jetbrains.mps.lang.smodel.query.structure.ProjectScope"), null, null, false); + quotedNode_18 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x3bc64421763adda2L, "jetbrains.mps.console.base.structure.ProjectScope"), null, null, false); quotedNode_14.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), quotedNode_18); quotedNode_9.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), quotedNode_14); quotedNode_6.addChild(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), quotedNode_9); diff --git a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info index f54addf421de..681a1bbe1a00 100644 --- a/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info +++ b/plugins/console/actions/source_gen/jetbrains/mps/console/actions/plugin/trace.info @@ -57,8 +57,8 @@ - - + + @@ -246,8 +246,8 @@ - - + + diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated index 0fd99a4ab30f..3ea3dda96f38 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index 52f09100e138..c8007f839232 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -33,6 +33,7 @@ + @@ -51,6 +52,9 @@ + + + @@ -117,6 +121,7 @@ + @@ -322,6 +327,18 @@ + + + + + + + + + + + + @@ -1634,5 +1651,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index 077e5751c0e8..8e90c515b1c6 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -2762,5 +2762,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/languageModels/structure.mps b/plugins/console/lang/base/languageModels/structure.mps index d94fc6eb5ee3..1f73ba6436a1 100644 --- a/plugins/console/lang/base/languageModels/structure.mps +++ b/plugins/console/lang/base/languageModels/structure.mps @@ -146,7 +146,7 @@ - + @@ -194,7 +194,7 @@ - + @@ -354,7 +354,7 @@ - + @@ -385,5 +385,18 @@ + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/languageModels/typesystem.mps b/plugins/console/lang/base/languageModels/typesystem.mps index 3a3d5fa12d22..67385a9fdf31 100644 --- a/plugins/console/lang/base/languageModels/typesystem.mps +++ b/plugins/console/lang/base/languageModels/typesystem.mps @@ -5,6 +5,7 @@ + @@ -273,5 +274,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies index d479b84ade1a..6298b40015b1 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/dependencies @@ -79,6 +79,8 @@ + + @@ -446,6 +448,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated index 7b5d3a329b76..aad38576d300 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated index 1c8458ff0862..03bff0816de8 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated index f6a4205db175..41f9ba272f3b 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/dependencies b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/dependencies index c0d71c65161e..d172729c8ff1 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/dependencies +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/dependencies @@ -7,6 +7,7 @@ + @@ -90,5 +91,18 @@ + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated index 99f3077b2b1c..100296ad4d9e 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java index d5d6c7ace8f3..1cf6f2624616 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/BehaviorAspectDescriptor.java @@ -29,11 +29,11 @@ public BehaviorDescriptor getDescriptor(String fqName) { return new HelpCommand_BehaviorDescriptor(); case 3: return new ConsoleRoot_BehaviorDescriptor(); - case 21: + case 23: return new Response_BehaviorDescriptor(); case 12: return new NodeResponseItem_BehaviorDescriptor(); - case 22: + case 24: return new TextResponseItem_BehaviorDescriptor(); case 9: return new NewLineResponseItem_BehaviorDescriptor(); @@ -57,9 +57,13 @@ public BehaviorDescriptor getDescriptor(String fqName) { return new PrintSequenceExpression_BehaviorDescriptor(); case 20: return new PrintTextExpression_BehaviorDescriptor(); + case 22: + return new ProjectScope_BehaviorDescriptor(); + case 21: + return new ProjectExpression_BehaviorDescriptor(); default: return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName); } } - private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.PrintExpression", "jetbrains.mps.console.base.structure.PrintNodeExpression", "jetbrains.mps.console.base.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.base.structure.PrintSequenceExpression", "jetbrains.mps.console.base.structure.PrintTextExpression", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.TextResponseItem"}; + private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.PrintExpression", "jetbrains.mps.console.base.structure.PrintNodeExpression", "jetbrains.mps.console.base.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.base.structure.PrintSequenceExpression", "jetbrains.mps.console.base.structure.PrintTextExpression", "jetbrains.mps.console.base.structure.ProjectExpression", "jetbrains.mps.console.base.structure.ProjectScope", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.TextResponseItem"}; } diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectExpression_Behavior.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectExpression_Behavior.java similarity index 87% rename from languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectExpression_Behavior.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectExpression_Behavior.java index e5852254d9c6..7d12187d687d 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectExpression_Behavior.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectExpression_Behavior.java @@ -1,4 +1,4 @@ -package jetbrains.mps.lang.smodel.query.behavior; +package jetbrains.mps.console.base.behavior; /*Generated by MPS */ diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectExpression_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectExpression_BehaviorDescriptor.java similarity index 72% rename from languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectExpression_BehaviorDescriptor.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectExpression_BehaviorDescriptor.java index 625e46207b24..2849ef980a44 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectExpression_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectExpression_BehaviorDescriptor.java @@ -1,7 +1,8 @@ -package jetbrains.mps.lang.smodel.query.behavior; +package jetbrains.mps.console.base.behavior; /*Generated by MPS */ +import jetbrains.mps.lang.smodel.query.behavior.QueryExpression_BehaviorDescriptor; import org.jetbrains.mps.openapi.model.SNode; import org.jetbrains.mps.openapi.language.SConcept; @@ -13,6 +14,6 @@ public Iterable virtual_getSupportedParameters_4307205004146936444(SConce } @Override public String getConceptFqName() { - return "jetbrains.mps.lang.smodel.query.structure.ProjectExpression"; + return "jetbrains.mps.console.base.structure.ProjectExpression"; } } diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectScope_BehaviorDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectScope_BehaviorDescriptor.java similarity index 53% rename from languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectScope_BehaviorDescriptor.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectScope_BehaviorDescriptor.java index d16ae85aa9f9..02ef1fa1b6a5 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/behavior/ProjectScope_BehaviorDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/ProjectScope_BehaviorDescriptor.java @@ -1,13 +1,14 @@ -package jetbrains.mps.lang.smodel.query.behavior; +package jetbrains.mps.console.base.behavior; /*Generated by MPS */ +import jetbrains.mps.lang.smodel.query.behavior.ScopeParameter_BehaviorDescriptor; public class ProjectScope_BehaviorDescriptor extends ScopeParameter_BehaviorDescriptor { public ProjectScope_BehaviorDescriptor() { } @Override public String getConceptFqName() { - return "jetbrains.mps.lang.smodel.query.structure.ProjectScope"; + return "jetbrains.mps.console.base.structure.ProjectScope"; } } diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info index 46e55b9891a6..f18c562a57d5 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/behavior/trace.info @@ -24,7 +24,7 @@ - + @@ -104,6 +104,12 @@ + + + + + + @@ -800,6 +806,22 @@ + + + + + + + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java index 551305fadabe..d62c7915cfee 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/StructureAspectDescriptor.java @@ -41,19 +41,21 @@ public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { /*package*/ final ConceptDescriptor myConceptPrintNodeReferenceExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PrintNodeReferenceExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd9bddcL)).super_("jetbrains.mps.console.base.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.base.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).alias("#printNodeRef", "print reference to the node").create(); /*package*/ final ConceptDescriptor myConceptPrintSequenceExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PrintSequenceExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6979f0787b7db64fL)).super_("jetbrains.mps.console.base.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.base.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).alias("#printSequence", "print size with link to usages view").create(); /*package*/ final ConceptDescriptor myConceptPrintTextExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.PrintTextExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x7417cca3eb1feca9L)).super_("jetbrains.mps.console.base.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.base.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L)).alias("#printText", "print as string").create(); + /*package*/ final ConceptDescriptor myConceptProjectExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ProjectExpression", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xa721a59126bb908L)).super_("jetbrains.mps.lang.smodel.query.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.lang.smodel.query.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#project", "the current project").create(); + /*package*/ final ConceptDescriptor myConceptProjectScope = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ProjectScope", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x3bc64421763adda2L)).super_("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.lang.smodel.query.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).alias("project", "").create(); /*package*/ final ConceptDescriptor myConceptResponse = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.Response", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171a5ba02L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.lang.core.structure.IDontSubstituteByDefault").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x5f195a051bd47defL), MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x19796fa16a19888bL)).childDescriptors(new ConceptDescriptorBuilder.Link(5637103006919120621L, "item", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b3583cL), true, true, false)).children(new String[]{"item"}, new boolean[]{true}).create(); /*package*/ final ConceptDescriptor myConceptResponseItem = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.ResponseItem", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b3583cL)).interface_().create(); /*package*/ final ConceptDescriptor myConceptTextResponseItem = new ConceptDescriptorBuilder("jetbrains.mps.console.base.structure.TextResponseItem", MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b35c38L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept", "jetbrains.mps.console.base.structure.ResponseItem").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL), MetaIdFactory.conceptId(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x4e3b035171b3583cL)).propertyDescriptors(new ConceptDescriptorBuilder.Prop(5637103006919122193L, "text")).properties("text").create(); @Override public Collection getDescriptors() { - return Arrays.asList(myConceptAbstractPrintExpression, myConceptBLCommand, myConceptBLExpression, myConceptCommand, myConceptCommandHolder, myConceptConsoleRoot, myConceptExceptionHolder, myConceptGeneratedCommand, myConceptHelpCommand, myConceptHelpConceptReference, myConceptHistory, myConceptHistoryItem, myConceptIActionHolder, myConceptIClickable, myConceptINodeWithReference, myConceptInterpretedCommand, myConceptModifiedCommandHistoryItem, myConceptNewLineResponseItem, myConceptNodeReferencePresentation, myConceptNodeReferenceString, myConceptNodeResponseItem, myConceptNodeWithClosure, myConceptOutputConsoleRoot, myConceptPastedNodeReference, myConceptPrintExpression, myConceptPrintNodeExpression, myConceptPrintNodeReferenceExpression, myConceptPrintSequenceExpression, myConceptPrintTextExpression, myConceptResponse, myConceptResponseItem, myConceptTextResponseItem); + return Arrays.asList(myConceptAbstractPrintExpression, myConceptBLCommand, myConceptBLExpression, myConceptCommand, myConceptCommandHolder, myConceptConsoleRoot, myConceptExceptionHolder, myConceptGeneratedCommand, myConceptHelpCommand, myConceptHelpConceptReference, myConceptHistory, myConceptHistoryItem, myConceptIActionHolder, myConceptIClickable, myConceptINodeWithReference, myConceptInterpretedCommand, myConceptModifiedCommandHistoryItem, myConceptNewLineResponseItem, myConceptNodeReferencePresentation, myConceptNodeReferenceString, myConceptNodeResponseItem, myConceptNodeWithClosure, myConceptOutputConsoleRoot, myConceptPastedNodeReference, myConceptPrintExpression, myConceptPrintNodeExpression, myConceptPrintNodeReferenceExpression, myConceptPrintSequenceExpression, myConceptPrintTextExpression, myConceptProjectExpression, myConceptProjectScope, myConceptResponse, myConceptResponseItem, myConceptTextResponseItem); } @Override @Nullable public ConceptDescriptor getDescriptor(String conceptFqName) { - switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0kb, conceptFqName)) { + switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0mb, conceptFqName)) { case 0: return myConceptAbstractPrintExpression; case 1: @@ -113,14 +115,18 @@ public ConceptDescriptor getDescriptor(String conceptFqName) { case 28: return myConceptPrintTextExpression; case 29: - return myConceptResponse; + return myConceptProjectExpression; case 30: - return myConceptResponseItem; + return myConceptProjectScope; case 31: + return myConceptResponse; + case 32: + return myConceptResponseItem; + case 33: return myConceptTextResponseItem; default: return null; } } - private static String[] stringSwitchCases_1htk8d_a0a0kb = new String[]{"jetbrains.mps.console.base.structure.AbstractPrintExpression", "jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.Command", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.console.base.structure.IActionHolder", "jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference", "jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.PrintExpression", "jetbrains.mps.console.base.structure.PrintNodeExpression", "jetbrains.mps.console.base.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.base.structure.PrintSequenceExpression", "jetbrains.mps.console.base.structure.PrintTextExpression", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.ResponseItem", "jetbrains.mps.console.base.structure.TextResponseItem"}; + private static String[] stringSwitchCases_1htk8d_a0a0mb = new String[]{"jetbrains.mps.console.base.structure.AbstractPrintExpression", "jetbrains.mps.console.base.structure.BLCommand", "jetbrains.mps.console.base.structure.BLExpression", "jetbrains.mps.console.base.structure.Command", "jetbrains.mps.console.base.structure.CommandHolder", "jetbrains.mps.console.base.structure.ConsoleRoot", "jetbrains.mps.console.base.structure.ExceptionHolder", "jetbrains.mps.console.base.structure.GeneratedCommand", "jetbrains.mps.console.base.structure.HelpCommand", "jetbrains.mps.console.base.structure.HelpConceptReference", "jetbrains.mps.console.base.structure.History", "jetbrains.mps.console.base.structure.HistoryItem", "jetbrains.mps.console.base.structure.IActionHolder", "jetbrains.mps.console.base.structure.IClickable", "jetbrains.mps.console.base.structure.INodeWithReference", "jetbrains.mps.console.base.structure.InterpretedCommand", "jetbrains.mps.console.base.structure.ModifiedCommandHistoryItem", "jetbrains.mps.console.base.structure.NewLineResponseItem", "jetbrains.mps.console.base.structure.NodeReferencePresentation", "jetbrains.mps.console.base.structure.NodeReferenceString", "jetbrains.mps.console.base.structure.NodeResponseItem", "jetbrains.mps.console.base.structure.NodeWithClosure", "jetbrains.mps.console.base.structure.OutputConsoleRoot", "jetbrains.mps.console.base.structure.PastedNodeReference", "jetbrains.mps.console.base.structure.PrintExpression", "jetbrains.mps.console.base.structure.PrintNodeExpression", "jetbrains.mps.console.base.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.base.structure.PrintSequenceExpression", "jetbrains.mps.console.base.structure.PrintTextExpression", "jetbrains.mps.console.base.structure.ProjectExpression", "jetbrains.mps.console.base.structure.ProjectScope", "jetbrains.mps.console.base.structure.Response", "jetbrains.mps.console.base.structure.ResponseItem", "jetbrains.mps.console.base.structure.TextResponseItem"}; } diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info index 39179d82aac8..57d9414cdc4e 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/structure/trace.info @@ -2,7 +2,7 @@ - + diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/TypesystemDescriptor.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/TypesystemDescriptor.java index 9e9669491bb7..7a0176509bf9 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/TypesystemDescriptor.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/TypesystemDescriptor.java @@ -31,5 +31,9 @@ public TypesystemDescriptor() { InferenceRule_Runtime inferenceRule = new typeof_PrintTextExpression_InferenceRule(); this.myInferenceRules.add(inferenceRule); } + { + InferenceRule_Runtime inferenceRule = new typeof_ProjectExpression_InferenceRule(); + this.myInferenceRules.add(inferenceRule); + } } } diff --git a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/trace.info b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/trace.info index c40972ace466..43104ebebaf0 100644 --- a/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/trace.info +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/trace.info @@ -10,7 +10,7 @@ - + @@ -119,6 +119,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ProjectExpression_InferenceRule.java b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_ProjectExpression_InferenceRule.java similarity index 80% rename from languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ProjectExpression_InferenceRule.java rename to plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_ProjectExpression_InferenceRule.java index 30b507be4c1b..b6a18c48c689 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/typesystem/typeof_ProjectExpression_InferenceRule.java +++ b/plugins/console/lang/base/source_gen/jetbrains/mps/console/base/typesystem/typeof_ProjectExpression_InferenceRule.java @@ -1,4 +1,4 @@ -package jetbrains.mps.lang.smodel.query.typesystem; +package jetbrains.mps.console.base.typesystem; /*Generated by MPS */ @@ -20,12 +20,12 @@ public typeof_ProjectExpression_InferenceRule() { public void applyRule(final SNode projectExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { { SNode _nodeToCheck_1029348928467 = projectExpression; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "752693057587763729", 0, null); - typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.lang.smodel.query.typesystem)", "752693057587762707", true), (SNode) _quotation_createNode_osiggc_a0a0b(), _info_12389875345); + EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "752693057587763729", 0, null); + typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:ae7d1f20-2cfe-46ef-a88a-193353a8b62b(jetbrains.mps.console.base.typesystem)", "752693057587762707", true), (SNode) _quotation_createNode_osiggc_a0a0b(), _info_12389875345); } } public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0xa721a59126bb908L, "jetbrains.mps.lang.smodel.query.structure.ProjectExpression"); + return MetaAdapterFactory.getConcept(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0xa721a59126bb908L, "jetbrains.mps.console.base.structure.ProjectExpression"); } public IsApplicableStatus isApplicableAndPattern(SNode argument) { return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); diff --git a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated index 85546fad40c5..36a61a77b194 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated +++ b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/generator/template/main@generator.mps b/plugins/console/lang/ideCommands/generator/template/main@generator.mps index c39fce595c06..929bd4e3c346 100644 --- a/plugins/console/lang/ideCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/ideCommands/generator/template/main@generator.mps @@ -13,6 +13,7 @@ + @@ -286,7 +287,6 @@ - @@ -314,6 +314,9 @@ + + + diff --git a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl index f81f128d64af..57877a548760 100644 --- a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl +++ b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl @@ -54,36 +54,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated index 8c7e974bdc68..d42afaff9df4 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated @@ -1,3 +1,3 @@ - + From 7b4b21daef77984330cd629a796050817f678d5c Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 27 Aug 2015 01:07:47 +0300 Subject: [PATCH 40/52] rebuild compiler.xml --- .idea/compiler.xml | 45 ++++++++++++++++----------------- tools/gensources/gensources.iml | 12 +++++---- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 14986b2775de..8d2e4d5d18b1 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -72,8 +72,6 @@ - - @@ -81,6 +79,8 @@ + + @@ -154,6 +154,10 @@ + + + + @@ -195,8 +199,6 @@ - - @@ -414,6 +416,12 @@ + + + + + + @@ -443,6 +451,14 @@ + + + + + + + + @@ -636,24 +652,6 @@ - - - - - - - - - - - - - - - - - - @@ -679,4 +677,5 @@ - - - - - - @@ -17085,14 +17079,50 @@ - - + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + - - + + + + + + + + @@ -17144,16 +17174,15 @@ - - + + - + - - - - + + + @@ -17234,10 +17263,10 @@ - - + + - + @@ -17291,22 +17320,28 @@ - - + + - + - - + + - + - - - + + + + + + + + + @@ -17427,10 +17462,10 @@ - - - - + + + + @@ -17658,18 +17693,30 @@ - - - - - - + + + + + + + + + + + + + + + + + + @@ -17734,21 +17781,21 @@ - - - + + + + - - + + - - - - + + + @@ -17856,16 +17903,16 @@ - - + + - + - - + + - + @@ -17875,15 +17922,15 @@ - - - + + + + - - - - + + + @@ -23159,16 +23206,10 @@ - - - - + - - - - + @@ -23466,19 +23507,22 @@ - - + + - - - - - - - + + + + + + + + + + @@ -23490,397 +23534,199 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - + + - + - - + + - - - - - - - + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - - - - - - - + + - - - - - - - + - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - - - - - - + + - + - - - - + + + - - - - + + + - - + + - - - - - - - - From 9c1ee01fb742837e6b4448f8217bc1d3372b6e3a Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 27 Aug 2015 01:40:45 +0300 Subject: [PATCH 43/52] move ui-related method smodel.query.runtime->c.base runtime --- .../mps/lang/smodel/query/runtime/util.mps | 106 -- .../smodel/query/runtime/util/dependencies | 7 - .../lang/smodel/query/runtime/util/generated | 2 +- .../query/runtime/util/CommandUtil.java | 67 +- .../lang/smodel/query/runtime/util/trace.info | 465 +++---- .../jetbrains/mps/lang/smodel/query/generated | 2 +- .../mps/lang/smodel/query/Language.java | 2 +- .../generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 6 +- .../generator/template/main/trace.info | 376 +++--- .../generator/template/main@generator.mps | 294 ++-- .../models/jetbrains/mps/console/tool.mps | 96 +- .../jetbrains/mps/console/tool/dependencies | 8 +- .../jetbrains/mps/console/tool/generated | 2 +- .../mps/console/tool/BaseConsoleTab.java | 3 +- .../mps/console/tool/ConsoleUtil.java | 19 + .../jetbrains/mps/console/tool/trace.info | 1193 +++++++++-------- 17 files changed, 1307 insertions(+), 1343 deletions(-) diff --git a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps index 4303a8ffb0a1..8226a77f66ce 100644 --- a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps +++ b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps @@ -5,7 +5,6 @@ - @@ -15,17 +14,13 @@ - - - - @@ -45,17 +40,9 @@ - - - - - - - - @@ -114,7 +101,6 @@ - @@ -148,17 +134,11 @@ - - - - - - @@ -167,14 +147,6 @@ - - - - - - - - @@ -471,84 +443,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies index 24745b0cf573..ea5c7b200dd8 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies @@ -1,8 +1,6 @@ - - @@ -16,8 +14,6 @@ - - @@ -28,9 +24,6 @@ - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated index f950c7b5f746..395cd9714c01 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated +++ b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java index f25aca961c51..6c80a32d79bf 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java @@ -17,11 +17,8 @@ import java.util.Collections; import jetbrains.mps.progress.EmptyProgressMonitor; import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.project.Project; import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes; import jetbrains.mps.ide.findusages.model.SearchResults; -import jetbrains.mps.ide.project.ProjectHelper; -import org.apache.log4j.Level; import org.jetbrains.mps.openapi.model.SNodeReference; import org.jetbrains.mps.openapi.module.SRepository; import jetbrains.mps.internal.collections.runtime.IWhereFilter; @@ -35,10 +32,8 @@ import jetbrains.mps.ide.findusages.model.scopes.ModelsScope; import jetbrains.mps.ide.findusages.model.scopes.ModulesScope; import java.util.Iterator; +import jetbrains.mps.project.Project; import jetbrains.mps.ide.findusages.model.scopes.ProjectScope; -import org.apache.log4j.Logger; -import org.apache.log4j.LogManager; -import jetbrains.mps.ide.findusages.view.UsagesViewTool; public class CommandUtil { public static Iterable nodes(SearchScope scope) { @@ -73,28 +68,17 @@ public static Collection instances(SearchScope scope, SAbstractConcept co return FindUsagesManager.getInstance().findInstances(scope, Collections.singleton(concept), false, new EmptyProgressMonitor()); } - public static void show(Project p, _FunctionTypes._return_P0_E0 results) { - try { - check_1pinza_a0a0a0m(ProjectHelper.toIdeaProject(p)).show(results.invoke(), "No results to show"); - } catch (Exception e) { - if (LOG.isEnabledFor(Level.WARN)) { - LOG.warn("Exception in showing custom console result", e); - } - } - } - - public static _FunctionTypes._return_P0_E0 nodesToResults(final Iterable nodes, final SRepository repository) { return new _FunctionTypes._return_P0_E0>() { public SearchResults invoke() { final SearchResults res = new SearchResults(); Sequence.fromIterable(nodes).where(new IWhereFilter() { public boolean accept(SNodeReference it) { - return check_1pinza_a0a0a0a0b0a0a51(it, repository) != null; + return check_1pinza_a0a0a0a0b0a0a21(it, repository) != null; } }).visitAll(new IVisitor() { public void visit(SNodeReference it) { - res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a51(it, repository), "usage")); + res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a21(it, repository), "usage")); } }); return res; @@ -108,11 +92,11 @@ public SearchResults invoke() { final SearchResults res = new SearchResults(); Sequence.fromIterable(models).where(new IWhereFilter() { public boolean accept(SModelReference it) { - return check_1pinza_a0a0a0a0b0a0a71(it, repository) != null; + return check_1pinza_a0a0a0a0b0a0a41(it, repository) != null; } }).visitAll(new IVisitor() { public void visit(SModelReference it) { - res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a71(it, repository), "usage")); + res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a41(it, repository), "usage")); } }); return res; @@ -126,11 +110,11 @@ public SearchResults invoke() { final SearchResults res = new SearchResults(); Sequence.fromIterable(modules).where(new IWhereFilter() { public boolean accept(SModuleReference it) { - return check_1pinza_a0a0a0a0b0a0a91(it, repository) != null; + return check_1pinza_a0a0a0a0b0a0a61(it, repository) != null; } }).visitAll(new IVisitor() { public void visit(SModuleReference it) { - res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a91(it, repository), "usage")); + res.getSearchResults().add(new SearchResult(check_1pinza_a0a0a0a0a0b0a0a61(it, repository), "usage")); } }); return res; @@ -140,16 +124,16 @@ public void visit(SModuleReference it) { } public static SNodeReference getNodeReference(SNode aNode) { - return check_1pinza_a0a12(aNode); + return check_1pinza_a0a81(aNode); } public static SNodeReference getReferenceReference(SReference aReference) { - return check_1pinza_a0a22(check_1pinza_a0a0w(aReference)); + return check_1pinza_a0a91(check_1pinza_a0a0t(aReference)); } public static SModelReference getModelReference(SModel aModel) { - return check_1pinza_a0a32(aModel); + return check_1pinza_a0a02(aModel); } public static SModuleReference getModuleReference(SModule aModule) { - return check_1pinza_a0a42(aModule); + return check_1pinza_a0a12(aModule); } public static SearchScope createConsoleScope(@Nullable final SearchScope baseScope, final boolean includeReadOnly, QueryExecutionContext context) { @@ -174,74 +158,67 @@ public static SearchScope createScope(Project project) { return new ProjectScope(project); } - protected static Logger LOG = LogManager.getLogger(CommandUtil.class); - private static UsagesViewTool check_1pinza_a0a0a0m(com.intellij.openapi.project.Project checkedDotOperand) { - if (null != checkedDotOperand) { - return checkedDotOperand.getComponent(UsagesViewTool.class); - } - return null; - } - private static SNode check_1pinza_a0a0a0a0b0a0a51(SNodeReference checkedDotOperand, SRepository repository) { + private static SNode check_1pinza_a0a0a0a0b0a0a21(SNodeReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SNode check_1pinza_a0a0a0a0a0b0a0a51(SNodeReference checkedDotOperand, SRepository repository) { + private static SNode check_1pinza_a0a0a0a0a0b0a0a21(SNodeReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SModel check_1pinza_a0a0a0a0b0a0a71(SModelReference checkedDotOperand, SRepository repository) { + private static SModel check_1pinza_a0a0a0a0b0a0a41(SModelReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SModel check_1pinza_a0a0a0a0a0b0a0a71(SModelReference checkedDotOperand, SRepository repository) { + private static SModel check_1pinza_a0a0a0a0a0b0a0a41(SModelReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SModule check_1pinza_a0a0a0a0b0a0a91(SModuleReference checkedDotOperand, SRepository repository) { + private static SModule check_1pinza_a0a0a0a0b0a0a61(SModuleReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SModule check_1pinza_a0a0a0a0a0b0a0a91(SModuleReference checkedDotOperand, SRepository repository) { + private static SModule check_1pinza_a0a0a0a0a0b0a0a61(SModuleReference checkedDotOperand, SRepository repository) { if (null != checkedDotOperand) { return checkedDotOperand.resolve(repository); } return null; } - private static SNodeReference check_1pinza_a0a12(SNode checkedDotOperand) { + private static SNodeReference check_1pinza_a0a81(SNode checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getReference(); } return null; } - private static SNodeReference check_1pinza_a0a22(SNode checkedDotOperand) { + private static SNodeReference check_1pinza_a0a91(SNode checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getReference(); } return null; } - private static SNode check_1pinza_a0a0w(SReference checkedDotOperand) { + private static SNode check_1pinza_a0a0t(SReference checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getSourceNode(); } return null; } - private static SModelReference check_1pinza_a0a32(SModel checkedDotOperand) { + private static SModelReference check_1pinza_a0a02(SModel checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getReference(); } return null; } - private static SModuleReference check_1pinza_a0a42(SModule checkedDotOperand) { + private static SModuleReference check_1pinza_a0a12(SModule checkedDotOperand) { if (null != checkedDotOperand) { return checkedDotOperand.getModuleReference(); } diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info index 28d66d674e60..f467060b7156 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info +++ b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info @@ -1,359 +1,328 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - - - - - + - + - + - - - - - - - + + + + + + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated index 245bac09f2fc..ddfa7a7518a8 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/Language.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/Language.java index 0085a9847104..2ac0fd16b92e 100644 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/Language.java +++ b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/lang/smodel/query/Language.java @@ -42,7 +42,7 @@ protected String[] getExtendedLanguageIDs() { } @Override public Collection getGenerators() { - return TemplateUtil.asCollection(TemplateUtil.createInterpretedGenerator(this, "504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)")); + return TemplateUtil.asCollection(TemplateUtil.createInterpretedGenerator(this, "504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.lang.smodel.query#5336086527852811409)")); } @Override protected T createAspect(Class aspectClass) { diff --git a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated index 36a61a77b194..c3f5711e293f 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated +++ b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java index fcf55f56d1e4..dffda6a2566e 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java +++ b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java @@ -61,7 +61,7 @@ public static Object referenceMacro_GetReferent_5582028874769201340(final Refere public static Object referenceMacro_GetReferent_5932042262276049107(final ReferenceMacroContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getReferenceLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x5252d9021b8b45a8L, 0x5252d9021b8c25b0L, "requestedAspect")); } - public static Object referenceMacro_GetReferent_3501374812264730107(final ReferenceMacroContext _context) { + public static Object referenceMacro_GetReferent_1095064659819954416(final ReferenceMacroContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"))); if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a31())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263258755"); @@ -77,7 +77,7 @@ public static Object referenceMacro_GetReferent_3501374812264730107(final Refere } return null; } - public static Object referenceMacro_GetReferent_7600370246425972944(final ReferenceMacroContext _context) { + public static Object referenceMacro_GetReferent_1095064659819954476(final ReferenceMacroContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"))); if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a41())) { return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); @@ -138,7 +138,7 @@ public static SNode sourceNodeQuery_4615018937607279093(final SourceSubstituteMa public static SNode sourceNodeQuery_4615018937607279112(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x276b371e77c0a29aL, 0x276b371e77c0a2f0L, "argument")); } - public static SNode sourceNodeQuery_3501374812264728764(final SourceSubstituteMacroNodeContext _context) { + public static SNode sourceNodeQuery_1095064659819954403(final SourceSubstituteMacroNodeContext _context) { return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object")); } public static Iterable sourceNodesQuery_5582028874769201358(final SourceSubstituteMacroNodesContext _context) { diff --git a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info index 66143076f4e1..2a639b0a217d 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info +++ b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info @@ -13,203 +13,203 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - + + diff --git a/plugins/console/lang/ideCommands/generator/template/main@generator.mps b/plugins/console/lang/ideCommands/generator/template/main@generator.mps index 929bd4e3c346..426e419c1ce3 100644 --- a/plugins/console/lang/ideCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/ideCommands/generator/template/main@generator.mps @@ -315,7 +315,7 @@ - + @@ -1372,160 +1372,160 @@ - - - - - + + + + + - + - + - - - - - - - - - + + + + + + + + + - + - - - - - + + + + + - - + + - + - - - - + + + + - - - - - + + + + + - + - - - - + + + + - + - - - + + + - - - + + + - - - - + + + + - + - - - + + + - - - + + + - - - - + + + + - + - - - + + + - - - + + + - - - - + + + + - + - - - + + + - - - + + + - - + + @@ -1533,144 +1533,144 @@ - + - + - - - + + + - + - + - + - - - - + + + + - - - - - + + + + + - + - - - - + + + + - + - - - + + + - - - + + + - - - - + + + + - + - - - + + + - - - + + + - - - - + + + + - + - - - + + + - - - + + + - - - - + + + + - + - - - + + + - - - + + + - - + + - + diff --git a/plugins/console/models/jetbrains/mps/console/tool.mps b/plugins/console/models/jetbrains/mps/console/tool.mps index 13ccc31b2940..d744445775c6 100644 --- a/plugins/console/models/jetbrains/mps/console/tool.mps +++ b/plugins/console/models/jetbrains/mps/console/tool.mps @@ -2,9 +2,7 @@ - - @@ -12,6 +10,8 @@ + + @@ -71,6 +71,7 @@ + @@ -352,6 +353,9 @@ + + + @@ -6672,13 +6676,13 @@ - - - - + + + + - + @@ -8672,6 +8676,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8695,7 +8775,7 @@ - + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies index f8d3c16978f0..1626c4cffefa 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies @@ -48,6 +48,7 @@ + @@ -62,7 +63,6 @@ - @@ -203,13 +203,19 @@ + + + + + + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated index 79b30cf5e68b..3541be734464 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java b/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java index ee7f5edf0d4d..4ff306c83227 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/BaseConsoleTab.java @@ -71,7 +71,6 @@ import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes; import jetbrains.mps.console.actions.ClosureHoldingNodeUtil; import jetbrains.mps.ide.findusages.model.SearchResults; -import jetbrains.mps.lang.smodel.query.runtime.util.CommandUtil; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.actionSystem.MouseShortcut; import java.awt.event.MouseEvent; @@ -368,7 +367,7 @@ public void addSequence(final Project project, final _FunctionTypes._return_P0_E } else { addClosure(new _FunctionTypes._void_P0_E0() { public void invoke() { - CommandUtil.show(project, results); + ConsoleUtil.show(project, results); } }, resultsCount + " " + resultDescription); } diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleUtil.java b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleUtil.java index a64ed7c7f15e..936ee1e989d8 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleUtil.java +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleUtil.java @@ -23,8 +23,12 @@ import jetbrains.mps.smodel.resources.ModelsToResources; import jetbrains.mps.internal.collections.runtime.Sequence; import java.util.concurrent.ExecutionException; +import jetbrains.mps.baseLanguage.closures.runtime._FunctionTypes; +import jetbrains.mps.ide.findusages.model.SearchResults; +import jetbrains.mps.ide.project.ProjectHelper; import org.apache.log4j.Logger; import org.apache.log4j.LogManager; +import jetbrains.mps.ide.findusages.view.UsagesViewTool; public class ConsoleUtil { public static boolean make(final Project project, final SModel model) { @@ -65,5 +69,20 @@ public T relayQuery(IQuery query) { return false; } + public static void show(Project p, _FunctionTypes._return_P0_E0 results) { + try { + check_xg48a4_a0a0a0c(ProjectHelper.toIdeaProject(p)).show(results.invoke(), "No results to show"); + } catch (Exception e) { + if (LOG.isEnabledFor(Level.WARN)) { + LOG.warn("Exception in showing custom console result", e); + } + } + } protected static Logger LOG = LogManager.getLogger(ConsoleUtil.class); + private static UsagesViewTool check_xg48a4_a0a0a0c(com.intellij.openapi.project.Project checkedDotOperand) { + if (null != checkedDotOperand) { + return checkedDotOperand.getComponent(UsagesViewTool.class); + } + return null; + } } diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info b/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info index 12093e66f7e9..5b48b97528c5 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/trace.info @@ -495,702 +495,702 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - + - + - - - - + + + + - + - + - + - + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - + + - - - - + + + + - + - - - - - - - - - + + + + + + + + + - - - - + + + + - + - + - - + + - + - - - - - - + + + + + + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - - - - - + + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - + - - + + - + - + - - + + - + - - + + - + - - + + - - - - + + + + - - + + - + - + - + - + - - - - + + + + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -1474,71 +1474,98 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + + + + + + + - + + + + + + + + + + - + - + - - + + From c4a79f2c9cb3e06a178a6aef166fe1e61156aee7 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 27 Aug 2015 01:41:55 +0300 Subject: [PATCH 44/52] fix idea project structure --- .idea/compiler.xml | 2 -- .idea/modules.xml | 2 +- core/mps-core/mps-core.iml | 3 --- .../jetbrains.mps.lang.smodel.query.runtime.msd | 2 +- .../smodel.query/runtime/smodelquery-runtime.iml | 13 ++++++++++++- plugins/console/console.iml | 1 + tools/gensources/gensources.iml | 1 - 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 8d2e4d5d18b1..b2e8eba58c0a 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -155,8 +155,6 @@ - - diff --git a/.idea/modules.xml b/.idea/modules.xml index 4763cd8a2d9a..17eff1ab0cca 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -73,7 +73,7 @@ - + diff --git a/core/mps-core/mps-core.iml b/core/mps-core/mps-core.iml index 85c03971a2e6..86e98663346e 100644 --- a/core/mps-core/mps-core.iml +++ b/core/mps-core/mps-core.iml @@ -7,9 +7,6 @@ - - - diff --git a/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd b/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd index 462a07aba41e..a3ed59816d0c 100644 --- a/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd +++ b/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd @@ -1,5 +1,5 @@ - + diff --git a/languages/languageDesign/smodel.query/runtime/smodelquery-runtime.iml b/languages/languageDesign/smodel.query/runtime/smodelquery-runtime.iml index abe680ed4513..9a50cb347ddb 100644 --- a/languages/languageDesign/smodel.query/runtime/smodelquery-runtime.iml +++ b/languages/languageDesign/smodel.query/runtime/smodelquery-runtime.iml @@ -1,11 +1,22 @@ - + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/console/console.iml b/plugins/console/console.iml index 895b876bb056..3d71f8830d3b 100644 --- a/plugins/console/console.iml +++ b/plugins/console/console.iml @@ -25,5 +25,6 @@ + \ No newline at end of file diff --git a/tools/gensources/gensources.iml b/tools/gensources/gensources.iml index 84ef1203a0bf..480ae2e4115b 100644 --- a/tools/gensources/gensources.iml +++ b/tools/gensources/gensources.iml @@ -293,7 +293,6 @@ - From 67d9fe19730da6f99c274f548f19dd82e9fa923c Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 27 Aug 2015 02:30:21 +0300 Subject: [PATCH 45/52] fixing tests (fix refs, remove illegal imports) --- .../runtime/jetbrains.mps.lang.smodel.query.runtime.msd | 1 - .../mps/console/base/generator/template/main/generated | 2 +- .../mps/console/lang/generator/template/main@generator.mps | 6 +++--- plugins/console/lang/base/languageModels/behavior.mps | 2 +- .../jetbrains/mps/console/base/behavior/generated | 2 +- .../source_gen.caches/jetbrains/mps/console/base/generated | 2 +- .../jetbrains.mps.console.internalCommands.mpl | 1 - .../lang/internalCommands/languageModels/behavior.mps | 3 --- .../mps/console/internalCommands/behavior/generated | 2 +- .../jetbrains/mps/console/internalCommands/generated | 2 +- 10 files changed, 9 insertions(+), 14 deletions(-) diff --git a/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd b/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd index a3ed59816d0c..98c6ebede8cd 100644 --- a/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd +++ b/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd @@ -25,7 +25,6 @@ - diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated index 3ea3dda96f38..dd4e5e0423b6 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index c8007f839232..af4de7f7186e 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -952,7 +952,7 @@ - + @@ -1008,7 +1008,7 @@ - + @@ -1596,7 +1596,7 @@ - + diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index 8e90c515b1c6..30ac558106fa 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -13,7 +13,6 @@ - @@ -34,6 +33,7 @@ + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated index aad38576d300..4ab4899a807a 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated index 03bff0816de8..f2edd57e0aba 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl b/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl index fb86da8daac8..093a4a55bf5a 100644 --- a/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl +++ b/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl @@ -18,7 +18,6 @@ - 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) diff --git a/plugins/console/lang/internalCommands/languageModels/behavior.mps b/plugins/console/lang/internalCommands/languageModels/behavior.mps index 33cbe1870ec6..cad7bee0bd05 100644 --- a/plugins/console/lang/internalCommands/languageModels/behavior.mps +++ b/plugins/console/lang/internalCommands/languageModels/behavior.mps @@ -14,9 +14,6 @@ - - - diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated index 43396b2f3029..3cc496524803 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated index 23e7340d7a5e..6431bccdac62 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated @@ -1,3 +1,3 @@ - + From c86ac7b6266997b139436ec7ff38278748964d3c Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 27 Aug 2015 02:53:52 +0300 Subject: [PATCH 46/52] move smodel.query.runtime into kernel solution (left error fro Artem: build solution can't be built) --- .mps/modules.xml | 1 - core/kernel/kernel.iml | 1 + .../kernelSolution/jetbrains.mps.kernel.msd | 1 + .../jetbrains/mps/smodel/query.mps | 81 +++-- .../jetbrains/mps/smodel/query}/dependencies | 7 +- .../jetbrains/mps/smodel/query/generated | 3 + .../mps/smodel/query}/CommandUtil.java | 3 +- .../smodel/query}/QueryExecutionContext.java | 2 +- .../jetbrains/mps/smodel/query/trace.info | 336 ++++++++++++++++++ .../query/generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 93 +++-- .../jetbrains.mps.lang.smodel.query.mpl | 4 +- ...etbrains.mps.lang.smodel.query.runtime.msd | 33 -- .../mps/lang/smodel/query/runtime.mps | 56 --- .../console/blCommand/runtime/dependencies | 7 - .../mps/console/blCommand/runtime/generated | 3 - .../lang/smodel/query/runtime/dependencies | 7 - .../mps/lang/smodel/query/runtime/generated | 3 - .../lang/smodel/query/runtime/util/generated | 3 - .../mps/lang/smodel/query/runtime/trace.info | 12 - .../lang/smodel/query/runtime/util/trace.info | 329 ----------------- .../jetbrains/mps/lang/smodel/query/generated | 2 +- .../console/jetbrains.mps.console.actions.msd | 4 +- plugins/console/jetbrains.mps.console.msd | 1 - .../base/generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 16 +- .../base/generator/template/main/trace.info | 32 +- .../generator/template/main@generator.mps | 44 ++- .../lang/base/jetbrains.mps.console.base.mpl | 5 +- .../lang/base/languageModels/behavior.mps | 1 - .../mps/console/base/behavior/generated | 2 +- .../jetbrains/mps/console/base/generated | 2 +- .../generator/template/main/generated | 2 +- .../template/main/QueriesGenerated.java | 16 +- .../generator/template/main/trace.info | 32 +- .../generator/template/main@generator.mps | 43 ++- .../jetbrains.mps.console.ideCommands.mpl | 4 +- .../mps/console/ideCommands/util.mps | 1 - .../ideCommands/languageModels/behavior.mps | 1 - .../console/ideCommands/behavior/generated | 2 +- .../mps/console/ideCommands/generated | 2 +- .../mps/console/ideCommands/util/generated | 2 +- .../generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 2 - ...jetbrains.mps.console.internalCommands.mpl | 4 +- .../mps/console/internalCommands/generated | 2 +- .../console/scripts/generator/main/generated | 2 +- .../generator/template/main@generator.mps | 3 +- .../scripts/jetbrains.mps.console.scripts.mpl | 20 +- .../jetbrains/mps/console/scripts/generated | 2 +- .../jetbrains.mps.console.scripts.runtime.msd | 1 - .../mps/console/scripts/runtime/util.mps | 7 - .../console/scripts/runtime/util/generated | 2 +- .../models/jetbrains/mps/console/tool.mps | 5 +- .../jetbrains/mps/console/tool/dependencies | 2 +- .../jetbrains/mps/console/tool/generated | 2 +- .../mps/console/tool/ConsoleContext.java | 2 +- .../solutions/mpsBuild/models/build.mps | 192 +--------- 58 files changed, 575 insertions(+), 878 deletions(-) rename languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps => core/kernel/kernelSolution/jetbrains/mps/smodel/query.mps (95%) rename {languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util => core/kernel/source_gen.caches/jetbrains/mps/smodel/query}/dependencies (87%) create mode 100644 core/kernel/source_gen.caches/jetbrains/mps/smodel/query/generated rename {languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util => core/kernel/source_gen/jetbrains/mps/smodel/query}/CommandUtil.java (98%) rename {languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime => core/kernel/source_gen/jetbrains/mps/smodel/query}/QueryExecutionContext.java (77%) create mode 100644 core/kernel/source_gen/jetbrains/mps/smodel/query/trace.info delete mode 100644 languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd delete mode 100644 languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime.mps delete mode 100644 languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies delete mode 100644 languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated delete mode 100644 languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/dependencies delete mode 100644 languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/generated delete mode 100644 languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated delete mode 100644 languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/trace.info delete mode 100644 languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info diff --git a/.mps/modules.xml b/.mps/modules.xml index ba8e82852756..0854b0cacf9a 100644 --- a/.mps/modules.xml +++ b/.mps/modules.xml @@ -128,7 +128,6 @@ - diff --git a/core/kernel/kernel.iml b/core/kernel/kernel.iml index 81b702eb47ad..068bcc3adc02 100644 --- a/core/kernel/kernel.iml +++ b/core/kernel/kernel.iml @@ -39,5 +39,6 @@ + \ No newline at end of file diff --git a/core/kernel/kernelSolution/jetbrains.mps.kernel.msd b/core/kernel/kernelSolution/jetbrains.mps.kernel.msd index 830bd76e7f5f..52b7dd3ec471 100644 --- a/core/kernel/kernelSolution/jetbrains.mps.kernel.msd +++ b/core/kernel/kernelSolution/jetbrains.mps.kernel.msd @@ -24,6 +24,7 @@ 9ef82768-a1b1-451e-b136-5a86b2b5fdbb(jetbrains.mps.persistence) 9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime) f159adf4-3c93-40f9-9c5a-1f245a8697af(jetbrains.mps.lang.customAspect) + bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps b/core/kernel/kernelSolution/jetbrains/mps/smodel/query.mps similarity index 95% rename from languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps rename to core/kernel/kernelSolution/jetbrains/mps/smodel/query.mps index 8226a77f66ce..6d4d799bb1de 100644 --- a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime/util.mps +++ b/core/kernel/kernelSolution/jetbrains/mps/smodel/query.mps @@ -1,26 +1,26 @@ - + - + + + - - - - - - - - - - - - - + + + + + + + + + + + @@ -79,6 +79,9 @@ + + + @@ -128,6 +131,7 @@ + @@ -182,6 +186,19 @@ + + + + + + + + + + + + + @@ -455,12 +472,12 @@ - + - + @@ -509,14 +526,14 @@ - + - + @@ -572,7 +589,7 @@ - + @@ -589,12 +606,12 @@ - + - + @@ -643,14 +660,14 @@ - + - + @@ -706,7 +723,7 @@ - + @@ -723,14 +740,14 @@ - + - + @@ -781,14 +798,14 @@ - + - + @@ -847,7 +864,7 @@ - + @@ -986,7 +1003,7 @@ - + @@ -1038,7 +1055,7 @@ - + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies b/core/kernel/source_gen.caches/jetbrains/mps/smodel/query/dependencies similarity index 87% rename from languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies rename to core/kernel/source_gen.caches/jetbrains/mps/smodel/query/dependencies index ea5c7b200dd8..01859a11471c 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/dependencies +++ b/core/kernel/source_gen.caches/jetbrains/mps/smodel/query/dependencies @@ -1,6 +1,6 @@ - + @@ -20,10 +20,10 @@ - + @@ -36,5 +36,8 @@ + + + diff --git a/core/kernel/source_gen.caches/jetbrains/mps/smodel/query/generated b/core/kernel/source_gen.caches/jetbrains/mps/smodel/query/generated new file mode 100644 index 000000000000..70489b14ae8c --- /dev/null +++ b/core/kernel/source_gen.caches/jetbrains/mps/smodel/query/generated @@ -0,0 +1,3 @@ + + + diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java b/core/kernel/source_gen/jetbrains/mps/smodel/query/CommandUtil.java similarity index 98% rename from languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java rename to core/kernel/source_gen/jetbrains/mps/smodel/query/CommandUtil.java index 6c80a32d79bf..d41726b5acca 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/CommandUtil.java +++ b/core/kernel/source_gen/jetbrains/mps/smodel/query/CommandUtil.java @@ -1,4 +1,4 @@ -package jetbrains.mps.lang.smodel.query.runtime.util; +package jetbrains.mps.smodel.query; /*Generated by MPS */ @@ -27,7 +27,6 @@ import org.jetbrains.mps.openapi.model.SModelReference; import org.jetbrains.mps.openapi.module.SModuleReference; import org.jetbrains.annotations.Nullable; -import jetbrains.mps.lang.smodel.query.runtime.QueryExecutionContext; import jetbrains.mps.project.EditableFilteringScope; import jetbrains.mps.ide.findusages.model.scopes.ModelsScope; import jetbrains.mps.ide.findusages.model.scopes.ModulesScope; diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/QueryExecutionContext.java b/core/kernel/source_gen/jetbrains/mps/smodel/query/QueryExecutionContext.java similarity index 77% rename from languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/QueryExecutionContext.java rename to core/kernel/source_gen/jetbrains/mps/smodel/query/QueryExecutionContext.java index ef95c8cc4c05..b7122dbf11a0 100644 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/QueryExecutionContext.java +++ b/core/kernel/source_gen/jetbrains/mps/smodel/query/QueryExecutionContext.java @@ -1,4 +1,4 @@ -package jetbrains.mps.lang.smodel.query.runtime; +package jetbrains.mps.smodel.query; /*Generated by MPS */ diff --git a/core/kernel/source_gen/jetbrains/mps/smodel/query/trace.info b/core/kernel/source_gen/jetbrains/mps/smodel/query/trace.info new file mode 100644 index 000000000000..a91aedc976fc --- /dev/null +++ b/core/kernel/source_gen/jetbrains/mps/smodel/query/trace.info @@ -0,0 +1,336 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated index 082097fd879c..e00b702d2b83 100644 --- a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated +++ b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/lang/smodel/query/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps index 2a194d8acdc7..e1f046f3b59d 100644 --- a/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps +++ b/languages/languageDesign/smodel.query/generator/template/jetbrains/mps/console/lang/commands/generator/template/main@generator.mps @@ -7,26 +7,19 @@ - - - - - - - - + @@ -293,18 +286,18 @@ - + - - + + - - + + @@ -359,18 +352,18 @@ - + - - + + - - + + @@ -426,19 +419,19 @@ - + - - + + - - + + @@ -476,18 +469,18 @@ - + - - + + - - + + @@ -526,18 +519,18 @@ - + - - + + - - + + @@ -576,18 +569,18 @@ - + - - + + - - + + @@ -626,15 +619,15 @@ - + - - + + @@ -819,7 +812,7 @@ - + @@ -849,7 +842,7 @@ - + @@ -902,8 +895,8 @@ - - + + @@ -945,7 +938,7 @@ - + @@ -996,14 +989,14 @@ - + - + @@ -1015,8 +1008,8 @@ - - + + diff --git a/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl b/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl index f648006b855f..6a5830b42f81 100644 --- a/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl +++ b/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl @@ -21,12 +21,12 @@ 9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) + 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -57,7 +57,6 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor) @@ -88,7 +87,6 @@ 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) diff --git a/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd b/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd deleted file mode 100644 index 98c6ebede8cd..000000000000 --- a/languages/languageDesign/smodel.query/runtime/jetbrains.mps.lang.smodel.query.runtime.msd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - 3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations) - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) - 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) - 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) - 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) - f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query) - bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime) - 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) - 2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel) - 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime.mps b/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime.mps deleted file mode 100644 index b4ad92ca0071..000000000000 --- a/languages/languageDesign/smodel.query/runtime/models/jetbrains/mps/lang/smodel/query/runtime.mps +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies deleted file mode 100644 index 00876bb428c8..000000000000 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/dependencies +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated deleted file mode 100644 index 18b908912fde..000000000000 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/console/blCommand/runtime/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/dependencies b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/dependencies deleted file mode 100644 index 412b30be9f1e..000000000000 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/dependencies +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/generated b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/generated deleted file mode 100644 index 8b346fd12bf0..000000000000 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated b/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated deleted file mode 100644 index 395cd9714c01..000000000000 --- a/languages/languageDesign/smodel.query/runtime/source_gen.caches/jetbrains/mps/lang/smodel/query/runtime/util/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/trace.info b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/trace.info deleted file mode 100644 index 420838c9e4cb..000000000000 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/trace.info +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info b/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info deleted file mode 100644 index f467060b7156..000000000000 --- a/languages/languageDesign/smodel.query/runtime/source_gen/jetbrains/mps/lang/smodel/query/runtime/util/trace.info +++ /dev/null @@ -1,329 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated index ddfa7a7518a8..8d151e58dc93 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/jetbrains.mps.console.actions.msd b/plugins/console/jetbrains.mps.console.actions.msd index 027afd17b8b9..3a1eddae9318 100644 --- a/plugins/console/jetbrains.mps.console.actions.msd +++ b/plugins/console/jetbrains.mps.console.actions.msd @@ -23,9 +23,8 @@ - - + @@ -33,6 +32,7 @@ + diff --git a/plugins/console/jetbrains.mps.console.msd b/plugins/console/jetbrains.mps.console.msd index 486376d901bb..ad39bc46074e 100644 --- a/plugins/console/jetbrains.mps.console.msd +++ b/plugins/console/jetbrains.mps.console.msd @@ -26,7 +26,6 @@ f8e20673-3f65-44e9-84c0-c4a4b6ede37e(jetbrains.mps.make.facets) a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime) df9d410f-2ebb-43f7-893a-483a4f085250(jetbrains.mps.smodel.resources) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated index dd4e5e0423b6..dbeaeeea2306 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java index 7058fe610f8d..9741b0e97d8e 100644 --- a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java +++ b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/QueriesGenerated.java @@ -62,32 +62,32 @@ public static Object propertyMacro_GetPropertyValue_9010839353952736697(final Pr public static Object referenceMacro_GetReferent_1597470200014435807(final ReferenceMacroContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a7())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844631948"); } if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a7())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844631948"); } if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a7())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632137"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844632137"); } if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a7())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632254"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844632254"); } return null; } public static Object referenceMacro_GetReferent_3501374812263511250(final ReferenceMacroContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xde1ad86d6e504a02L, 0xb306d4d17f64c375L, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a8())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263258755"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263258755"); } if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a8())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263262593"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263262593"); } if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a8())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263265578"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263265578"); } if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a8())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263268620"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263268620"); } return null; } diff --git a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info index acbf9c5d6af2..8abadb78e15f 100644 --- a/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info +++ b/plugins/console/lang/base/generator/source_gen/jetbrains/mps/console/base/generator/template/main/trace.info @@ -181,16 +181,16 @@ - - - - + + + + - - - - + + + + @@ -447,14 +447,14 @@ - - - - - - - - + + + + + + + + diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index af4de7f7186e..c436228f9bdc 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -5,7 +5,6 @@ - @@ -21,10 +20,8 @@ - - @@ -34,6 +31,7 @@ + @@ -1046,8 +1044,8 @@ - - + + @@ -1088,9 +1086,9 @@ - + - + @@ -1110,9 +1108,9 @@ - + - + @@ -1132,9 +1130,9 @@ - + - + @@ -1154,9 +1152,9 @@ - + - + @@ -1448,8 +1446,8 @@ - - + + @@ -1477,9 +1475,9 @@ - + - + @@ -1499,9 +1497,9 @@ - + - + @@ -1521,9 +1519,9 @@ - + - + @@ -1543,9 +1541,9 @@ - + - + diff --git a/plugins/console/lang/base/jetbrains.mps.console.base.mpl b/plugins/console/lang/base/jetbrains.mps.console.base.mpl index f36b151af254..47ff95231773 100644 --- a/plugins/console/lang/base/jetbrains.mps.console.base.mpl +++ b/plugins/console/lang/base/jetbrains.mps.console.base.mpl @@ -19,12 +19,11 @@ a8de7923-dc6f-4aa1-b8a9-2d19ffee3edd(jetbrains.mps.console) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) de1ad86d-6e50-4a02-b306-d4d17f64c375(jetbrains.mps.console.base) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) - 504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409) + 504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.lang.smodel.query#5336086527852811409) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) 9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime) @@ -39,7 +38,6 @@ - @@ -68,7 +66,6 @@ 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/base/languageModels/behavior.mps b/plugins/console/lang/base/languageModels/behavior.mps index 30ac558106fa..17e434eb241a 100644 --- a/plugins/console/lang/base/languageModels/behavior.mps +++ b/plugins/console/lang/base/languageModels/behavior.mps @@ -31,7 +31,6 @@ - diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated index 4ab4899a807a..b039f58f9884 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated index f2edd57e0aba..c7b4faff3af7 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated index c3f5711e293f..fa529bfaf11b 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated +++ b/plugins/console/lang/ideCommands/generator/source_gen.caches/jetbrains/mps/console/ideCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java index dffda6a2566e..4f626035153e 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java +++ b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/QueriesGenerated.java @@ -64,32 +64,32 @@ public static Object referenceMacro_GetReferent_5932042262276049107(final Refere public static Object referenceMacro_GetReferent_1095064659819954416(final ReferenceMacroContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"))); if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a31())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263258755"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263258755"); } if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a31())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263262593"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263262593"); } if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a31())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263265578"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263265578"); } if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a31())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "3501374812263268620"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "3501374812263268620"); } return null; } public static Object referenceMacro_GetReferent_1095064659819954476(final ReferenceMacroContext _context) { SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0xa5e4de5346a344daL, 0xaab368fdf1c34ed0L, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"))); if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a41())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844631948"); } if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a41())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844631948"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844631948"); } if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a41())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632137"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844632137"); } if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a41())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.lang.smodel.query.runtime.util)", "1125969196844632254"); + return SNodeOperations.getNode("r:06575848-210a-49ab-af5f-1e6972a4fc8d(jetbrains.mps.smodel.query)", "1125969196844632254"); } return null; } diff --git a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info index 2a639b0a217d..004c1f44a2f1 100644 --- a/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info +++ b/plugins/console/lang/ideCommands/generator/source_gen/jetbrains/mps/console/ideCommands/generator/template/main/trace.info @@ -14,16 +14,16 @@ - - - - + + + + - - - - + + + + @@ -132,14 +132,14 @@ - - - - - - - - + + + + + + + + diff --git a/plugins/console/lang/ideCommands/generator/template/main@generator.mps b/plugins/console/lang/ideCommands/generator/template/main@generator.mps index 426e419c1ce3..db8c95ba5bb3 100644 --- a/plugins/console/lang/ideCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/ideCommands/generator/template/main@generator.mps @@ -34,8 +34,7 @@ - - + @@ -1384,8 +1383,8 @@ - - + + @@ -1409,8 +1408,8 @@ - - + + @@ -1438,9 +1437,9 @@ - + - + @@ -1460,9 +1459,9 @@ - + - + @@ -1482,9 +1481,9 @@ - + - + @@ -1504,9 +1503,9 @@ - + - + @@ -1577,9 +1576,9 @@ - + - + @@ -1599,9 +1598,9 @@ - + - + @@ -1621,9 +1620,9 @@ - + - + @@ -1643,9 +1642,9 @@ - + - + diff --git a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl index 57877a548760..9e8ef42833a3 100644 --- a/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl +++ b/plugins/console/lang/ideCommands/jetbrains.mps.console.ideCommands.mpl @@ -18,7 +18,7 @@ - + 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) @@ -27,7 +27,6 @@ c7567052-205c-4a15-80b0-7a32b32a9656(jetbrains.mps.console.ideCommands.runtime) 019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide) 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) @@ -70,7 +69,6 @@ 28f9e497-3b42-4291-aeba-0a1039153ab1(jetbrains.mps.lang.plugin) d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime) 7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps index 17c3e3316716..22d45c5ed573 100644 --- a/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps +++ b/plugins/console/lang/ideCommands/languageAccessories/jetbrains/mps/console/ideCommands/util.mps @@ -20,7 +20,6 @@ - diff --git a/plugins/console/lang/ideCommands/languageModels/behavior.mps b/plugins/console/lang/ideCommands/languageModels/behavior.mps index fd1e4078a0a1..6b705445432e 100644 --- a/plugins/console/lang/ideCommands/languageModels/behavior.mps +++ b/plugins/console/lang/ideCommands/languageModels/behavior.mps @@ -37,7 +37,6 @@ - diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated index fe4ffd99f950..7113f2247b4e 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated index d42afaff9df4..82d9f3e3e856 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated index 968a2e6d1c71..4aa01f434e28 100644 --- a/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated +++ b/plugins/console/lang/ideCommands/source_gen.caches/jetbrains/mps/console/ideCommands/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated index ed623496a113..729de112696f 100644 --- a/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated +++ b/plugins/console/lang/internalCommands/generator/source_gen.caches/jetbrains/mps/console/internalCommands/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/internalCommands/generator/template/main@generator.mps b/plugins/console/lang/internalCommands/generator/template/main@generator.mps index d60480e33f76..ab6fc39b489f 100644 --- a/plugins/console/lang/internalCommands/generator/template/main@generator.mps +++ b/plugins/console/lang/internalCommands/generator/template/main@generator.mps @@ -12,11 +12,9 @@ - - diff --git a/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl b/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl index 093a4a55bf5a..0856700f9aed 100644 --- a/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl +++ b/plugins/console/lang/internalCommands/jetbrains.mps.console.internalCommands.mpl @@ -26,7 +26,6 @@ 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query) 995a7394-7f76-4b8b-a929-c53448708106(jetbrains.mps.console.internalCommands) 1a497c57-0f1a-4016-8042-2ff7591fe612(jetbrains.mps.console.internalCommands.runtime) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -71,7 +70,7 @@ - + @@ -84,7 +83,6 @@ 6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core) f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated index 6431bccdac62..2277f81a9430 100644 --- a/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated +++ b/plugins/console/lang/internalCommands/source_gen.caches/jetbrains/mps/console/internalCommands/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated b/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated index 36c9d262d1a7..d3c4c7d76139 100644 --- a/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated +++ b/plugins/console/lang/scripts/generator/source_gen.caches/jetbrains/mps/console/scripts/generator/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scripts/generator/template/main@generator.mps b/plugins/console/lang/scripts/generator/template/main@generator.mps index d2ef654c730c..c20ea096dc97 100644 --- a/plugins/console/lang/scripts/generator/template/main@generator.mps +++ b/plugins/console/lang/scripts/generator/template/main@generator.mps @@ -9,8 +9,7 @@ - - + diff --git a/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl b/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl index 7b4fd77ec4aa..8feee44e229c 100644 --- a/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl +++ b/plugins/console/lang/scripts/jetbrains.mps.console.scripts.mpl @@ -13,13 +13,10 @@ - - - + 1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.lang.smodel.query) 2bdcefec-ba49-4b32-ab50-ebc7a41d5090(jetbrains.mps.lang.smodel#1139186730696) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) @@ -35,20 +32,6 @@ - - - - - - - - - - - - - - @@ -70,7 +53,6 @@ f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage) 83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated index 0e1f2d071e9f..07944effa4ab 100644 --- a/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated +++ b/plugins/console/lang/scripts/source_gen.caches/jetbrains/mps/console/scripts/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd b/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd index 7f5579980d3a..6113f9987719 100644 --- a/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd +++ b/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd @@ -16,7 +16,6 @@ bfbdd672-7ff5-403f-af4f-16da5226f34c(jetbrains.mps.findUsages.runtime) 019b622b-0aef-4dd3-86d0-4eef01f3f6bb(jetbrains.mps.ide) 8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform) - 7726760c-95f5-4242-b36a-e069417e9d94(jetbrains.mps.lang.smodel.query.runtime) fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose) diff --git a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps index 89c6e71a76a5..73fe1dca5ab9 100644 --- a/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps +++ b/plugins/console/lang/scriptsRuntime/models/jetbrains/mps/console/scripts/runtime/util.mps @@ -2,29 +2,22 @@ - - - - - - - diff --git a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated index 7eef856e9b1e..6b3a192b8584 100644 --- a/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated +++ b/plugins/console/lang/scriptsRuntime/source_gen.caches/jetbrains/mps/console/scripts/runtime/util/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/models/jetbrains/mps/console/tool.mps b/plugins/console/models/jetbrains/mps/console/tool.mps index d744445775c6..84f6c72a1d49 100644 --- a/plugins/console/models/jetbrains/mps/console/tool.mps +++ b/plugins/console/models/jetbrains/mps/console/tool.mps @@ -68,10 +68,9 @@ - - + @@ -8776,7 +8775,7 @@ - + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies index 1626c4cffefa..987002c5afb4 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/dependencies @@ -106,7 +106,7 @@ - + diff --git a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated index 3541be734464..a95955ed2e9f 100644 --- a/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated +++ b/plugins/console/source_gen.caches/jetbrains/mps/console/tool/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java index 296c0b1ef03d..dcd9abfc08ca 100644 --- a/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java +++ b/plugins/console/source_gen/jetbrains/mps/console/tool/ConsoleContext.java @@ -2,7 +2,7 @@ /*Generated by MPS */ -import jetbrains.mps.lang.smodel.query.runtime.QueryExecutionContext; +import jetbrains.mps.smodel.query.QueryExecutionContext; import jetbrains.mps.project.Project; public interface ConsoleContext extends QueryExecutionContext { diff --git a/plugins/mps-build/solutions/mpsBuild/models/build.mps b/plugins/mps-build/solutions/mpsBuild/models/build.mps index d6d7d536a224..2270f99fc01b 100644 --- a/plugins/mps-build/solutions/mpsBuild/models/build.mps +++ b/plugins/mps-build/solutions/mpsBuild/models/build.mps @@ -4313,6 +4313,12 @@ + + + + + + @@ -17103,12 +17109,6 @@ - - - - - - @@ -17174,12 +17174,6 @@ - - - - - - @@ -17263,12 +17257,6 @@ - - - - - - @@ -17320,12 +17308,6 @@ - - - - - - @@ -17333,12 +17315,6 @@ - - - - - - @@ -17462,12 +17438,6 @@ - - - - - - @@ -17705,12 +17675,6 @@ - - - - - - @@ -17781,12 +17745,6 @@ - - - - - - @@ -17903,12 +17861,6 @@ - - - - - - @@ -17922,12 +17874,6 @@ - - - - - - @@ -23208,9 +23154,6 @@ - - - @@ -23505,96 +23448,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -23633,18 +23486,6 @@ - - - - - - - - - - - - @@ -23657,6 +23498,18 @@ + + + + + + + + + + + + @@ -23664,9 +23517,6 @@ - - - @@ -23700,12 +23550,6 @@ - - - - - - From 635fe6019297b5e0bfb1b1d2239e31a76fa4949b Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 27 Aug 2015 03:06:27 +0300 Subject: [PATCH 47/52] finally fix build solution --- build/mpsCore.xml | 438 ++---------------- build/mpsPlugins.xml | 57 +-- .../jetbrains.mps.lang.smodel.query.mpl | 3 - .../jetbrains/mps/ide/build/generated | 2 +- .../jetbrains/mps/ide/build/mpsCore.xml | 438 ++---------------- .../jetbrains/mps/ide/build/mpsPlugins.xml | 57 +-- .../jetbrains/mps/ide/build/trace.info | 4 +- 7 files changed, 123 insertions(+), 876 deletions(-) diff --git a/build/mpsCore.xml b/build/mpsCore.xml index ac189b38895c..b56b5f5e3499 100644 --- a/build/mpsCore.xml +++ b/build/mpsCore.xml @@ -166,10 +166,10 @@ - - - - + + + + @@ -183,145 +183,36 @@ - + - - - - - + + + + + - - + + - - + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + mpsBootstrapCore.version=${mpsBootstrapCore.version} @@ -339,7 +230,7 @@ - + @@ -353,7 +244,6 @@ - @@ -420,13 +310,10 @@ - - - - + @@ -639,101 +526,20 @@ - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -750,182 +556,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + - + @@ -938,10 +593,7 @@ - - - - + @@ -953,16 +605,12 @@ - - - - @@ -970,21 +618,17 @@ - - + + - - - - - - + + \ No newline at end of file diff --git a/build/mpsPlugins.xml b/build/mpsPlugins.xml index e6d6d1b90ab1..b8d567bd9e71 100644 --- a/build/mpsPlugins.xml +++ b/build/mpsPlugins.xml @@ -250,9 +250,9 @@ - - + + @@ -578,10 +578,8 @@ - - - - + + @@ -886,13 +884,12 @@ - - - + + @@ -942,12 +939,13 @@ - - + + + @@ -999,13 +997,11 @@ - - - + @@ -1056,13 +1052,11 @@ - - - + @@ -1114,13 +1108,11 @@ - - - + @@ -1131,7 +1123,7 @@ - + @@ -1157,6 +1149,7 @@ + @@ -1173,14 +1166,11 @@ - - - - + @@ -1288,15 +1278,13 @@ - - - + @@ -1352,16 +1340,13 @@ - - - - + @@ -1443,13 +1428,11 @@ - - - + @@ -1502,13 +1485,11 @@ - - - + diff --git a/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl b/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl index 6a5830b42f81..f358d27ccf77 100644 --- a/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl +++ b/languages/languageDesign/smodel.query/jetbrains.mps.lang.smodel.query.mpl @@ -39,16 +39,13 @@ - - - diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated index c15c8294fe29..56d01071ad8b 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated +++ b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml index ac189b38895c..b56b5f5e3499 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsCore.xml @@ -166,10 +166,10 @@ - - - - + + + + @@ -183,145 +183,36 @@ - + - - - - - + + + + + - - + + - - + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + mpsBootstrapCore.version=${mpsBootstrapCore.version} @@ -339,7 +230,7 @@ - + @@ -353,7 +244,6 @@ - @@ -420,13 +310,10 @@ - - - - + @@ -639,101 +526,20 @@ - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -750,182 +556,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + - + @@ -938,10 +593,7 @@ - - - - + @@ -953,16 +605,12 @@ - - - - @@ -970,21 +618,17 @@ - - + + - - - - - - + + \ No newline at end of file diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml index e6d6d1b90ab1..b8d567bd9e71 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/mpsPlugins.xml @@ -250,9 +250,9 @@ - - + + @@ -578,10 +578,8 @@ - - - - + + @@ -886,13 +884,12 @@ - - - + + @@ -942,12 +939,13 @@ - - + + + @@ -999,13 +997,11 @@ - - - + @@ -1056,13 +1052,11 @@ - - - + @@ -1114,13 +1108,11 @@ - - - + @@ -1131,7 +1123,7 @@ - + @@ -1157,6 +1149,7 @@ + @@ -1173,14 +1166,11 @@ - - - - + @@ -1288,15 +1278,13 @@ - - - + @@ -1352,16 +1340,13 @@ - - - - + @@ -1443,13 +1428,11 @@ - - - + @@ -1502,13 +1485,11 @@ - - - + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info index e8a22c492b64..5ba3a04a6e8c 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info +++ b/plugins/mps-build/solutions/mpsBuild/source_gen/jetbrains/mps/ide/build/trace.info @@ -77,12 +77,12 @@ - + - + From c858d3952b85a45ae62750aecb9305c10d6cfaf0 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 27 Aug 2015 03:33:32 +0300 Subject: [PATCH 48/52] fix tests, make --- .../jetbrains/mps/lang/smodel/query/generated | 2 +- .../base/generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 19 ++++++++----------- .../lang/base/languageModels/typesystem.mps | 11 ++++++++++- .../jetbrains/mps/console/base/generated | 2 +- .../mps/console/base/typesystem/generated | 2 +- .../jetbrains.mps.console.scripts.runtime.msd | 1 - .../jetbrains/mps/ide/build/generated | 2 +- .../lang/structure/pluginSolution/plugin.mps | 1 - .../structure/pluginSolution/plugin/generated | 2 +- 10 files changed, 24 insertions(+), 20 deletions(-) diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated index 8d151e58dc93..4f32eeeee4be 100644 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated +++ b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/lang/smodel/query/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated index dbeaeeea2306..f8e6212c6b02 100644 --- a/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated +++ b/plugins/console/lang/base/generator/source_gen.caches/jetbrains/mps/console/base/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps index c436228f9bdc..f0cdc0aded70 100644 --- a/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps +++ b/plugins/console/lang/base/generator/template/jetbrains/mps/console/lang/generator/template/main@generator.mps @@ -273,9 +273,6 @@ - - - @@ -298,8 +295,8 @@ - - + + @@ -568,7 +565,7 @@ - + @@ -584,7 +581,7 @@ - + @@ -606,7 +603,7 @@ - + @@ -715,7 +712,7 @@ - + @@ -772,7 +769,7 @@ - + @@ -808,7 +805,7 @@ - + diff --git a/plugins/console/lang/base/languageModels/typesystem.mps b/plugins/console/lang/base/languageModels/typesystem.mps index 67385a9fdf31..9f3fe4f72507 100644 --- a/plugins/console/lang/base/languageModels/typesystem.mps +++ b/plugins/console/lang/base/languageModels/typesystem.mps @@ -1,7 +1,16 @@ - + + + + + + + + + + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated index c7b4faff3af7..c48efb552b1b 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated index 100296ad4d9e..5d43584104c6 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/typesystem/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd b/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd index 6113f9987719..77adb1039fb0 100644 --- a/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd +++ b/plugins/console/lang/scriptsRuntime/jetbrains.mps.console.scripts.runtime.msd @@ -23,7 +23,6 @@ - diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated index 56d01071ad8b..33bcbb5c43d8 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated +++ b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps index afabe329dc50..160d883256c8 100644 --- a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps +++ b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps @@ -55,7 +55,6 @@ - diff --git a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated index e59996d90bc5..c08c9b1a6426 100644 --- a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated +++ b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated @@ -1,3 +1,3 @@ - + From de80eff7925d9de2c91d71a881bdb7185d218dfa Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 27 Aug 2015 14:52:42 +0300 Subject: [PATCH 49/52] remove obsolete files MPS hasn't removed during refactoring --- .../generator/template/main/dependencies | 31 - .../generator/template/main/generated | 3 - .../template/main/QueriesGenerated.java | 551 ----- .../generator/template/main/trace.info | 969 -------- .../console/blCommand/actions/dependencies | 40 - .../mps/console/blCommand/actions/generated | 3 - .../console/blCommand/behavior/dependencies | 360 --- .../mps/console/blCommand/behavior/generated | 3 - .../blCommand/constraints/dependencies | 57 - .../console/blCommand/constraints/generated | 3 - .../mps/console/blCommand/dependencies | 28 - .../mps/console/blCommand/editor/dependencies | 376 --- .../mps/console/blCommand/editor/generated | 3 - .../jetbrains/mps/console/blCommand/generated | 3 - .../console/blCommand/structure/dependencies | 15 - .../mps/console/blCommand/structure/generated | 3 - .../console/blCommand/typesystem/dependencies | 293 --- .../console/blCommand/typesystem/generated | 3 - .../mps/console/blCommand/Language.java | 71 - .../actions/ActionAspectDescriptorImpl.java | 34 - .../blCommand/actions/QueriesGenerated.java | 7 - .../QueryExpression_NodeFactories.java | 22 - .../ScopeParameterLiteral_factories.java | 27 - .../actions/printStatement_NodeFactories.java | 20 - .../mps/console/blCommand/actions/trace.info | 88 - .../AbstractPrintExpression_Behavior.java | 14 - ...actPrintExpression_BehaviorDescriptor.java | 18 - .../behavior/BehaviorAspectDescriptor.java | 63 - .../behavior/ConsoleExpression_Behavior.java | 14 - .../ConsoleExpression_BehaviorDescriptor.java | 7 - .../ConsoleHelpProvider_Behavior.java | 36 - ...onsoleHelpProvider_BehaviorDescriptor.java | 14 - .../behavior/ConsoleOperation_Behavior.java | 14 - .../ConsoleOperation_BehaviorDescriptor.java | 7 - .../CustomScope_BehaviorDescriptor.java | 13 - .../GlobalScope_BehaviorDescriptor.java | 13 - .../InstancesExpression_Behavior.java | 25 - ...nstancesExpression_BehaviorDescriptor.java | 24 - .../ModelScope_BehaviorDescriptor.java | 13 - .../behavior/ModelsExpression_Behavior.java | 17 - .../ModelsExpression_BehaviorDescriptor.java | 18 - .../behavior/ModulesExpression_Behavior.java | 17 - .../ModulesExpression_BehaviorDescriptor.java | 18 - .../ModulesScope_BehaviorDescriptor.java | 13 - .../behavior/NodesExpression_Behavior.java | 17 - .../NodesExpression_BehaviorDescriptor.java | 18 - .../behavior/PrintExpression_Behavior.java | 14 - .../PrintExpression_BehaviorDescriptor.java | 32 - ...rintNodeExpression_BehaviorDescriptor.java | 13 - ...eferenceExpression_BehaviorDescriptor.java | 13 - ...SequenceExpression_BehaviorDescriptor.java | 13 - ...rintTextExpression_BehaviorDescriptor.java | 13 - .../behavior/ProjectExpression_Behavior.java | 14 - .../ProjectExpression_BehaviorDescriptor.java | 18 - .../ProjectScope_BehaviorDescriptor.java | 13 - .../behavior/QueryExpression_Behavior.java | 39 - .../QueryExpression_BehaviorDescriptor.java | 38 - ...terIncludeReadOnly_BehaviorDescriptor.java | 13 - ...QueryParameterList_BehaviorDescriptor.java | 14 - ...ueryParameterScope_BehaviorDescriptor.java | 13 - .../QueryParameter_BehaviorDescriptor.java | 14 - .../ReferencesExpression_Behavior.java | 17 - ...ferencesExpression_BehaviorDescriptor.java | 18 - .../ScopeParameter_BehaviorDescriptor.java | 14 - .../behavior/ShowExpression_Behavior.java | 17 - .../ShowExpression_BehaviorDescriptor.java | 36 - .../behavior/UsagesExpression_Behavior.java | 25 - .../UsagesExpression_BehaviorDescriptor.java | 24 - .../WithStatement_BehaviorDescriptor.java | 14 - .../mps/console/blCommand/behavior/trace.info | 420 ---- .../ConstraintsAspectDescriptor.java | 25 - .../InstancesExpression_Constraints.java | 38 - .../QueryParameter_Constraints.java | 46 - .../UsagesExpression_Constraints.java | 38 - .../console/blCommand/constraints/trace.info | 154 -- .../AbstractPrintExpression_Actions.java | 43 - .../AbstractPrintExpression_Editor.java | 81 - .../blCommand/editor/CustomScope_Actions.java | 29 - .../blCommand/editor/CustomScope_Editor.java | 64 - .../editor/EditorAspectDescriptorImpl.java | 62 - .../editor/InstancesExpression_Editor.java | 92 - .../blCommand/editor/ModelScope_Editor.java | 127 - .../blCommand/editor/ModulesScope_Editor.java | 127 - .../editor/QueryExpression_Actions.java | 47 - .../editor/QueryExpression_Editor.java | 26 - .../QueryExpression_EditorComponent.java | 127 - .../editor/QueryExpression_KeyMap.java | 62 - .../editor/QueryParameterList_Editor.java | 90 - .../QueryParameterScopeValue_Actions.java | 63 - .../editor/QueryParameterScope_Editor.java | 92 - .../editor/QueryParameter_Actions.java | 70 - .../editor/QueryParameter_Editor.java | 36 - .../editor/ScopeParameter_Editor.java | 55 - .../editor/ShowExpression_Editor.java | 68 - .../editor/UsagesExpression_Editor.java | 92 - .../editor/WithStatement_Editor.java | 185 -- .../mps/console/blCommand/editor/trace.info | 2185 ----------------- .../structure/StructureAspectDescriptor.java | 117 - .../console/blCommand/structure/trace.info | 9 - .../mps/console/blCommand/trace.info | 9 - .../typesystem/TypesystemDescriptor.java | 88 - ...uplicatedParameters_NonTypesystemRule.java | 65 - .../console/blCommand/typesystem/trace.info | 1457 ----------- ...AbstractPrintExpression_InferenceRule.java | 41 - .../typeof_CustomScope_InferenceRule.java | 46 - ...eof_InstancesExpression_InferenceRule.java | 119 - ...ypeof_ModelScopeLiteral_InferenceRule.java | 47 - ...typeof_ModelsExpression_InferenceRule.java | 44 - ...peof_ModuleScopeLiteral_InferenceRule.java | 49 - ...ypeof_ModulesExpression_InferenceRule.java | 46 - .../typeof_NodesExpresiion_InferenceRule.java | 44 - .../typeof_PrintExpression_InferenceRule.java | 50 - ...eof_PrintNodeExpression_InferenceRule.java | 44 - ...NodeReferenceExpression_InferenceRule.java | 44 - ...PrintSequenceExpression_InferenceRule.java | 68 - ...eof_PrintTextExpression_InferenceRule.java | 44 - ...ypeof_ProjectExpression_InferenceRule.java | 43 - ...of_ReferencesExpression_InferenceRule.java | 44 - .../typeof_ScopeProvider_InferenceRule.java | 73 - .../typeof_ShowExpression_InferenceRule.java | 81 - ...typeof_UsagesExpression_InferenceRule.java | 58 - 121 files changed, 11119 deletions(-) delete mode 100644 languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/dependencies delete mode 100644 languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated delete mode 100644 languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java delete mode 100644 languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info delete mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies delete mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated delete mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies delete mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated delete mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/constraints/dependencies delete mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/constraints/generated delete mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/dependencies delete mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies delete mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated delete mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/generated delete mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/structure/dependencies delete mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated delete mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies delete mode 100644 languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/Language.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/ActionAspectDescriptorImpl.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/QueryExpression_NodeFactories.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/ScopeParameterLiteral_factories.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/printStatement_NodeFactories.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/trace.info delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_Behavior.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_Behavior.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_Behavior.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_Behavior.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/CustomScope_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/GlobalScope_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_Behavior.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelScope_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_Behavior.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_Behavior.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesScope_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_Behavior.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_Behavior.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintSequenceExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintTextExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_Behavior.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectScope_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_Behavior.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterList_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterScope_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameter_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_Behavior.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ScopeParameter_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_Behavior.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_Behavior.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/ConstraintsAspectDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/InstancesExpression_Constraints.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/QueryParameter_Constraints.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/UsagesExpression_Constraints.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/trace.info delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Actions.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Editor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Actions.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Editor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/InstancesExpression_Editor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ModelScope_Editor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ModulesScope_Editor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Actions.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Editor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_EditorComponent.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_KeyMap.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterList_Editor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScopeValue_Actions.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScope_Editor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Actions.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Editor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ScopeParameter_Editor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ShowExpression_Editor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/UsagesExpression_Editor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/trace.info delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/structure/trace.info delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/trace.info delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_AbstractPrintExpression_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_CustomScope_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_InstancesExpression_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelScopeLiteral_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelsExpression_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModulesExpression_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_NodesExpresiion_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintExpression_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeExpression_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintSequenceExpression_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintTextExpression_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ProjectExpression_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ReferencesExpression_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ShowExpression_InferenceRule.java delete mode 100644 languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_UsagesExpression_InferenceRule.java diff --git a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/dependencies b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/dependencies deleted file mode 100644 index 9c8e80954784..000000000000 --- a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/dependencies +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated b/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated deleted file mode 100644 index e7b584657931..000000000000 --- a/languages/languageDesign/smodel.query/generator/source_gen.caches/jetbrains/mps/console/blCommand/generator/template/main/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java deleted file mode 100644 index 7f9efc552348..000000000000 --- a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/QueriesGenerated.java +++ /dev/null @@ -1,551 +0,0 @@ -package jetbrains.mps.console.blCommand.generator.template.main; - -/*Generated by MPS */ - -import jetbrains.mps.generator.runtime.Generated; -import jetbrains.mps.generator.template.BaseMappingRuleContext; -import jetbrains.mps.typesystem.inference.TypeChecker; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.lang.typesystem.runtime.HUtil; -import jetbrains.mps.internal.collections.runtime.ListSequence; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.generator.template.PropertyMacroContext; -import jetbrains.mps.smodel.behaviour.BehaviorReflection; -import jetbrains.mps.generator.template.ReferenceMacroContext; -import jetbrains.mps.generator.template.SourceSubstituteMacroNodeContext; -import jetbrains.mps.internal.collections.runtime.IWhereFilter; -import jetbrains.mps.internal.collections.runtime.ISelector; -import jetbrains.mps.internal.collections.runtime.Sequence; -import jetbrains.mps.generator.template.SourceSubstituteMacroNodesContext; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; -import jetbrains.mps.smodel.SReference; -import org.jetbrains.mps.openapi.model.SNodeAccessUtil; - -@Generated -public class QueriesGenerated { - public static boolean baseMappingRule_Condition_3395429865810138642(final BaseMappingRuleContext _context) { - return TypeChecker.getInstance().getSubtypingManager().isSubtype(TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), _quotation_createNode_x583g4_b0a0a0()); - } - public static boolean baseMappingRule_Condition_7600370246419375459(final BaseMappingRuleContext _context) { - return TypeChecker.getInstance().getSubtypingManager().isSubtype(TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), _quotation_createNode_x583g4_b0a0a1()); - } - public static boolean baseMappingRule_Condition_7600370246421231722(final BaseMappingRuleContext _context) { - SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - return TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0a0b0c()) || TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0a0b0c_0()) || TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0a1a2()) || TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a0b0c()); - } - public static boolean baseMappingRule_Condition_3856122757887589572(final BaseMappingRuleContext _context) { - SNode functionType = TypeChecker.getInstance().getRuntimeSupport().coerce_(TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), HUtil.createMatchingPatternByConcept(MetaAdapterFactory.getConcept(0xfd3920347849419dL, 0x907112563d152375L, 0x1174a4d19ffL, "jetbrains.mps.baseLanguage.closures.structure.FunctionType")), false); - return functionType != null; - } - public static boolean baseMappingRule_Condition_3786816536599965790(final BaseMappingRuleContext _context) { - return ListSequence.fromList(SNodeOperations.getNodeDescendants(_context.getNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b2a9377L, "jetbrains.mps.console.blCommand.structure.PrintExpression"), false, new SAbstractConcept[]{})).isEmpty(); - } - public static Object propertyMacro_GetPropertyValue_6690111761723079789(final PropertyMacroContext _context) { - return "closure : " + BehaviorReflection.invokeVirtual(String.class, TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))), "virtual_getPresentation_1213877396640", new Object[]{}); - } - public static Object propertyMacro_GetPropertyValue_9010839353952736697(final PropertyMacroContext _context) { - SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a6())) { - return "nodes"; - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a6())) { - return "references"; - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a6())) { - return "models"; - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a6())) { - return "modules"; - } - return null; - } - public static Object referenceMacro_GetReferent_3501374812264730107(final ReferenceMacroContext _context) { - SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a7())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263258755"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a7())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263262593"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a7())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263265578"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a7())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263268620"); - } - return null; - } - public static Object referenceMacro_GetReferent_7600370246425972944(final ReferenceMacroContext _context) { - SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a8())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844631948"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a8())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844631948"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a8())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844632137"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a8())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844632254"); - } - return null; - } - public static Object referenceMacro_GetReferent_1597470200014435807(final ReferenceMacroContext _context) { - SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a9())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844631948"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a9())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844631948"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a9())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844632137"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a9())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "1125969196844632254"); - } - return null; - } - public static Object referenceMacro_GetReferent_3501374812263511250(final ReferenceMacroContext _context) { - SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a01())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263258755"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a01())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263262593"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a01())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263265578"); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a01())) { - return SNodeOperations.getNode("r:b4d3e080-529f-482d-ad99-114342004f83(jetbrains.mps.console.blCommand.runtime.util)", "3501374812263268620"); - } - return null; - } - public static SNode sourceNodeQuery_4598452390226163566(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - } - public static SNode sourceNodeQuery_3501374812264728764(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object")); - } - public static SNode sourceNodeQuery_4307205004144966846(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); - } - public static SNode sourceNodeQuery_7738379549905474169(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL, 0x75bb0160f191d6ecL, "node")); - } - public static SNode sourceNodeQuery_4307205004144963070(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); - } - public static SNode sourceNodeQuery_5582028874771414574(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")); - } - public static SNode sourceNodeQuery_5510759644748879578(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - } - public static SNode sourceNodeQuery_6134217374019005717(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - } - public static SNode sourceNodeQuery_4307205004143195962(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); - } - public static SNode sourceNodeQuery_4307205004144964264(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); - } - public static SNode sourceNodeQuery_4307205004144961927(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); - } - public static SNode sourceNodeQuery_4307205004144960989(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")); - } - public static SNode sourceNodeQuery_4307205004142795439(final SourceSubstituteMacroNodeContext _context) { - Iterable results = ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).where(new IWhereFilter() { - public boolean accept(SNode it) { - return SNodeOperations.isInstanceOf(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope")); - } - }).select(new ISelector() { - public SNode select(SNode it) { - return SNodeOperations.cast(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope")); - } - }); - return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0x() : SLinkOperations.getTarget(Sequence.fromIterable(results).first(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"))); - } - public static SNode sourceNodeQuery_4307205004142895894(final SourceSubstituteMacroNodeContext _context) { - Iterable results = ListSequence.fromList(SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).where(new IWhereFilter() { - public boolean accept(SNode it) { - return SNodeOperations.isInstanceOf(it, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly")); - } - }); - return (Sequence.fromIterable(results).isEmpty() ? _quotation_createNode_x583g4_a0b0y_0() : _quotation_createNode_x583g4_a0b0y()); - } - public static SNode sourceNodeQuery_3395429865810287239(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - } - public static SNode sourceNodeQuery_9010839353951768772(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - } - public static SNode sourceNodeQuery_7600370246429334103(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - } - public static SNode sourceNodeQuery_7600370246419387223(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - } - public static SNode sourceNodeQuery_3501374812261883521(final SourceSubstituteMacroNodeContext _context) { - SNode type = TypeChecker.getInstance().getTypeOf(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a1a92())) { - return _quotation_createNode_x583g4_a0a1a92(); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a2a92())) { - return _quotation_createNode_x583g4_a0a2a92(); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a3a92())) { - return _quotation_createNode_x583g4_a0a3a92(); - } - if (TypeChecker.getInstance().getSubtypingManager().isSubtype(type, _quotation_createNode_x583g4_b0a4a92())) { - return _quotation_createNode_x583g4_a0a4a92(); - } - return null; - } - public static SNode sourceNodeQuery_9010839353952788840(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - } - public static SNode sourceNodeQuery_3492877759612269969(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, 0x307931d0f985950eL, "scope")); - } - public static SNode sourceNodeQuery_1964420931776208395(final SourceSubstituteMacroNodeContext _context) { - return SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope")); - } - public static Iterable sourceNodesQuery_6134217374019191580(final SourceSubstituteMacroNodesContext _context) { - return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL, 0x307931d0f952484fL, "model")); - } - public static Iterable sourceNodesQuery_3492877759611137837(final SourceSubstituteMacroNodesContext _context) { - return SLinkOperations.getChildren(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL, 0x307931d0f94af768L, "module")); - } - public static Iterable sourceNodesQuery_1964420931776045744(final SourceSubstituteMacroNodesContext _context) { - return SLinkOperations.getChildren(SLinkOperations.getTarget(_context.getNode(), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts")), MetaAdapterFactory.getContainmentLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L, 0xf8cc6bf961L, "statement")); - } - private static SNode _quotation_createNode_x583g4_b0a0a0() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc6bf96dL, "jetbrains.mps.baseLanguage.structure.VoidType"), null, null, false); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a0a1() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a0a0b0c() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a0a0b0c_0() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a0a1a2() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a0b0c() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a1a6() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a2a6() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a3a6() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a4a6() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a1a7() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a2a7() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a3a7() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a4a7() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a1a8() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a2a8() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a3a8() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a4a8() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a1a9() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a2a9() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a3a9() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a4a9() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a1a01() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a2a01() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a3a01() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a4a01() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_a0b0x() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf940cd6167L, "jetbrains.mps.baseLanguage.structure.NullLiteral"), null, null, false); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_a0b0y() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_1, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "true"); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_a0b0y_0() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, "jetbrains.mps.baseLanguage.structure.BooleanConstant"), null, null, false); - SNodeAccessUtil.setProperty(quotedNode_1, MetaAdapterFactory.getProperty(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b201L, 0xf8cc56b202L, "value"), "false"); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_a0a1a92() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference"))); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a1a92() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_a0a2a92() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SNodeReference"))); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a2a92() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_a0a3a92() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)"), facade.createNodeId("~SModelReference"))); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a3a92() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_a0a4a92() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModuleReference"))); - return quotedNode_1; - } - private static SNode _quotation_createNode_x583g4_b0a4a92() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info b/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info deleted file mode 100644 index c741fb74e4d6..000000000000 --- a/languages/languageDesign/smodel.query/generator/source_gen/jetbrains/mps/console/blCommand/generator/template/main/trace.info +++ /dev/null @@ -1,969 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies deleted file mode 100644 index d03af3e544e9..000000000000 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/actions/dependencies +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated deleted file mode 100644 index dbd3ff781c35..000000000000 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/actions/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies deleted file mode 100644 index 3b4179dc3073..000000000000 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/behavior/dependencies +++ /dev/null @@ -1,360 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated deleted file mode 100644 index 74a2ab32aa6c..000000000000 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/behavior/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/constraints/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/constraints/dependencies deleted file mode 100644 index bdc9047e1d5e..000000000000 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/constraints/dependencies +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/constraints/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/constraints/generated deleted file mode 100644 index 48894a569918..000000000000 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/constraints/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/dependencies deleted file mode 100644 index 9b03bc099f62..000000000000 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/dependencies +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies deleted file mode 100644 index 212854a480ad..000000000000 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/editor/dependencies +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated deleted file mode 100644 index aa7685b8ad53..000000000000 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/editor/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/generated deleted file mode 100644 index bb911da4bd0c..000000000000 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/structure/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/structure/dependencies deleted file mode 100644 index 81f68f4a15f3..000000000000 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/structure/dependencies +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated deleted file mode 100644 index 6a14b08eceda..000000000000 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/structure/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies deleted file mode 100644 index 07f9e7a0f692..000000000000 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/dependencies +++ /dev/null @@ -1,293 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated b/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated deleted file mode 100644 index 3e30491005f8..000000000000 --- a/languages/languageDesign/smodel.query/source_gen.caches/jetbrains/mps/console/blCommand/typesystem/generated +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/Language.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/Language.java deleted file mode 100644 index 17aa5542df5e..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/Language.java +++ /dev/null @@ -1,71 +0,0 @@ -package jetbrains.mps.console.blCommand; - -/*Generated by MPS */ - -import jetbrains.mps.smodel.language.LanguageRuntime; -import jetbrains.mps.smodel.adapter.ids.SLanguageId; -import java.util.UUID; -import java.util.Collection; -import jetbrains.mps.generator.runtime.TemplateModule; -import jetbrains.mps.generator.runtime.TemplateUtil; -import jetbrains.mps.smodel.runtime.ILanguageAspect; -import jetbrains.mps.openapi.actions.descriptor.ActionAspectDescriptor; -import jetbrains.mps.console.blCommand.actions.ActionAspectDescriptorImpl; -import jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor; -import jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor; -import jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor; -import jetbrains.mps.console.blCommand.editor.EditorAspectDescriptorImpl; -import jetbrains.mps.smodel.runtime.StructureAspectDescriptor; -import jetbrains.mps.lang.typesystem.runtime.IHelginsDescriptor; -import jetbrains.mps.console.blCommand.typesystem.TypesystemDescriptor; - -public class Language extends LanguageRuntime { - public static String MODULE_REF = "1a8554c4-eb84-43ba-8c34-6f0d90c6e75a(jetbrains.mps.console.blCommand)"; - public Language() { - } - @Override - public String getNamespace() { - return "jetbrains.mps.console.blCommand"; - } - - @Override - public int getVersion() { - return 0; - } - - public SLanguageId getId() { - return new SLanguageId(UUID.fromString("1a8554c4-eb84-43ba-8c34-6f0d90c6e75a")); - } - @Override - protected String[] getExtendedLanguageIDs() { - return new String[]{"jetbrains.mps.lang.smodel", "jetbrains.mps.lang.core", "jetbrains.mps.baseLanguage", "jetbrains.mps.baseLanguage.tuples"}; - } - @Override - public Collection getGenerators() { - return TemplateUtil.asCollection(TemplateUtil.createInterpretedGenerator(this, "504d7390-81ca-4422-8018-f7290efa217f(jetbrains.mps.console.blCommand#5336086527852811409)")); - } - @Override - protected T createAspect(Class aspectClass) { - if (aspectClass == ActionAspectDescriptor.class) { - return (T) new ActionAspectDescriptorImpl(); - } - if (aspectClass == BehaviorAspectDescriptor.class) { - return (T) new jetbrains.mps.console.blCommand.behavior.BehaviorAspectDescriptor(); - } - if (aspectClass == ConstraintsAspectDescriptor.class) { - return (T) new jetbrains.mps.console.blCommand.constraints.ConstraintsAspectDescriptor(); - } - if (aspectClass == EditorAspectDescriptor.class) { - return (T) new EditorAspectDescriptorImpl(); - } - if (aspectClass == StructureAspectDescriptor.class) { - return (T) new jetbrains.mps.console.blCommand.structure.StructureAspectDescriptor(); - } - if (aspectClass == IHelginsDescriptor.class) { - return (T) new TypesystemDescriptor(); - } - - - return super.createAspect(aspectClass); - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/ActionAspectDescriptorImpl.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/ActionAspectDescriptorImpl.java deleted file mode 100644 index 60fb742e9800..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/ActionAspectDescriptorImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -package jetbrains.mps.console.blCommand.actions; - -/*Generated by MPS */ - -import jetbrains.mps.openapi.actions.descriptor.ActionAspectDescriptor; -import java.util.Collection; -import jetbrains.mps.openapi.actions.descriptor.NodeFactory; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import java.util.Arrays; -import java.util.Collections; - -public class ActionAspectDescriptorImpl implements ActionAspectDescriptor { - private static final String LANGUAGE_FQ_NAME = "jetbrains.mps.console.blCommand"; - - public Collection getFactories(SAbstractConcept concept) { - if (LANGUAGE_FQ_NAME.equals(concept.getLanguage().getQualifiedName())) { - switch (Arrays.binarySearch(stringSwitchCases_tpto26_a0a0a0c, concept.getName())) { - case 0: - return Collections.singletonList(new printStatement_NodeFactories.NodeFactory_7284872370241013667()); - case 1: - return Collections.singletonList(new ScopeParameterLiteral_factories.NodeFactory_3492877759609298945()); - case 2: - return Collections.singletonList(new ScopeParameterLiteral_factories.NodeFactory_3492877759608986170()); - case 3: - return Collections.singletonList(new ScopeParameterLiteral_factories.NodeFactory_3492877759608901705()); - case 4: - return Collections.singletonList(new QueryExpression_NodeFactories.NodeFactory_4307205004138627840()); - default: - } - } - return Collections.emptyList(); - } - private static String[] stringSwitchCases_tpto26_a0a0a0c = new String[]{"AbstractPrintExpression", "CustomScope", "ModelScope", "ModulesScope", "QueryExpression"}; -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java deleted file mode 100644 index ffa5bc8daacd..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/QueriesGenerated.java +++ /dev/null @@ -1,7 +0,0 @@ -package jetbrains.mps.console.blCommand.actions; - -/*Generated by MPS */ - - -public class QueriesGenerated { -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/QueryExpression_NodeFactories.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/QueryExpression_NodeFactories.java deleted file mode 100644 index 4589f1ed3050..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/QueryExpression_NodeFactories.java +++ /dev/null @@ -1,22 +0,0 @@ -package jetbrains.mps.console.blCommand.actions; - -/*Generated by MPS */ - -import jetbrains.mps.openapi.actions.descriptor.NodeFactory; -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.model.SModel; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; - -public class QueryExpression_NodeFactories { - public static class NodeFactory_4307205004138627840 implements NodeFactory { - public void setup(SNode newNode, SNode sampleNode, SNode enclosingNode, SModel model) { - if (SNodeOperations.isInstanceOf(sampleNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.console.blCommand.structure.QueryExpression"))) { - SLinkOperations.setTarget(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), SLinkOperations.getTarget(SNodeOperations.cast(sampleNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.console.blCommand.structure.QueryExpression")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"))); - } else { - SLinkOperations.setTarget(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), null); - } - } - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/ScopeParameterLiteral_factories.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/ScopeParameterLiteral_factories.java deleted file mode 100644 index b93e8351c215..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/ScopeParameterLiteral_factories.java +++ /dev/null @@ -1,27 +0,0 @@ -package jetbrains.mps.console.blCommand.actions; - -/*Generated by MPS */ - -import jetbrains.mps.openapi.actions.descriptor.NodeFactory; -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.model.SModel; -import jetbrains.mps.smodel.action.SNodeFactoryOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; - -public class ScopeParameterLiteral_factories { - public static class NodeFactory_3492877759608901705 implements NodeFactory { - public void setup(SNode newNode, SNode sampleNode, SNode enclosingNode, SModel model) { - SNodeFactoryOperations.addNewChild(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL, 0x307931d0f94af768L, "module"), SNodeFactoryOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x38130dc4e3db5af1L, "jetbrains.mps.lang.smodel.structure.ModuleReferenceExpression"))); - } - } - public static class NodeFactory_3492877759608986170 implements NodeFactory { - public void setup(SNode newNode, SNode sampleNode, SNode enclosingNode, SModel model) { - SNodeFactoryOperations.addNewChild(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL, 0x307931d0f952484fL, "model"), SNodeFactoryOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x7c3f2da20e92b62L, "jetbrains.mps.lang.smodel.structure.ModelReferenceExpression"))); - } - } - public static class NodeFactory_3492877759609298945 implements NodeFactory { - public void setup(SNode newNode, SNode sampleNode, SNode enclosingNode, SModel model) { - SNodeFactoryOperations.setNewChild(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, 0x307931d0f985950eL, "scope"), SNodeFactoryOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x10ab8473cc5L, "jetbrains.mps.baseLanguage.structure.GenericNewExpression"))); - } - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/printStatement_NodeFactories.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/printStatement_NodeFactories.java deleted file mode 100644 index 70784965524e..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/printStatement_NodeFactories.java +++ /dev/null @@ -1,20 +0,0 @@ -package jetbrains.mps.console.blCommand.actions; - -/*Generated by MPS */ - -import jetbrains.mps.openapi.actions.descriptor.NodeFactory; -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.model.SModel; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; - -public class printStatement_NodeFactories { - public static class NodeFactory_7284872370241013667 implements NodeFactory { - public void setup(SNode newNode, SNode sampleNode, SNode enclosingNode, SModel model) { - if (SNodeOperations.isInstanceOf(sampleNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, "jetbrains.mps.console.blCommand.structure.AbstractPrintExpression"))) { - SLinkOperations.setTarget(newNode, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"), SLinkOperations.getTarget(SNodeOperations.cast(sampleNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, "jetbrains.mps.console.blCommand.structure.AbstractPrintExpression")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - } - } - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/trace.info deleted file mode 100644 index c16adb953358..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/actions/trace.info +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_Behavior.java deleted file mode 100644 index 0446914668f6..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_Behavior.java +++ /dev/null @@ -1,14 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SAbstractConcept; - -public class AbstractPrintExpression_Behavior { - public static void init(SNode thisNode) { - } - public static boolean virtual_legalAsStatement_1262430001741498032(SAbstractConcept thisConcept) { - return true; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_BehaviorDescriptor.java deleted file mode 100644 index 155405591ada..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/AbstractPrintExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,18 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; -import org.jetbrains.mps.openapi.language.SConcept; - -public abstract class AbstractPrintExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor { - public AbstractPrintExpression_BehaviorDescriptor() { - } - public boolean virtual_legalAsStatement_1262430001741498032(SConcept thisConcept) { - return AbstractPrintExpression_Behavior.virtual_legalAsStatement_1262430001741498032(thisConcept); - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.AbstractPrintExpression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java deleted file mode 100644 index f3630dbe4f3a..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/BehaviorAspectDescriptor.java +++ /dev/null @@ -1,63 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import jetbrains.mps.smodel.runtime.BehaviorDescriptor; -import java.util.Arrays; -import jetbrains.mps.smodel.runtime.interpreted.BehaviorAspectInterpreted; - -public class BehaviorAspectDescriptor implements jetbrains.mps.smodel.runtime.BehaviorAspectDescriptor { - public BehaviorAspectDescriptor() { - } - public BehaviorDescriptor getDescriptor(String fqName) { - switch (Arrays.binarySearch(stringSwitchCases_846f5o_a0a0b, fqName)) { - case 10: - return new PrintNodeReferenceExpression_BehaviorDescriptor(); - case 20: - return new UsagesExpression_BehaviorDescriptor(); - case 19: - return new ShowExpression_BehaviorDescriptor(); - case 2: - return new InstancesExpression_BehaviorDescriptor(); - case 13: - return new ProjectExpression_BehaviorDescriptor(); - case 12: - return new PrintTextExpression_BehaviorDescriptor(); - case 9: - return new PrintNodeExpression_BehaviorDescriptor(); - case 7: - return new NodesExpression_BehaviorDescriptor(); - case 18: - return new ReferencesExpression_BehaviorDescriptor(); - case 4: - return new ModelsExpression_BehaviorDescriptor(); - case 5: - return new ModulesExpression_BehaviorDescriptor(); - case 16: - return new QueryParameterList_BehaviorDescriptor(); - case 15: - return new QueryParameterIncludeReadOnly_BehaviorDescriptor(); - case 17: - return new QueryParameterScope_BehaviorDescriptor(); - case 1: - return new GlobalScope_BehaviorDescriptor(); - case 14: - return new ProjectScope_BehaviorDescriptor(); - case 8: - return new PrintExpression_BehaviorDescriptor(); - case 11: - return new PrintSequenceExpression_BehaviorDescriptor(); - case 6: - return new ModulesScope_BehaviorDescriptor(); - case 3: - return new ModelScope_BehaviorDescriptor(); - case 0: - return new CustomScope_BehaviorDescriptor(); - case 21: - return new WithStatement_BehaviorDescriptor(); - default: - return BehaviorAspectInterpreted.getInstance().getDescriptor(fqName); - } - } - private static String[] stringSwitchCases_846f5o_a0a0b = new String[]{"jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.GlobalScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModelsExpression", "jetbrains.mps.console.blCommand.structure.ModulesExpression", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.NodesExpression", "jetbrains.mps.console.blCommand.structure.PrintExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression", "jetbrains.mps.console.blCommand.structure.PrintTextExpression", "jetbrains.mps.console.blCommand.structure.ProjectExpression", "jetbrains.mps.console.blCommand.structure.ProjectScope", "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ReferencesExpression", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression", "jetbrains.mps.console.blCommand.structure.WithStatement"}; -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_Behavior.java deleted file mode 100644 index 0e8e5512db9a..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_Behavior.java +++ /dev/null @@ -1,14 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SAbstractConcept; - -public class ConsoleExpression_Behavior { - public static void init(SNode thisNode) { - } - public static String virtual_getKind_7006261637493126084(SAbstractConcept thisConcept) { - return "expression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java deleted file mode 100644 index 791abba8dc35..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,7 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - - -public interface ConsoleExpression_BehaviorDescriptor extends ConsoleHelpProvider_BehaviorDescriptor { -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_Behavior.java deleted file mode 100644 index be7fbb6f9120..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_Behavior.java +++ /dev/null @@ -1,36 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.smodel.behaviour.BehaviorReflection; - -public class ConsoleHelpProvider_Behavior { - public static void init(SNode thisNode) { - } - public static String virtual_getShortHelp_473081947982699339(SAbstractConcept thisConcept) { - return SPropertyOperations.getString(SNodeOperations.asNode(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), MetaAdapterFactory.getProperty(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0x1103553c5ffL, 0x403a32c5772bbe20L, "conceptShortDescription")); - } - public static String virtual_getHelpPage_7006261637493125297(SAbstractConcept thisConcept) { - return null; - } - public static String virtual_getGroup_6928665434441162387(SAbstractConcept thisConcept) { - return SNodeOperations.getModel(SNodeOperations.asNode(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName()))).getModule().getModuleName(); - } - public static String virtual_getShortDisplayString_7006261637493126103(SAbstractConcept thisConcept) { - String alias = SPropertyOperations.getString(SNodeOperations.asNode(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), MetaAdapterFactory.getProperty(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0x1103553c5ffL, 0x46ab0ad5826c74caL, "conceptAlias")); - if ((alias != null && alias.length() > 0)) { - return alias; - } else { - return SPropertyOperations.getString(SNodeOperations.asNode(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), MetaAdapterFactory.getProperty(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x110396eaaa4L, 0x110396ec041L, "name")); - } - } - public static String virtual_getDisplayString_6891027939994892943(SAbstractConcept thisConcept) { - return BehaviorReflection.invokeVirtualStatic(String.class, SNodeOperations.asSConcept(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), "virtual_getShortDisplayString_7006261637493126103", new Object[]{}); - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_BehaviorDescriptor.java deleted file mode 100644 index 16d722611ef7..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleHelpProvider_BehaviorDescriptor.java +++ /dev/null @@ -1,14 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.language.SConcept; - -public interface ConsoleHelpProvider_BehaviorDescriptor { - public String virtual_getShortHelp_473081947982699339(SConcept thisConcept); - public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept); - public String virtual_getKind_7006261637493126084(SConcept thisConcept); - public String virtual_getGroup_6928665434441162387(SConcept thisConcept); - public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept); - public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept); -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_Behavior.java deleted file mode 100644 index bb2d6ea78952..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_Behavior.java +++ /dev/null @@ -1,14 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SAbstractConcept; - -public class ConsoleOperation_Behavior { - public static void init(SNode thisNode) { - } - public static String virtual_getKind_7006261637493126084(SAbstractConcept thisConcept) { - return "operation"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java deleted file mode 100644 index 9b43fc56d583..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ConsoleOperation_BehaviorDescriptor.java +++ /dev/null @@ -1,7 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - - -public interface ConsoleOperation_BehaviorDescriptor extends ConsoleHelpProvider_BehaviorDescriptor { -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/CustomScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/CustomScope_BehaviorDescriptor.java deleted file mode 100644 index 83bed45b0710..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/CustomScope_BehaviorDescriptor.java +++ /dev/null @@ -1,13 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - - -public class CustomScope_BehaviorDescriptor extends ScopeParameter_BehaviorDescriptor { - public CustomScope_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.CustomScope"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/GlobalScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/GlobalScope_BehaviorDescriptor.java deleted file mode 100644 index 947638a15359..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/GlobalScope_BehaviorDescriptor.java +++ /dev/null @@ -1,13 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - - -public class GlobalScope_BehaviorDescriptor extends ScopeParameter_BehaviorDescriptor { - public GlobalScope_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.GlobalScope"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_Behavior.java deleted file mode 100644 index b580a9d3f4e0..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_Behavior.java +++ /dev/null @@ -1,25 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.internal.collections.runtime.ListSequence; -import java.util.ArrayList; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.smodel.behaviour.BehaviorReflection; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; - -public class InstancesExpression_Behavior { - public static void init(SNode thisNode) { - } - public static Iterable virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) { - return ListSequence.fromListAndArray(new ArrayList(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly").getDeclarationNode()); - } - public static String virtual_getHelpPage_7006261637493125297(SAbstractConcept thisConcept) { - return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.console.blCommand.structure.QueryExpression", "virtual_getHelpPage_7006261637493125297", new Object[]{}) + "\nImplementation of this command uses the IDE indexes to speed up execution"; - } - public static String virtual_getDisplayString_6891027939994892943(SAbstractConcept thisConcept) { - return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.console.blCommand.structure.QueryExpression", "virtual_getDisplayString_6891027939994892943", new Object[]{}) + "(concept)"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_BehaviorDescriptor.java deleted file mode 100644 index 23a08b3475a4..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/InstancesExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,24 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.language.SConcept; -import org.jetbrains.mps.openapi.model.SNode; - -public class InstancesExpression_BehaviorDescriptor extends QueryExpression_BehaviorDescriptor { - public InstancesExpression_BehaviorDescriptor() { - } - public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { - return InstancesExpression_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); - } - public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { - return InstancesExpression_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); - } - public Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept) { - return InstancesExpression_Behavior.virtual_getSupportedParameters_4307205004146936444(thisConcept); - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.InstancesExpression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelScope_BehaviorDescriptor.java deleted file mode 100644 index f23ec4a7e516..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelScope_BehaviorDescriptor.java +++ /dev/null @@ -1,13 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - - -public class ModelScope_BehaviorDescriptor extends ScopeParameter_BehaviorDescriptor { - public ModelScope_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.ModelScope"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_Behavior.java deleted file mode 100644 index 2b95c987487c..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_Behavior.java +++ /dev/null @@ -1,17 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.internal.collections.runtime.ListSequence; -import java.util.ArrayList; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; - -public class ModelsExpression_Behavior { - public static void init(SNode thisNode) { - } - public static Iterable virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) { - return ListSequence.fromListAndArray(new ArrayList(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly").getDeclarationNode()); - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_BehaviorDescriptor.java deleted file mode 100644 index 997d34018f59..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModelsExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,18 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SConcept; - -public class ModelsExpression_BehaviorDescriptor extends QueryExpression_BehaviorDescriptor { - public ModelsExpression_BehaviorDescriptor() { - } - public Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept) { - return ModelsExpression_Behavior.virtual_getSupportedParameters_4307205004146936444(thisConcept); - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.ModelsExpression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_Behavior.java deleted file mode 100644 index 3c0b2fc594be..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_Behavior.java +++ /dev/null @@ -1,17 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.internal.collections.runtime.ListSequence; -import java.util.ArrayList; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; - -public class ModulesExpression_Behavior { - public static void init(SNode thisNode) { - } - public static Iterable virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) { - return ListSequence.fromListAndArray(new ArrayList(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly").getDeclarationNode()); - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_BehaviorDescriptor.java deleted file mode 100644 index 39f93aa4d2e0..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,18 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SConcept; - -public class ModulesExpression_BehaviorDescriptor extends QueryExpression_BehaviorDescriptor { - public ModulesExpression_BehaviorDescriptor() { - } - public Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept) { - return ModulesExpression_Behavior.virtual_getSupportedParameters_4307205004146936444(thisConcept); - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.ModulesExpression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesScope_BehaviorDescriptor.java deleted file mode 100644 index 029b01c62b31..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ModulesScope_BehaviorDescriptor.java +++ /dev/null @@ -1,13 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - - -public class ModulesScope_BehaviorDescriptor extends ScopeParameter_BehaviorDescriptor { - public ModulesScope_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.ModulesScope"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_Behavior.java deleted file mode 100644 index dfa7158ce0cd..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_Behavior.java +++ /dev/null @@ -1,17 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.internal.collections.runtime.ListSequence; -import java.util.ArrayList; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; - -public class NodesExpression_Behavior { - public static void init(SNode thisNode) { - } - public static Iterable virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) { - return ListSequence.fromListAndArray(new ArrayList(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly").getDeclarationNode()); - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_BehaviorDescriptor.java deleted file mode 100644 index 1764788030a4..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/NodesExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,18 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SConcept; - -public class NodesExpression_BehaviorDescriptor extends QueryExpression_BehaviorDescriptor { - public NodesExpression_BehaviorDescriptor() { - } - public Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept) { - return NodesExpression_Behavior.virtual_getSupportedParameters_4307205004146936444(thisConcept); - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.NodesExpression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_Behavior.java deleted file mode 100644 index f478e8483526..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_Behavior.java +++ /dev/null @@ -1,14 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SAbstractConcept; - -public class PrintExpression_Behavior { - public static void init(SNode thisNode) { - } - public static String virtual_getShortHelp_473081947982699339(SAbstractConcept thisConcept) { - return "print into the console window"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java deleted file mode 100644 index cb21a7958b15..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,32 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.language.SConcept; - -public class PrintExpression_BehaviorDescriptor extends AbstractPrintExpression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor { - public PrintExpression_BehaviorDescriptor() { - } - public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); - } - public String virtual_getGroup_6928665434441162387(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); - } - public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); - } - public String virtual_getKind_7006261637493126084(SConcept thisConcept) { - return ConsoleExpression_Behavior.virtual_getKind_7006261637493126084(thisConcept); - } - public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); - } - public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) { - return PrintExpression_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.PrintExpression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeExpression_BehaviorDescriptor.java deleted file mode 100644 index 3565be43463c..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,13 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - - -public class PrintNodeExpression_BehaviorDescriptor extends AbstractPrintExpression_BehaviorDescriptor { - public PrintNodeExpression_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.PrintNodeExpression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java deleted file mode 100644 index 1795b7f05a13..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintNodeReferenceExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,13 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - - -public class PrintNodeReferenceExpression_BehaviorDescriptor extends AbstractPrintExpression_BehaviorDescriptor { - public PrintNodeReferenceExpression_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintSequenceExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintSequenceExpression_BehaviorDescriptor.java deleted file mode 100644 index 1bd820f93fb2..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintSequenceExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,13 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - - -public class PrintSequenceExpression_BehaviorDescriptor extends AbstractPrintExpression_BehaviorDescriptor { - public PrintSequenceExpression_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintTextExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintTextExpression_BehaviorDescriptor.java deleted file mode 100644 index f9f38413ebe9..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/PrintTextExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,13 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - - -public class PrintTextExpression_BehaviorDescriptor extends AbstractPrintExpression_BehaviorDescriptor { - public PrintTextExpression_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.PrintTextExpression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_Behavior.java deleted file mode 100644 index 2f991d4a4e5e..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_Behavior.java +++ /dev/null @@ -1,14 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SAbstractConcept; - -public class ProjectExpression_Behavior { - public static void init(SNode thisNode) { - } - public static Iterable virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) { - return null; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_BehaviorDescriptor.java deleted file mode 100644 index 22e2f443ecbb..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,18 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SConcept; - -public class ProjectExpression_BehaviorDescriptor extends QueryExpression_BehaviorDescriptor { - public ProjectExpression_BehaviorDescriptor() { - } - public Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept) { - return ProjectExpression_Behavior.virtual_getSupportedParameters_4307205004146936444(thisConcept); - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.ProjectExpression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectScope_BehaviorDescriptor.java deleted file mode 100644 index 53324fc66cdd..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ProjectScope_BehaviorDescriptor.java +++ /dev/null @@ -1,13 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - - -public class ProjectScope_BehaviorDescriptor extends ScopeParameter_BehaviorDescriptor { - public ProjectScope_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.ProjectScope"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_Behavior.java deleted file mode 100644 index 514de5562ba2..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_Behavior.java +++ /dev/null @@ -1,39 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.internal.collections.runtime.Sequence; -import jetbrains.mps.smodel.behaviour.BehaviorReflection; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; - -public class QueryExpression_Behavior { - public static void init(SNode thisNode) { - } - public static boolean virtual_legalAsStatement_1262430001741498032(SAbstractConcept thisConcept) { - return true; - } - public static String virtual_getHelpPage_7006261637493125297(SAbstractConcept thisConcept) { - String result = "Supported parameters:\n"; - if (Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class>) ((Class) Object.class), SNodeOperations.asSConcept(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).contains(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope").getDeclarationNode())) { - result += "scope (default = project) specifies the boundaries of the lookup operation\n"; - } - if (Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class>) ((Class) Object.class), SNodeOperations.asSConcept(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).contains(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly").getDeclarationNode())) { - result += "r/o+ (default = false) also search in read-only models\n"; - } else { - result += "Note: read-only models are included in the search scope\n"; - } - return result; - } - public static String virtual_getDisplayString_6891027939994892943(SAbstractConcept thisConcept) { - String result = BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.console.blCommand.structure.ConsoleExpression", "virtual_getShortDisplayString_7006261637493126103", new Object[]{}); - if (Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class>) ((Class) Object.class), SNodeOperations.asSConcept(SConceptOperations.findConceptDeclaration(thisConcept.getQualifiedName())), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).isEmpty()) { - return result; - } else { - return result + ""; - } - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java deleted file mode 100644 index d78d4b5b97b9..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,38 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; -import org.jetbrains.mps.openapi.language.SConcept; -import org.jetbrains.mps.openapi.model.SNode; - -public abstract class QueryExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor { - public QueryExpression_BehaviorDescriptor() { - } - public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { - return QueryExpression_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); - } - public String virtual_getGroup_6928665434441162387(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); - } - public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { - return QueryExpression_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); - } - public String virtual_getKind_7006261637493126084(SConcept thisConcept) { - return ConsoleExpression_Behavior.virtual_getKind_7006261637493126084(thisConcept); - } - public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); - } - public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); - } - public boolean virtual_legalAsStatement_1262430001741498032(SConcept thisConcept) { - return QueryExpression_Behavior.virtual_legalAsStatement_1262430001741498032(thisConcept); - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.QueryExpression"; - } - public abstract Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept); -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java deleted file mode 100644 index 0a8dd311bd81..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterIncludeReadOnly_BehaviorDescriptor.java +++ /dev/null @@ -1,13 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - - -public class QueryParameterIncludeReadOnly_BehaviorDescriptor extends QueryParameter_BehaviorDescriptor { - public QueryParameterIncludeReadOnly_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterList_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterList_BehaviorDescriptor.java deleted file mode 100644 index 25d7cd274657..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterList_BehaviorDescriptor.java +++ /dev/null @@ -1,14 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; - -public class QueryParameterList_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor { - public QueryParameterList_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.QueryParameterList"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterScope_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterScope_BehaviorDescriptor.java deleted file mode 100644 index 42cad177f278..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameterScope_BehaviorDescriptor.java +++ /dev/null @@ -1,13 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - - -public class QueryParameterScope_BehaviorDescriptor extends QueryParameter_BehaviorDescriptor { - public QueryParameterScope_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.QueryParameterScope"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameter_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameter_BehaviorDescriptor.java deleted file mode 100644 index 697315de8e8c..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/QueryParameter_BehaviorDescriptor.java +++ /dev/null @@ -1,14 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; - -public abstract class QueryParameter_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor { - public QueryParameter_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.QueryParameter"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_Behavior.java deleted file mode 100644 index f1c78f381b37..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_Behavior.java +++ /dev/null @@ -1,17 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.internal.collections.runtime.ListSequence; -import java.util.ArrayList; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; - -public class ReferencesExpression_Behavior { - public static void init(SNode thisNode) { - } - public static Iterable virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) { - return ListSequence.fromListAndArray(new ArrayList(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly").getDeclarationNode()); - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_BehaviorDescriptor.java deleted file mode 100644 index 135c3f09530b..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ReferencesExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,18 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SConcept; - -public class ReferencesExpression_BehaviorDescriptor extends QueryExpression_BehaviorDescriptor { - public ReferencesExpression_BehaviorDescriptor() { - } - public Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept) { - return ReferencesExpression_Behavior.virtual_getSupportedParameters_4307205004146936444(thisConcept); - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.ReferencesExpression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ScopeParameter_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ScopeParameter_BehaviorDescriptor.java deleted file mode 100644 index b4ff9c915116..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ScopeParameter_BehaviorDescriptor.java +++ /dev/null @@ -1,14 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import jetbrains.mps.lang.core.behavior.BaseConcept_BehaviorDescriptor; - -public abstract class ScopeParameter_BehaviorDescriptor extends BaseConcept_BehaviorDescriptor { - public ScopeParameter_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.ScopeParameter"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_Behavior.java deleted file mode 100644 index f95588b10e1f..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_Behavior.java +++ /dev/null @@ -1,17 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SAbstractConcept; - -public class ShowExpression_Behavior { - public static void init(SNode thisNode) { - } - public static boolean virtual_legalAsStatement_1262430001741498032(SAbstractConcept thisConcept) { - return true; - } - public static String virtual_getShortHelp_473081947982699339(SAbstractConcept thisConcept) { - return "show sequence of nodes/references/models/modules in the Usages View panel"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java deleted file mode 100644 index 239ae177735c..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/ShowExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,36 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import jetbrains.mps.baseLanguage.behavior.Expression_BehaviorDescriptor; -import org.jetbrains.mps.openapi.language.SConcept; - -public class ShowExpression_BehaviorDescriptor extends Expression_BehaviorDescriptor implements ConsoleExpression_BehaviorDescriptor { - public ShowExpression_BehaviorDescriptor() { - } - public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); - } - public String virtual_getGroup_6928665434441162387(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getGroup_6928665434441162387(thisConcept); - } - public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); - } - public String virtual_getKind_7006261637493126084(SConcept thisConcept) { - return ConsoleExpression_Behavior.virtual_getKind_7006261637493126084(thisConcept); - } - public String virtual_getShortDisplayString_7006261637493126103(SConcept thisConcept) { - return ConsoleHelpProvider_Behavior.virtual_getShortDisplayString_7006261637493126103(thisConcept); - } - public String virtual_getShortHelp_473081947982699339(SConcept thisConcept) { - return ShowExpression_Behavior.virtual_getShortHelp_473081947982699339(thisConcept); - } - public boolean virtual_legalAsStatement_1262430001741498032(SConcept thisConcept) { - return ShowExpression_Behavior.virtual_legalAsStatement_1262430001741498032(thisConcept); - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.ShowExpression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_Behavior.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_Behavior.java deleted file mode 100644 index eec41dbc0c26..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_Behavior.java +++ /dev/null @@ -1,25 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.internal.collections.runtime.ListSequence; -import java.util.ArrayList; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.smodel.behaviour.BehaviorReflection; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; - -public class UsagesExpression_Behavior { - public static void init(SNode thisNode) { - } - public static Iterable virtual_getSupportedParameters_4307205004146936444(SAbstractConcept thisConcept) { - return ListSequence.fromListAndArray(new ArrayList(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, "jetbrains.mps.console.blCommand.structure.QueryParameterScope").getDeclarationNode(), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L, "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly").getDeclarationNode()); - } - public static String virtual_getHelpPage_7006261637493125297(SAbstractConcept thisConcept) { - return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.console.blCommand.structure.QueryExpression", "virtual_getHelpPage_7006261637493125297", new Object[]{}) + "\nImplementation of this command uses the IDE indexes to speed up execution"; - } - public static String virtual_getDisplayString_6891027939994892943(SAbstractConcept thisConcept) { - return BehaviorReflection.invokeSuperStatic(String.class, SNodeOperations.asSConcept(thisConcept), "jetbrains.mps.console.blCommand.structure.QueryExpression", "virtual_getDisplayString_6891027939994892943", new Object[]{}) + "(node)"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_BehaviorDescriptor.java deleted file mode 100644 index 7dac71a50a68..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/UsagesExpression_BehaviorDescriptor.java +++ /dev/null @@ -1,24 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import org.jetbrains.mps.openapi.language.SConcept; -import org.jetbrains.mps.openapi.model.SNode; - -public class UsagesExpression_BehaviorDescriptor extends QueryExpression_BehaviorDescriptor { - public UsagesExpression_BehaviorDescriptor() { - } - public String virtual_getDisplayString_6891027939994892943(SConcept thisConcept) { - return UsagesExpression_Behavior.virtual_getDisplayString_6891027939994892943(thisConcept); - } - public String virtual_getHelpPage_7006261637493125297(SConcept thisConcept) { - return UsagesExpression_Behavior.virtual_getHelpPage_7006261637493125297(thisConcept); - } - public Iterable virtual_getSupportedParameters_4307205004146936444(SConcept thisConcept) { - return UsagesExpression_Behavior.virtual_getSupportedParameters_4307205004146936444(thisConcept); - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.UsagesExpression"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java deleted file mode 100644 index ecf6c6714ca9..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/WithStatement_BehaviorDescriptor.java +++ /dev/null @@ -1,14 +0,0 @@ -package jetbrains.mps.console.blCommand.behavior; - -/*Generated by MPS */ - -import jetbrains.mps.baseLanguage.behavior.Statement_BehaviorDescriptor; - -public class WithStatement_BehaviorDescriptor extends Statement_BehaviorDescriptor { - public WithStatement_BehaviorDescriptor() { - } - @Override - public String getConceptFqName() { - return "jetbrains.mps.console.blCommand.structure.WithStatement"; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info deleted file mode 100644 index 3555e74e0ea6..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/behavior/trace.info +++ /dev/null @@ -1,420 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/ConstraintsAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/ConstraintsAspectDescriptor.java deleted file mode 100644 index 061f1318a747..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/ConstraintsAspectDescriptor.java +++ /dev/null @@ -1,25 +0,0 @@ -package jetbrains.mps.console.blCommand.constraints; - -/*Generated by MPS */ - -import jetbrains.mps.smodel.runtime.ConstraintsDescriptor; -import jetbrains.mps.smodel.adapter.ids.SConceptId; -import jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor; - -public class ConstraintsAspectDescriptor implements jetbrains.mps.smodel.runtime.ConstraintsAspectDescriptor { - public ConstraintsAspectDescriptor() { - } - public ConstraintsDescriptor getDescriptor(SConceptId conceptId) { - long id = conceptId.getIdValue(); - if (id == 0x6b643f33718aa10dL) { - return new InstancesExpression_Constraints(); - } - if (id == 0x75bb0160f191d6ebL) { - return new UsagesExpression_Constraints(); - } - if (id == 0x3bc64421760badf5L) { - return new QueryParameter_Constraints(); - } - return new BaseConstraintsDescriptor(conceptId); - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/InstancesExpression_Constraints.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/InstancesExpression_Constraints.java deleted file mode 100644 index 77996e73a8fb..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/InstancesExpression_Constraints.java +++ /dev/null @@ -1,38 +0,0 @@ -package jetbrains.mps.console.blCommand.constraints; - -/*Generated by MPS */ - -import jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor; -import jetbrains.mps.smodel.adapter.ids.MetaIdFactory; -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.annotations.Nullable; -import jetbrains.mps.smodel.IOperationContext; -import jetbrains.mps.smodel.runtime.CheckingNodeContext; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.smodel.SNodePointer; - -public class InstancesExpression_Constraints extends BaseConstraintsDescriptor { - public InstancesExpression_Constraints() { - super(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL)); - } - @Override - public boolean hasOwnCanBeAncestorMethod() { - return true; - } - @Override - public boolean canBeAncestor(SNode node, @Nullable SNode childNode, SNode childConcept, IOperationContext context, @Nullable CheckingNodeContext checkingNodeContext) { - boolean result = static_canBeAnAncestor(node, childNode, childConcept, context); - - if (!(result) && checkingNodeContext != null) { - checkingNodeContext.setBreakingNode(canBeAncesctorBreakingPoint); - } - - return result; - } - public static boolean static_canBeAnAncestor(SNode node, SNode childNode, SNode childConcept, final IOperationContext operationContext) { - return !(SConceptOperations.isExactly(SNodeOperations.asSConcept(childConcept), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add42L, "jetbrains.mps.console.blCommand.structure.GlobalScope"))); - } - private static SNodePointer canBeAncesctorBreakingPoint = new SNodePointer("r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.console.blCommand.constraints)", "3470161847493603670"); -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/QueryParameter_Constraints.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/QueryParameter_Constraints.java deleted file mode 100644 index 9519de89480d..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/QueryParameter_Constraints.java +++ /dev/null @@ -1,46 +0,0 @@ -package jetbrains.mps.console.blCommand.constraints; - -/*Generated by MPS */ - -import jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor; -import jetbrains.mps.smodel.adapter.ids.MetaIdFactory; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.smodel.IOperationContext; -import jetbrains.mps.smodel.runtime.CheckingNodeContext; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.internal.collections.runtime.Sequence; -import jetbrains.mps.smodel.behaviour.BehaviorReflection; -import jetbrains.mps.smodel.SNodePointer; - -public class QueryParameter_Constraints extends BaseConstraintsDescriptor { - public QueryParameter_Constraints() { - super(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)); - } - @Override - public boolean hasOwnCanBeChildMethod() { - return true; - } - @Override - public boolean canBeChild(@Nullable SNode node, SNode parentNode, SNode link, SNode childConcept, final IOperationContext operationContext, @Nullable final CheckingNodeContext checkingNodeContext) { - boolean result = static_canBeAChild(node, parentNode, link, childConcept, operationContext); - - if (!(result) && checkingNodeContext != null) { - checkingNodeContext.setBreakingNode(canBeChildBreakingPoint); - } - - return result; - } - public static boolean static_canBeAChild(SNode node, SNode parentNode, SNode link, SNode childConcept, final IOperationContext operationContext) { - if (neq_2bkn6k_a0a0d(SNodeOperations.getContainingLinkDeclaration(parentNode), SLinkOperations.findLinkDeclaration(MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")))) { - return false; - } - return Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class>) ((Class) Object.class), SNodeOperations.asSConcept(SNodeOperations.getConcept(SNodeOperations.cast(SNodeOperations.getParent(parentNode), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.console.blCommand.structure.QueryExpression")))), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).contains((SNode) childConcept); - } - private static boolean neq_2bkn6k_a0a0d(Object a, Object b) { - return !(((a != null ? a.equals(b) : a == b))); - } - private static SNodePointer canBeChildBreakingPoint = new SNodePointer("r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.console.blCommand.constraints)", "6891027939993473118"); -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/UsagesExpression_Constraints.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/UsagesExpression_Constraints.java deleted file mode 100644 index 318e5f338076..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/UsagesExpression_Constraints.java +++ /dev/null @@ -1,38 +0,0 @@ -package jetbrains.mps.console.blCommand.constraints; - -/*Generated by MPS */ - -import jetbrains.mps.smodel.runtime.base.BaseConstraintsDescriptor; -import jetbrains.mps.smodel.adapter.ids.MetaIdFactory; -import org.jetbrains.mps.openapi.model.SNode; -import org.jetbrains.annotations.Nullable; -import jetbrains.mps.smodel.IOperationContext; -import jetbrains.mps.smodel.runtime.CheckingNodeContext; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.smodel.SNodePointer; - -public class UsagesExpression_Constraints extends BaseConstraintsDescriptor { - public UsagesExpression_Constraints() { - super(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL)); - } - @Override - public boolean hasOwnCanBeAncestorMethod() { - return true; - } - @Override - public boolean canBeAncestor(SNode node, @Nullable SNode childNode, SNode childConcept, IOperationContext context, @Nullable CheckingNodeContext checkingNodeContext) { - boolean result = static_canBeAnAncestor(node, childNode, childConcept, context); - - if (!(result) && checkingNodeContext != null) { - checkingNodeContext.setBreakingNode(canBeAncesctorBreakingPoint); - } - - return result; - } - public static boolean static_canBeAnAncestor(SNode node, SNode childNode, SNode childConcept, final IOperationContext operationContext) { - return !(SConceptOperations.isExactly(SNodeOperations.asSConcept(childConcept), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add42L, "jetbrains.mps.console.blCommand.structure.GlobalScope"))); - } - private static SNodePointer canBeAncesctorBreakingPoint = new SNodePointer("r:aef526b1-5019-472a-a761-72ac88ef58a4(jetbrains.mps.console.blCommand.constraints)", "3470161847493618356"); -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/trace.info deleted file mode 100644 index 27c3c0c02868..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/constraints/trace.info +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Actions.java deleted file mode 100644 index a1a4ef1d82cc..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Actions.java +++ /dev/null @@ -1,43 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.openapi.editor.cells.EditorCell; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.openapi.editor.EditorContext; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.cells.AbstractCellAction; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; - -public class AbstractPrintExpression_Actions { - public static void setCellActions(EditorCell editorCell, SNode node, EditorContext context) { - editorCell.setAction(CellActionType.DELETE, new AbstractPrintExpression_Actions.AbstractPrintExpression_Actions_DELETE(node)); - editorCell.setAction(CellActionType.BACKSPACE, new AbstractPrintExpression_Actions.AbstractPrintExpression_Actions_BACKSPACE(node)); - } - public static class AbstractPrintExpression_Actions_DELETE extends AbstractCellAction { - /*package*/ SNode myNode; - public AbstractPrintExpression_Actions_DELETE(SNode node) { - this.myNode = node; - } - public void execute(EditorContext editorContext) { - this.execute_internal(editorContext, this.myNode); - } - public void execute_internal(EditorContext editorContext, SNode node) { - SNodeOperations.replaceWithAnother(node, SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - } - } - public static class AbstractPrintExpression_Actions_BACKSPACE extends AbstractCellAction { - /*package*/ SNode myNode; - public AbstractPrintExpression_Actions_BACKSPACE(SNode node) { - this.myNode = node; - } - public void execute(EditorContext editorContext) { - this.execute_internal(editorContext, this.myNode); - } - public void execute_internal(EditorContext editorContext, SNode node) { - SNodeOperations.replaceWithAnother(node, SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"))); - } - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Editor.java deleted file mode 100644 index 9dde009944e0..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/AbstractPrintExpression_Editor.java +++ /dev/null @@ -1,81 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.nodeEditor.DefaultNodeEditor; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import jetbrains.mps.openapi.editor.EditorContext; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; -import jetbrains.mps.nodeEditor.cellMenu.CompositeSubstituteInfo; -import jetbrains.mps.nodeEditor.cellMenu.BasicCellContext; -import jetbrains.mps.nodeEditor.cellMenu.SubstituteInfoPartExt; -import jetbrains.mps.lang.editor.generator.internal.AbstractCellMenuPart_ReplaceNode_CustomNodeConcept; -import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.language.SContainmentLink; -import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; - -public class AbstractPrintExpression_Editor extends DefaultNodeEditor { - public EditorCell createEditorCell(EditorContext editorContext, SNode node) { - return this.createCollection_9ckmec_a(editorContext, node); - } - private EditorCell createCollection_9ckmec_a(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); - editorCell.setCellId("Collection_9ckmec_a"); - editorCell.setBig(true); - editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); - editorCell.addEditorCell(this.createComponent_9ckmec_a0(editorContext, node)); - editorCell.addEditorCell(this.createRefNode_9ckmec_b0(editorContext, node)); - return editorCell; - } - private EditorCell createComponent_9ckmec_a0(EditorContext editorContext, SNode node) { - EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); - AbstractPrintExpression_Actions.setCellActions(editorCell, node, editorContext); - editorCell.setSubstituteInfo(new CompositeSubstituteInfo(editorContext, new BasicCellContext(node), new SubstituteInfoPartExt[]{new AbstractPrintExpression_Editor.ReplaceWith_AbstractPrintExpression_cellMenu_9ckmec_a0a0()})); - return editorCell; - } - public static class ReplaceWith_AbstractPrintExpression_cellMenu_9ckmec_a0a0 extends AbstractCellMenuPart_ReplaceNode_CustomNodeConcept { - public ReplaceWith_AbstractPrintExpression_cellMenu_9ckmec_a0a0() { - } - public String getReplacementConceptName() { - return "jetbrains.mps.console.blCommand.structure.AbstractPrintExpression"; - } - } - private EditorCell createRefNode_9ckmec_b0(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new AbstractPrintExpression_Editor.objectSingleRoleHandler_9ckmec_b0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object"), editorContext); - return provider.createCell(); - } - private class objectSingleRoleHandler_9ckmec_b0 extends SingleRoleCellProvider { - public objectSingleRoleHandler_9ckmec_b0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { - super(ownerNode, containmentLink, context); - } - public EditorCell createChildCell(EditorContext editorContext, SNode child) { - EditorCell editorCell = super.createChildCell(editorContext, child); - installCellInfo(child, editorCell); - return editorCell; - } - public void installCellInfo(SNode child, EditorCell editorCell) { - editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); - if (editorCell.getRole() == null) { - editorCell.setRole("object"); - } - } - - - @Override - protected EditorCell createEmptyCell() { - EditorCell editorCell = super.createEmptyCell(); - editorCell.setCellId("empty_object"); - installCellInfo(null, editorCell); - return editorCell; - } - - protected String getNoTargetText() { - return ""; - } - - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Actions.java deleted file mode 100644 index 4333888ccdbf..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Actions.java +++ /dev/null @@ -1,29 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.openapi.editor.cells.EditorCell; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.openapi.editor.EditorContext; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.cells.AbstractCellAction; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; - -public class CustomScope_Actions { - public static void setCellActions(EditorCell editorCell, SNode node, EditorContext context) { - editorCell.setAction(CellActionType.BACKSPACE, new CustomScope_Actions.CustomScope_Actions_BACKSPACE(node)); - } - public static class CustomScope_Actions_BACKSPACE extends AbstractCellAction { - /*package*/ SNode myNode; - public CustomScope_Actions_BACKSPACE(SNode node) { - this.myNode = node; - } - public void execute(EditorContext editorContext) { - this.execute_internal(editorContext, this.myNode); - } - public void execute_internal(EditorContext editorContext, SNode node) { - SNodeOperations.replaceWithNewChild(node, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.console.blCommand.structure.ScopeParameter")); - } - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Editor.java deleted file mode 100644 index f5c1ded85581..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/CustomScope_Editor.java +++ /dev/null @@ -1,64 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.nodeEditor.DefaultNodeEditor; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import jetbrains.mps.openapi.editor.EditorContext; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; -import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.language.SContainmentLink; -import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; - -public class CustomScope_Editor extends DefaultNodeEditor { - public EditorCell createEditorCell(EditorContext editorContext, SNode node) { - return this.createCollection_sm4cuc_a(editorContext, node); - } - private EditorCell createCollection_sm4cuc_a(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); - editorCell.setCellId("Collection_sm4cuc_a"); - editorCell.setBig(true); - editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); - editorCell.addEditorCell(this.createRefNode_sm4cuc_a0(editorContext, node)); - return editorCell; - } - private EditorCell createRefNode_sm4cuc_a0(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new CustomScope_Editor.scopeSingleRoleHandler_sm4cuc_a0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, 0x307931d0f985950eL, "scope"), editorContext); - return provider.createCell(); - } - private class scopeSingleRoleHandler_sm4cuc_a0 extends SingleRoleCellProvider { - public scopeSingleRoleHandler_sm4cuc_a0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { - super(ownerNode, containmentLink, context); - } - public EditorCell createChildCell(EditorContext editorContext, SNode child) { - EditorCell editorCell = super.createChildCell(editorContext, child); - installCellInfo(child, editorCell); - return editorCell; - } - public void installCellInfo(SNode child, EditorCell editorCell) { - editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); - if (editorCell.getRole() == null) { - editorCell.setRole("scope"); - } - CustomScope_Actions.setCellActions(editorCell, myOwnerNode, myEditorContext); - } - - - @Override - protected EditorCell createEmptyCell() { - EditorCell editorCell = super.createEmptyCell(); - editorCell.setCellId("empty_scope"); - installCellInfo(null, editorCell); - return editorCell; - } - - protected String getNoTargetText() { - return ""; - } - - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java deleted file mode 100644 index 77833b52ecac..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/EditorAspectDescriptorImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.openapi.editor.descriptor.EditorAspectDescriptor; -import java.util.Collection; -import jetbrains.mps.openapi.editor.descriptor.ConceptEditor; -import jetbrains.mps.smodel.runtime.ConceptDescriptor; -import java.util.Arrays; -import java.util.Collections; -import jetbrains.mps.openapi.editor.descriptor.ConceptEditorComponent; - -public class EditorAspectDescriptorImpl implements EditorAspectDescriptor { - - public Collection getEditors(ConceptDescriptor descriptor) { - switch (Arrays.binarySearch(stringSwitchCases_xbvbvu_a0a0b, descriptor.getConceptFqName())) { - case 0: - return Collections.singletonList(new AbstractPrintExpression_Editor()); - case 1: - return Collections.singletonList(new CustomScope_Editor()); - case 2: - return Collections.singletonList(new InstancesExpression_Editor()); - case 3: - return Collections.singletonList(new ModelScope_Editor()); - case 4: - return Collections.singletonList(new ModulesScope_Editor()); - case 5: - return Collections.singletonList(new QueryExpression_Editor()); - case 6: - return Collections.singletonList(new QueryParameter_Editor()); - case 7: - return Collections.singletonList(new QueryParameterList_Editor()); - case 8: - return Collections.singletonList(new QueryParameterScope_Editor()); - case 9: - return Collections.singletonList(new ScopeParameter_Editor()); - case 10: - return Collections.singletonList(new ShowExpression_Editor()); - case 11: - return Collections.singletonList(new UsagesExpression_Editor()); - case 12: - return Collections.singletonList(new WithStatement_Editor()); - default: - } - return Collections.emptyList(); - } - public Collection getEditorComponents(ConceptDescriptor descriptor, String editorComponentId) { - switch (Arrays.binarySearch(stringSwitchCases_xbvbvu_a0a0c, descriptor.getConceptFqName())) { - case 0: - if ("jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent".equals(editorComponentId)) { - return Collections.singletonList(new QueryExpression_EditorComponent()); - } - break; - default: - } - return Collections.emptyList(); - } - - - private static String[] stringSwitchCases_xbvbvu_a0a0b = new String[]{"jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", "jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.QueryExpression", "jetbrains.mps.console.blCommand.structure.QueryParameter", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ScopeParameter", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression", "jetbrains.mps.console.blCommand.structure.WithStatement"}; - private static String[] stringSwitchCases_xbvbvu_a0a0c = new String[]{"jetbrains.mps.console.blCommand.structure.QueryExpression"}; -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/InstancesExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/InstancesExpression_Editor.java deleted file mode 100644 index aae4e1b37062..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/InstancesExpression_Editor.java +++ /dev/null @@ -1,92 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.nodeEditor.DefaultNodeEditor; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import jetbrains.mps.openapi.editor.EditorContext; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; -import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; -import jetbrains.mps.openapi.editor.style.Style; -import jetbrains.mps.editor.runtime.style.StyleImpl; -import jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet; -import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.language.SContainmentLink; -import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; - -public class InstancesExpression_Editor extends DefaultNodeEditor { - public EditorCell createEditorCell(EditorContext editorContext, SNode node) { - return this.createCollection_le77e3_a(editorContext, node); - } - private EditorCell createCollection_le77e3_a(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); - editorCell.setCellId("Collection_le77e3_a"); - editorCell.setBig(true); - editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); - editorCell.addEditorCell(this.createComponent_le77e3_a0(editorContext, node)); - editorCell.addEditorCell(this.createConstant_le77e3_b0(editorContext, node)); - editorCell.addEditorCell(this.createRefNode_le77e3_c0(editorContext, node)); - editorCell.addEditorCell(this.createConstant_le77e3_d0(editorContext, node)); - return editorCell; - } - private EditorCell createComponent_le77e3_a0(EditorContext editorContext, SNode node) { - EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent"); - return editorCell; - } - private EditorCell createConstant_le77e3_b0(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "("); - editorCell.setCellId("Constant_le77e3_b0"); - Style style = new StyleImpl(); - BaseLanguageStyle_StyleSheet.apply_LeftParenAfterName(style, editorCell); - editorCell.getStyle().putAll(style); - editorCell.setDefaultText(""); - return editorCell; - } - private EditorCell createRefNode_le77e3_c0(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new InstancesExpression_Editor.conceptArgSingleRoleHandler_le77e3_c0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg"), editorContext); - return provider.createCell(); - } - private class conceptArgSingleRoleHandler_le77e3_c0 extends SingleRoleCellProvider { - public conceptArgSingleRoleHandler_le77e3_c0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { - super(ownerNode, containmentLink, context); - } - public EditorCell createChildCell(EditorContext editorContext, SNode child) { - EditorCell editorCell = super.createChildCell(editorContext, child); - installCellInfo(child, editorCell); - return editorCell; - } - public void installCellInfo(SNode child, EditorCell editorCell) { - editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); - if (editorCell.getRole() == null) { - editorCell.setRole("conceptArg"); - } - } - - - @Override - protected EditorCell createEmptyCell() { - EditorCell editorCell = super.createEmptyCell(); - editorCell.setCellId("empty_conceptArg"); - installCellInfo(null, editorCell); - return editorCell; - } - - protected String getNoTargetText() { - return ""; - } - - } - private EditorCell createConstant_le77e3_d0(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, ")"); - editorCell.setCellId("Constant_le77e3_d0"); - Style style = new StyleImpl(); - BaseLanguageStyle_StyleSheet.apply_RightParen(style, editorCell); - editorCell.getStyle().putAll(style); - editorCell.setDefaultText(""); - return editorCell; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ModelScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ModelScope_Editor.java deleted file mode 100644 index 0baacc993944..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ModelScope_Editor.java +++ /dev/null @@ -1,127 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.nodeEditor.DefaultNodeEditor; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import jetbrains.mps.openapi.editor.EditorContext; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; -import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; -import jetbrains.mps.openapi.editor.style.Style; -import jetbrains.mps.editor.runtime.style.StyleImpl; -import jetbrains.mps.editor.runtime.style.StyleAttributes; -import jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet; -import jetbrains.mps.nodeEditor.cellProviders.AbstractCellListHandler; -import jetbrains.mps.nodeEditor.cellLayout.CellLayout_Indent; -import jetbrains.mps.lang.editor.cellProviders.RefNodeListHandler; -import jetbrains.mps.smodel.action.NodeFactoryManager; -import jetbrains.mps.nodeEditor.cellActions.CellAction_DeleteNode; -import jetbrains.mps.lang.editor.cellProviders.RefNodeListHandlerElementKeyMap; -import jetbrains.mps.openapi.editor.cells.DefaultSubstituteInfo; -import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; - -public class ModelScope_Editor extends DefaultNodeEditor { - public EditorCell createEditorCell(EditorContext editorContext, SNode node) { - return this.createCollection_ukl9kw_a(editorContext, node); - } - private EditorCell createCollection_ukl9kw_a(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); - editorCell.setCellId("Collection_ukl9kw_a"); - editorCell.setBig(true); - editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); - editorCell.addEditorCell(this.createComponent_ukl9kw_a0(editorContext, node)); - editorCell.addEditorCell(this.createConstant_ukl9kw_b0(editorContext, node)); - editorCell.addEditorCell(this.createConstant_ukl9kw_c0(editorContext, node)); - editorCell.addEditorCell(this.createRefNodeList_ukl9kw_d0(editorContext, node)); - editorCell.addEditorCell(this.createConstant_ukl9kw_e0(editorContext, node)); - return editorCell; - } - private EditorCell createComponent_ukl9kw_a0(EditorContext editorContext, SNode node) { - EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); - return editorCell; - } - private EditorCell createConstant_ukl9kw_b0(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, ":"); - editorCell.setCellId("Constant_ukl9kw_b0"); - Style style = new StyleImpl(); - style.set(StyleAttributes.PUNCTUATION_LEFT, 0, true); - style.set(StyleAttributes.PUNCTUATION_RIGHT, 0, true); - editorCell.getStyle().putAll(style); - editorCell.setDefaultText(""); - return editorCell; - } - private EditorCell createConstant_ukl9kw_c0(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "["); - editorCell.setCellId("Constant_ukl9kw_c0"); - Style style = new StyleImpl(); - BaseLanguageStyle_StyleSheet.apply_LeftBracket(style, editorCell); - style.set(StyleAttributes.PUNCTUATION_LEFT, 0, true); - editorCell.getStyle().putAll(style); - editorCell.setDefaultText(""); - return editorCell; - } - private EditorCell createRefNodeList_ukl9kw_d0(EditorContext editorContext, SNode node) { - AbstractCellListHandler handler = new ModelScope_Editor.modelListHandler_ukl9kw_d0(node, "model", editorContext); - EditorCell_Collection editorCell = handler.createCells(editorContext, new CellLayout_Indent(), false); - editorCell.setCellId("refNodeList_model"); - editorCell.setRole(handler.getElementRole()); - return editorCell; - } - private static class modelListHandler_ukl9kw_d0 extends RefNodeListHandler { - public modelListHandler_ukl9kw_d0(SNode ownerNode, String childRole, EditorContext context) { - super(ownerNode, childRole, context, false); - } - public SNode createNodeToInsert(EditorContext editorContext) { - SNode listOwner = super.getOwner(); - return NodeFactoryManager.createNode(listOwner, editorContext, super.getElementRole()); - } - public EditorCell createNodeCell(EditorContext editorContext, SNode elementNode) { - EditorCell elementCell = super.createNodeCell(editorContext, elementNode); - this.installElementCellActions(this.getOwner(), elementNode, elementCell, editorContext); - return elementCell; - } - public EditorCell createEmptyCell(EditorContext editorContext) { - EditorCell emptyCell = null; - emptyCell = super.createEmptyCell(editorContext); - this.installElementCellActions(super.getOwner(), null, emptyCell, editorContext); - return emptyCell; - } - public void installElementCellActions(SNode listOwner, SNode elementNode, EditorCell elementCell, EditorContext editorContext) { - if (elementCell.getUserObject(AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET) == null) { - elementCell.putUserObject(AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET, AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET); - if (elementNode != null) { - elementCell.setAction(CellActionType.DELETE, new CellAction_DeleteNode(elementNode)); - elementCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteNode(elementNode)); - elementCell.addKeyMap(new RefNodeListHandlerElementKeyMap(this, ",")); - } - if (elementCell.getSubstituteInfo() == null || elementCell.getSubstituteInfo() instanceof DefaultSubstituteInfo) { - elementCell.setSubstituteInfo(new DefaultChildSubstituteInfo(listOwner, elementNode, super.getLinkDeclaration(), editorContext)); - } - } - } - @Override - public EditorCell createSeparatorCell(EditorContext editorContext, SNode prevNode, SNode nextNode) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, this.getOwner(), ","); - editorCell.setSelectable(false); - Style style = new StyleImpl(); - style.set(StyleAttributes.LAYOUT_CONSTRAINT, ""); - style.set(StyleAttributes.PUNCTUATION_LEFT, true); - editorCell.getStyle().putAll(style); - editorCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteNode(prevNode)); - editorCell.setAction(CellActionType.DELETE, new CellAction_DeleteNode(prevNode)); - return editorCell; - } - } - private EditorCell createConstant_ukl9kw_e0(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "]"); - editorCell.setCellId("Constant_ukl9kw_e0"); - Style style = new StyleImpl(); - BaseLanguageStyle_StyleSheet.apply_RightBracket(style, editorCell); - editorCell.getStyle().putAll(style); - editorCell.setDefaultText(""); - return editorCell; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ModulesScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ModulesScope_Editor.java deleted file mode 100644 index 54aa24d651c6..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ModulesScope_Editor.java +++ /dev/null @@ -1,127 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.nodeEditor.DefaultNodeEditor; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import jetbrains.mps.openapi.editor.EditorContext; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; -import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; -import jetbrains.mps.openapi.editor.style.Style; -import jetbrains.mps.editor.runtime.style.StyleImpl; -import jetbrains.mps.editor.runtime.style.StyleAttributes; -import jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet; -import jetbrains.mps.nodeEditor.cellProviders.AbstractCellListHandler; -import jetbrains.mps.nodeEditor.cellLayout.CellLayout_Indent; -import jetbrains.mps.lang.editor.cellProviders.RefNodeListHandler; -import jetbrains.mps.smodel.action.NodeFactoryManager; -import jetbrains.mps.nodeEditor.cellActions.CellAction_DeleteNode; -import jetbrains.mps.lang.editor.cellProviders.RefNodeListHandlerElementKeyMap; -import jetbrains.mps.openapi.editor.cells.DefaultSubstituteInfo; -import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; - -public class ModulesScope_Editor extends DefaultNodeEditor { - public EditorCell createEditorCell(EditorContext editorContext, SNode node) { - return this.createCollection_szrfqn_a(editorContext, node); - } - private EditorCell createCollection_szrfqn_a(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); - editorCell.setCellId("Collection_szrfqn_a"); - editorCell.setBig(true); - editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); - editorCell.addEditorCell(this.createComponent_szrfqn_a0(editorContext, node)); - editorCell.addEditorCell(this.createConstant_szrfqn_b0(editorContext, node)); - editorCell.addEditorCell(this.createConstant_szrfqn_c0(editorContext, node)); - editorCell.addEditorCell(this.createRefNodeList_szrfqn_d0(editorContext, node)); - editorCell.addEditorCell(this.createConstant_szrfqn_e0(editorContext, node)); - return editorCell; - } - private EditorCell createComponent_szrfqn_a0(EditorContext editorContext, SNode node) { - EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); - return editorCell; - } - private EditorCell createConstant_szrfqn_b0(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, ":"); - editorCell.setCellId("Constant_szrfqn_b0"); - Style style = new StyleImpl(); - style.set(StyleAttributes.PUNCTUATION_LEFT, 0, true); - style.set(StyleAttributes.PUNCTUATION_RIGHT, 0, true); - editorCell.getStyle().putAll(style); - editorCell.setDefaultText(""); - return editorCell; - } - private EditorCell createConstant_szrfqn_c0(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "["); - editorCell.setCellId("Constant_szrfqn_c0"); - Style style = new StyleImpl(); - BaseLanguageStyle_StyleSheet.apply_LeftBracket(style, editorCell); - style.set(StyleAttributes.PUNCTUATION_LEFT, 0, true); - editorCell.getStyle().putAll(style); - editorCell.setDefaultText(""); - return editorCell; - } - private EditorCell createRefNodeList_szrfqn_d0(EditorContext editorContext, SNode node) { - AbstractCellListHandler handler = new ModulesScope_Editor.moduleListHandler_szrfqn_d0(node, "module", editorContext); - EditorCell_Collection editorCell = handler.createCells(editorContext, new CellLayout_Indent(), false); - editorCell.setCellId("refNodeList_module"); - editorCell.setRole(handler.getElementRole()); - return editorCell; - } - private static class moduleListHandler_szrfqn_d0 extends RefNodeListHandler { - public moduleListHandler_szrfqn_d0(SNode ownerNode, String childRole, EditorContext context) { - super(ownerNode, childRole, context, false); - } - public SNode createNodeToInsert(EditorContext editorContext) { - SNode listOwner = super.getOwner(); - return NodeFactoryManager.createNode(listOwner, editorContext, super.getElementRole()); - } - public EditorCell createNodeCell(EditorContext editorContext, SNode elementNode) { - EditorCell elementCell = super.createNodeCell(editorContext, elementNode); - this.installElementCellActions(this.getOwner(), elementNode, elementCell, editorContext); - return elementCell; - } - public EditorCell createEmptyCell(EditorContext editorContext) { - EditorCell emptyCell = null; - emptyCell = super.createEmptyCell(editorContext); - this.installElementCellActions(super.getOwner(), null, emptyCell, editorContext); - return emptyCell; - } - public void installElementCellActions(SNode listOwner, SNode elementNode, EditorCell elementCell, EditorContext editorContext) { - if (elementCell.getUserObject(AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET) == null) { - elementCell.putUserObject(AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET, AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET); - if (elementNode != null) { - elementCell.setAction(CellActionType.DELETE, new CellAction_DeleteNode(elementNode)); - elementCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteNode(elementNode)); - elementCell.addKeyMap(new RefNodeListHandlerElementKeyMap(this, ",")); - } - if (elementCell.getSubstituteInfo() == null || elementCell.getSubstituteInfo() instanceof DefaultSubstituteInfo) { - elementCell.setSubstituteInfo(new DefaultChildSubstituteInfo(listOwner, elementNode, super.getLinkDeclaration(), editorContext)); - } - } - } - @Override - public EditorCell createSeparatorCell(EditorContext editorContext, SNode prevNode, SNode nextNode) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, this.getOwner(), ","); - editorCell.setSelectable(false); - Style style = new StyleImpl(); - style.set(StyleAttributes.LAYOUT_CONSTRAINT, ""); - style.set(StyleAttributes.PUNCTUATION_LEFT, true); - editorCell.getStyle().putAll(style); - editorCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteNode(prevNode)); - editorCell.setAction(CellActionType.DELETE, new CellAction_DeleteNode(prevNode)); - return editorCell; - } - } - private EditorCell createConstant_szrfqn_e0(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "]"); - editorCell.setCellId("Constant_szrfqn_e0"); - Style style = new StyleImpl(); - BaseLanguageStyle_StyleSheet.apply_RightBracket(style, editorCell); - editorCell.getStyle().putAll(style); - editorCell.setDefaultText(""); - return editorCell; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Actions.java deleted file mode 100644 index d60034aa2551..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Actions.java +++ /dev/null @@ -1,47 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.openapi.editor.cells.EditorCell; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.openapi.editor.EditorContext; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.cells.AbstractCellAction; -import jetbrains.mps.internal.collections.runtime.ListSequence; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.editor.runtime.selection.SelectionUtil; -import jetbrains.mps.openapi.editor.selection.SelectionManager; - -public class QueryExpression_Actions { - public static void setCellActions(EditorCell editorCell, SNode node, EditorContext context) { - editorCell.setAction(CellActionType.DELETE, new QueryExpression_Actions.QueryExpression_Actions_DELETE(node)); - editorCell.setAction(CellActionType.BACKSPACE, new QueryExpression_Actions.QueryExpression_Actions_BACKSPACE(node)); - } - public static class QueryExpression_Actions_DELETE extends AbstractCellAction { - /*package*/ SNode myNode; - public QueryExpression_Actions_DELETE(SNode node) { - this.myNode = node; - } - public void execute(EditorContext editorContext) { - this.execute_internal(editorContext, this.myNode); - } - public void execute_internal(EditorContext editorContext, SNode node) { - ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).clear(); - SelectionUtil.selectLabelCellAnSetCaret(editorContext, node, SelectionManager.LAST_CELL, -1); - } - } - public static class QueryExpression_Actions_BACKSPACE extends AbstractCellAction { - /*package*/ SNode myNode; - public QueryExpression_Actions_BACKSPACE(SNode node) { - this.myNode = node; - } - public void execute(EditorContext editorContext) { - this.execute_internal(editorContext, this.myNode); - } - public void execute_internal(EditorContext editorContext, SNode node) { - ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).clear(); - SelectionUtil.selectLabelCellAnSetCaret(editorContext, node, SelectionManager.LAST_CELL, -1); - } - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Editor.java deleted file mode 100644 index 7148fd5e2bef..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_Editor.java +++ /dev/null @@ -1,26 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.nodeEditor.DefaultNodeEditor; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import jetbrains.mps.openapi.editor.EditorContext; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.editor.runtime.cells.BigCellUtil; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; - -public class QueryExpression_Editor extends DefaultNodeEditor { - public EditorCell createEditorCell(EditorContext editorContext, SNode node) { - return this.createComponent_8t0fqe_a(editorContext, node); - } - private EditorCell createComponent_8t0fqe_a(EditorContext editorContext, SNode node) { - EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent"); - EditorCell bigCell = BigCellUtil.findBigCell(editorCell, node); - if (bigCell != null) { - bigCell.setBig(true); - } - editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); - return editorCell; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_EditorComponent.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_EditorComponent.java deleted file mode 100644 index c1635ba8770a..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_EditorComponent.java +++ /dev/null @@ -1,127 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.openapi.editor.descriptor.ConceptEditorComponent; -import java.util.Collection; -import java.util.Collections; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import jetbrains.mps.openapi.editor.EditorContext; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; -import jetbrains.mps.openapi.editor.style.Style; -import jetbrains.mps.editor.runtime.style.StyleImpl; -import jetbrains.mps.editor.runtime.style.StyleAttributes; -import jetbrains.mps.nodeEditor.cellMenu.CompositeSubstituteInfo; -import jetbrains.mps.nodeEditor.cellMenu.BasicCellContext; -import jetbrains.mps.nodeEditor.cellMenu.SubstituteInfoPartExt; -import jetbrains.mps.lang.editor.generator.internal.AbstractCellMenuPart_ReplaceNode_CustomNodeConcept; -import jetbrains.mps.internal.collections.runtime.ListSequence; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; -import jetbrains.mps.baseLanguage.collections.editor.Collections_Style_StyleSheet; -import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; -import org.jetbrains.mps.openapi.language.SContainmentLink; -import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; - -public class QueryExpression_EditorComponent implements ConceptEditorComponent { - public Collection getContextHints() { - return Collections.emptyList(); - } - public EditorCell createEditorCell(EditorContext editorContext, SNode node) { - return this.createCollection_adikco_a(editorContext, node); - } - private EditorCell createCollection_adikco_a(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); - editorCell.setCellId("Collection_adikco_a"); - editorCell.addEditorCell(this.createComponent_adikco_a0(editorContext, node)); - if (renderingCondition_adikco_a1a(node, editorContext)) { - editorCell.addEditorCell(this.createCollection_adikco_b0(editorContext, node)); - } - return editorCell; - } - private EditorCell createComponent_adikco_a0(EditorContext editorContext, SNode node) { - EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); - Style style = new StyleImpl(); - style.set(StyleAttributes.AUTO_DELETABLE, 0, true); - editorCell.getStyle().putAll(style); - editorCell.addKeyMap(new QueryExpression_KeyMap()); - editorCell.setSubstituteInfo(new CompositeSubstituteInfo(editorContext, new BasicCellContext(node), new SubstituteInfoPartExt[]{new QueryExpression_EditorComponent.ReplaceWith_QueryExpression_cellMenu_adikco_a0a0()})); - return editorCell; - } - public static class ReplaceWith_QueryExpression_cellMenu_adikco_a0a0 extends AbstractCellMenuPart_ReplaceNode_CustomNodeConcept { - public ReplaceWith_QueryExpression_cellMenu_adikco_a0a0() { - } - public String getReplacementConceptName() { - return "jetbrains.mps.console.blCommand.structure.QueryExpression"; - } - } - private EditorCell createCollection_adikco_b0(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); - editorCell.setCellId("Collection_adikco_b0"); - Style style = new StyleImpl(); - style.set(StyleAttributes.SELECTABLE, 0, false); - editorCell.getStyle().putAll(style); - editorCell.addEditorCell(this.createConstant_adikco_a1a(editorContext, node)); - editorCell.addEditorCell(this.createRefNode_adikco_b1a(editorContext, node)); - editorCell.addEditorCell(this.createConstant_adikco_c1a(editorContext, node)); - return editorCell; - } - private static boolean renderingCondition_adikco_a1a(SNode node, EditorContext editorContext) { - return ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).isNotEmpty(); - } - private EditorCell createConstant_adikco_a1a(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "<"); - editorCell.setCellId("Constant_adikco_a1a"); - Style style = new StyleImpl(); - Collections_Style_StyleSheet.apply_LeftAngleBracket(style, editorCell); - editorCell.getStyle().putAll(style); - editorCell.setDefaultText(""); - return editorCell; - } - private EditorCell createRefNode_adikco_b1a(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new QueryExpression_EditorComponent.parameterSingleRoleHandler_adikco_b1a(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter"), editorContext); - return provider.createCell(); - } - private class parameterSingleRoleHandler_adikco_b1a extends SingleRoleCellProvider { - public parameterSingleRoleHandler_adikco_b1a(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { - super(ownerNode, containmentLink, context); - } - public EditorCell createChildCell(EditorContext editorContext, SNode child) { - EditorCell editorCell = super.createChildCell(editorContext, child); - installCellInfo(child, editorCell); - return editorCell; - } - public void installCellInfo(SNode child, EditorCell editorCell) { - editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); - if (editorCell.getRole() == null) { - editorCell.setRole("parameter"); - } - } - - - @Override - protected EditorCell createEmptyCell() { - EditorCell editorCell = super.createEmptyCell(); - editorCell.setCellId("empty_parameter"); - installCellInfo(null, editorCell); - return editorCell; - } - - protected String getNoTargetText() { - return ""; - } - - } - private EditorCell createConstant_adikco_c1a(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, ">"); - editorCell.setCellId("Constant_adikco_c1a"); - Style style = new StyleImpl(); - Collections_Style_StyleSheet.apply_RightAngleBracket(style, editorCell); - editorCell.getStyle().putAll(style); - QueryExpression_Actions.setCellActions(editorCell, node, editorContext); - editorCell.setDefaultText(""); - return editorCell; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_KeyMap.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_KeyMap.java deleted file mode 100644 index be857998e3c5..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryExpression_KeyMap.java +++ /dev/null @@ -1,62 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.editor.runtime.cells.KeyMapImpl; -import jetbrains.mps.openapi.editor.cells.KeyMapAction; -import jetbrains.mps.editor.runtime.cells.KeyMapActionImpl; -import jetbrains.mps.openapi.editor.EditorContext; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import java.util.List; -import jetbrains.mps.internal.collections.runtime.ListSequence; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.internal.collections.runtime.Sequence; -import jetbrains.mps.smodel.behaviour.BehaviorReflection; -import jetbrains.mps.smodel.action.SNodeFactoryOperations; - -public class QueryExpression_KeyMap extends KeyMapImpl { - public QueryExpression_KeyMap() { - this.setApplicableToEveryModel(false); - KeyMapAction action; - action = new QueryExpression_KeyMap.QueryExpression_KeyMap_Action0(); - this.putAction("any", "<", action); - } - public static class QueryExpression_KeyMap_Action0 extends KeyMapActionImpl { - public QueryExpression_KeyMap_Action0() { - this.setShownInPopupMenu(false); - } - public boolean isMenuAlwaysShown() { - return false; - } - public boolean canExecute(final EditorContext editorContext) { - EditorCell contextCell = editorContext.getContextCell(); - if ((contextCell == null)) { - return false; - } - SNode contextNode = contextCell.getSNode(); - if (contextNode == null) { - return false; - } - if (!(SNodeOperations.isInstanceOf(contextNode, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.console.blCommand.structure.QueryExpression")))) { - return false; - } - return this.canExecute_internal(editorContext, contextNode, this.getSelectedNodes(editorContext)); - } - public void execute(final EditorContext editorContext) { - EditorCell contextCell = editorContext.getContextCell(); - this.execute_internal(editorContext, contextCell.getSNode(), this.getSelectedNodes(editorContext)); - } - private boolean canExecute_internal(final EditorContext editorContext, final SNode node, final List selectedNodes) { - return ListSequence.fromList(SLinkOperations.getChildren(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).isEmpty() && Sequence.fromIterable(BehaviorReflection.invokeVirtualStatic((Class>) ((Class) Object.class), SNodeOperations.asSConcept(SNodeOperations.getConceptDeclaration(node)), "virtual_getSupportedParameters_4307205004146936444", new Object[]{})).isNotEmpty(); - } - private void execute_internal(final EditorContext editorContext, final SNode node, final List selectedNodes) { - SNodeFactoryOperations.addNewChild(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, 0x3bc644217616e548L, "parameter")), MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"), SNodeFactoryOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.console.blCommand.structure.QueryParameter"))); - } - public String getKeyStroke() { - return " <"; - } - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterList_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterList_Editor.java deleted file mode 100644 index 36200568282c..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterList_Editor.java +++ /dev/null @@ -1,90 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.nodeEditor.DefaultNodeEditor; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import jetbrains.mps.openapi.editor.EditorContext; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; -import jetbrains.mps.nodeEditor.cellProviders.AbstractCellListHandler; -import jetbrains.mps.nodeEditor.cellLayout.CellLayout_Indent; -import jetbrains.mps.lang.editor.cellProviders.RefNodeListHandler; -import jetbrains.mps.smodel.action.NodeFactoryManager; -import jetbrains.mps.nodeEditor.cellActions.CellAction_DeleteNode; -import jetbrains.mps.lang.editor.cellProviders.RefNodeListHandlerElementKeyMap; -import jetbrains.mps.openapi.editor.cells.DefaultSubstituteInfo; -import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; -import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; -import jetbrains.mps.openapi.editor.style.Style; -import jetbrains.mps.editor.runtime.style.StyleImpl; -import jetbrains.mps.editor.runtime.style.StyleAttributes; - -public class QueryParameterList_Editor extends DefaultNodeEditor { - public EditorCell createEditorCell(EditorContext editorContext, SNode node) { - return this.createCollection_3efoba_a(editorContext, node); - } - private EditorCell createCollection_3efoba_a(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); - editorCell.setCellId("Collection_3efoba_a"); - editorCell.setBig(true); - editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); - editorCell.addEditorCell(this.createRefNodeList_3efoba_a0(editorContext, node)); - return editorCell; - } - private EditorCell createRefNodeList_3efoba_a0(EditorContext editorContext, SNode node) { - AbstractCellListHandler handler = new QueryParameterList_Editor.parameterListHandler_3efoba_a0(node, "parameter", editorContext); - EditorCell_Collection editorCell = handler.createCells(editorContext, new CellLayout_Indent(), false); - editorCell.setCellId("refNodeList_parameter"); - editorCell.setRole(handler.getElementRole()); - return editorCell; - } - private static class parameterListHandler_3efoba_a0 extends RefNodeListHandler { - public parameterListHandler_3efoba_a0(SNode ownerNode, String childRole, EditorContext context) { - super(ownerNode, childRole, context, false); - } - public SNode createNodeToInsert(EditorContext editorContext) { - SNode listOwner = super.getOwner(); - return NodeFactoryManager.createNode(listOwner, editorContext, super.getElementRole()); - } - public EditorCell createNodeCell(EditorContext editorContext, SNode elementNode) { - EditorCell elementCell = super.createNodeCell(editorContext, elementNode); - this.installElementCellActions(this.getOwner(), elementNode, elementCell, editorContext); - return elementCell; - } - public EditorCell createEmptyCell(EditorContext editorContext) { - EditorCell emptyCell = null; - emptyCell = super.createEmptyCell(editorContext); - this.installElementCellActions(super.getOwner(), null, emptyCell, editorContext); - return emptyCell; - } - public void installElementCellActions(SNode listOwner, SNode elementNode, EditorCell elementCell, EditorContext editorContext) { - if (elementCell.getUserObject(AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET) == null) { - elementCell.putUserObject(AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET, AbstractCellListHandler.ELEMENT_CELL_ACTIONS_SET); - if (elementNode != null) { - elementCell.setAction(CellActionType.DELETE, new CellAction_DeleteNode(elementNode)); - elementCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteNode(elementNode)); - QueryParameter_Actions.setCellActions(elementCell, elementNode, editorContext); - elementCell.addKeyMap(new RefNodeListHandlerElementKeyMap(this, ",")); - } - if (elementCell.getSubstituteInfo() == null || elementCell.getSubstituteInfo() instanceof DefaultSubstituteInfo) { - elementCell.setSubstituteInfo(new DefaultChildSubstituteInfo(listOwner, elementNode, super.getLinkDeclaration(), editorContext)); - } - } - } - @Override - public EditorCell createSeparatorCell(EditorContext editorContext, SNode prevNode, SNode nextNode) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, this.getOwner(), ","); - editorCell.setSelectable(false); - Style style = new StyleImpl(); - style.set(StyleAttributes.LAYOUT_CONSTRAINT, ""); - style.set(StyleAttributes.PUNCTUATION_LEFT, true); - editorCell.getStyle().putAll(style); - editorCell.setAction(CellActionType.BACKSPACE, new CellAction_DeleteNode(prevNode)); - editorCell.setAction(CellActionType.DELETE, new CellAction_DeleteNode(prevNode)); - return editorCell; - } - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScopeValue_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScopeValue_Actions.java deleted file mode 100644 index 65d836a3875c..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScopeValue_Actions.java +++ /dev/null @@ -1,63 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.openapi.editor.cells.EditorCell; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.openapi.editor.EditorContext; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.cells.AbstractCellAction; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.openapi.editor.cells.CellAction; - -public class QueryParameterScopeValue_Actions { - public static void setCellActions(EditorCell editorCell, SNode node, EditorContext context) { - editorCell.setAction(CellActionType.DELETE, new QueryParameterScopeValue_Actions.QueryParameterScopeValue_Actions_DELETE(node)); - editorCell.setAction(CellActionType.BACKSPACE, new QueryParameterScopeValue_Actions.QueryParameterScopeValue_Actions_BACKSPACE(node)); - } - public static class QueryParameterScopeValue_Actions_DELETE extends AbstractCellAction { - /*package*/ SNode myNode; - public QueryParameterScopeValue_Actions_DELETE(SNode node) { - this.myNode = node; - } - public void execute(EditorContext editorContext) { - this.execute_internal(editorContext, this.myNode); - } - public void execute_internal(EditorContext editorContext, SNode node) { - if (!(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value")))), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.console.blCommand.structure.ScopeParameter")))) { - SLinkOperations.setTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.console.blCommand.structure.ScopeParameter")))); - return; - } - CellAction action = editorContext.getEditorComponent().findNodeCell(node).getAction(CellActionType.DELETE); - if (action != null && action.canExecute(editorContext)) { - action.execute(editorContext); - return; - } - SNodeOperations.deleteNode(node); - } - } - public static class QueryParameterScopeValue_Actions_BACKSPACE extends AbstractCellAction { - /*package*/ SNode myNode; - public QueryParameterScopeValue_Actions_BACKSPACE(SNode node) { - this.myNode = node; - } - public void execute(EditorContext editorContext) { - this.execute_internal(editorContext, this.myNode); - } - public void execute_internal(EditorContext editorContext, SNode node) { - if (!(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(SLinkOperations.getTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value")))), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.console.blCommand.structure.ScopeParameter")))) { - SLinkOperations.setTarget(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), SConceptOperations.createNewNode(SNodeOperations.asInstanceConcept(MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.console.blCommand.structure.ScopeParameter")))); - return; - } - CellAction action = editorContext.getEditorComponent().findNodeCell(node).getAction(CellActionType.DELETE); - if (action != null && action.canExecute(editorContext)) { - action.execute(editorContext); - return; - } - SNodeOperations.deleteNode(node); - } - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScope_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScope_Editor.java deleted file mode 100644 index 045f829afff1..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameterScope_Editor.java +++ /dev/null @@ -1,92 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.nodeEditor.DefaultNodeEditor; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import jetbrains.mps.openapi.editor.EditorContext; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; -import jetbrains.mps.openapi.editor.style.Style; -import jetbrains.mps.editor.runtime.style.StyleImpl; -import jetbrains.mps.editor.runtime.style.StyleAttributes; -import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; -import jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet; -import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.language.SContainmentLink; -import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; -import jetbrains.mps.editor.runtime.style.FocusPolicy; - -public class QueryParameterScope_Editor extends DefaultNodeEditor { - public EditorCell createEditorCell(EditorContext editorContext, SNode node) { - return this.createCollection_5iann0_a(editorContext, node); - } - private EditorCell createCollection_5iann0_a(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); - editorCell.setCellId("Collection_5iann0_a"); - editorCell.setBig(true); - editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); - editorCell.addEditorCell(this.createComponent_5iann0_a0(editorContext, node)); - editorCell.addEditorCell(this.createConstant_5iann0_b0(editorContext, node)); - editorCell.addEditorCell(this.createRefNode_5iann0_c0(editorContext, node)); - return editorCell; - } - private EditorCell createComponent_5iann0_a0(EditorContext editorContext, SNode node) { - EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); - Style style = new StyleImpl(); - style.set(StyleAttributes.AUTO_DELETABLE, 0, true); - editorCell.getStyle().putAll(style); - QueryParameter_Actions.setCellActions(editorCell, node, editorContext); - return editorCell; - } - private EditorCell createConstant_5iann0_b0(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "="); - editorCell.setCellId("EQ"); - Style style = new StyleImpl(); - BaseLanguageStyle_StyleSheet.apply_Operator(style, editorCell); - editorCell.getStyle().putAll(style); - editorCell.setDefaultText(""); - return editorCell; - } - private EditorCell createRefNode_5iann0_c0(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new QueryParameterScope_Editor.valueSingleRoleHandler_5iann0_c0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL, 0x3bc64421763bef89L, "value"), editorContext); - return provider.createCell(); - } - private class valueSingleRoleHandler_5iann0_c0 extends SingleRoleCellProvider { - public valueSingleRoleHandler_5iann0_c0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { - super(ownerNode, containmentLink, context); - } - public EditorCell createChildCell(EditorContext editorContext, SNode child) { - EditorCell editorCell = super.createChildCell(editorContext, child); - installCellInfo(child, editorCell); - return editorCell; - } - public void installCellInfo(SNode child, EditorCell editorCell) { - editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); - if (editorCell.getRole() == null) { - editorCell.setRole("value"); - } - if (true) { - editorCell.getStyle().set(StyleAttributes.FOCUS_POLICY, FocusPolicy.ATTRACTS_FOCUS); - } - QueryParameterScopeValue_Actions.setCellActions(editorCell, myOwnerNode, myEditorContext); - } - - - @Override - protected EditorCell createEmptyCell() { - EditorCell editorCell = super.createEmptyCell(); - editorCell.setCellId("empty_value"); - installCellInfo(null, editorCell); - return editorCell; - } - - protected String getNoTargetText() { - return ""; - } - - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Actions.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Actions.java deleted file mode 100644 index 9749a262f080..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Actions.java +++ /dev/null @@ -1,70 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.openapi.editor.cells.EditorCell; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.openapi.editor.EditorContext; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.cells.AbstractCellAction; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.internal.collections.runtime.ListSequence; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; -import jetbrains.mps.editor.runtime.selection.SelectionUtil; - -public class QueryParameter_Actions { - public static void setCellActions(EditorCell editorCell, SNode node, EditorContext context) { - editorCell.setAction(CellActionType.DELETE, new QueryParameter_Actions.QueryParameter_Actions_DELETE(node)); - editorCell.setAction(CellActionType.BACKSPACE, new QueryParameter_Actions.QueryParameter_Actions_BACKSPACE(node)); - } - public static class QueryParameter_Actions_DELETE extends AbstractCellAction { - /*package*/ SNode myNode; - public QueryParameter_Actions_DELETE(SNode node) { - this.myNode = node; - } - public void execute(EditorContext editorContext) { - this.execute_internal(editorContext, this.myNode); - } - public void execute_internal(EditorContext editorContext, SNode node) { - SNode parameterList = SNodeOperations.as(SNodeOperations.getParent(node), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.console.blCommand.structure.QueryParameterList")); - if (parameterList != null && ListSequence.fromList(SLinkOperations.getChildren(parameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).count() == 1 && !(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(node)), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.console.blCommand.structure.QueryParameter")))) { - SNodeOperations.replaceWithNewChild(node, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.console.blCommand.structure.QueryParameter")); - return; - } - - SNodeOperations.deleteNode(node); - if (parameterList != null && ListSequence.fromList(SLinkOperations.getChildren(parameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).isEmpty()) { - SNode queryExpression = SNodeOperations.as(SNodeOperations.getParent(parameterList), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.console.blCommand.structure.QueryExpression")); - if (queryExpression != null) { - SelectionUtil.selectLabelCellAnSetCaret(editorContext, queryExpression, "ALIAS_EDITOR_COMPONENT", -1); - } - } - } - } - public static class QueryParameter_Actions_BACKSPACE extends AbstractCellAction { - /*package*/ SNode myNode; - public QueryParameter_Actions_BACKSPACE(SNode node) { - this.myNode = node; - } - public void execute(EditorContext editorContext) { - this.execute_internal(editorContext, this.myNode); - } - public void execute_internal(EditorContext editorContext, SNode node) { - SNode parameterList = SNodeOperations.as(SNodeOperations.getParent(node), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.console.blCommand.structure.QueryParameterList")); - if (parameterList != null && ListSequence.fromList(SLinkOperations.getChildren(parameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).count() == 1 && !(SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(node)), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.console.blCommand.structure.QueryParameter")))) { - SNodeOperations.replaceWithNewChild(node, MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L, "jetbrains.mps.console.blCommand.structure.QueryParameter")); - return; - } - - SNodeOperations.deleteNode(node); - if (parameterList != null && ListSequence.fromList(SLinkOperations.getChildren(parameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter"))).isEmpty()) { - SNode queryExpression = SNodeOperations.as(SNodeOperations.getParent(parameterList), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL, "jetbrains.mps.console.blCommand.structure.QueryExpression")); - if (queryExpression != null) { - SelectionUtil.selectLabelCellAnSetCaret(editorContext, queryExpression, "ALIAS_EDITOR_COMPONENT", -1); - } - } - } - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Editor.java deleted file mode 100644 index e13f88e8db77..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/QueryParameter_Editor.java +++ /dev/null @@ -1,36 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.nodeEditor.DefaultNodeEditor; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import jetbrains.mps.openapi.editor.EditorContext; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.editor.runtime.cells.BigCellUtil; -import jetbrains.mps.openapi.editor.style.Style; -import jetbrains.mps.editor.runtime.style.StyleImpl; -import jetbrains.mps.editor.runtime.style.StyleAttributes; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; - -public class QueryParameter_Editor extends DefaultNodeEditor { - public EditorCell createEditorCell(EditorContext editorContext, SNode node) { - return this.createComponent_pp9zo5_a(editorContext, node); - } - private EditorCell createComponent_pp9zo5_a(EditorContext editorContext, SNode node) { - EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); - EditorCell bigCell = BigCellUtil.findBigCell(editorCell, node); - if (bigCell != null) { - bigCell.setBig(true); - } - Style style = new StyleImpl(); - style.set(StyleAttributes.AUTO_DELETABLE, 0, QueryParameter_Editor._StyleParameter_QueryFunction_pp9zo5_a0a((editorCell == null ? null : editorCell.getContext()), (editorCell == null ? null : editorCell.getSNode()))); - editorCell.getStyle().putAll(style); - editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); - return editorCell; - } - private static boolean _StyleParameter_QueryFunction_pp9zo5_a0a(EditorContext editorContext, SNode node) { - return SNodeOperations.getNextSibling(node) == null && SNodeOperations.getPrevSibling(node) == null; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ScopeParameter_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ScopeParameter_Editor.java deleted file mode 100644 index d889c65bb8d5..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ScopeParameter_Editor.java +++ /dev/null @@ -1,55 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.nodeEditor.DefaultNodeEditor; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import jetbrains.mps.openapi.editor.EditorContext; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.editor.runtime.cells.BigCellUtil; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.nodeEditor.cells.EditorCell_Error; -import jetbrains.mps.openapi.editor.style.Style; -import jetbrains.mps.editor.runtime.style.StyleImpl; -import jetbrains.mps.editor.runtime.style.StyleAttributes; - -public class ScopeParameter_Editor extends DefaultNodeEditor { - public EditorCell createEditorCell(EditorContext editorContext, SNode node) { - return this.createAlternation_pzkiaj_a(editorContext, node); - } - private EditorCell createAlternation_pzkiaj_a(EditorContext editorContext, SNode node) { - boolean alternationCondition = true; - alternationCondition = ScopeParameter_Editor.renderingCondition_pzkiaj_a0(node, editorContext); - EditorCell editorCell = null; - if (alternationCondition) { - editorCell = this.createError_pzkiaj_a0(editorContext, node); - } else { - editorCell = this.createComponent_pzkiaj_a0(editorContext, node); - } - EditorCell bigCell = BigCellUtil.findBigCell(editorCell, node); - if (bigCell != null) { - bigCell.setBig(true); - } - editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); - return editorCell; - } - private static boolean renderingCondition_pzkiaj_a0(SNode node, EditorContext editorContext) { - return SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(node)), MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL, "jetbrains.mps.console.blCommand.structure.ScopeParameter")); - } - private EditorCell createError_pzkiaj_a0(EditorContext editorContext, SNode node) { - EditorCell_Error editorCell = new EditorCell_Error(editorContext, node, ""); - editorCell.setCellId("Error_pzkiaj_a0"); - return editorCell; - } - private EditorCell createComponent_pzkiaj_a0(EditorContext editorContext, SNode node) { - EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); - Style style = new StyleImpl(); - style.set(StyleAttributes.AUTO_DELETABLE, 0, true); - editorCell.getStyle().putAll(style); - return editorCell; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ShowExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ShowExpression_Editor.java deleted file mode 100644 index b2de463c6828..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/ShowExpression_Editor.java +++ /dev/null @@ -1,68 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.nodeEditor.DefaultNodeEditor; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import jetbrains.mps.openapi.editor.EditorContext; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; -import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.language.SContainmentLink; -import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; - -public class ShowExpression_Editor extends DefaultNodeEditor { - public EditorCell createEditorCell(EditorContext editorContext, SNode node) { - return this.createCollection_rowo1n_a(editorContext, node); - } - private EditorCell createCollection_rowo1n_a(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); - editorCell.setCellId("Collection_rowo1n_a"); - editorCell.setBig(true); - editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); - editorCell.addEditorCell(this.createComponent_rowo1n_a0(editorContext, node)); - editorCell.addEditorCell(this.createRefNode_rowo1n_b0(editorContext, node)); - return editorCell; - } - private EditorCell createComponent_rowo1n_a0(EditorContext editorContext, SNode node) { - EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.lang.core.editor.alias"); - return editorCell; - } - private EditorCell createRefNode_rowo1n_b0(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new ShowExpression_Editor.objectSingleRoleHandler_rowo1n_b0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object"), editorContext); - return provider.createCell(); - } - private class objectSingleRoleHandler_rowo1n_b0 extends SingleRoleCellProvider { - public objectSingleRoleHandler_rowo1n_b0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { - super(ownerNode, containmentLink, context); - } - public EditorCell createChildCell(EditorContext editorContext, SNode child) { - EditorCell editorCell = super.createChildCell(editorContext, child); - installCellInfo(child, editorCell); - return editorCell; - } - public void installCellInfo(SNode child, EditorCell editorCell) { - editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); - if (editorCell.getRole() == null) { - editorCell.setRole("object"); - } - } - - - @Override - protected EditorCell createEmptyCell() { - EditorCell editorCell = super.createEmptyCell(); - editorCell.setCellId("empty_object"); - installCellInfo(null, editorCell); - return editorCell; - } - - protected String getNoTargetText() { - return ""; - } - - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/UsagesExpression_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/UsagesExpression_Editor.java deleted file mode 100644 index 6e83177ce2d4..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/UsagesExpression_Editor.java +++ /dev/null @@ -1,92 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.nodeEditor.DefaultNodeEditor; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import jetbrains.mps.openapi.editor.EditorContext; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; -import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; -import jetbrains.mps.openapi.editor.style.Style; -import jetbrains.mps.editor.runtime.style.StyleImpl; -import jetbrains.mps.baseLanguage.editor.BaseLanguageStyle_StyleSheet; -import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.language.SContainmentLink; -import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; - -public class UsagesExpression_Editor extends DefaultNodeEditor { - public EditorCell createEditorCell(EditorContext editorContext, SNode node) { - return this.createCollection_ikz501_a(editorContext, node); - } - private EditorCell createCollection_ikz501_a(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createIndent2(editorContext, node); - editorCell.setCellId("Collection_ikz501_a"); - editorCell.setBig(true); - editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); - editorCell.addEditorCell(this.createComponent_ikz501_a0(editorContext, node)); - editorCell.addEditorCell(this.createConstant_ikz501_b0(editorContext, node)); - editorCell.addEditorCell(this.createRefNode_ikz501_c0(editorContext, node)); - editorCell.addEditorCell(this.createConstant_ikz501_d0(editorContext, node)); - return editorCell; - } - private EditorCell createComponent_ikz501_a0(EditorContext editorContext, SNode node) { - EditorCell editorCell = editorContext.getCellFactory().createEditorComponentCell(node, "jetbrains.mps.console.blCommand.editor.QueryExpression_EditorComponent"); - return editorCell; - } - private EditorCell createConstant_ikz501_b0(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "("); - editorCell.setCellId("Constant_ikz501_b0"); - Style style = new StyleImpl(); - BaseLanguageStyle_StyleSheet.apply_LeftParenAfterName(style, editorCell); - editorCell.getStyle().putAll(style); - editorCell.setDefaultText(""); - return editorCell; - } - private EditorCell createRefNode_ikz501_c0(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new UsagesExpression_Editor.nodeSingleRoleHandler_ikz501_c0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL, 0x75bb0160f191d6ecL, "node"), editorContext); - return provider.createCell(); - } - private class nodeSingleRoleHandler_ikz501_c0 extends SingleRoleCellProvider { - public nodeSingleRoleHandler_ikz501_c0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { - super(ownerNode, containmentLink, context); - } - public EditorCell createChildCell(EditorContext editorContext, SNode child) { - EditorCell editorCell = super.createChildCell(editorContext, child); - installCellInfo(child, editorCell); - return editorCell; - } - public void installCellInfo(SNode child, EditorCell editorCell) { - editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); - if (editorCell.getRole() == null) { - editorCell.setRole("node"); - } - } - - - @Override - protected EditorCell createEmptyCell() { - EditorCell editorCell = super.createEmptyCell(); - editorCell.setCellId("empty_node"); - installCellInfo(null, editorCell); - return editorCell; - } - - protected String getNoTargetText() { - return ""; - } - - } - private EditorCell createConstant_ikz501_d0(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, ")"); - editorCell.setCellId("Constant_ikz501_d0"); - Style style = new StyleImpl(); - BaseLanguageStyle_StyleSheet.apply_RightParen(style, editorCell); - editorCell.getStyle().putAll(style); - editorCell.setDefaultText(""); - return editorCell; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java deleted file mode 100644 index 4b2c16c1332d..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/WithStatement_Editor.java +++ /dev/null @@ -1,185 +0,0 @@ -package jetbrains.mps.console.blCommand.editor; - -/*Generated by MPS */ - -import jetbrains.mps.nodeEditor.DefaultNodeEditor; -import jetbrains.mps.openapi.editor.cells.EditorCell; -import jetbrains.mps.openapi.editor.EditorContext; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.nodeEditor.cells.EditorCell_Collection; -import jetbrains.mps.openapi.editor.style.Style; -import jetbrains.mps.editor.runtime.style.StyleImpl; -import jetbrains.mps.editor.runtime.style.StyleAttributes; -import jetbrains.mps.openapi.editor.cells.CellActionType; -import jetbrains.mps.editor.runtime.impl.cellActions.CellAction_Comment; -import jetbrains.mps.nodeEditor.cells.EditorCell_Constant; -import jetbrains.mps.lang.editor.cellProviders.SingleRoleCellProvider; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.language.SContainmentLink; -import jetbrains.mps.nodeEditor.cellMenu.DefaultChildSubstituteInfo; -import jetbrains.mps.nodeEditor.MPSFonts; -import jetbrains.mps.nodeEditor.BlockCells; -import jetbrains.mps.nodeEditor.cells.EditorCell_Indent; - -public class WithStatement_Editor extends DefaultNodeEditor { - public EditorCell createEditorCell(EditorContext editorContext, SNode node) { - return this.createCollection_4f6do1_a(editorContext, node); - } - private EditorCell createCollection_4f6do1_a(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createVertical(editorContext, node); - editorCell.setCellId("Collection_4f6do1_a"); - editorCell.setBig(true); - Style style = new StyleImpl(); - style.set(StyleAttributes.SELECTABLE, 0, false); - editorCell.getStyle().putAll(style); - editorCell.setAction(CellActionType.COMMENT, new CellAction_Comment(node)); - editorCell.addEditorCell(this.createCollection_4f6do1_a0(editorContext, node)); - editorCell.addEditorCell(this.createCollection_4f6do1_b0(editorContext, node)); - if (renderingCondition_4f6do1_a2a(node, editorContext)) { - editorCell.addEditorCell(this.createConstant_4f6do1_c0(editorContext, node)); - } - return editorCell; - } - private EditorCell createCollection_4f6do1_a0(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createHorizontal(editorContext, node); - editorCell.setCellId("Collection_4f6do1_a0"); - Style style = new StyleImpl(); - style.set(StyleAttributes.SELECTABLE, 0, false); - editorCell.getStyle().putAll(style); - editorCell.addEditorCell(this.createCollection_4f6do1_a0a(editorContext, node)); - if (renderingCondition_4f6do1_a1a0(node, editorContext)) { - editorCell.addEditorCell(this.createConstant_4f6do1_b0a(editorContext, node)); - } - return editorCell; - } - private EditorCell createCollection_4f6do1_a0a(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createHorizontal(editorContext, node); - editorCell.setCellId("Collection_4f6do1_a0a"); - editorCell.addEditorCell(this.createConstant_4f6do1_a0a0(editorContext, node)); - editorCell.addEditorCell(this.createRefNode_4f6do1_b0a0(editorContext, node)); - editorCell.addEditorCell(this.createConstant_4f6do1_c0a0(editorContext, node)); - return editorCell; - } - private EditorCell createConstant_4f6do1_a0a0(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "with"); - editorCell.setCellId("Constant_4f6do1_a0a0"); - editorCell.setDefaultText(""); - return editorCell; - } - private EditorCell createRefNode_4f6do1_b0a0(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new WithStatement_Editor.scopeSingleRoleHandler_4f6do1_b0a0(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope"), editorContext); - return provider.createCell(); - } - private class scopeSingleRoleHandler_4f6do1_b0a0 extends SingleRoleCellProvider { - public scopeSingleRoleHandler_4f6do1_b0a0(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { - super(ownerNode, containmentLink, context); - } - public EditorCell createChildCell(EditorContext editorContext, SNode child) { - EditorCell editorCell = super.createChildCell(editorContext, child); - installCellInfo(child, editorCell); - return editorCell; - } - public void installCellInfo(SNode child, EditorCell editorCell) { - editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); - if (editorCell.getRole() == null) { - editorCell.setRole("scope"); - } - } - - - @Override - protected EditorCell createEmptyCell() { - EditorCell editorCell = super.createEmptyCell(); - editorCell.setCellId("empty_scope"); - installCellInfo(null, editorCell); - return editorCell; - } - - protected String getNoTargetText() { - return ""; - } - - } - private EditorCell createConstant_4f6do1_c0a0(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "do"); - editorCell.setCellId("Constant_4f6do1_c0a0"); - editorCell.setDefaultText(""); - return editorCell; - } - private EditorCell createConstant_4f6do1_b0a(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "{"); - editorCell.setCellId("Constant_4f6do1_b0a"); - Style style = new StyleImpl(); - style.set(StyleAttributes.MATCHING_LABEL, 0, "brace"); - style.set(StyleAttributes.INDENT_LAYOUT_NO_WRAP, 0, true); - style.set(StyleAttributes.FONT_STYLE, 0, MPSFonts.PLAIN); - editorCell.getStyle().putAll(style); - editorCell.setDefaultText(""); - return editorCell; - } - private static boolean renderingCondition_4f6do1_a1a0(SNode node, EditorContext editorContext) { - return BlockCells.useBraces(); - } - private EditorCell createCollection_4f6do1_b0(EditorContext editorContext, SNode node) { - EditorCell_Collection editorCell = EditorCell_Collection.createHorizontal(editorContext, node); - editorCell.setCellId("Collection_4f6do1_b0"); - Style style = new StyleImpl(); - style.set(StyleAttributes.SELECTABLE, 0, false); - editorCell.getStyle().putAll(style); - editorCell.addEditorCell(this.createIndentCell_4f6do1_a1a(editorContext, node)); - editorCell.addEditorCell(this.createRefNode_4f6do1_b1a(editorContext, node)); - return editorCell; - } - private EditorCell createIndentCell_4f6do1_a1a(EditorContext editorContext, SNode node) { - EditorCell_Indent editorCell = new EditorCell_Indent(editorContext, node); - return editorCell; - } - private EditorCell createRefNode_4f6do1_b1a(EditorContext editorContext, SNode node) { - SingleRoleCellProvider provider = new WithStatement_Editor.stmtsSingleRoleHandler_4f6do1_b1a(node, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf368cL, "stmts"), editorContext); - return provider.createCell(); - } - private class stmtsSingleRoleHandler_4f6do1_b1a extends SingleRoleCellProvider { - public stmtsSingleRoleHandler_4f6do1_b1a(SNode ownerNode, SContainmentLink containmentLink, EditorContext context) { - super(ownerNode, containmentLink, context); - } - public EditorCell createChildCell(EditorContext editorContext, SNode child) { - EditorCell editorCell = super.createChildCell(editorContext, child); - installCellInfo(child, editorCell); - return editorCell; - } - public void installCellInfo(SNode child, EditorCell editorCell) { - editorCell.setSubstituteInfo(new DefaultChildSubstituteInfo(myOwnerNode, myContainmentLink.getDeclarationNode(), myEditorContext)); - if (editorCell.getRole() == null) { - editorCell.setRole("stmts"); - } - } - - - @Override - protected EditorCell createEmptyCell() { - EditorCell editorCell = super.createEmptyCell(); - editorCell.setCellId("empty_stmts"); - installCellInfo(null, editorCell); - return editorCell; - } - - protected String getNoTargetText() { - return ""; - } - - } - private EditorCell createConstant_4f6do1_c0(EditorContext editorContext, SNode node) { - EditorCell_Constant editorCell = new EditorCell_Constant(editorContext, node, "}"); - editorCell.setCellId("Constant_4f6do1_c0"); - Style style = new StyleImpl(); - style.set(StyleAttributes.MATCHING_LABEL, 0, "brace"); - style.set(StyleAttributes.INDENT_LAYOUT_NO_WRAP, 0, true); - style.set(StyleAttributes.FONT_STYLE, 0, MPSFonts.PLAIN); - editorCell.getStyle().putAll(style); - editorCell.setDefaultText(""); - return editorCell; - } - private static boolean renderingCondition_4f6do1_a2a(SNode node, EditorContext editorContext) { - return BlockCells.useBraces(); - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/trace.info deleted file mode 100644 index b8b2ce3c2bda..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/editor/trace.info +++ /dev/null @@ -1,2185 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java deleted file mode 100644 index 15b285a82342..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/structure/StructureAspectDescriptor.java +++ /dev/null @@ -1,117 +0,0 @@ -package jetbrains.mps.console.blCommand.structure; - -/*Generated by MPS */ - -import jetbrains.mps.smodel.runtime.BaseStructureAspectDescriptor; -import jetbrains.mps.smodel.runtime.ConceptDescriptor; -import jetbrains.mps.smodel.runtime.impl.ConceptDescriptorBuilder; -import jetbrains.mps.smodel.adapter.ids.MetaIdFactory; -import java.util.Collection; -import java.util.Arrays; -import org.jetbrains.annotations.Nullable; - -public class StructureAspectDescriptor extends BaseStructureAspectDescriptor { - - /*package*/ final ConceptDescriptor myConceptAbstractPrintExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).childDescriptors(new ConceptDescriptorBuilder.Link(8365379837260461921L, "object", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"object"}, new boolean[]{false}).abstract_().create(); - /*package*/ final ConceptDescriptor myConceptConsoleExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ConsoleExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).interface_().parents("jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).create(); - /*package*/ final ConceptDescriptor myConceptConsoleHelpProvider = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).interface_().create(); - /*package*/ final ConceptDescriptor myConceptConsoleOperation = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ConsoleOperation", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5252d9021b8b6c03L)).interface_().parents("jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x690b986730edd07L)).create(); - /*package*/ final ConceptDescriptor myConceptCustomScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.CustomScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759611770126L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"scope"}, new boolean[]{false}).alias("custom", "? extends SearchScope").create(); - /*package*/ final ConceptDescriptor myConceptGlobalScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.GlobalScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add42L)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).alias("global", "").create(); - /*package*/ final ConceptDescriptor myConceptInstancesExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.InstancesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(7738379549910147342L, "conceptArg", MetaIdFactory.conceptId(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x118f285e4f7L), false, false, false)).children(new String[]{"conceptArg"}, new boolean[]{false}).alias("#instances", "instances of a concept in scope").create(); - /*package*/ final ConceptDescriptor myConceptModelScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ModelScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759608408143L, "model", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, true, false)).children(new String[]{"model"}, new boolean[]{true}).alias("models", "").create(); - /*package*/ final ConceptDescriptor myConceptModelsExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ModelsExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675beab2dL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#models", "all models in scope").create(); - /*package*/ final ConceptDescriptor myConceptModulesExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ModulesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675cc2262L)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#modules", "all modules in scope").create(); - /*package*/ final ConceptDescriptor myConceptModulesScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ModulesScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).childDescriptors(new ConceptDescriptorBuilder.Link(3492877759607928680L, "module", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, true, false)).children(new String[]{"module"}, new boolean[]{true}).alias("modules", "").create(); - /*package*/ final ConceptDescriptor myConceptNodesExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.NodesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x272b1214886bd08eL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#nodes", "all nodes in scope").create(); - /*package*/ final ConceptDescriptor myConceptPrintExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.PrintExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b2a9377L)).super_("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).alias("#print", "smart print depending on content").create(); - /*package*/ final ConceptDescriptor myConceptPrintNodeExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.PrintNodeExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4c7a26b31bd03b59L)).super_("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).alias("#printNode", "print node copy").create(); - /*package*/ final ConceptDescriptor myConceptPrintNodeReferenceExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f195a051bd9bddcL)).super_("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).alias("#printNodeRef", "print reference to the node").create(); - /*package*/ final ConceptDescriptor myConceptPrintSequenceExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.PrintSequenceExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b7db64fL)).super_("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).alias("#printSequence", "print size with link to usages view").create(); - /*package*/ final ConceptDescriptor myConceptPrintTextExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.PrintTextExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x7417cca3eb1feca9L)).super_("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).parents("jetbrains.mps.console.blCommand.structure.AbstractPrintExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L)).alias("#printText", "print as string").create(); - /*package*/ final ConceptDescriptor myConceptProjectExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ProjectExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0xa721a59126bb908L)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#project", "the current project").create(); - /*package*/ final ConceptDescriptor myConceptProjectScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ProjectScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763adda2L)).super_("jetbrains.mps.console.blCommand.structure.ScopeParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).parents("jetbrains.mps.console.blCommand.structure.ScopeParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).alias("project", "").create(); - /*package*/ final ConceptDescriptor myConceptQueryExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.QueryExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).childDescriptors(new ConceptDescriptorBuilder.Link(4307205004132279624L, "parameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L), false, false, false)).children(new String[]{"parameter"}, new boolean[]{false}).abstract_().create(); - /*package*/ final ConceptDescriptor myConceptQueryParameter = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.QueryParameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).abstract_().create(); - /*package*/ final ConceptDescriptor myConceptQueryParameterIncludeReadOnly = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ec86L)).super_("jetbrains.mps.console.blCommand.structure.QueryParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).parents("jetbrains.mps.console.blCommand.structure.QueryParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).alias("r/o+", "include read only").create(); - /*package*/ final ConceptDescriptor myConceptQueryParameterList = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.QueryParameterList", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).childDescriptors(new ConceptDescriptorBuilder.Link(4307205004141421222L, "parameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L), true, true, false)).children(new String[]{"parameter"}, new boolean[]{true}).alias("< .. >", "").create(); - /*package*/ final ConceptDescriptor myConceptQueryParameterScope = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.QueryParameterScope", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217618ed2fL)).super_("jetbrains.mps.console.blCommand.structure.QueryParameter").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).parents("jetbrains.mps.console.blCommand.structure.QueryParameter").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760badf5L)).childDescriptors(new ConceptDescriptorBuilder.Link(4307205004134707081L, "value", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL), false, false, false)).children(new String[]{"value"}, new boolean[]{false}).alias("scope", "used search scope").create(); - /*package*/ final ConceptDescriptor myConceptReferencesExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ReferencesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x57bda059470950bdL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).alias("#references", "all references in scope").create(); - /*package*/ final ConceptDescriptor myConceptScopeParameter = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ScopeParameter", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421763add4bL)).super_("jetbrains.mps.lang.core.structure.BaseConcept").super_(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).parents("jetbrains.mps.lang.core.structure.BaseConcept").parentIds(MetaIdFactory.conceptId(0xceab519525ea4f22L, 0x9b92103b95ca8c0cL, 0x10802efe25aL)).abstract_().create(); - /*package*/ final ConceptDescriptor myConceptShowExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.ShowExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL)).super_("jetbrains.mps.baseLanguage.structure.Expression").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL)).parents("jetbrains.mps.baseLanguage.structure.Expression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x613b3dd6aa6dac90L)).childDescriptors(new ConceptDescriptorBuilder.Link(7600370246423275637L, "object", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"object"}, new boolean[]{false}).alias("#show", "show in usage view").create(); - /*package*/ final ConceptDescriptor myConceptUsagesExpression = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.UsagesExpression", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL)).super_("jetbrains.mps.console.blCommand.structure.QueryExpression").super_(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).parents("jetbrains.mps.console.blCommand.structure.QueryExpression").parentIds(MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc64421760bacfdL)).childDescriptors(new ConceptDescriptorBuilder.Link(8483375838963816172L, "node", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"node"}, new boolean[]{false}).alias("#usages", "direct references to a node in scope").create(); - /*package*/ final ConceptDescriptor myConceptWithStatement = new ConceptDescriptorBuilder("jetbrains.mps.console.blCommand.structure.WithStatement", MetaIdFactory.conceptId(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL)).super_("jetbrains.mps.baseLanguage.structure.Statement").super_(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).parents("jetbrains.mps.baseLanguage.structure.Statement").parentIds(MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b215L)).childDescriptors(new ConceptDescriptorBuilder.Link(4234138103881610892L, "stmts", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc56b200L), false, false, false), new ConceptDescriptorBuilder.Link(4234138103881610935L, "scope", MetaIdFactory.conceptId(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c37f506fL), false, false, false)).children(new String[]{"stmts", "scope"}, new boolean[]{false, false}).alias("with", "").create(); - - @Override - public Collection getDescriptors() { - return Arrays.asList(myConceptAbstractPrintExpression, myConceptConsoleExpression, myConceptConsoleHelpProvider, myConceptConsoleOperation, myConceptCustomScope, myConceptGlobalScope, myConceptInstancesExpression, myConceptModelScope, myConceptModelsExpression, myConceptModulesExpression, myConceptModulesScope, myConceptNodesExpression, myConceptPrintExpression, myConceptPrintNodeExpression, myConceptPrintNodeReferenceExpression, myConceptPrintSequenceExpression, myConceptPrintTextExpression, myConceptProjectExpression, myConceptProjectScope, myConceptQueryExpression, myConceptQueryParameter, myConceptQueryParameterIncludeReadOnly, myConceptQueryParameterList, myConceptQueryParameterScope, myConceptReferencesExpression, myConceptScopeParameter, myConceptShowExpression, myConceptUsagesExpression, myConceptWithStatement); - } - - @Override - @Nullable - public ConceptDescriptor getDescriptor(String conceptFqName) { - switch (Arrays.binarySearch(stringSwitchCases_1htk8d_a0a0hb, conceptFqName)) { - case 0: - return myConceptAbstractPrintExpression; - case 1: - return myConceptConsoleExpression; - case 2: - return myConceptConsoleHelpProvider; - case 3: - return myConceptConsoleOperation; - case 4: - return myConceptCustomScope; - case 5: - return myConceptGlobalScope; - case 6: - return myConceptInstancesExpression; - case 7: - return myConceptModelScope; - case 8: - return myConceptModelsExpression; - case 9: - return myConceptModulesExpression; - case 10: - return myConceptModulesScope; - case 11: - return myConceptNodesExpression; - case 12: - return myConceptPrintExpression; - case 13: - return myConceptPrintNodeExpression; - case 14: - return myConceptPrintNodeReferenceExpression; - case 15: - return myConceptPrintSequenceExpression; - case 16: - return myConceptPrintTextExpression; - case 17: - return myConceptProjectExpression; - case 18: - return myConceptProjectScope; - case 19: - return myConceptQueryExpression; - case 20: - return myConceptQueryParameter; - case 21: - return myConceptQueryParameterIncludeReadOnly; - case 22: - return myConceptQueryParameterList; - case 23: - return myConceptQueryParameterScope; - case 24: - return myConceptReferencesExpression; - case 25: - return myConceptScopeParameter; - case 26: - return myConceptShowExpression; - case 27: - return myConceptUsagesExpression; - case 28: - return myConceptWithStatement; - default: - return null; - } - } - private static String[] stringSwitchCases_1htk8d_a0a0hb = new String[]{"jetbrains.mps.console.blCommand.structure.AbstractPrintExpression", "jetbrains.mps.console.blCommand.structure.ConsoleExpression", "jetbrains.mps.console.blCommand.structure.ConsoleHelpProvider", "jetbrains.mps.console.blCommand.structure.ConsoleOperation", "jetbrains.mps.console.blCommand.structure.CustomScope", "jetbrains.mps.console.blCommand.structure.GlobalScope", "jetbrains.mps.console.blCommand.structure.InstancesExpression", "jetbrains.mps.console.blCommand.structure.ModelScope", "jetbrains.mps.console.blCommand.structure.ModelsExpression", "jetbrains.mps.console.blCommand.structure.ModulesExpression", "jetbrains.mps.console.blCommand.structure.ModulesScope", "jetbrains.mps.console.blCommand.structure.NodesExpression", "jetbrains.mps.console.blCommand.structure.PrintExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeExpression", "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression", "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression", "jetbrains.mps.console.blCommand.structure.PrintTextExpression", "jetbrains.mps.console.blCommand.structure.ProjectExpression", "jetbrains.mps.console.blCommand.structure.ProjectScope", "jetbrains.mps.console.blCommand.structure.QueryExpression", "jetbrains.mps.console.blCommand.structure.QueryParameter", "jetbrains.mps.console.blCommand.structure.QueryParameterIncludeReadOnly", "jetbrains.mps.console.blCommand.structure.QueryParameterList", "jetbrains.mps.console.blCommand.structure.QueryParameterScope", "jetbrains.mps.console.blCommand.structure.ReferencesExpression", "jetbrains.mps.console.blCommand.structure.ScopeParameter", "jetbrains.mps.console.blCommand.structure.ShowExpression", "jetbrains.mps.console.blCommand.structure.UsagesExpression", "jetbrains.mps.console.blCommand.structure.WithStatement"}; -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/structure/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/structure/trace.info deleted file mode 100644 index 7eb5c59db5b8..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/structure/trace.info +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/trace.info deleted file mode 100644 index f58065bb5187..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/trace.info +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java deleted file mode 100644 index 12bb9a68fa37..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/TypesystemDescriptor.java +++ /dev/null @@ -1,88 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.BaseHelginsDescriptor; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.NonTypesystemRule_Runtime; - -public class TypesystemDescriptor extends BaseHelginsDescriptor { - public TypesystemDescriptor() { - { - InferenceRule_Runtime inferenceRule = new typeof_AbstractPrintExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_CustomScope_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_InstancesExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_ModelScopeLiteral_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_ModelsExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_ModuleScopeLiteral_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_ModulesExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_NodesExpresiion_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_PrintExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_PrintNodeExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_PrintNodeReferenceExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_PrintSequenceExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_PrintTextExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_ProjectExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_ReferencesExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_ScopeProvider_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_ShowExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - InferenceRule_Runtime inferenceRule = new typeof_UsagesExpression_InferenceRule(); - this.myInferenceRules.add(inferenceRule); - } - { - NonTypesystemRule_Runtime nonTypesystemRule = new check_QueryDuplicatedParameters_NonTypesystemRule(); - this.myNonTypesystemRules.add(nonTypesystemRule); - } - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java deleted file mode 100644 index e9f7a6e01976..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/check_QueryDuplicatedParameters_NonTypesystemRule.java +++ /dev/null @@ -1,65 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractNonTypesystemRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.NonTypesystemRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.language.SConcept; -import jetbrains.mps.internal.collections.runtime.Sequence; -import jetbrains.mps.internal.collections.runtime.ISelector; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import jetbrains.mps.internal.collections.runtime.ISequence; -import jetbrains.mps.internal.collections.runtime.IWhereFilter; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SConceptOperations; -import jetbrains.mps.errors.messageTargets.MessageTarget; -import jetbrains.mps.errors.messageTargets.NodeMessageTarget; -import jetbrains.mps.errors.IErrorReporter; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SPropertyOperations; -import org.jetbrains.mps.openapi.language.SAbstractConcept; - -public class check_QueryDuplicatedParameters_NonTypesystemRule extends AbstractNonTypesystemRule_Runtime implements NonTypesystemRule_Runtime { - public check_QueryDuplicatedParameters_NonTypesystemRule() { - } - public void applyRule(final SNode queryParameterList, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - final Iterable parameters = SLinkOperations.getChildren(queryParameterList, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, 0x3bc6442176a262a6L, "parameter")); - Iterable parameterConcepts = Sequence.fromIterable(parameters).select(new ISelector() { - public SConcept select(SNode it) { - return SNodeOperations.getConcept(it); - } - }).distinct(); - Iterable> groupedByConcepts = Sequence.fromIterable(parameterConcepts).select(new ISelector>() { - public ISequence select(final SConcept c) { - return Sequence.fromIterable(parameters).where(new IWhereFilter() { - public boolean accept(SNode p) { - return SConceptOperations.isExactly(SNodeOperations.asSConcept(SNodeOperations.getConcept(p)), SNodeOperations.asSConcept(c)); - } - }); - } - }); - - for (Iterable group : Sequence.fromIterable(groupedByConcepts)) { - if (Sequence.fromIterable(group).count() > 1) { - for (SNode other : Sequence.fromIterable(group).tail(Sequence.fromIterable(group).count() - 1)) { - { - MessageTarget errorTarget = new NodeMessageTarget(); - IErrorReporter _reporter_2309309498 = typeCheckingContext.reportTypeError(other, "Duplicated parameter: " + SPropertyOperations.getString(SNodeOperations.getConceptDeclaration(Sequence.fromIterable(group).first()), MetaAdapterFactory.getProperty(0xc72da2b97cce4447L, 0x8389f407dc1158b7L, 0x1103553c5ffL, 0x46ab0ad5826c74caL, "conceptAlias")), "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "2284201910212797905", null, errorTarget); - } - } - } - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3bc644217616ddf9L, "jetbrains.mps.console.blCommand.structure.QueryParameterList"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info deleted file mode 100644 index fd7397d8c224..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/trace.info +++ /dev/null @@ -1,1457 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_AbstractPrintExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_AbstractPrintExpression_InferenceRule.java deleted file mode 100644 index 019ff0382e8e..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_AbstractPrintExpression_InferenceRule.java +++ /dev/null @@ -1,41 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; - -public class typeof_AbstractPrintExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_AbstractPrintExpression_InferenceRule() { - } - public void applyRule(final SNode abstractPrintExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - { - SNode _nodeToCheck_1029348928467 = abstractPrintExpression; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7656298970878399354", 0, null); - typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7656298970878398907", true), (SNode) _quotation_createNode_5i9h05_a0a0b(), _info_12389875345); - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, "jetbrains.mps.console.blCommand.structure.AbstractPrintExpression"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_5i9h05_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc6bf96dL, "jetbrains.mps.baseLanguage.structure.VoidType"), null, null, false); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_CustomScope_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_CustomScope_InferenceRule.java deleted file mode 100644 index e12fedae5eb8..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_CustomScope_InferenceRule.java +++ /dev/null @@ -1,46 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; -import jetbrains.mps.smodel.SReference; - -public class typeof_CustomScope_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_CustomScope_InferenceRule() { - } - public void applyRule(final SNode customScope, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - if (!(typeCheckingContext.isSingleTypeComputation())) { - { - SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(customScope, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, 0x307931d0f985950eL, "scope")); - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3492877759611777799", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3492877759611770308", true), (SNode) _quotation_createNode_c5uzhx_a0a0b(), true, true, _info_12389875345); - } - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f98575c9L, "jetbrains.mps.console.blCommand.structure.CustomScope"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_c5uzhx_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SearchScope"))); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_InstancesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_InstancesExpression_InferenceRule.java deleted file mode 100644 index 50a1935772d7..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_InstancesExpression_InferenceRule.java +++ /dev/null @@ -1,119 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.typesystem.inference.EquationInfo; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; -import org.jetbrains.mps.openapi.model.SNodeAccessUtil; - -public class typeof_InstancesExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_InstancesExpression_InferenceRule() { - } - public void applyRule(final SNode instancesExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - { - SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")); - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7057947030084340457", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7057947030084340460", true), (SNode) _quotation_createNode_dwt96n_a0a0b(), false, true, _info_12389875345); - } - - { - SNode _nodeToCheck_1029348928467 = instancesExpression; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "473081947984804985", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "473081947984804988", true), (SNode) _quotation_createNode_dwt96n_a0c0b(), false, true, _info_12389875345); - } - if (SNodeOperations.isInstanceOf(SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x11885c0d945L, "jetbrains.mps.lang.smodel.structure.PoundExpression"))) { - { - final SNode conceptParameterType = typeCheckingContext.typeOf(SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")), "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874024291279", true); - typeCheckingContext.whenConcrete(conceptParameterType, new Runnable() { - public void run() { - if (SNodeOperations.isInstanceOf(typeCheckingContext.getExpandedNode(conceptParameterType), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x5cab42cd97571ceeL, "jetbrains.mps.lang.smodel.structure.SConceptType"))) { - SNode conceptType = SNodeOperations.cast(typeCheckingContext.getExpandedNode(conceptParameterType), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x5cab42cd97571ceeL, "jetbrains.mps.lang.smodel.structure.SConceptType")); - if (SLinkOperations.getTarget(conceptType, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x5cab42cd97571ceeL, 0x5cab42cd97571cefL, "conceptDeclaraton")) == null) { - { - SNode _nodeToCheck_1029348928467 = instancesExpression; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874024608968", 0, null); - typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874024608970", true), (SNode) _quotation_createNode_dwt96n_a0a0b0a0a0d0b(), _info_12389875345); - } - } else { - { - SNode _nodeToCheck_1029348928467 = instancesExpression; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874024291267", 0, null); - typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874024291269", true), (SNode) _quotation_createNode_dwt96n_a0a0a1a0a0a3a1(SLinkOperations.getTarget(conceptType, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x5cab42cd97571ceeL, 0x5cab42cd97571cefL, "conceptDeclaraton"))), _info_12389875345); - } - } - } - } - }, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874024291258", false, false); - } - } else if (SNodeOperations.isInstanceOf(SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference"))) { - { - SNode _nodeToCheck_1029348928467 = instancesExpression; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "4693937538539160493", 0, null); - typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "4693937538539160495", true), (SNode) _quotation_createNode_dwt96n_a0a0a3a1(SLinkOperations.getTarget(SNodeOperations.cast(SLinkOperations.getTarget(instancesExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, 0x6b643f33718aa10eL, "conceptArg")), MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, "jetbrains.mps.lang.smodel.structure.RefConcept_Reference")), MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x1120c45902cL, 0x1120c45d024L, "conceptDeclaration"))), _info_12389875345); - } - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6b643f33718aa10dL, "jetbrains.mps.console.blCommand.structure.InstancesExpression"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_dwt96n_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x5cab42cd97571ceeL, "jetbrains.mps.lang.smodel.structure.SConceptType"), null, null, false); - return quotedNode_1; - } - private static SNode _quotation_createNode_dwt96n_a0c0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_dwt96n_a0a0b0a0a0d0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_dwt96n_a0a0a1a0a0a3a1(Object parameter_1) { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_2 = null; - SNode quotedNode_3 = null; - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - SNodeAccessUtil.setReferenceTarget(quotedNode_3, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, 0x1090e46ca51L, "concept"), (SNode) parameter_1); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_3); - return quotedNode_2; - } - private static SNode _quotation_createNode_dwt96n_a0a0a3a1(Object parameter_1) { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_2 = null; - SNode quotedNode_3 = null; - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - SNodeAccessUtil.setReferenceTarget(quotedNode_3, MetaAdapterFactory.getReferenceLink(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, 0x1090e46ca51L, "concept"), (SNode) parameter_1); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_3); - return quotedNode_2; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelScopeLiteral_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelScopeLiteral_InferenceRule.java deleted file mode 100644 index 67a77fad520f..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelScopeLiteral_InferenceRule.java +++ /dev/null @@ -1,47 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.internal.collections.runtime.ListSequence; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; - -public class typeof_ModelScopeLiteral_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_ModelScopeLiteral_InferenceRule() { - } - public void applyRule(final SNode modelScopeLiteral, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - for (SNode elem : ListSequence.fromList(SLinkOperations.getChildren(modelScopeLiteral, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL, 0x307931d0f952484fL, "model")))) { - if (!(typeCheckingContext.isSingleTypeComputation())) { - { - SNode _nodeToCheck_1029348928467 = elem; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3492877759611330834", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3492877759611330836", true), (SNode) _quotation_createNode_hadfae_a0a0a0b(), true, true, _info_12389875345); - } - } - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x307931d0f952484eL, "jetbrains.mps.console.blCommand.structure.ModelScope"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_hadfae_a0a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelsExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelsExpression_InferenceRule.java deleted file mode 100644 index cf2ef19cbb5b..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModelsExpression_InferenceRule.java +++ /dev/null @@ -1,44 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; - -public class typeof_ModelsExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_ModelsExpression_InferenceRule() { - } - public void applyRule(final SNode modelsExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - { - SNode _nodeToCheck_1029348928467 = modelsExpression; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874027864625", 0, null); - typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874027864139", true), (SNode) _quotation_createNode_i8e9pf_a0a0b(), _info_12389875345); - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675beab2dL, "jetbrains.mps.console.blCommand.structure.ModelsExpression"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_i8e9pf_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java deleted file mode 100644 index 7f92902ccddb..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModuleScopeLiteral_InferenceRule.java +++ /dev/null @@ -1,49 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.internal.collections.runtime.ListSequence; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; -import jetbrains.mps.smodel.SReference; - -public class typeof_ModuleScopeLiteral_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_ModuleScopeLiteral_InferenceRule() { - } - public void applyRule(final SNode moduleScopeLiteral, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - for (SNode elem : ListSequence.fromList(SLinkOperations.getChildren(moduleScopeLiteral, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL, 0x307931d0f94af768L, "module")))) { - if (!(typeCheckingContext.isSingleTypeComputation())) { - { - SNode _nodeToCheck_1029348928467 = elem; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3492877759608999063", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3492877759608999069", true), (SNode) _quotation_createNode_51ub11_a0a0a0b(), true, true, _info_12389875345); - } - } - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x263c7e661fa6d53dL, "jetbrains.mps.console.blCommand.structure.ModulesScope"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_51ub11_a0a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModulesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModulesExpression_InferenceRule.java deleted file mode 100644 index b769937ee775..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ModulesExpression_InferenceRule.java +++ /dev/null @@ -1,46 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; -import jetbrains.mps.smodel.SReference; - -public class typeof_ModulesExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_ModulesExpression_InferenceRule() { - } - public void applyRule(final SNode modulesExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - { - SNode _nodeToCheck_1029348928467 = modulesExpression; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874028745824", 0, null); - typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6864030874028745375", true), (SNode) _quotation_createNode_2y0lxf_a0a0b(), _info_12389875345); - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f41efb675cc2262L, "jetbrains.mps.console.blCommand.structure.ModulesExpression"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_2y0lxf_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_NodesExpresiion_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_NodesExpresiion_InferenceRule.java deleted file mode 100644 index 96f02372239f..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_NodesExpresiion_InferenceRule.java +++ /dev/null @@ -1,44 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; - -public class typeof_NodesExpresiion_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_NodesExpresiion_InferenceRule() { - } - public void applyRule(final SNode nodesExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - { - SNode _nodeToCheck_1029348928467 = nodesExpression; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6322385757205373104", 0, null); - typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6322385757205373115", true), (SNode) _quotation_createNode_4xyjb1_a0a0b(), _info_12389875345); - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x272b1214886bd08eL, "jetbrains.mps.console.blCommand.structure.NodesExpression"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_4xyjb1_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintExpression_InferenceRule.java deleted file mode 100644 index 1733d50698fb..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintExpression_InferenceRule.java +++ /dev/null @@ -1,50 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; -import jetbrains.mps.smodel.SReference; - -public class typeof_PrintExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_PrintExpression_InferenceRule() { - } - public void applyRule(final SNode printExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - { - SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246421664444", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246421664447", true), (SNode) _quotation_createNode_nk4iqe_a0a0b(), false, true, _info_12389875345); - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b2a9377L, "jetbrains.mps.console.blCommand.structure.PrintExpression"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_nk4iqe_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - SNode quotedNode_3 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, "jetbrains.mps.lang.typesystem.structure.JoinType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_2.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_2, facade.createModelReference("6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)"), facade.createNodeId("~Object"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_2); - quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc6bf96dL, "jetbrains.mps.baseLanguage.structure.VoidType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_3); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeExpression_InferenceRule.java deleted file mode 100644 index 1a1bda05d98a..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeExpression_InferenceRule.java +++ /dev/null @@ -1,44 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; - -public class typeof_PrintNodeExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_PrintNodeExpression_InferenceRule() { - } - public void applyRule(final SNode printNodeExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - if (!(typeCheckingContext.isSingleTypeComputation())) { - { - SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printNodeExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "5510759644748858657", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "5510759644748858662", true), (SNode) _quotation_createNode_j9pmav_a0a0b(), true, false, _info_12389875345); - } - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x4c7a26b31bd03b59L, "jetbrains.mps.console.blCommand.structure.PrintNodeExpression"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_j9pmav_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java deleted file mode 100644 index 4caaab1503ad..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintNodeReferenceExpression_InferenceRule.java +++ /dev/null @@ -1,44 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; - -public class typeof_PrintNodeReferenceExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_PrintNodeReferenceExpression_InferenceRule() { - } - public void applyRule(final SNode printNodeReferenceExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - if (!(typeCheckingContext.isSingleTypeComputation())) { - { - SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printNodeReferenceExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6852607286009512877", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6852607286009511978", true), (SNode) _quotation_createNode_t5gmh8_a0a0b(), true, false, _info_12389875345); - } - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x5f195a051bd9bddcL, "jetbrains.mps.console.blCommand.structure.PrintNodeReferenceExpression"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_t5gmh8_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintSequenceExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintSequenceExpression_InferenceRule.java deleted file mode 100644 index 10c5c092390a..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintSequenceExpression_InferenceRule.java +++ /dev/null @@ -1,68 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; -import jetbrains.mps.smodel.SReference; - -public class typeof_PrintSequenceExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_PrintSequenceExpression_InferenceRule() { - } - public void applyRule(final SNode printSequenceExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - { - SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printSequenceExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3856122757887347236", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "3856122757887347250", true), (SNode) _quotation_createNode_u62o5j_a0a0b(), false, true, _info_12389875345); - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6979f0787b7db64fL, "jetbrains.mps.console.blCommand.structure.PrintSequenceExpression"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_u62o5j_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - SNode quotedNode_3 = null; - SNode quotedNode_4 = null; - SNode quotedNode_5 = null; - SNode quotedNode_6 = null; - SNode quotedNode_7 = null; - SNode quotedNode_8 = null; - SNode quotedNode_9 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, "jetbrains.mps.lang.typesystem.structure.JoinType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_6); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_2); - quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_7); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_3); - quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_8); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_4); - quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_9.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_9, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_9); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_5); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintTextExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintTextExpression_InferenceRule.java deleted file mode 100644 index 99dc145477e2..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_PrintTextExpression_InferenceRule.java +++ /dev/null @@ -1,44 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; -import jetbrains.mps.smodel.SReference; - -public class typeof_PrintTextExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_PrintTextExpression_InferenceRule() { - } - public void applyRule(final SNode printTextExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - { - SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(printTextExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x6c8954f469a7c420L, 0x7417cca3eb1ff761L, "object")); - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246421665039", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246421665042", true), (SNode) _quotation_createNode_tqzol9_a0a0b(), false, true, _info_12389875345); - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x7417cca3eb1feca9L, "jetbrains.mps.console.blCommand.structure.PrintTextExpression"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_tqzol9_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)"), facade.createNodeId("~Object"))); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ProjectExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ProjectExpression_InferenceRule.java deleted file mode 100644 index 55e4a17e8118..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ProjectExpression_InferenceRule.java +++ /dev/null @@ -1,43 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; -import jetbrains.mps.smodel.SReference; - -public class typeof_ProjectExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_ProjectExpression_InferenceRule() { - } - public void applyRule(final SNode projectExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - { - SNode _nodeToCheck_1029348928467 = projectExpression; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "752693057587763729", 0, null); - typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "752693057587762707", true), (SNode) _quotation_createNode_osiggc_a0a0b(), _info_12389875345); - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0xa721a59126bb908L, "jetbrains.mps.console.blCommand.structure.ProjectExpression"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_osiggc_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_1.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_1, facade.createModelReference("6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)"), facade.createNodeId("~Project"))); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ReferencesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ReferencesExpression_InferenceRule.java deleted file mode 100644 index ed0d9f0b7c4b..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ReferencesExpression_InferenceRule.java +++ /dev/null @@ -1,44 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; - -public class typeof_ReferencesExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_ReferencesExpression_InferenceRule() { - } - public void applyRule(final SNode referencesExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - { - SNode _nodeToCheck_1029348928467 = referencesExpression; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6322385757205641653", 0, null); - typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "6322385757205641659", true), (SNode) _quotation_createNode_bx15pu_a0a0b(), _info_12389875345); - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x57bda059470950bdL, "jetbrains.mps.console.blCommand.structure.ReferencesExpression"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_bx15pu_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_2); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java deleted file mode 100644 index f5e618f5d435..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ScopeProvider_InferenceRule.java +++ /dev/null @@ -1,73 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import jetbrains.mps.typesystem.inference.EquationInfo; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; -import jetbrains.mps.smodel.SReference; - -public class typeof_ScopeProvider_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_ScopeProvider_InferenceRule() { - } - public void applyRule(final SNode scopeProvider, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - { - SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(scopeProvider, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, 0x3ac2ae2c0bcf36b7L, "scope")); - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "4234138103881642865", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "4234138103881614549", true), (SNode) _quotation_createNode_jkxe46_a0a0b(), false, false, _info_12389875345); - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x3ac2ae2c0bcf368bL, "jetbrains.mps.console.blCommand.structure.WithStatement"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_jkxe46_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - SNode quotedNode_3 = null; - SNode quotedNode_4 = null; - SNode quotedNode_5 = null; - SNode quotedNode_6 = null; - SNode quotedNode_7 = null; - SNode quotedNode_8 = null; - SNode quotedNode_9 = null; - SNode quotedNode_10 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, "jetbrains.mps.lang.typesystem.structure.JoinType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_8); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_2); - quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_3); - quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_9); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_4); - quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_5.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_5, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_5); - quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_10 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_10.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_10, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_6.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_10); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_6); - quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_7.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_7, facade.createModelReference("6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)"), facade.createNodeId("~Project"))); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_7); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ShowExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ShowExpression_InferenceRule.java deleted file mode 100644 index e78ff5c2302d..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_ShowExpression_InferenceRule.java +++ /dev/null @@ -1,81 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.typesystem.inference.EquationInfo; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; -import jetbrains.mps.smodel.SReference; - -public class typeof_ShowExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_ShowExpression_InferenceRule() { - } - public void applyRule(final SNode showExpression, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - { - SNode _nodeToCheck_1029348928467 = showExpression; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246417176611", 0, null); - typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246417176148", true), (SNode) _quotation_createNode_jy8svg_a0a0b(), _info_12389875345); - } - if (!(typeCheckingContext.isSingleTypeComputation())) { - { - SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(showExpression, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, 0x6979f0787b81e875L, "object")); - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246423284446", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7600370246423276130", true), (SNode) _quotation_createNode_jy8svg_a0b0b(), true, true, _info_12389875345); - } - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d79fL, "jetbrains.mps.console.blCommand.structure.ShowExpression"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_jy8svg_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8cc6bf96dL, "jetbrains.mps.baseLanguage.structure.VoidType"), null, null, false); - return quotedNode_1; - } - private static SNode _quotation_createNode_jy8svg_a0b0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - SNode quotedNode_3 = null; - SNode quotedNode_4 = null; - SNode quotedNode_5 = null; - SNode quotedNode_6 = null; - SNode quotedNode_7 = null; - SNode quotedNode_8 = null; - SNode quotedNode_9 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, "jetbrains.mps.lang.typesystem.structure.JoinType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_6 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - quotedNode_2.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_6); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_2); - quotedNode_3 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_7 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_3.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_7); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_3); - quotedNode_4 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_8 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x10a2d94c0cdL, "jetbrains.mps.lang.smodel.structure.SModelType"), null, null, false); - quotedNode_4.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_8); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_4); - quotedNode_5 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, "jetbrains.mps.baseLanguage.collections.structure.SequenceType"), null, null, false); - quotedNode_9 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, "jetbrains.mps.baseLanguage.structure.ClassifierType"), null, null, false); - quotedNode_9.setReference(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), SReference.create(MetaAdapterFactory.getReferenceLink(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0x101de48bf9eL, 0x101de490babL, "classifier"), quotedNode_9, facade.createModelReference("8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)"), facade.createNodeId("~SModule"))); - quotedNode_5.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x10c260e9444L, 0x10c260ee40eL, "elementType"), quotedNode_9); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x7a5dda6291404668L, 0xab76d5ed1746f2b2L, 0x1129e737f02L, 0x1129e73a76aL, "argument"), quotedNode_5); - return quotedNode_1; - } -} diff --git a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_UsagesExpression_InferenceRule.java b/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_UsagesExpression_InferenceRule.java deleted file mode 100644 index a927dd43b139..000000000000 --- a/languages/languageDesign/smodel.query/source_gen/jetbrains/mps/console/blCommand/typesystem/typeof_UsagesExpression_InferenceRule.java +++ /dev/null @@ -1,58 +0,0 @@ -package jetbrains.mps.console.blCommand.typesystem; - -/*Generated by MPS */ - -import jetbrains.mps.lang.typesystem.runtime.AbstractInferenceRule_Runtime; -import jetbrains.mps.lang.typesystem.runtime.InferenceRule_Runtime; -import org.jetbrains.mps.openapi.model.SNode; -import jetbrains.mps.typesystem.inference.TypeCheckingContext; -import jetbrains.mps.lang.typesystem.runtime.IsApplicableStatus; -import jetbrains.mps.typesystem.inference.EquationInfo; -import jetbrains.mps.lang.smodel.generator.smodelAdapter.SLinkOperations; -import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; -import org.jetbrains.mps.openapi.language.SAbstractConcept; -import org.jetbrains.mps.openapi.persistence.PersistenceFacade; -import jetbrains.mps.smodel.SModelUtil_new; - -public class typeof_UsagesExpression_InferenceRule extends AbstractInferenceRule_Runtime implements InferenceRule_Runtime { - public typeof_UsagesExpression_InferenceRule() { - } - public void applyRule(final SNode expr, final TypeCheckingContext typeCheckingContext, IsApplicableStatus status) { - { - SNode _nodeToCheck_1029348928467 = expr; - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7738379549905488875", 0, null); - typeCheckingContext.createEquation((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "7738379549905488404", true), (SNode) _quotation_createNode_qth3vr_a0a0b(), _info_12389875345); - } - if (!(typeCheckingContext.isSingleTypeComputation())) { - { - SNode _nodeToCheck_1029348928467 = SLinkOperations.getTarget(expr, MetaAdapterFactory.getContainmentLink(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL, 0x75bb0160f191d6ecL, "node")); - EquationInfo _info_12389875345 = new EquationInfo(_nodeToCheck_1029348928467, null, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "473081947995054364", 0, null); - typeCheckingContext.createLessThanInequality((SNode) typeCheckingContext.typeOf(_nodeToCheck_1029348928467, "r:7e8cfa8a-da13-467d-9878-63b90b943128(jetbrains.mps.console.blCommand.typesystem)", "473081947995054370", true), (SNode) _quotation_createNode_qth3vr_a0b0b(), true, true, _info_12389875345); - } - } - } - public SAbstractConcept getApplicableConcept() { - return MetaAdapterFactory.getConcept(0x1a8554c4eb8443baL, 0x8c346f0d90c6e75aL, 0x75bb0160f191d6ebL, "jetbrains.mps.console.blCommand.structure.UsagesExpression"); - } - public IsApplicableStatus isApplicableAndPattern(SNode argument) { - return new IsApplicableStatus(argument.getConcept().isSubConceptOf(getApplicableConcept()), null); - } - public boolean overrides() { - return false; - } - private static SNode _quotation_createNode_qth3vr_a0a0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - SNode quotedNode_2 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x62e1df06bd2172b2L, "jetbrains.mps.baseLanguage.collections.structure.CollectionType"), null, null, false); - quotedNode_2 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x798c0d67da9d2175L, "jetbrains.mps.lang.smodel.structure.SReferenceType"), null, null, false); - quotedNode_1.addChild(MetaAdapterFactory.getContainmentLink(0x8388864671ce4f1cL, 0x9c53c54016f6ad4fL, 0x4eec26fcbaf8c39bL, 0x4eec26fcbaf8c39cL, "elementType"), quotedNode_2); - return quotedNode_1; - } - private static SNode _quotation_createNode_qth3vr_a0b0b() { - PersistenceFacade facade = PersistenceFacade.getInstance(); - SNode quotedNode_1 = null; - quotedNode_1 = SModelUtil_new.instantiateConceptDeclaration(MetaAdapterFactory.getConcept(0x7866978ea0f04cc7L, 0x81bc4d213d9375e1L, 0x108f968b3caL, "jetbrains.mps.lang.smodel.structure.SNodeType"), null, null, false); - return quotedNode_1; - } -} From 1ac6fee0ca1f597834a49672c9a696258f0f1415 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 27 Aug 2015 16:24:45 +0300 Subject: [PATCH 50/52] make project after rebase --- .../base/source_gen.caches/jetbrains/mps/console/base/generated | 2 +- .../source_gen.caches/jetbrains/mps/ide/build/generated | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated index c48efb552b1b..dda8118a0bb9 100644 --- a/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated +++ b/plugins/console/lang/base/source_gen.caches/jetbrains/mps/console/base/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated index 33bcbb5c43d8..f9b7d2d05b41 100644 --- a/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated +++ b/plugins/mps-build/solutions/mpsBuild/source_gen.caches/jetbrains/mps/ide/build/generated @@ -1,3 +1,3 @@ - + From 8e83af1f9bc65a9d93ff7077c75cc0cca1763c85 Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 27 Aug 2015 16:42:00 +0300 Subject: [PATCH 51/52] migration to remove odd annotations in lightweightdsl --- ...brains.mps.baseLanguage.lightweightdsl.mpl | 6 +- .../languageModels/migration.mps | 274 ++++++++++++++++++ .../mps/baseLanguage/lightweightdsl/generated | 2 +- .../lightweightdsl/migration/dependencies | 30 ++ .../lightweightdsl/migration/generated | 3 + .../baseLanguage/lightweightdsl/Language.java | 2 +- .../migration/MigrationDescriptorImpl.java | 16 + .../migration/RemoveOddAnnotations.java | 48 +++ .../lightweightdsl/migration/trace.info | 61 ++++ 9 files changed, 439 insertions(+), 3 deletions(-) create mode 100644 languages/baseLanguage/lightweightdsl/languageModels/migration.mps create mode 100644 languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/dependencies create mode 100644 languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/generated create mode 100644 languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/MigrationDescriptorImpl.java create mode 100644 languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/RemoveOddAnnotations.java create mode 100644 languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/trace.info diff --git a/languages/baseLanguage/lightweightdsl/jetbrains.mps.baseLanguage.lightweightdsl.mpl b/languages/baseLanguage/lightweightdsl/jetbrains.mps.baseLanguage.lightweightdsl.mpl index 465777f0dbc8..c844578ea93c 100644 --- a/languages/baseLanguage/lightweightdsl/jetbrains.mps.baseLanguage.lightweightdsl.mpl +++ b/languages/baseLanguage/lightweightdsl/jetbrains.mps.baseLanguage.lightweightdsl.mpl @@ -1,5 +1,5 @@ - + @@ -90,9 +90,13 @@ + + + + diff --git a/languages/baseLanguage/lightweightdsl/languageModels/migration.mps b/languages/baseLanguage/lightweightdsl/languageModels/migration.mps new file mode 100644 index 000000000000..daca03bdf9eb --- /dev/null +++ b/languages/baseLanguage/lightweightdsl/languageModels/migration.mps @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/generated b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/generated index e178452a693f..88fdcffea431 100644 --- a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/generated +++ b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/dependencies b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/dependencies new file mode 100644 index 000000000000..f5d5167f1e3c --- /dev/null +++ b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/dependencies @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/generated b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/generated new file mode 100644 index 000000000000..6d00b5110d1e --- /dev/null +++ b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/generated @@ -0,0 +1,3 @@ + + + diff --git a/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/Language.java b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/Language.java index ca396a9bb27f..d2e36aaefe20 100644 --- a/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/Language.java +++ b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/Language.java @@ -34,7 +34,7 @@ public String getNamespace() { @Override public int getVersion() { - return 0; + return 1; } public SLanguageId getId() { diff --git a/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/MigrationDescriptorImpl.java b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/MigrationDescriptorImpl.java new file mode 100644 index 000000000000..411f42503824 --- /dev/null +++ b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/MigrationDescriptorImpl.java @@ -0,0 +1,16 @@ +package jetbrains.mps.baseLanguage.lightweightdsl.migration; + +/*Generated by MPS */ + +import jetbrains.mps.lang.migration.runtime.base.MigrationDescriptor; +import java.util.Map; +import jetbrains.mps.lang.migration.runtime.base.MigrationScript; +import jetbrains.mps.internal.collections.runtime.MapSequence; +import java.util.HashMap; + +public class MigrationDescriptorImpl implements MigrationDescriptor { + private Map myScripts = MapSequence.fromMapAndKeysArray(new HashMap(), 0).withValues(new RemoveOddAnnotations()); + public MigrationScript getScript(int fromVersion) { + return MapSequence.fromMap(myScripts).get(fromVersion); + } +} diff --git a/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/RemoveOddAnnotations.java b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/RemoveOddAnnotations.java new file mode 100644 index 000000000000..24b1309e215a --- /dev/null +++ b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/RemoveOddAnnotations.java @@ -0,0 +1,48 @@ +package jetbrains.mps.baseLanguage.lightweightdsl.migration; + +/*Generated by MPS */ + +import jetbrains.mps.lang.migration.runtime.base.MigrationScriptBase; +import org.jetbrains.mps.openapi.model.SNode; +import org.jetbrains.mps.openapi.module.SModule; +import jetbrains.mps.smodel.query.QueryExecutionContext; +import org.jetbrains.mps.openapi.module.SearchScope; +import jetbrains.mps.smodel.query.CommandUtil; +import jetbrains.mps.internal.collections.runtime.Sequence; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.SNodeOperations; +import jetbrains.mps.smodel.adapter.structure.MetaAdapterFactory; +import jetbrains.mps.internal.collections.runtime.IWhereFilter; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.AttributeOperations; +import jetbrains.mps.lang.smodel.generator.smodelAdapter.IAttributeDescriptor; +import jetbrains.mps.internal.collections.runtime.IVisitor; +import jetbrains.mps.lang.migration.runtime.base.MigrationScriptReference; + +public class RemoveOddAnnotations extends MigrationScriptBase { + public String getCaption() { + return "Remove @dslclass annotations from instances of AutoInitDSLClass"; + } + public SNode execute(SModule m) { + final SModule finalM = m; + { + QueryExecutionContext context = new QueryExecutionContext() { + public SearchScope getDefaultSearchScope() { + return CommandUtil.createScope(finalM); + } + }; + Sequence.fromIterable(SNodeOperations.ofConcept(CommandUtil.instances(CommandUtil.createConsoleScope(null, false, context), MetaAdapterFactory.getInterfaceConcept(0xc7d5b9dda05f4be2L, 0xbc73f2e16994cc67L, 0xea740fb893a13edL, "jetbrains.mps.baseLanguage.lightweightdsl.structure.AutoInitDSLClass")), MetaAdapterFactory.getConcept(0xf3061a5392264cc5L, 0xa443f952ceaf5816L, 0xf8c108ca66L, "jetbrains.mps.baseLanguage.structure.ClassConcept"))).where(new IWhereFilter() { + public boolean accept(SNode it) { + return (AttributeOperations.getAttribute(it, new IAttributeDescriptor.NodeAttribute(MetaAdapterFactory.getConcept(0xc7d5b9dda05f4be2L, 0xbc73f2e16994cc67L, 0x3190d3f9f1cab0caL, "jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation"))) != null); + } + }).visitAll(new IVisitor() { + public void visit(SNode it) { + SNodeOperations.deleteNode(AttributeOperations.getAttribute(it, new IAttributeDescriptor.NodeAttribute(MetaAdapterFactory.getConcept(0xc7d5b9dda05f4be2L, 0xbc73f2e16994cc67L, 0x3190d3f9f1cab0caL, "jetbrains.mps.baseLanguage.lightweightdsl.structure.DSLAnnotation")))); + } + }); + } + return null; + } + public MigrationScriptReference getDescriptor() { + return new MigrationScriptReference(MetaAdapterFactory.getLanguage(0xc7d5b9dda05f4be2L, 0xbc73f2e16994cc67L, "jetbrains.mps.baseLanguage.lightweightdsl"), 0); + } + +} diff --git a/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/trace.info b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/trace.info new file mode 100644 index 000000000000..fe900a348eef --- /dev/null +++ b/languages/baseLanguage/lightweightdsl/source_gen/jetbrains/mps/baseLanguage/lightweightdsl/migration/trace.info @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 580813f0797f9493d2c1a1ebeebef1acb14aa04c Mon Sep 17 00:00:00 2001 From: Mihail Muhin Date: Thu, 27 Aug 2015 17:18:44 +0300 Subject: [PATCH 52/52] execute migration to remove odd annotations in lightweightdsl, make project --- .../kernelSolution/jetbrains.mps.kernel.msd | 2 +- .../baseLanguage/jetbrains.mps.baseLanguage.mpl | 2 +- .../baseLanguage/languageModels/migration.mps | 8 +------- .../jetbrains/mps/baseLanguage/generated | 2 +- .../mps/baseLanguage/migration/generated | 2 +- .../jetbrains.mps.baseLanguage.collections.mpl | 2 +- ...rains.mps.baseLanguage.collections.trove.mpl | 2 +- .../baseLanguage/collections/trove/generated | 2 +- .../mps/baseLanguage/collections/generated | 2 +- .../jetbrains.mps.baseLanguage.javadoc.mpl | 2 +- .../javadoc/languageModels/migration.mps | 14 +------------- .../mps/baseLanguage/javadoc/generated | 2 +- .../baseLanguage/javadoc/migration/generated | 2 +- ...etbrains.mps.baseLanguage.lightweightdsl.mpl | 2 +- .../baseLanguage/lightweightdsl/behavior.mps | 2 +- .../baseLanguage/lightweightdsl/typesystem.mps | 2 +- .../lightweightdsl/languageModels/migration.mps | 2 +- .../lightweightdsl/behavior/generated | 2 +- .../mps/baseLanguage/lightweightdsl/generated | 2 +- .../lightweightdsl/migration/generated | 2 +- .../lightweightdsl/typesystem/generated | 2 +- languages/core/core/jetbrains.mps.lang.core.mpl | 2 +- .../core/core/languageModels/migration.mps | 11 +---------- .../jetbrains/mps/lang/core/generated | 2 +- .../jetbrains/mps/lang/core/migration/generated | 2 +- .../generator/template/main/generated | 2 +- .../generator/template/main@generator.mps | 8 +------- .../jetbrains.mps.lang.customAspect.mpl | 4 ++-- .../jetbrains/mps/lang/customAspect/methods.mps | 2 +- .../jetbrains/mps/lang/customAspect/generated | 2 +- .../mps/lang/customAspect/methods/generated | 2 +- .../extension/jetbrains.mps.lang.extension.mpl | 4 ++-- .../jetbrains/mps/lang/extension/methods.mps | 2 +- .../jetbrains/mps/lang/extension/generated | 2 +- .../mps/lang/extension/methods/generated | 2 +- .../jetbrains.mps.lang.descriptor.mpl | 2 +- .../jetbrains/mps/lang/descriptor/generated | 2 +- .../migration/jetbrains.mps.lang.migration.mpl | 2 +- .../jetbrains/mps/lang/migration/methods.mps | 2 +- .../jetbrains.mps.lang.migration.actions.msd | 2 +- .../jetbrains/mps/lang/migration/generated | 2 +- .../mps/lang/migration/methods/generated | 2 +- .../smodel/jetbrains.mps.lang.smodel.mpl | 2 +- .../smodel/languageModels/migration.mps | 8 +------- .../jetbrains/mps/lang/smodel/generated | 2 +- .../mps/lang/smodel/migration/generated | 2 +- .../structure/jetbrains.mps.lang.structure.mpl | 2 +- .../jetbrains/mps/lang/structure/generated | 2 +- .../jetbrains.mps.lang.traceable.operations.mpl | 2 +- .../languageModels/migration.mps | 8 +------- .../mps/lang/traceable/operations/generated | 2 +- .../traceable/operations/migration/generated | 2 +- .../build.mps/jetbrains.mps.build.mps.mpl | 2 +- .../build.mps/languageModels/migration.mps | 11 +---------- .../jetbrains/mps/build/mps/generated | 2 +- .../jetbrains/mps/build/mps/migration/generated | 2 +- .../test/jetbrains.mps.lang.test.mpl | 2 +- .../test/languageModels/migration.mps | 11 +---------- .../jetbrains.mps.lang.test.pluginSolution.msd | 2 +- .../jetbrains/mps/lang/test/generated | 2 +- .../jetbrains/mps/lang/test/migration/generated | 2 +- .../mpsdevkit/jetbrains.mps.ide.mpsdevkit.msd | 2 +- ...brains.mps.lang.migration.pluginSolution.msd | 2 +- ...brains.mps.lang.structure.pluginSolution.msd | 2 +- .../lang/structure/pluginSolution/plugin.mps | 17 +---------------- .../structure/pluginSolution/plugin/generated | 2 +- ...rains.mps.samples.LightweightDSL.sandbox.msd | 2 +- .../mps/samples/LightweightDSL/sandbox.mps | 17 +---------------- .../mps/samples/SwingBuilder/sandbox/generated | 2 +- ...brains.mps.samples.LightweightDSL.plugin.msd | 2 +- .../LightweightDSL/plugin/definitions.mps | 2 +- .../LightweightDSL/plugin/definitions/generated | 2 +- samples/migrations/languages/decl/decl.mpl | 2 +- .../languages/decl/languageModels/migration.mps | 8 +------- .../decl/source_gen.caches/decl/generated | 2 +- .../source_gen.caches/decl/migration/generated | 2 +- .../languages/declarations/declarations.mpl | 2 +- .../declarations/languageModels/migration.mps | 8 +------- .../source_gen.caches/declarations/generated | 2 +- .../declarations/migration/generated | 2 +- .../languages/ref/languageModels/migration.mps | 11 +---------- samples/migrations/languages/ref/ref.mpl | 2 +- .../ref/source_gen.caches/ref/generated | 2 +- .../source_gen.caches/ref/migration/generated | 2 +- .../references/languageModels/migration.mps | 8 +------- .../languages/references/references.mpl | 2 +- .../source_gen.caches/references/generated | 2 +- .../references/migration/generated | 2 +- .../languageModels/migration.mps | 11 +---------- .../source_gen.caches/updatedLanguage/generated | 2 +- .../updatedLanguage/migration/generated | 2 +- .../updatedLanguage/updatedLanguage.mpl | 2 +- .../jetbrains.mps.lang.extension.tests.msd | 2 +- .../mps-platform/jetbrains.mps.ide.platform.msd | 2 +- .../jetbrains/mps/ide/platform/actions/core.mps | 4 ++-- .../mps/ide/platform/actions/core/generated | 2 +- .../jetbrains.mps.ide/jetbrains.mps.ide.msd | 2 +- .../jetbrains.mps.lang.core.pluginSolution.msd | 2 +- 98 files changed, 101 insertions(+), 230 deletions(-) diff --git a/core/kernel/kernelSolution/jetbrains.mps.kernel.msd b/core/kernel/kernelSolution/jetbrains.mps.kernel.msd index 52b7dd3ec471..ac36a89c3212 100644 --- a/core/kernel/kernelSolution/jetbrains.mps.kernel.msd +++ b/core/kernel/kernelSolution/jetbrains.mps.kernel.msd @@ -37,7 +37,7 @@ - + diff --git a/languages/baseLanguage/baseLanguage/jetbrains.mps.baseLanguage.mpl b/languages/baseLanguage/baseLanguage/jetbrains.mps.baseLanguage.mpl index 3b2510e3d03c..62ff0f4e4acf 100644 --- a/languages/baseLanguage/baseLanguage/jetbrains.mps.baseLanguage.mpl +++ b/languages/baseLanguage/baseLanguage/jetbrains.mps.baseLanguage.mpl @@ -96,7 +96,7 @@ - + diff --git a/languages/baseLanguage/baseLanguage/languageModels/migration.mps b/languages/baseLanguage/baseLanguage/languageModels/migration.mps index d8f037c42387..e03c5565aeae 100644 --- a/languages/baseLanguage/baseLanguage/languageModels/migration.mps +++ b/languages/baseLanguage/baseLanguage/languageModels/migration.mps @@ -3,8 +3,8 @@ - + @@ -85,9 +85,6 @@ - - - @@ -142,9 +139,6 @@ - - - diff --git a/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generated b/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generated index 448cc377bb54..df555fc3cb7e 100644 --- a/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generated +++ b/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/migration/generated b/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/migration/generated index 42276fc8670a..7dbae015cb08 100644 --- a/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/migration/generated +++ b/languages/baseLanguage/baseLanguage/source_gen.caches/jetbrains/mps/baseLanguage/migration/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/baseLanguage/collections/jetbrains.mps.baseLanguage.collections.mpl b/languages/baseLanguage/collections/jetbrains.mps.baseLanguage.collections.mpl index 253b0f363b89..01199a9a2d8a 100644 --- a/languages/baseLanguage/collections/jetbrains.mps.baseLanguage.collections.mpl +++ b/languages/baseLanguage/collections/jetbrains.mps.baseLanguage.collections.mpl @@ -116,7 +116,7 @@ - + diff --git a/languages/baseLanguage/collections/languages/trove/jetbrains.mps.baseLanguage.collections.trove.mpl b/languages/baseLanguage/collections/languages/trove/jetbrains.mps.baseLanguage.collections.trove.mpl index 3f1b90dc91ae..4b88133c06ad 100644 --- a/languages/baseLanguage/collections/languages/trove/jetbrains.mps.baseLanguage.collections.trove.mpl +++ b/languages/baseLanguage/collections/languages/trove/jetbrains.mps.baseLanguage.collections.trove.mpl @@ -54,7 +54,7 @@ - + diff --git a/languages/baseLanguage/collections/languages/trove/source_gen.caches/jetbrains/mps/baseLanguage/collections/trove/generated b/languages/baseLanguage/collections/languages/trove/source_gen.caches/jetbrains/mps/baseLanguage/collections/trove/generated index d58a1823d416..102605f367f1 100644 --- a/languages/baseLanguage/collections/languages/trove/source_gen.caches/jetbrains/mps/baseLanguage/collections/trove/generated +++ b/languages/baseLanguage/collections/languages/trove/source_gen.caches/jetbrains/mps/baseLanguage/collections/trove/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/baseLanguage/collections/source_gen.caches/jetbrains/mps/baseLanguage/collections/generated b/languages/baseLanguage/collections/source_gen.caches/jetbrains/mps/baseLanguage/collections/generated index 7b38498ad938..3d40faf37b63 100644 --- a/languages/baseLanguage/collections/source_gen.caches/jetbrains/mps/baseLanguage/collections/generated +++ b/languages/baseLanguage/collections/source_gen.caches/jetbrains/mps/baseLanguage/collections/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/baseLanguage/javadoc/jetbrains.mps.baseLanguage.javadoc.mpl b/languages/baseLanguage/javadoc/jetbrains.mps.baseLanguage.javadoc.mpl index b0b7dd7a71d6..6f6473685600 100644 --- a/languages/baseLanguage/javadoc/jetbrains.mps.baseLanguage.javadoc.mpl +++ b/languages/baseLanguage/javadoc/jetbrains.mps.baseLanguage.javadoc.mpl @@ -25,7 +25,7 @@ - + diff --git a/languages/baseLanguage/javadoc/languageModels/migration.mps b/languages/baseLanguage/javadoc/languageModels/migration.mps index dbd5307d4553..3d7650c7ab13 100644 --- a/languages/baseLanguage/javadoc/languageModels/migration.mps +++ b/languages/baseLanguage/javadoc/languageModels/migration.mps @@ -3,10 +3,10 @@ - + @@ -121,9 +121,6 @@ - - - @@ -162,9 +159,6 @@ - - - @@ -205,9 +199,6 @@ - - - @@ -300,9 +291,6 @@ - - - diff --git a/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/generated b/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/generated index 2e129292e5a0..11fa81c9efca 100644 --- a/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/generated +++ b/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/migration/generated b/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/migration/generated index 6408f2f292ba..c0b5f64764f7 100644 --- a/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/migration/generated +++ b/languages/baseLanguage/javadoc/source_gen.caches/jetbrains/mps/baseLanguage/javadoc/migration/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/baseLanguage/lightweightdsl/jetbrains.mps.baseLanguage.lightweightdsl.mpl b/languages/baseLanguage/lightweightdsl/jetbrains.mps.baseLanguage.lightweightdsl.mpl index c844578ea93c..776f8acbc52a 100644 --- a/languages/baseLanguage/lightweightdsl/jetbrains.mps.baseLanguage.lightweightdsl.mpl +++ b/languages/baseLanguage/lightweightdsl/jetbrains.mps.baseLanguage.lightweightdsl.mpl @@ -77,7 +77,7 @@ - + diff --git a/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/behavior.mps b/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/behavior.mps index 400db024feb9..acf424bcbefe 100644 --- a/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/behavior.mps +++ b/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/behavior.mps @@ -4,10 +4,10 @@ - + diff --git a/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/typesystem.mps b/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/typesystem.mps index 94459f3c578b..56e42b9caac1 100644 --- a/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/typesystem.mps +++ b/languages/baseLanguage/lightweightdsl/languageModels/jetbrains/mps/baseLanguage/lightweightdsl/typesystem.mps @@ -3,8 +3,8 @@ - + diff --git a/languages/baseLanguage/lightweightdsl/languageModels/migration.mps b/languages/baseLanguage/lightweightdsl/languageModels/migration.mps index daca03bdf9eb..daf4701d3992 100644 --- a/languages/baseLanguage/lightweightdsl/languageModels/migration.mps +++ b/languages/baseLanguage/lightweightdsl/languageModels/migration.mps @@ -8,7 +8,7 @@ - + diff --git a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/behavior/generated b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/behavior/generated index 24188eb66960..f8424e0f8a0e 100644 --- a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/behavior/generated +++ b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/behavior/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/generated b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/generated index 88fdcffea431..03fd4240cf6f 100644 --- a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/generated +++ b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/generated b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/generated index 6d00b5110d1e..aa5afa903215 100644 --- a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/generated +++ b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/migration/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/typesystem/generated b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/typesystem/generated index ea3b46d59456..071e87ce80e6 100644 --- a/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/typesystem/generated +++ b/languages/baseLanguage/lightweightdsl/source_gen.caches/jetbrains/mps/baseLanguage/lightweightdsl/typesystem/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/core/core/jetbrains.mps.lang.core.mpl b/languages/core/core/jetbrains.mps.lang.core.mpl index f0852dff54fa..e3dffa5fd571 100644 --- a/languages/core/core/jetbrains.mps.lang.core.mpl +++ b/languages/core/core/jetbrains.mps.lang.core.mpl @@ -33,7 +33,7 @@ - + diff --git a/languages/core/core/languageModels/migration.mps b/languages/core/core/languageModels/migration.mps index 71734b0040f5..100f9b58878b 100644 --- a/languages/core/core/languageModels/migration.mps +++ b/languages/core/core/languageModels/migration.mps @@ -5,7 +5,7 @@ - + @@ -91,9 +91,6 @@ - - - @@ -126,9 +123,6 @@ - - - @@ -154,9 +148,6 @@ - - - diff --git a/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/generated b/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/generated index 4720e36ed908..07a54f756bd4 100644 --- a/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/generated +++ b/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/migration/generated b/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/migration/generated index 6ef08378ce34..3c9d5912609c 100644 --- a/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/migration/generated +++ b/languages/core/core/source_gen.caches/jetbrains/mps/lang/core/migration/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/customAspect/generator/source_gen.caches/jetbrains/mps/lang/customAspect/generator/template/main/generated b/languages/languageDesign/customAspect/generator/source_gen.caches/jetbrains/mps/lang/customAspect/generator/template/main/generated index 7bf2d375f70b..1fc2eb1a92df 100644 --- a/languages/languageDesign/customAspect/generator/source_gen.caches/jetbrains/mps/lang/customAspect/generator/template/main/generated +++ b/languages/languageDesign/customAspect/generator/source_gen.caches/jetbrains/mps/lang/customAspect/generator/template/main/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/customAspect/generator/template/main@generator.mps b/languages/languageDesign/customAspect/generator/template/main@generator.mps index fe7d4a98d0ca..f5db761b87db 100644 --- a/languages/languageDesign/customAspect/generator/template/main@generator.mps +++ b/languages/languageDesign/customAspect/generator/template/main@generator.mps @@ -7,7 +7,7 @@ - + @@ -233,9 +233,6 @@ - - - @@ -931,9 +928,6 @@ - - - diff --git a/languages/languageDesign/customAspect/jetbrains.mps.lang.customAspect.mpl b/languages/languageDesign/customAspect/jetbrains.mps.lang.customAspect.mpl index 9685d71f9032..fbaf93a6e413 100644 --- a/languages/languageDesign/customAspect/jetbrains.mps.lang.customAspect.mpl +++ b/languages/languageDesign/customAspect/jetbrains.mps.lang.customAspect.mpl @@ -43,7 +43,7 @@ - + @@ -94,7 +94,7 @@ - + diff --git a/languages/languageDesign/customAspect/languageAccessories/jetbrains/mps/lang/customAspect/methods.mps b/languages/languageDesign/customAspect/languageAccessories/jetbrains/mps/lang/customAspect/methods.mps index 797ffa4f441e..fc842de7b7d6 100644 --- a/languages/languageDesign/customAspect/languageAccessories/jetbrains/mps/lang/customAspect/methods.mps +++ b/languages/languageDesign/customAspect/languageAccessories/jetbrains/mps/lang/customAspect/methods.mps @@ -2,7 +2,7 @@ - + diff --git a/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/generated b/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/generated index 3c553652c177..fa84a64731d4 100644 --- a/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/generated +++ b/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/methods/generated b/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/methods/generated index a07318213881..52d64a7f2215 100644 --- a/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/methods/generated +++ b/languages/languageDesign/customAspect/source_gen.caches/jetbrains/mps/lang/customAspect/methods/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/extension/jetbrains.mps.lang.extension.mpl b/languages/languageDesign/extension/jetbrains.mps.lang.extension.mpl index 62859dd74fca..6008a39083f5 100644 --- a/languages/languageDesign/extension/jetbrains.mps.lang.extension.mpl +++ b/languages/languageDesign/extension/jetbrains.mps.lang.extension.mpl @@ -55,7 +55,7 @@ - + @@ -108,7 +108,7 @@ - + diff --git a/languages/languageDesign/extension/languageAccessories/jetbrains/mps/lang/extension/methods.mps b/languages/languageDesign/extension/languageAccessories/jetbrains/mps/lang/extension/methods.mps index 1519b6b6a884..cc3fde13ee60 100644 --- a/languages/languageDesign/extension/languageAccessories/jetbrains/mps/lang/extension/methods.mps +++ b/languages/languageDesign/extension/languageAccessories/jetbrains/mps/lang/extension/methods.mps @@ -2,7 +2,7 @@ - + diff --git a/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/generated b/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/generated index 36e3853fb3e0..777090e311da 100644 --- a/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/generated +++ b/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/methods/generated b/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/methods/generated index 0686e7108215..d2d9b41284fc 100644 --- a/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/methods/generated +++ b/languages/languageDesign/extension/source_gen.caches/jetbrains/mps/lang/extension/methods/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/generator/languages/descriptor/jetbrains.mps.lang.descriptor.mpl b/languages/languageDesign/generator/languages/descriptor/jetbrains.mps.lang.descriptor.mpl index 4a5e0c28db5d..f1679898de67 100644 --- a/languages/languageDesign/generator/languages/descriptor/jetbrains.mps.lang.descriptor.mpl +++ b/languages/languageDesign/generator/languages/descriptor/jetbrains.mps.lang.descriptor.mpl @@ -36,7 +36,7 @@ - + diff --git a/languages/languageDesign/generator/languages/descriptor/source_gen.caches/jetbrains/mps/lang/descriptor/generated b/languages/languageDesign/generator/languages/descriptor/source_gen.caches/jetbrains/mps/lang/descriptor/generated index 9adb786d6491..f09f2884f2a6 100644 --- a/languages/languageDesign/generator/languages/descriptor/source_gen.caches/jetbrains/mps/lang/descriptor/generated +++ b/languages/languageDesign/generator/languages/descriptor/source_gen.caches/jetbrains/mps/lang/descriptor/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/migration/jetbrains.mps.lang.migration.mpl b/languages/languageDesign/migration/jetbrains.mps.lang.migration.mpl index 2a366b2df353..a74131f90bd4 100644 --- a/languages/languageDesign/migration/jetbrains.mps.lang.migration.mpl +++ b/languages/languageDesign/migration/jetbrains.mps.lang.migration.mpl @@ -176,7 +176,7 @@ - + diff --git a/languages/languageDesign/migration/languageAccessories/jetbrains/mps/lang/migration/methods.mps b/languages/languageDesign/migration/languageAccessories/jetbrains/mps/lang/migration/methods.mps index 887cf1288e6f..e80058a403dc 100644 --- a/languages/languageDesign/migration/languageAccessories/jetbrains/mps/lang/migration/methods.mps +++ b/languages/languageDesign/migration/languageAccessories/jetbrains/mps/lang/migration/methods.mps @@ -3,10 +3,10 @@ - + diff --git a/languages/languageDesign/migration/solutions/actions/jetbrains.mps.lang.migration.actions.msd b/languages/languageDesign/migration/solutions/actions/jetbrains.mps.lang.migration.actions.msd index 6ffb7c1f12e8..6ab5ae6d3e2e 100644 --- a/languages/languageDesign/migration/solutions/actions/jetbrains.mps.lang.migration.actions.msd +++ b/languages/languageDesign/migration/solutions/actions/jetbrains.mps.lang.migration.actions.msd @@ -21,7 +21,7 @@ - + diff --git a/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/generated b/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/generated index 65ccb9014b3a..fb28cdebca10 100644 --- a/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/generated +++ b/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/methods/generated b/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/methods/generated index 1e5d6720aad3..d0f19350aacd 100644 --- a/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/methods/generated +++ b/languages/languageDesign/migration/source_gen.caches/jetbrains/mps/lang/migration/methods/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel/jetbrains.mps.lang.smodel.mpl b/languages/languageDesign/smodel/jetbrains.mps.lang.smodel.mpl index 9e3d6ae32751..8891e6785b80 100644 --- a/languages/languageDesign/smodel/jetbrains.mps.lang.smodel.mpl +++ b/languages/languageDesign/smodel/jetbrains.mps.lang.smodel.mpl @@ -153,7 +153,7 @@ - + diff --git a/languages/languageDesign/smodel/languageModels/migration.mps b/languages/languageDesign/smodel/languageModels/migration.mps index c15f834b35ce..9cddb7a6ce00 100644 --- a/languages/languageDesign/smodel/languageModels/migration.mps +++ b/languages/languageDesign/smodel/languageModels/migration.mps @@ -5,7 +5,7 @@ - + @@ -108,9 +108,6 @@ - - - @@ -210,9 +207,6 @@ - - - diff --git a/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/generated b/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/generated index c915b26a7ec6..8a2123e00d27 100644 --- a/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/generated +++ b/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/migration/generated b/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/migration/generated index 006633facf7b..36a031d703af 100644 --- a/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/migration/generated +++ b/languages/languageDesign/smodel/source_gen.caches/jetbrains/mps/lang/smodel/migration/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/structure/jetbrains.mps.lang.structure.mpl b/languages/languageDesign/structure/jetbrains.mps.lang.structure.mpl index 3e11defef3e0..adc54ba37597 100644 --- a/languages/languageDesign/structure/jetbrains.mps.lang.structure.mpl +++ b/languages/languageDesign/structure/jetbrains.mps.lang.structure.mpl @@ -89,7 +89,7 @@ - + diff --git a/languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/generated b/languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/generated index efddc2df3eca..82d54803913b 100644 --- a/languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/generated +++ b/languages/languageDesign/structure/source_gen.caches/jetbrains/mps/lang/structure/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/traceable.operations/jetbrains.mps.lang.traceable.operations.mpl b/languages/languageDesign/traceable.operations/jetbrains.mps.lang.traceable.operations.mpl index 5dbcf9e71b53..a9f369304bd4 100644 --- a/languages/languageDesign/traceable.operations/jetbrains.mps.lang.traceable.operations.mpl +++ b/languages/languageDesign/traceable.operations/jetbrains.mps.lang.traceable.operations.mpl @@ -68,7 +68,7 @@ - + diff --git a/languages/languageDesign/traceable.operations/languageModels/migration.mps b/languages/languageDesign/traceable.operations/languageModels/migration.mps index cc33fc258f43..7057efb65c4d 100644 --- a/languages/languageDesign/traceable.operations/languageModels/migration.mps +++ b/languages/languageDesign/traceable.operations/languageModels/migration.mps @@ -11,8 +11,8 @@ - + @@ -76,9 +76,6 @@ - - - @@ -154,9 +151,6 @@ - - - diff --git a/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/generated b/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/generated index f14b52065df9..6f4a8d227a2c 100644 --- a/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/generated +++ b/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/generated @@ -1,3 +1,3 @@ - + diff --git a/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/migration/generated b/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/migration/generated index 2ff00df7472b..7835bd8f06e2 100644 --- a/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/migration/generated +++ b/languages/languageDesign/traceable.operations/source_gen.caches/jetbrains/mps/lang/traceable/operations/migration/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-build/languages/build.mps/jetbrains.mps.build.mps.mpl b/plugins/mps-build/languages/build.mps/jetbrains.mps.build.mps.mpl index 64ed7f756577..b7f870e35f57 100644 --- a/plugins/mps-build/languages/build.mps/jetbrains.mps.build.mps.mpl +++ b/plugins/mps-build/languages/build.mps/jetbrains.mps.build.mps.mpl @@ -124,7 +124,7 @@ - + diff --git a/plugins/mps-build/languages/build.mps/languageModels/migration.mps b/plugins/mps-build/languages/build.mps/languageModels/migration.mps index 73d244173990..b62854d40c9b 100644 --- a/plugins/mps-build/languages/build.mps/languageModels/migration.mps +++ b/plugins/mps-build/languages/build.mps/languageModels/migration.mps @@ -5,7 +5,7 @@ - + @@ -115,9 +115,6 @@ - - - @@ -155,9 +152,6 @@ - - - @@ -198,9 +192,6 @@ - - - diff --git a/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/generated b/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/generated index c36e617e503d..1528d0c1f7ba 100644 --- a/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/generated +++ b/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/migration/generated b/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/migration/generated index 00a768f6da0a..3ecba085aa86 100644 --- a/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/migration/generated +++ b/plugins/mps-build/languages/build.mps/source_gen.caches/jetbrains/mps/build/mps/migration/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-testing/languages/languageDesign/test/jetbrains.mps.lang.test.mpl b/plugins/mps-testing/languages/languageDesign/test/jetbrains.mps.lang.test.mpl index 3c30d6c9a24a..25ff2c056a22 100644 --- a/plugins/mps-testing/languages/languageDesign/test/jetbrains.mps.lang.test.mpl +++ b/plugins/mps-testing/languages/languageDesign/test/jetbrains.mps.lang.test.mpl @@ -104,7 +104,7 @@ - + diff --git a/plugins/mps-testing/languages/languageDesign/test/languageModels/migration.mps b/plugins/mps-testing/languages/languageDesign/test/languageModels/migration.mps index 7cc6aa55f202..714e02ad9b1c 100644 --- a/plugins/mps-testing/languages/languageDesign/test/languageModels/migration.mps +++ b/plugins/mps-testing/languages/languageDesign/test/languageModels/migration.mps @@ -4,8 +4,8 @@ - + @@ -87,9 +87,6 @@ - - - @@ -110,9 +107,6 @@ - - - @@ -132,9 +126,6 @@ - - - diff --git a/plugins/mps-testing/languages/languageDesign/test/solutions/pluginSolution/jetbrains.mps.lang.test.pluginSolution.msd b/plugins/mps-testing/languages/languageDesign/test/solutions/pluginSolution/jetbrains.mps.lang.test.pluginSolution.msd index 4273312e4652..a8f3ae79eb9a 100644 --- a/plugins/mps-testing/languages/languageDesign/test/solutions/pluginSolution/jetbrains.mps.lang.test.pluginSolution.msd +++ b/plugins/mps-testing/languages/languageDesign/test/solutions/pluginSolution/jetbrains.mps.lang.test.pluginSolution.msd @@ -19,7 +19,7 @@ - + diff --git a/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/generated b/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/generated index e6a573feb829..24e2e6ba1c69 100644 --- a/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/generated +++ b/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/migration/generated b/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/migration/generated index 0203d1bce433..72983798f45f 100644 --- a/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/migration/generated +++ b/plugins/mps-testing/languages/languageDesign/test/source_gen.caches/jetbrains/mps/lang/test/migration/generated @@ -1,3 +1,3 @@ - + diff --git a/plugins/mpsdevkit/jetbrains.mps.ide.mpsdevkit.msd b/plugins/mpsdevkit/jetbrains.mps.ide.mpsdevkit.msd index 9d4c6b887b11..aa729b0f83d3 100644 --- a/plugins/mpsdevkit/jetbrains.mps.ide.mpsdevkit.msd +++ b/plugins/mpsdevkit/jetbrains.mps.ide.mpsdevkit.msd @@ -44,7 +44,7 @@ - + diff --git a/plugins/mpsdevkit/languages/pluginSolutions/lang.migration/jetbrains.mps.lang.migration.pluginSolution.msd b/plugins/mpsdevkit/languages/pluginSolutions/lang.migration/jetbrains.mps.lang.migration.pluginSolution.msd index ac92f3d6437e..e14549b37780 100644 --- a/plugins/mpsdevkit/languages/pluginSolutions/lang.migration/jetbrains.mps.lang.migration.pluginSolution.msd +++ b/plugins/mpsdevkit/languages/pluginSolutions/lang.migration/jetbrains.mps.lang.migration.pluginSolution.msd @@ -22,7 +22,7 @@ - + diff --git a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/jetbrains.mps.lang.structure.pluginSolution.msd b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/jetbrains.mps.lang.structure.pluginSolution.msd index 5667d165ffe3..3d792a12ab01 100644 --- a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/jetbrains.mps.lang.structure.pluginSolution.msd +++ b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/jetbrains.mps.lang.structure.pluginSolution.msd @@ -34,7 +34,7 @@ - + diff --git a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps index 160d883256c8..23c0a43b22ee 100644 --- a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps +++ b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/models/jetbrains/mps/lang/structure/pluginSolution/plugin.mps @@ -15,8 +15,8 @@ - + @@ -411,9 +411,6 @@ - - - @@ -4291,9 +4288,6 @@ - - - @@ -8407,9 +8401,6 @@ - - - @@ -9362,9 +9353,6 @@ - - - @@ -9926,9 +9914,6 @@ - - - diff --git a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated index c08c9b1a6426..b4503a0f4d59 100644 --- a/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated +++ b/plugins/mpsdevkit/languages/pluginSolutions/lang.structure/source_gen.caches/jetbrains/mps/lang/structure/pluginSolution/plugin/generated @@ -1,3 +1,3 @@ - + diff --git a/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/jetbrains.mps.samples.LightweightDSL.sandbox.msd b/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/jetbrains.mps.samples.LightweightDSL.sandbox.msd index 0734e8391b53..ac474a8ee38a 100644 --- a/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/jetbrains.mps.samples.LightweightDSL.sandbox.msd +++ b/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/jetbrains.mps.samples.LightweightDSL.sandbox.msd @@ -16,7 +16,7 @@ - + diff --git a/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/models/jetbrains/mps/samples/LightweightDSL/sandbox.mps b/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/models/jetbrains/mps/samples/LightweightDSL/sandbox.mps index a73e0de7be31..08832aa3b05d 100644 --- a/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/models/jetbrains/mps/samples/LightweightDSL/sandbox.mps +++ b/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/models/jetbrains/mps/samples/LightweightDSL/sandbox.mps @@ -4,10 +4,10 @@ - + @@ -358,9 +358,6 @@ - - - @@ -389,9 +386,6 @@ - - - @@ -420,9 +414,6 @@ - - - @@ -451,9 +442,6 @@ - - - @@ -524,9 +512,6 @@ - - - diff --git a/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/source_gen.caches/jetbrains/mps/samples/SwingBuilder/sandbox/generated b/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/source_gen.caches/jetbrains/mps/samples/SwingBuilder/sandbox/generated index b7fc3d3dcb72..2a8eb73c0efb 100644 --- a/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/source_gen.caches/jetbrains/mps/samples/SwingBuilder/sandbox/generated +++ b/samples/lightweightDSL/languages/jetbrains.mps.samples.SwingBuilder/sandbox/source_gen.caches/jetbrains/mps/samples/SwingBuilder/sandbox/generated @@ -1,3 +1,3 @@ - + diff --git a/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/jetbrains.mps.samples.LightweightDSL.plugin.msd b/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/jetbrains.mps.samples.LightweightDSL.plugin.msd index e3232c0b5351..2add2dfb98c6 100644 --- a/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/jetbrains.mps.samples.LightweightDSL.plugin.msd +++ b/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/jetbrains.mps.samples.LightweightDSL.plugin.msd @@ -18,7 +18,7 @@ - + diff --git a/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/models/jetbrains/mps/samples/LightweightDSL/plugin/definitions.mps b/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/models/jetbrains/mps/samples/LightweightDSL/plugin/definitions.mps index ee9ffb54af2c..3d7027997db1 100644 --- a/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/models/jetbrains/mps/samples/LightweightDSL/plugin/definitions.mps +++ b/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/models/jetbrains/mps/samples/LightweightDSL/plugin/definitions.mps @@ -2,11 +2,11 @@ - + diff --git a/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/source_gen.caches/jetbrains/mps/samples/LightweightDSL/plugin/definitions/generated b/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/source_gen.caches/jetbrains/mps/samples/LightweightDSL/plugin/definitions/generated index d21cbb8670bc..57eef5d39c40 100644 --- a/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/source_gen.caches/jetbrains/mps/samples/LightweightDSL/plugin/definitions/generated +++ b/samples/lightweightDSL/solutions/jetbrains.mps.samples.LightweightDSL.plugin/source_gen.caches/jetbrains/mps/samples/LightweightDSL/plugin/definitions/generated @@ -1,3 +1,3 @@ - + diff --git a/samples/migrations/languages/decl/decl.mpl b/samples/migrations/languages/decl/decl.mpl index efeda2ccc261..e33861085b2e 100755 --- a/samples/migrations/languages/decl/decl.mpl +++ b/samples/migrations/languages/decl/decl.mpl @@ -55,7 +55,7 @@ - + diff --git a/samples/migrations/languages/decl/languageModels/migration.mps b/samples/migrations/languages/decl/languageModels/migration.mps index d1dd02f5a422..40487d5bd9d7 100755 --- a/samples/migrations/languages/decl/languageModels/migration.mps +++ b/samples/migrations/languages/decl/languageModels/migration.mps @@ -2,11 +2,11 @@ - + @@ -116,9 +116,6 @@ - - - @@ -217,9 +214,6 @@ - - - diff --git a/samples/migrations/languages/decl/source_gen.caches/decl/generated b/samples/migrations/languages/decl/source_gen.caches/decl/generated index 42a23e7ebfd2..ba05435b658b 100644 --- a/samples/migrations/languages/decl/source_gen.caches/decl/generated +++ b/samples/migrations/languages/decl/source_gen.caches/decl/generated @@ -1,3 +1,3 @@ - + diff --git a/samples/migrations/languages/decl/source_gen.caches/decl/migration/generated b/samples/migrations/languages/decl/source_gen.caches/decl/migration/generated index 6e905ddb758c..2a6f585aec84 100644 --- a/samples/migrations/languages/decl/source_gen.caches/decl/migration/generated +++ b/samples/migrations/languages/decl/source_gen.caches/decl/migration/generated @@ -1,3 +1,3 @@ - + diff --git a/samples/migrations/languages/declarations/declarations.mpl b/samples/migrations/languages/declarations/declarations.mpl index 2589b8ef5c80..4c5dd97b0c55 100644 --- a/samples/migrations/languages/declarations/declarations.mpl +++ b/samples/migrations/languages/declarations/declarations.mpl @@ -52,7 +52,7 @@ - + diff --git a/samples/migrations/languages/declarations/languageModels/migration.mps b/samples/migrations/languages/declarations/languageModels/migration.mps index b98e64935c4e..420cdc8f88e7 100644 --- a/samples/migrations/languages/declarations/languageModels/migration.mps +++ b/samples/migrations/languages/declarations/languageModels/migration.mps @@ -5,8 +5,8 @@ - + @@ -92,9 +92,6 @@ - - - @@ -168,9 +165,6 @@ - - - diff --git a/samples/migrations/languages/declarations/source_gen.caches/declarations/generated b/samples/migrations/languages/declarations/source_gen.caches/declarations/generated index 0bd5f1489fbd..b91358a08691 100644 --- a/samples/migrations/languages/declarations/source_gen.caches/declarations/generated +++ b/samples/migrations/languages/declarations/source_gen.caches/declarations/generated @@ -1,3 +1,3 @@ - + diff --git a/samples/migrations/languages/declarations/source_gen.caches/declarations/migration/generated b/samples/migrations/languages/declarations/source_gen.caches/declarations/migration/generated index c8a262f5e004..a2ffc4835f32 100644 --- a/samples/migrations/languages/declarations/source_gen.caches/declarations/migration/generated +++ b/samples/migrations/languages/declarations/source_gen.caches/declarations/migration/generated @@ -1,3 +1,3 @@ - + diff --git a/samples/migrations/languages/ref/languageModels/migration.mps b/samples/migrations/languages/ref/languageModels/migration.mps index 12e981f5a59d..97f2012a6707 100755 --- a/samples/migrations/languages/ref/languageModels/migration.mps +++ b/samples/migrations/languages/ref/languageModels/migration.mps @@ -2,12 +2,12 @@ - + @@ -116,9 +116,6 @@ - - - @@ -167,9 +164,6 @@ - - - @@ -217,9 +211,6 @@ - - - diff --git a/samples/migrations/languages/ref/ref.mpl b/samples/migrations/languages/ref/ref.mpl index 5b4d1c62466c..dd1568bc2ad9 100755 --- a/samples/migrations/languages/ref/ref.mpl +++ b/samples/migrations/languages/ref/ref.mpl @@ -56,7 +56,7 @@ - + diff --git a/samples/migrations/languages/ref/source_gen.caches/ref/generated b/samples/migrations/languages/ref/source_gen.caches/ref/generated index 9b5b6a17508c..5f3fd9fbab8a 100644 --- a/samples/migrations/languages/ref/source_gen.caches/ref/generated +++ b/samples/migrations/languages/ref/source_gen.caches/ref/generated @@ -1,3 +1,3 @@ - + diff --git a/samples/migrations/languages/ref/source_gen.caches/ref/migration/generated b/samples/migrations/languages/ref/source_gen.caches/ref/migration/generated index 916ecdaef941..00eb935fdad7 100644 --- a/samples/migrations/languages/ref/source_gen.caches/ref/migration/generated +++ b/samples/migrations/languages/ref/source_gen.caches/ref/migration/generated @@ -1,3 +1,3 @@ - + diff --git a/samples/migrations/languages/references/languageModels/migration.mps b/samples/migrations/languages/references/languageModels/migration.mps index 9500a3161142..23f039bd992f 100644 --- a/samples/migrations/languages/references/languageModels/migration.mps +++ b/samples/migrations/languages/references/languageModels/migration.mps @@ -5,10 +5,10 @@ - + @@ -91,9 +91,6 @@ - - - @@ -163,9 +160,6 @@ - - - diff --git a/samples/migrations/languages/references/references.mpl b/samples/migrations/languages/references/references.mpl index 1ddcbae559a7..93a24b5746f7 100644 --- a/samples/migrations/languages/references/references.mpl +++ b/samples/migrations/languages/references/references.mpl @@ -54,7 +54,7 @@ - + diff --git a/samples/migrations/languages/references/source_gen.caches/references/generated b/samples/migrations/languages/references/source_gen.caches/references/generated index aff6e08c392b..5793138ba553 100644 --- a/samples/migrations/languages/references/source_gen.caches/references/generated +++ b/samples/migrations/languages/references/source_gen.caches/references/generated @@ -1,3 +1,3 @@ - + diff --git a/samples/migrations/languages/references/source_gen.caches/references/migration/generated b/samples/migrations/languages/references/source_gen.caches/references/migration/generated index 6a8f130d54d2..881af482a05c 100644 --- a/samples/migrations/languages/references/source_gen.caches/references/migration/generated +++ b/samples/migrations/languages/references/source_gen.caches/references/migration/generated @@ -1,3 +1,3 @@ - + diff --git a/testbench/modules/migrationAssistant/languages/updatedLanguage/languageModels/migration.mps b/testbench/modules/migrationAssistant/languages/updatedLanguage/languageModels/migration.mps index 39b7a447afc0..f4d81e60da26 100644 --- a/testbench/modules/migrationAssistant/languages/updatedLanguage/languageModels/migration.mps +++ b/testbench/modules/migrationAssistant/languages/updatedLanguage/languageModels/migration.mps @@ -5,11 +5,11 @@ - + @@ -84,9 +84,6 @@ - - - @@ -104,9 +101,6 @@ - - - @@ -126,9 +120,6 @@ - - - diff --git a/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/generated b/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/generated index 966851c8ebd3..dd15e87532a1 100644 --- a/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/generated +++ b/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/generated @@ -1,3 +1,3 @@ - + diff --git a/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/migration/generated b/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/migration/generated index f98d1d8bd1f7..73ec39c69716 100644 --- a/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/migration/generated +++ b/testbench/modules/migrationAssistant/languages/updatedLanguage/source_gen.caches/updatedLanguage/migration/generated @@ -1,3 +1,3 @@ - + diff --git a/testbench/modules/migrationAssistant/languages/updatedLanguage/updatedLanguage.mpl b/testbench/modules/migrationAssistant/languages/updatedLanguage/updatedLanguage.mpl index 9b11394c51fb..d67d05cab1fa 100644 --- a/testbench/modules/migrationAssistant/languages/updatedLanguage/updatedLanguage.mpl +++ b/testbench/modules/migrationAssistant/languages/updatedLanguage/updatedLanguage.mpl @@ -22,7 +22,7 @@ - + diff --git a/testbench/testsolutions/extension.test/jetbrains.mps.lang.extension.tests.msd b/testbench/testsolutions/extension.test/jetbrains.mps.lang.extension.tests.msd index 794b6aadbe7b..fb31b654902d 100644 --- a/testbench/testsolutions/extension.test/jetbrains.mps.lang.extension.tests.msd +++ b/testbench/testsolutions/extension.test/jetbrains.mps.lang.extension.tests.msd @@ -18,7 +18,7 @@ - + diff --git a/workbench/mps-platform/jetbrains.mps.ide.platform.msd b/workbench/mps-platform/jetbrains.mps.ide.platform.msd index 537b0ecdf665..cb64d01df51f 100644 --- a/workbench/mps-platform/jetbrains.mps.ide.platform.msd +++ b/workbench/mps-platform/jetbrains.mps.ide.platform.msd @@ -43,7 +43,7 @@ - + diff --git a/workbench/mps-platform/models/jetbrains/mps/ide/platform/actions/core.mps b/workbench/mps-platform/models/jetbrains/mps/ide/platform/actions/core.mps index 2b93f44f57c0..c715b3a6eb70 100644 --- a/workbench/mps-platform/models/jetbrains/mps/ide/platform/actions/core.mps +++ b/workbench/mps-platform/models/jetbrains/mps/ide/platform/actions/core.mps @@ -13,8 +13,8 @@ - + @@ -38,8 +38,8 @@ - + diff --git a/workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/platform/actions/core/generated b/workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/platform/actions/core/generated index 7377e8efc2a3..e366a6fe748e 100644 --- a/workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/platform/actions/core/generated +++ b/workbench/mps-platform/source_gen.caches/jetbrains/mps/ide/platform/actions/core/generated @@ -1,3 +1,3 @@ - + diff --git a/workbench/mps-workbench/jetbrains.mps.ide/jetbrains.mps.ide.msd b/workbench/mps-workbench/jetbrains.mps.ide/jetbrains.mps.ide.msd index a86b2345d9b8..77d6b03fc340 100644 --- a/workbench/mps-workbench/jetbrains.mps.ide/jetbrains.mps.ide.msd +++ b/workbench/mps-workbench/jetbrains.mps.ide/jetbrains.mps.ide.msd @@ -55,7 +55,7 @@ - + diff --git a/workbench/mps-workbench/pluginSolutions/lang.core/jetbrains.mps.lang.core.pluginSolution.msd b/workbench/mps-workbench/pluginSolutions/lang.core/jetbrains.mps.lang.core.pluginSolution.msd index 534c16bd810f..b8794988af85 100644 --- a/workbench/mps-workbench/pluginSolutions/lang.core/jetbrains.mps.lang.core.pluginSolution.msd +++ b/workbench/mps-workbench/pluginSolutions/lang.core/jetbrains.mps.lang.core.pluginSolution.msd @@ -17,7 +17,7 @@ - +