Skip to content

Commit

Permalink
Merge pull request #909 from JetBrains/refactor/diagram_tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexanderpann
alexanderpann authored Aug 12, 2024
2 parents 2ce4994 + cdef891 commit 9dcff1c
Show file tree
Hide file tree
Showing 26 changed files with 28,634 additions and 7,120 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@ code/dependencies.txt
*.iml

TEST*.xml

# screenshots
code/cell-screenshots
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e

### Fixed

- *de.itemis.mps.editor.diagram*: Some issues related to ELK styles and custom IDs were fixed.

### Changed

- *com.mbeddr.mpsutil.projectview.runtime*: Fixed several NPEs. See: [#903,](https://github.com/JetBrains/MPS-extensions/issues/903) [#904]((https://github.com/JetBrains/MPS-extensions/issues/904) , [#901](https://github.com/JetBrains/MPS-extensions/issues/901)

## July 2024
Expand Down
175 changes: 107 additions & 68 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 @@ -20736,6 +20736,11 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="6actlYi6hIq" role="3bR37C">
<node concept="3bR9La" id="6actlYi6hIr" role="1SiIV1">
<ref role="3bR37D" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
</node>
</node>
</node>
<node concept="1E1JtD" id="6$6tsX_CISo" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -20819,6 +20824,17 @@
<ref role="1Busuk" to="ffeo:7Kfy9QB6L4X" resolve="jetbrains.mps.lang.editor" />
</node>
</node>
<node concept="1SiIV0" id="1mqidcyBhjB" role="3bR37C">
<node concept="3bR9La" id="1mqidcyBhjC" role="1SiIV1">
<ref role="3bR37D" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
</node>
</node>
<node concept="1SiIV0" id="3yqOawE1ycg" role="3bR37C">
<node concept="3bR9La" id="3yqOawE1ych" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" node="4be$WTb1AQa" resolve="de.itemis.mps.editor.diagram.runtime" />
</node>
</node>
</node>
<node concept="1E1JtA" id="6$6tsX_CJdr" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -20905,6 +20921,21 @@
<ref role="3bR37D" node="56Tfdun3uan" resolve="de.itemis.mps.editor.diagram.layout" />
</node>
</node>
<node concept="1SiIV0" id="1mqidcyBhjY" role="3bR37C">
<node concept="3bR9La" id="1mqidcyBhjZ" role="1SiIV1">
<ref role="3bR37D" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
</node>
</node>
<node concept="1SiIV0" id="1mqidcyBhk0" role="3bR37C">
<node concept="3bR9La" id="1mqidcyBhk1" role="1SiIV1">
<ref role="3bR37D" node="PE3B26QCrP" resolve="org.apache.commons" />
</node>
</node>
<node concept="1SiIV0" id="6qGdjWm4Pdb" role="3bR37C">
<node concept="3bR9La" id="6qGdjWm4Pdc" role="1SiIV1">
<ref role="3bR37D" node="3$A0JaN5bpX" resolve="MPS.ThirdParty" />
</node>
</node>
</node>
<node concept="1E1JtD" id="7qi8mU1Oz$h" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -21109,6 +21140,11 @@
<ref role="3bR37D" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
</node>
</node>
<node concept="1SiIV0" id="1mqidcyBhlq" role="3bR37C">
<node concept="3bR9La" id="1mqidcyBhlr" role="1SiIV1">
<ref role="3bR37D" node="6$6tsX_CISo" resolve="test.de.itemis.mps.editor.diagram.lang" />
</node>
</node>
</node>
<node concept="1E1JtD" id="7qi8mU1OzOZ" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -21199,104 +21235,101 @@
</node>
</node>
</node>
<node concept="1E0d5M" id="vVBnaOe2hM" role="1E1XAP">
<ref role="1E0d5P" node="PE3B26QCrP" resolve="org.apache.commons" />
<node concept="1yeLz9" id="vVBnaOe2HD" role="1TViLv">
<property role="TrG5h" value="de.itemis.mps.editor.diagram.demo.elk.generator" />
<property role="3LESm3" value="48d94ad6-a113-4499-aacc-a4391725805d" />
<node concept="1BupzO" id="naXaFmz4ke" role="3bR31x">
<property role="3ZfqAx" value="generator/templates" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="naXaFmz4kf" role="1HemKq">
<node concept="398BVA" id="naXaFmz4jP" role="3LXTmr">
<ref role="398BVh" node="6$6tsX_CF7m" resolve="diagram.home" />
<node concept="2Ry0Ak" id="naXaFmz4jQ" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="naXaFmz4jR" role="2Ry0An">
<property role="2Ry0Am" value="de.itemis.mps.editor.diagram.demo.elk" />
<node concept="2Ry0Ak" id="naXaFmz4jS" role="2Ry0An">
<property role="2Ry0Am" value="generator" />
<node concept="2Ry0Ak" id="naXaFmz4jT" role="2Ry0An">
<property role="2Ry0Am" value="templates" />
</node>
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="naXaFmz4kg" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="naXaFmz4jd" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4je" role="1SiIV1">
<ref role="3bR37D" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
</node>
</node>
<node concept="1SiIV0" id="vVBnaOe2hN" role="3bR37C">
<node concept="3bR9La" id="vVBnaOe2hO" role="1SiIV1">
<node concept="1SiIV0" id="naXaFmz4jf" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4jg" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="vVBnaOe2hR" role="3bR37C">
<node concept="3bR9La" id="vVBnaOe2hS" role="1SiIV1">
<node concept="1SiIV0" id="naXaFmz4jh" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4ji" role="1SiIV1">
<ref role="3bR37D" to="ffeo:3HV74$ebibC" resolve="jetbrains.mps.lang.text" />
</node>
</node>
<node concept="1SiIV0" id="naXaFmz4jl" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4jm" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
</node>
</node>
<node concept="3rtmxn" id="vVBnaOe2hT" role="3bR31x">
<node concept="3LXTmp" id="vVBnaOe2hU" role="3rtmxm">
<node concept="3qWCbU" id="vVBnaOe2hV" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="vVBnaOe2hW" role="3LXTmr">
<ref role="398BVh" node="6$6tsX_CF7m" resolve="diagram.home" />
<node concept="2Ry0Ak" id="vVBnaOe2hX" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="vVBnaOe2hY" role="2Ry0An">
<property role="2Ry0Am" value="de.itemis.mps.editor.diagram.demo.callgraph" />
</node>
</node>
</node>
<node concept="1SiIV0" id="naXaFmz4jn" role="3bR37C">
<node concept="3bR9La" id="naXaFmz4jo" role="1SiIV1">
<ref role="3bR37D" node="6wEeo$QJAsB" resolve="de.itemis.mps.editor.diagram.shapes" />
</node>
</node>
<node concept="1BupzO" id="vVBnaOe2hZ" role="3bR31x">
<node concept="1BupzO" id="naXaFmz4jI" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="vVBnaOe2H_" role="1HemKq">
<node concept="398BVA" id="vVBnaOe2Hg" role="3LXTmr">
<node concept="3LXTmp" id="naXaFmz4jJ" role="1HemKq">
<node concept="398BVA" id="naXaFmz4jp" role="3LXTmr">
<ref role="398BVh" node="6$6tsX_CF7m" resolve="diagram.home" />
<node concept="2Ry0Ak" id="vVBnaOe2Hh" role="iGT6I">
<node concept="2Ry0Ak" id="naXaFmz4jq" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="vVBnaOe2Hi" role="2Ry0An">
<node concept="2Ry0Ak" id="naXaFmz4jr" role="2Ry0An">
<property role="2Ry0Am" value="de.itemis.mps.editor.diagram.demo.elk" />
<node concept="2Ry0Ak" id="vVBnaOe2Hj" role="2Ry0An">
<node concept="2Ry0Ak" id="naXaFmz4js" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="vVBnaOe2HA" role="3LXTna">
<node concept="3qWCbU" id="naXaFmz4jK" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
<node concept="1SiIV0" id="vVBnaOe2Hc" role="3bR37C">
<node concept="3bR9La" id="vVBnaOe2Hd" role="1SiIV1">
<ref role="3bR37D" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
</node>
</node>
<node concept="1SiIV0" id="vVBnaOe2He" role="3bR37C">
<node concept="3bR9La" id="vVBnaOe2Hf" role="1SiIV1">
<ref role="3bR37D" node="6wEeo$QJAsB" resolve="de.itemis.mps.editor.diagram.shapes" />
</node>
</node>
<node concept="1SiIV0" id="vVBnaOe2HB" role="3bR37C">
<node concept="1Busua" id="vVBnaOe2HC" role="1SiIV1">
<node concept="1SiIV0" id="naXaFmz4jL" role="3bR37C">
<node concept="1Busua" id="naXaFmz4jM" role="1SiIV1">
<ref role="1Busuk" node="4be$WTb1CbJ" resolve="de.itemis.mps.editor.diagram" />
</node>
</node>
<node concept="1yeLz9" id="vVBnaOe2HD" role="1TViLv">
<property role="TrG5h" value="de.itemis.mps.editor.diagram.demo.elk.generator" />
<property role="3LESm3" value="48d94ad6-a113-4499-aacc-a4391725805d" />
<node concept="1BupzO" id="vVBnaOe2I3" role="3bR31x">
<property role="3ZfqAx" value="generator/templates" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="vVBnaOe2I4" role="1HemKq">
<node concept="398BVA" id="vVBnaOe2HE" role="3LXTmr">
<ref role="398BVh" node="6$6tsX_CF7m" resolve="diagram.home" />
<node concept="2Ry0Ak" id="vVBnaOe2HF" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="vVBnaOe2HG" role="2Ry0An">
<property role="2Ry0Am" value="de.itemis.mps.editor.diagram.demo.elk" />
<node concept="2Ry0Ak" id="vVBnaOe2HH" role="2Ry0An">
<property role="2Ry0Am" value="generator" />
<node concept="2Ry0Ak" id="vVBnaOe2HI" role="2Ry0An">
<property role="2Ry0Am" value="templates" />
</node>
</node>
</node>
<node concept="3rtmxn" id="naXaFmzPtx" role="3bR31x">
<node concept="3LXTmp" id="naXaFmzPty" role="3rtmxm">
<node concept="398BVA" id="naXaFmzPtz" role="3LXTmr">
<ref role="398BVh" node="6$6tsX_CF7m" resolve="diagram.home" />
<node concept="2Ry0Ak" id="naXaFmzPt$" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="naXaFmzPt_" role="2Ry0An">
<property role="2Ry0Am" value="de.itemis.mps.editor.diagram.demo.elk" />
</node>
</node>
<node concept="3qWCbU" id="vVBnaOe2I5" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="3QN6lkAcxXE" role="3bR37C">
<node concept="3bR9La" id="3QN6lkAcxXF" role="1SiIV1">
<ref role="3bR37D" to="ffeo:3HV74$ebibC" resolve="jetbrains.mps.lang.text" />
<node concept="3qWCbU" id="naXaFmzPtB" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -22157,6 +22190,12 @@
<node concept="L2wRC" id="6$6tsX_CJST" role="39821P">
<ref role="L2wRA" node="6$6tsX_CJdr" resolve="test.de.itemis.mps.editor.diagram.solution" />
</node>
<node concept="L2wRC" id="naXaFmGxTu" role="39821P">
<ref role="L2wRA" node="vVBnaOe2hH" resolve="de.itemis.mps.editor.diagram.demo.elk" />
</node>
<node concept="L2wRC" id="naXaFmHkQT" role="39821P">
<ref role="L2wRA" node="7qi8mU1Oz$v" resolve="de.itemis.mps.editor.diagram.demoentities" />
</node>
<node concept="L2wRC" id="1x_$NGQM_y3" role="39821P">
<ref role="L2wRA" node="6$6tsX_CUvL" resolve="de.itemis.mps.structurecheck" />
</node>
Expand Down
11 changes: 11 additions & 0 deletions ...de.itemis.mps.editor.diagram.demo.activity/de.itemis.mps.editor.diagram.demo.activity.mpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)</dependency>
<dependency reexport="false">f7ad14aa-a3e2-4301-8822-d919845c8bcf(de.itemis.mps.editor.diagram.shapes)</dependency>
<dependency reexport="false">fa13cc63-c476-4d46-9c96-d53670abe7bc(de.itemis.mps.editor.diagram)</dependency>
</dependencies>
<languageVersions>
<language slang="l:3bdedd09-792a-4e15-a4db-83970df3ee86:de.itemis.mps.editor.collapsible" version="0" />
Expand Down Expand Up @@ -63,6 +64,7 @@
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
<module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
<module reference="fa13cc63-c476-4d46-9c96-d53670abe7bc(de.itemis.mps.editor.diagram)" version="0" />
<module reference="5a82b7b8-2303-45be-b960-4e3ff16e82ce(de.itemis.mps.editor.diagram.demo.activity)" version="0" />
<module reference="1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)" version="0" />
<module reference="f7ad14aa-a3e2-4301-8822-d919845c8bcf(de.itemis.mps.editor.diagram.shapes)" version="0" />
Expand All @@ -71,10 +73,19 @@
<module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" 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" />
<module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
<module reference="18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)" version="0" />
<module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
<module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
</dependencyVersions>
<extendedLanguages>
Expand Down
Loading

0 comments on commit 9dcff1c

Please sign in to comment.