Skip to content

Commit 4613a62

Browse files
slissonslisson
committed
Tooltips in used in diagrams where not shown
Fixes mbeddr/mbeddr.core#1819
1 parent 7c7eee3 commit 4613a62

File tree

4 files changed

+580
-157
lines changed

4 files changed

+580
-157
lines changed

‎code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3897,6 +3897,12 @@
38973897
<ref role="3bR37D" to="ffeo:7YI57w6K0iE" resolve="jetbrains.mps.lang.editor#1129914002149" />
38983898
</node>
38993899
</node>
3900+
<node concept="1SiIV0" id="44ByU5ZEzWz" role="3bR37C">
3901+
<node concept="3bR9La" id="44ByU5ZEzW$" role="1SiIV1">
3902+
<property role="3bR36h" value="false" />
3903+
<ref role="3bR37D" node="6$BmuzArLGs" resolve="de.itemis.mps.tooltips" />
3904+
</node>
3905+
</node>
39003906
</node>
39013907
<node concept="3rtmxn" id="3xFG3bj5Mmn" role="3bR31x">
39023908
<node concept="3LXTmp" id="3xFG3bj5Mmo" role="3rtmxm">

‎code/diagram/languages/de.itemis.mps.editor.diagram/de.itemis.mps.editor.diagram.mpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<dependency reexport="false">18bc6592-03a6-4e29-a83a-7ff23bde13ba(jetbrains.mps.lang.editor)</dependency>
2525
<dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
2626
<dependency reexport="false" scope="design">a150150e-46ee-4c9e-b080-08d136e4eefb(jetbrains.mps.baseLanguage.tuples#1238919486295)</dependency>
27+
<dependency reexport="false">a0ab8c10-c118-4755-ba27-3853435cf524(de.itemis.mps.tooltips)</dependency>
2728
</dependencies>
2829
<languageVersions>
2930
<language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="0" />

‎code/diagram/languages/de.itemis.mps.editor.diagram/generator/template/[email protected]‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="-1" />
99
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
1010
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="11" />
11+
<use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
1112
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
1213
</languages>
1314
<imports>
@@ -38,6 +39,7 @@
3839
<import index="j1kf" ref="1144260c-e9a5-49a2-9add-39a1a1a7077e/java:de.cau.cs.kieler.kiml.options(de.itemis.mps.editor.diagram.runtime/)" />
3940
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
4041
<import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
42+
<import index="bhcn" ref="r:b764cfb6-903f-41e9-95dc-ea24a6097dec(de.itemis.mps.tooltips.structure)" />
4143
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
4244
<import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
4345
<import index="qvne" ref="r:8ff33705-85bf-4855-805c-06d68fbe233c(jetbrains.mps.editor.runtime.descriptor)" implicit="true" />
@@ -48,6 +50,9 @@
4850
<child id="1238853845806" name="component" index="1Lso8e" />
4951
</concept>
5052
</language>
53+
<language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
54+
<concept id="1161622665029" name="jetbrains.mps.lang.sharedConcepts.structure.ConceptFunctionParameter_model" flags="nn" index="1Q6Npb" />
55+
</language>
5156
<language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
5257
<concept id="3982520150125052579" name="jetbrains.mps.lang.editor.structure.QueryFunction_AttributeStyleParameter" flags="ig" index="3sjG9q" />
5358
<concept id="3982520150122341378" name="jetbrains.mps.lang.editor.structure.AttributeStyleClassItem" flags="lg" index="3tD6jV">
@@ -265,6 +270,7 @@
265270
<child id="1200911492601" name="mappingLabel" index="2rTMjI" />
266271
<child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
267272
<child id="1167514678247" name="rootMappingRule" index="3lj3bC" />
273+
<child id="1195502100749" name="preMappingScript" index="1puA0r" />
268274
</concept>
269275
<concept id="1177093525992" name="jetbrains.mps.lang.generator.structure.InlineTemplate_RuleConsequence" flags="lg" index="gft3U">
270276
<child id="1177093586806" name="templateNode" index="gfFT$" />
@@ -325,6 +331,15 @@
325331
<property id="1169670356567" name="messageType" index="1lMjX7" />
326332
</concept>
327333
<concept id="1131073187192" name="jetbrains.mps.lang.generator.structure.MapSrcNodeMacro" flags="ln" index="1pdMLZ" />
334+
<concept id="1195499912406" name="jetbrains.mps.lang.generator.structure.MappingScript" flags="lg" index="1pmfR0">
335+
<property id="1195595592106" name="scriptKind" index="1v3f2W" />
336+
<property id="1195595611951" name="modifiesModel" index="1v3jST" />
337+
<child id="1195501105008" name="codeBlock" index="1pqMTA" />
338+
</concept>
339+
<concept id="1195500722856" name="jetbrains.mps.lang.generator.structure.MappingScript_CodeBlock" flags="in" index="1pplIY" />
340+
<concept id="1195502151594" name="jetbrains.mps.lang.generator.structure.MappingScriptReference" flags="lg" index="1puMqW">
341+
<reference id="1195502167610" name="mappingScript" index="1puQsG" />
342+
</concept>
328343
<concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
329344
<child id="982871510064032342" name="parameter" index="1s_3oS" />
330345
</concept>
@@ -439,8 +454,17 @@
439454
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
440455
</concept>
441456
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
457+
<concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
458+
<child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
459+
</concept>
442460
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
443461
<concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
462+
<concept id="1154546920561" name="jetbrains.mps.lang.smodel.structure.OperationParm_ConceptList" flags="ng" index="3gmYPX">
463+
<child id="1154546920563" name="concept" index="3gmYPZ" />
464+
</concept>
465+
<concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
466+
<reference id="1154546997487" name="concept" index="3gnhBz" />
467+
</concept>
444468
<concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
445469
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
446470
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
@@ -495,6 +519,7 @@
495519
<concept id="1176906603202" name="jetbrains.mps.baseLanguage.collections.structure.BinaryOperation" flags="nn" index="56pJg">
496520
<child id="1176906787974" name="rightExpression" index="576Qk" />
497521
</concept>
522+
<concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
498523
<concept id="1224414427926" name="jetbrains.mps.baseLanguage.collections.structure.SequenceCreator" flags="nn" index="kMnCb">
499524
<child id="1224414456414" name="elementType" index="kMuH3" />
500525
</concept>
@@ -528,6 +553,9 @@
528553
<node concept="bUwia" id="XBYj285MY_">
529554
<property role="TrG5h" value="mapping_main" />
530555
<property role="3GE5qa" value="" />
556+
<node concept="1puMqW" id="44ByU5ZCa2g" role="1puA0r">
557+
<ref role="1puQsG" node="44ByU5ZCdOU" resolve="script_makeTooltipsEager" />
558+
</node>
531559
<node concept="3lhOvk" id="6uo2fN6nz33" role="3lj3bC">
532560
<ref role="30HIoZ" to="2qld:6uo2fN6fbSW" resolve="ShapeDefinition" />
533561
<ref role="3lhOvi" node="6uo2fN6nz62" resolve="map_ShapeDefinition" />
@@ -13160,5 +13188,83 @@
1316013188
<node concept="3Tm1VV" id="heOdHOW" role="1B3o_S" />
1316113189
</node>
1316213190
</node>
13191+
<node concept="1pmfR0" id="44ByU5ZCdOU">
13192+
<property role="TrG5h" value="script_makeTooltipsEager" />
13193+
<property role="1v3f2W" value="pre_processing" />
13194+
<property role="1v3jST" value="true" />
13195+
<node concept="1pplIY" id="44ByU5ZCdOV" role="1pqMTA">
13196+
<node concept="3clFbS" id="44ByU5ZCdOW" role="2VODD2">
13197+
<node concept="3clFbF" id="44ByU5ZCkcW" role="3cqZAp">
13198+
<node concept="2OqwBi" id="44ByU5ZCJit" role="3clFbG">
13199+
<node concept="2OqwBi" id="44ByU5ZCypl" role="2Oq$k0">
13200+
<node concept="2OqwBi" id="44ByU5ZCkDT" role="2Oq$k0">
13201+
<node concept="1Q6Npb" id="44ByU5ZCkJP" role="2Oq$k0" />
13202+
<node concept="2SmgA7" id="44ByU5ZCkPC" role="2OqNvi">
13203+
<node concept="chp4Y" id="44ByU5ZCvEy" role="1dBWTz">
13204+
<ref role="cht4Q" to="bhcn:7XU1fOGp7Jz" resolve="CellModel_Tooltip" />
13205+
</node>
13206+
</node>
13207+
</node>
13208+
<node concept="3zZkjj" id="44ByU5ZCCPd" role="2OqNvi">
13209+
<node concept="1bVj0M" id="44ByU5ZCCPf" role="23t8la">
13210+
<node concept="3clFbS" id="44ByU5ZCCPg" role="1bW5cS">
13211+
<node concept="3clFbF" id="44ByU5ZCCT1" role="3cqZAp">
13212+
<node concept="2OqwBi" id="44ByU5ZCDTY" role="3clFbG">
13213+
<node concept="2OqwBi" id="44ByU5ZCD6X" role="2Oq$k0">
13214+
<node concept="37vLTw" id="44ByU5ZCCT0" role="2Oq$k0">
13215+
<ref role="3cqZAo" node="44ByU5ZCCPh" resolve="it" />
13216+
</node>
13217+
<node concept="2Xjw5R" id="44ByU5ZCD_s" role="2OqNvi">
13218+
<node concept="3gmYPX" id="44ByU5ZCFCj" role="1xVPHs">
13219+
<node concept="3gn64h" id="44ByU5ZCFVB" role="3gmYPZ">
13220+
<ref role="3gnhBz" to="2qld:5qgNcfDnW3k" resolve="IDiagramCell" />
13221+
</node>
13222+
<node concept="3gn64h" id="44ByU5ZCIR5" role="3gmYPZ">
13223+
<ref role="3gnhBz" to="2qld:4EOrrTBazwV" resolve="IDiagramElementsProvider" />
13224+
</node>
13225+
</node>
13226+
</node>
13227+
</node>
13228+
<node concept="3x8VRR" id="44ByU5ZCEdt" role="2OqNvi" />
13229+
</node>
13230+
</node>
13231+
</node>
13232+
<node concept="Rh6nW" id="44ByU5ZCCPh" role="1bW2Oz">
13233+
<property role="TrG5h" value="it" />
13234+
<node concept="2jxLKc" id="44ByU5ZCCPi" role="1tU5fm" />
13235+
</node>
13236+
</node>
13237+
</node>
13238+
</node>
13239+
<node concept="2es0OD" id="44ByU5ZCJQ4" role="2OqNvi">
13240+
<node concept="1bVj0M" id="44ByU5ZCJQ6" role="23t8la">
13241+
<node concept="3clFbS" id="44ByU5ZCJQ7" role="1bW5cS">
13242+
<node concept="3clFbF" id="44ByU5ZCJTj" role="3cqZAp">
13243+
<node concept="37vLTI" id="44ByU5ZCL1H" role="3clFbG">
13244+
<node concept="3clFbT" id="44ByU5ZCL9J" role="37vLTx">
13245+
<property role="3clFbU" value="true" />
13246+
</node>
13247+
<node concept="2OqwBi" id="44ByU5ZCK5r" role="37vLTJ">
13248+
<node concept="37vLTw" id="44ByU5ZCJTi" role="2Oq$k0">
13249+
<ref role="3cqZAo" node="44ByU5ZCJQ8" resolve="it" />
13250+
</node>
13251+
<node concept="3TrcHB" id="44ByU5ZCKpC" role="2OqNvi">
13252+
<ref role="3TsBF5" to="bhcn:4aFy6Rq$F7F" resolve="disableLazyEvaluation" />
13253+
</node>
13254+
</node>
13255+
</node>
13256+
</node>
13257+
</node>
13258+
<node concept="Rh6nW" id="44ByU5ZCJQ8" role="1bW2Oz">
13259+
<property role="TrG5h" value="it" />
13260+
<node concept="2jxLKc" id="44ByU5ZCJQ9" role="1tU5fm" />
13261+
</node>
13262+
</node>
13263+
</node>
13264+
</node>
13265+
</node>
13266+
</node>
13267+
</node>
13268+
</node>
1316313269
</model>
1316413270

0 commit comments

Comments
 (0)