Skip to content

Commit

Permalink
Merge pull request #907 from JetBrains/bugfix/remove_reflection_copy
Browse files Browse the repository at this point in the history 
mps.reflection: don't copy the ReflectonUtil class
  • Loading branch information
@alexanderpann
alexanderpann authored Aug 2, 2024
2 parents 5500bf0 + 3d67a61 commit 2aa7e3a
Show file tree
Hide file tree
Showing 8 changed files with 171 additions and 860 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project are documented in this file.

The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) .The project does *not* follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.

## August 2024

### Changed

- *de.slisson.mps.reflection*: The language uses the class ReflectionUtil directly and doesn't copy ReflectionUtil_copy in the model anymore.

## July 2024

### Fixed
Expand Down
11 changes: 11 additions & 0 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5010,6 +5010,12 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="76bI8XWtudM" role="3bR37C">
<node concept="3bR9La" id="76bI8XWtudN" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" node="2Xjt3l57hht" resolve="de.slisson.mps.reflection.runtime" />
</node>
</node>
</node>
</node>
<node concept="m$_wf" id="4be$WTb1MZD" role="3989C9">
Expand Down Expand Up @@ -13515,6 +13521,11 @@
<ref role="3bR37D" to="ffeo:ymnOULAU1u" resolve="jetbrains.mps.lang.test.runtime" />
</node>
</node>
<node concept="1SiIV0" id="76bI8XWtuxR" role="3bR37C">
<node concept="3bR9La" id="76bI8XWtuxS" role="1SiIV1">
<ref role="3bR37D" node="2Xjt3l57hht" resolve="de.slisson.mps.reflection.runtime" />
</node>
</node>
</node>
<node concept="1E1JtD" id="4Hbnsm4O7VL" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down
119 changes: 72 additions & 47 deletions ...s.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5234,13 +5234,6 @@
<property role="3cmrfH" value="10" />
</node>
</node>
<node concept="gqqVs" id="3zMER65IL6W" role="lGtFl">
<property role="gqqTZ" value="12.0" />
<property role="gqqTW" value="182.00030517578125" />
<property role="gqqTX" value="100.0" />
<property role="gqqTy" value="20.0" />
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
</node>
<node concept="1iiUih" id="3zMER65J3$3" role="3cqZAp">
<node concept="3clFbS" id="3zMER65J3$5" role="1ii_UM">
Expand All @@ -5252,40 +5245,26 @@
<property role="3cmrfH" value="20" />
</node>
</node>
<node concept="gqqVs" id="3zMER65J3Ts" role="lGtFl">
<property role="gqqTZ" value="12.0" />
<property role="gqqTW" value="182.00030517578125" />
<property role="gqqTX" value="94.0" />
<property role="gqqTy" value="20.0" />
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
</node>
</node>
<node concept="gqqVs" id="3zMER65J3Tr" role="lGtFl">
<property role="gqqTZ" value="12.0" />
<property role="gqqTW" value="302.0" />
<property role="gqqTX" value="549.0" />
<property role="gqqTy" value="431.0" />
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
<node concept="37mRI7" id="3zMER65J3Tu" role="lGtFl">
<node concept="37mRIm" id="3zMER65J3Tv" role="37mRID">
<property role="37mO49" value="start" />
<node concept="gqqVs" id="3zMER65J3Tt" role="37mO4d">
<property role="gqqTZ" value="28.0" />
<property role="gqqTW" value="12.000100135803223" />
<property role="gqqTX" value="62.0" />
<property role="gqqTy" value="56.0" />
<property role="gqqTZ" value="12.0" />
<property role="gqqTW" value="277.0010999999999" />
<property role="gqqTX" value="66.0" />
<property role="gqqTy" value="81.0" />
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
</node>
<node concept="37mRIm" id="3zMER65J3Tx" role="37mRID">
<property role="37mO49" value="end" />
<node concept="gqqVs" id="3zMER65J3Tw" role="37mO4d">
<property role="gqqTZ" value="54.0" />
<property role="gqqTW" value="316.00048828125" />
<property role="gqqTX" value="10.0" />
<property role="gqqTy" value="20.0" />
<property role="gqqTZ" value="304.0" />
<property role="gqqTW" value="429.0014999999998" />
<property role="gqqTX" value="12.0" />
<property role="gqqTy" value="31.0" />
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
</node>
Expand All @@ -5296,8 +5275,8 @@
<property role="3ul5GH" value="label" />
<node concept="3wpmZ1" id="3zMER65J3T_" role="3ul5Gz">
<node concept="2VclrF" id="3zMER65J3TA" role="3wpmZR">
<property role="2Vclpx" value="-32.99995040893555" />
<property role="2Vclpz" value="-6.9993133544921875" />
<property role="2Vclpx" value="39.0" />
<property role="2Vclpz" value="246.00120000000004" />
</node>
<node concept="2VclrF" id="3zMER65J3TB" role="3wpmZP">
<property role="2Vclpx" value="59.0" />
Expand Down Expand Up @@ -5331,6 +5310,14 @@
</node>
</node>
</node>
<node concept="2VclrF" id="76bI8XWsPrF" role="2Vcluh">
<property role="2Vclpx" value="46.00005" />
<property role="2Vclpz" value="368.00119999999987" />
</node>
<node concept="2VclrF" id="76bI8XWsPrG" role="2Vcluh">
<property role="2Vclpx" value="192.00005" />
<property role="2Vclpz" value="368.00119999999987" />
</node>
</node>
</node>
<node concept="37mRIm" id="3zMER65J3TL" role="37mRID">
Expand All @@ -5340,8 +5327,8 @@
<property role="3ul5GH" value="label" />
<node concept="3wpmZ1" id="3zMER65J3TN" role="3ul5Gz">
<node concept="2VclrF" id="3zMER65J3TO" role="3wpmZR">
<property role="2Vclpx" value="-32.99995040893555" />
<property role="2Vclpz" value="-6.999114990234375" />
<property role="2Vclpx" value="201.0" />
<property role="2Vclpz" value="163.00140000000005" />
</node>
<node concept="2VclrF" id="3zMER65J3TP" role="3wpmZP">
<property role="2Vclpx" value="59.0" />
Expand Down Expand Up @@ -5375,6 +5362,14 @@
</node>
</node>
</node>
<node concept="2VclrF" id="76bI8XWsPrH" role="2Vcluh">
<property role="2Vclpx" value="192.00005" />
<property role="2Vclpz" value="419.0013999999998" />
</node>
<node concept="2VclrF" id="76bI8XWsPrI" role="2Vcluh">
<property role="2Vclpx" value="311.00005" />
<property role="2Vclpz" value="419.0013999999998" />
</node>
</node>
</node>
<node concept="37mRIm" id="3zMER65J3TZ" role="37mRID">
Expand All @@ -5387,27 +5382,37 @@
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
</node>
<node concept="37mRIm" id="76bI8XWsPqT" role="37mRID">
<property role="37mO49" value="4103530714551302443" />
<node concept="gqqVs" id="3zMER65J3Ts" role="37mO4d">
<property role="gqqTZ" value="142.0" />
<property role="gqqTW" value="378.00129999999984" />
<property role="gqqTX" value="98.0" />
<property role="gqqTy" value="31.0" />
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
</node>
</node>
</node>
</node>
<node concept="37mRI7" id="3zMER65IL6X" role="lGtFl">
<node concept="37mRIm" id="3zMER65IL6Y" role="37mRID">
<property role="37mO49" value="start" />
<node concept="gqqVs" id="3zMER65IL6Z" role="37mO4d">
<property role="gqqTZ" value="30.0" />
<property role="gqqTW" value="12.000100135803223" />
<property role="gqqTX" value="64.0" />
<property role="gqqTy" value="56.0" />
<property role="gqqTZ" value="158.0" />
<property role="gqqTW" value="12.000100000000003" />
<property role="gqqTX" value="66.0" />
<property role="gqqTy" value="81.0" />
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
</node>
<node concept="37mRIm" id="3zMER65IL70" role="37mRID">
<property role="37mO49" value="end" />
<node concept="gqqVs" id="3zMER65IL71" role="37mO4d">
<property role="gqqTZ" value="657.5" />
<property role="gqqTW" value="608.000732421875" />
<property role="gqqTX" value="29.0" />
<property role="gqqTy" value="34.0" />
<property role="gqqTZ" value="184.74994999999998" />
<property role="gqqTW" value="881.0007103515625" />
<property role="gqqTX" value="12.0" />
<property role="gqqTy" value="31.0" />
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
</node>
Expand Down Expand Up @@ -6578,8 +6583,8 @@
<property role="3ul5GH" value="label" />
<node concept="3wpmZ1" id="3zMER65J3U3" role="3ul5Gz">
<node concept="2VclrF" id="3zMER65J3U4" role="3wpmZR">
<property role="2Vclpx" value="-32.99995040893555" />
<property role="2Vclpz" value="-6.999603271484375" />
<property role="2Vclpx" value="96.00004999999999" />
<property role="2Vclpz" value="-46.999603271484375" />
</node>
<node concept="2VclrF" id="3zMER65J3U5" role="3wpmZP">
<property role="2Vclpx" value="62.0" />
Expand Down Expand Up @@ -6622,8 +6627,8 @@
<property role="3ul5GH" value="label" />
<node concept="3wpmZ1" id="3zMER65J3Uh" role="3ul5Gz">
<node concept="2VclrF" id="3zMER65J3Ui" role="3wpmZR">
<property role="2Vclpx" value="-32.99995040893555" />
<property role="2Vclpz" value="-6.9998016357421875" />
<property role="2Vclpx" value="96.00004999999999" />
<property role="2Vclpz" value="-11.999801635742188" />
</node>
<node concept="2VclrF" id="3zMER65J3Uj" role="3wpmZP">
<property role="2Vclpx" value="62.0" />
Expand Down Expand Up @@ -6666,8 +6671,8 @@
<property role="3ul5GH" value="label" />
<node concept="3wpmZ1" id="3zMER65J3Uv" role="3ul5Gz">
<node concept="2VclrF" id="3zMER65J3Uw" role="3wpmZR">
<property role="2Vclpx" value="-37.99995040893555" />
<property role="2Vclpz" value="-6.9993896484375" />
<property role="2Vclpx" value="-451.49995" />
<property role="2Vclpz" value="232.0006103515625" />
</node>
<node concept="2VclrF" id="3zMER65J3Ux" role="3wpmZP">
<property role="2Vclpx" value="609.5" />
Expand Down Expand Up @@ -6703,6 +6708,26 @@
</node>
</node>
</node>
<node concept="37mRIm" id="76bI8XWsPqR" role="37mRID">
<property role="37mO49" value="4103530714551226808" />
<node concept="gqqVs" id="3zMER65IL6W" role="37mO4d">
<property role="gqqTZ" value="142.0" />
<property role="gqqTW" value="154.00029836425782" />
<property role="gqqTX" value="98.0" />
<property role="gqqTy" value="31.0" />
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
</node>
<node concept="37mRIm" id="76bI8XWsPqS" role="37mRID">
<property role="37mO49" value="4103530714551302403" />
<node concept="gqqVs" id="3zMER65J3Tr" role="37mO4d">
<property role="gqqTZ" value="12.0" />
<property role="gqqTW" value="246.0004967285156" />
<property role="gqqTX" value="360.0" />
<property role="gqqTy" value="574.0" />
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
</node>
</node>
</node>
<node concept="LIFWc" id="3zMER65ILcD" role="lGtFl">
Expand Down
7 changes: 6 additions & 1 deletion code/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<language namespace="de.slisson.mps.reflection" uuid="654422bf-e75f-44dc-936d-188890a746ce" languageVersion="0" moduleVersion="0">
<models>
<modelRoot contentPath="${module}" type="default">
<modelRoot type="default" contentPath="${module}">
<sourceRoot location="languageModels" />
</modelRoot>
</models>
Expand Down Expand Up @@ -155,6 +155,7 @@
<dependency reexport="false">e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)</dependency>
<dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
<dependency reexport="false">d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)</dependency>
<dependency reexport="true">7037b32c-9607-4f8e-81bd-1f028a4c117b(de.slisson.mps.reflection.runtime)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
Expand Down Expand Up @@ -196,6 +197,7 @@
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="654422bf-e75f-44dc-936d-188890a746ce(de.slisson.mps.reflection)" version="0" />
<module reference="7037b32c-9607-4f8e-81bd-1f028a4c117b(de.slisson.mps.reflection.runtime)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
Expand All @@ -204,6 +206,9 @@
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
</dependencyVersions>
<runtime>
<dependency reexport="false">7037b32c-9607-4f8e-81bd-1f028a4c117b(de.slisson.mps.reflection.runtime)</dependency>
</runtime>
<extendedLanguages>
<extendedLanguage>f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</extendedLanguage>
</extendedLanguages>
Expand Down
Loading

0 comments on commit 2aa7e3a

Please sign in to comment.