From bb8fffc7eae5b2950f12d93f0ee2d05e8b4c7781 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Tue, 5 Nov 2019 18:32:55 +0100 Subject: [PATCH] Enable to use origin{} block to specify no origin. Rules that are used only as auxiliary resolvers don't have an associated origin node, even though they are produced from a specific location. To enable tracking of correct origin to report errors to one can use origin(no origin){} to override the default behaviour. --- build.xml | 2 + .../generator/template/main@generator.mps | 181 ++++++++++-------- .../jetbrains.mps.lang.coderules.mpl | 2 + .../languageModels/editor.mps | 1 + .../languageModels/structure.mps | 1 - .../models/jetbrains.mps.coderules.build.mps | 5 + 6 files changed, 113 insertions(+), 79 deletions(-) diff --git a/build.xml b/build.xml index ccda9958..2bb1d778 100644 --- a/build.xml +++ b/build.xml @@ -504,6 +504,7 @@ + @@ -2557,6 +2558,7 @@ + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps index b6aba024..e8de88b7 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps @@ -48,6 +48,7 @@ + @@ -1568,6 +1569,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -14325,7 +14346,7 @@ - + @@ -16507,7 +16528,7 @@ - + @@ -16520,29 +16541,28 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -16554,7 +16574,7 @@ - + @@ -16584,57 +16604,62 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16645,10 +16670,10 @@ + - diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl index dffaecfb..2ccf22f5 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl +++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl @@ -23,6 +23,7 @@ bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor) cba985fe-1e96-4f16-9f8d-b07434405d4f(jetbrains.mps.lang.smodel.types) 8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI) + 9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime) @@ -73,6 +74,7 @@ + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps index b0b428c2..b68a5d28 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps @@ -5123,6 +5123,7 @@ + diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps index f1baadee..e821c492 100644 --- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps +++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps @@ -1443,7 +1443,6 @@ - diff --git a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps index 7ef3e0b0..866a564a 100644 --- a/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps +++ b/coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps @@ -1601,6 +1601,11 @@ + + + + +