From c401e686cb152e6fe02b0412ead959b0cd039a21 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Fri, 20 Sep 2024 18:18:37 +0200 Subject: [PATCH] Drop usages of OriginIndex; minor fixes in tests --- ...ains.mps.coderules.testhelper.testutil.mps | 96 +++++++++++---- ...rains.mps.coderules.typechecking@tests.mps | 16 --- ...ins.mps.coderules.typechecking.service.mps | 116 ++---------------- ...Language.methodReferencesExt.test.code.mps | 2 +- 4 files changed, 82 insertions(+), 148 deletions(-) diff --git a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps index fdf490f0..2b957232 100644 --- a/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps +++ b/coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps @@ -1002,8 +1002,13 @@ - - + + + + + + + @@ -1048,21 +1053,6 @@ - - - - - - - - - - - - - - - @@ -5545,6 +5535,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6697,6 +6724,7 @@ + @@ -7060,6 +7088,7 @@ + @@ -7992,6 +8021,12 @@ + + + + + + @@ -8232,6 +8267,10 @@ + + + + @@ -8278,13 +8317,26 @@ - + - - + + - - + + + + + + + + + + + + + + + diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps index abad4db8..44d61a2f 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps @@ -3503,21 +3503,6 @@ - - - - - - - - - - - - - - - @@ -4489,7 +4474,6 @@ - diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps index 567103ca..3775e757 100644 --- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps +++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps @@ -3783,24 +3783,6 @@ - - - - - - - - - - - - - - - - - - @@ -7313,12 +7295,6 @@ - - - - - - @@ -7372,19 +7348,6 @@ - - - - - - - - - - - - - @@ -7618,19 +7581,6 @@ - - - - - - - - - - - - - @@ -7657,13 +7607,6 @@ - - - - - - - @@ -18127,38 +18070,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18216,8 +18127,13 @@ - - + + + + + + + @@ -18240,9 +18156,6 @@ - - - @@ -19302,21 +19215,6 @@ - - - - - - - - - - - - - - - diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.code.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.code.mps index 4987fc78..e57dc79c 100644 --- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.code.mps +++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.code.mps @@ -994,7 +994,7 @@ - +