Skip to content

Commit 5e28f89

Browse files
arimerarimer
authored
Merge pull request #712 from IETS3/bugfix/MessageHandlerSupportIdentifierConfiguration
Enable usage of MessageHandler and MessageArg with umlauts or paragraphs
2 parents 312b08e + 903b968 commit 5e28f89

File tree

8 files changed

+1620
-36
lines changed

8 files changed

+1620
-36
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project are documented in this file.
55
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
77

8+
## March 2024
9+
10+
- *MessageDefiniton* uses *extensionPoint/IdentifierConfigurator/* that allows the user to decide to use german umlauts and paragraphs in it.
11+
- This extensionPoint got a new method to select which implementation will be chosen.
12+
13+
814
## February 2024
915

1016
### Added

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps‎

Lines changed: 113 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,9 @@
173173
<property id="1176718929932" name="isFinal" index="3TUv4t" />
174174
<child id="1068431790190" name="initializer" index="33vP2m" />
175175
</concept>
176+
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
177+
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
178+
</concept>
176179
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
177180
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
178181
</concept>
@@ -335,10 +338,15 @@
335338
</concept>
336339
</language>
337340
<language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
341+
<concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA">
342+
<property id="5858074156537516431" name="text" index="x79VB" />
343+
</concept>
338344
<concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
339345
<concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
340346
<child id="8465538089690331502" name="body" index="TZ5H$" />
347+
<child id="5383422241790532083" name="tags" index="3nqlJM" />
341348
</concept>
349+
<concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
342350
<concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
343351
<child id="8970989240999019149" name="part" index="1dT_Ay" />
344352
</concept>
@@ -379,6 +387,12 @@
379387
<language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
380388
<concept id="1176544042499" name="jetbrains.mps.lang.typesystem.structure.Node_TypeOperation" flags="nn" index="3JvlWi" />
381389
</language>
390+
<language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
391+
<concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
392+
<property id="2034914114981261751" name="severity" index="RRSoG" />
393+
<child id="2034914114981261753" name="message" index="RRSoy" />
394+
</concept>
395+
</language>
382396
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
383397
<concept id="1204834851141" name="jetbrains.mps.lang.smodel.structure.PoundExpression" flags="ng" index="25Kdxt">
384398
<child id="1204834868751" name="expression" index="25KhWn" />
@@ -546,9 +560,6 @@
546560
<node concept="3uibUv" id="6MNhNeUh6na" role="EKbjA">
547561
<ref role="3uigEE" to="2ahs:6MNhNeUeM9i" resolve="IStopAndReturn" />
548562
</node>
549-
<node concept="3uibUv" id="4TtBy4czRM6" role="EKbjA">
550-
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
551-
</node>
552563
<node concept="3Tm1VV" id="UN2ftLWgA9" role="1B3o_S" />
553564
<node concept="3clFb_" id="UN2ftLXFXP" role="jymVt">
554565
<property role="1EzhhJ" value="false" />
@@ -672,14 +683,14 @@
672683
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
673684
</node>
674685
</node>
675-
<node concept="2tJIrI" id="4TtBy4czSoi" role="jymVt" />
676686
<node concept="3UR2Jj" id="3iq6R$ZyJbu" role="lGtFl">
677687
<node concept="TZ5HA" id="3iq6R$ZyJbv" role="TZ5H$">
678688
<node concept="1dT_AC" id="3iq6R$ZyJbw" role="1dT_Ay">
679689
<property role="1dT_AB" value="Represents 'none' value of an optional type." />
680690
</node>
681691
</node>
682692
</node>
693+
<node concept="2tJIrI" id="4TtBy4czSoi" role="jymVt" />
683694
<node concept="3clFb_" id="4TtBy4czRUR" role="jymVt">
684695
<property role="TrG5h" value="compareTo" />
685696
<node concept="3Tm1VV" id="4TtBy4czRUS" role="1B3o_S" />
@@ -739,6 +750,9 @@
739750
</node>
740751
</node>
741752
<node concept="2tJIrI" id="29KNCeybCV7" role="jymVt" />
753+
<node concept="3uibUv" id="4TtBy4czRM6" role="EKbjA">
754+
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
755+
</node>
742756
</node>
743757
<node concept="312cEu" id="12WRc298rqY">
744758
<property role="TrG5h" value="SpecificErrorValue" />
@@ -13316,6 +13330,29 @@
1331613330
<property role="3GE5qa" value="identConfig" />
1331713331
<property role="TrG5h" value="IdentifierConfigurator" />
1331813332
<property role="1sVAO0" value="true" />
13333+
<node concept="2tJIrI" id="12O03AaWLfx" role="jymVt" />
13334+
<node concept="3clFb_" id="12O03AaWLhs" role="jymVt">
13335+
<property role="TrG5h" value="getPriorityLevel" />
13336+
<node concept="10Oyi0" id="12O03AaWLht" role="3clF45" />
13337+
<node concept="3Tm1VV" id="12O03AaWLhu" role="1B3o_S" />
13338+
<node concept="3clFbS" id="12O03AaWLhv" role="3clF47">
13339+
<node concept="3cpWs6" id="3joh7TIXYo1" role="3cqZAp">
13340+
<node concept="3cmrfG" id="3joh7TIXZxF" role="3cqZAk">
13341+
<property role="3cmrfH" value="0" />
13342+
</node>
13343+
</node>
13344+
</node>
13345+
<node concept="P$JXv" id="3joh7TIXZKS" role="lGtFl">
13346+
<node concept="TZ5HA" id="3joh7TIXZKT" role="TZ5H$">
13347+
<node concept="1dT_AC" id="3joh7TIXZKU" role="1dT_Ay">
13348+
<property role="1dT_AB" value="You have to return a greater number if your implementation should be taken into account." />
13349+
</node>
13350+
</node>
13351+
<node concept="x79VA" id="3joh7TIXZKV" role="3nqlJM">
13352+
<property role="x79VB" value="0 as default" />
13353+
</node>
13354+
</node>
13355+
</node>
1331913356
<node concept="2tJIrI" id="3NUSEp5xIaF" role="jymVt" />
1332013357
<node concept="3clFb_" id="3NUSEp5xVog" role="jymVt">
1332113358
<property role="TrG5h" value="allowUmlautsInIdentifiers" />
@@ -13354,6 +13391,23 @@
1335413391
<property role="3GE5qa" value="identConfig" />
1335513392
<property role="TrG5h" value="DefaultIdentifierConfigurator" />
1335613393
<node concept="2tJIrI" id="3NUSEp5y2Eb" role="jymVt" />
13394+
<node concept="2tJIrI" id="12O03AaWL$w" role="jymVt" />
13395+
<node concept="3clFb_" id="12O03AaWLED" role="jymVt">
13396+
<property role="TrG5h" value="getPriorityLevel" />
13397+
<node concept="10Oyi0" id="12O03AaWLEE" role="3clF45" />
13398+
<node concept="3Tm1VV" id="12O03AaWLEF" role="1B3o_S" />
13399+
<node concept="3clFbS" id="12O03AaWLEH" role="3clF47">
13400+
<node concept="3clFbF" id="12O03AaWLEK" role="3cqZAp">
13401+
<node concept="3cmrfG" id="12O03AaWLEJ" role="3clFbG">
13402+
<property role="3cmrfH" value="0" />
13403+
</node>
13404+
</node>
13405+
</node>
13406+
<node concept="2AHcQZ" id="12O03AaWLEI" role="2AJF6D">
13407+
<ref role="2AI5Lk" to="wyt6:~Override" />
13408+
</node>
13409+
</node>
13410+
<node concept="2tJIrI" id="12O03AaWLXx" role="jymVt" />
1335713411
<node concept="3clFb_" id="3NUSEp5y2Je" role="jymVt">
1335813412
<property role="TrG5h" value="allowUmlautsInIdentifiers" />
1335913413
<node concept="37vLTG" id="6fmG8CYU4m0" role="3clF46">
@@ -14100,5 +14154,60 @@
1410014154
<ref role="3uigEE" node="34s7_UnUH2A" resolve="TypesystemCustomizer" />
1410114155
</node>
1410214156
</node>
14157+
<node concept="1lYeZD" id="x6l$aoyUxg">
14158+
<property role="TrG5h" value="DefaultIdentifierConfiguratorExtension" />
14159+
<property role="3GE5qa" value="identConfig" />
14160+
<ref role="1lYe$Y" node="3NUSEp5xVSm" resolve="identifierConfigurator" />
14161+
<node concept="3Tm1VV" id="x6l$aoyUxh" role="1B3o_S" />
14162+
<node concept="2tJIrI" id="x6l$aoyUxi" role="jymVt" />
14163+
<node concept="q3mfD" id="x6l$aozcTj" role="jymVt">
14164+
<property role="TrG5h" value="activate" />
14165+
<ref role="2VtyIY" to="90d:3zLwYDe0CPy" resolve="activate" />
14166+
<node concept="3Tm1VV" id="x6l$aozcTl" role="1B3o_S" />
14167+
<node concept="3clFbS" id="x6l$aozcTn" role="3clF47">
14168+
<node concept="RRSsy" id="x6l$aoC4YD" role="3cqZAp">
14169+
<property role="RRSoG" value="h1akgim/info" />
14170+
<node concept="Xl_RD" id="x6l$aoC4YF" role="RRSoy">
14171+
<property role="Xl_RC" value="ExtensionPoint implementation DefaultIdentifierConfiguratorExtension is activated" />
14172+
</node>
14173+
</node>
14174+
</node>
14175+
<node concept="3cqZAl" id="x6l$aozcTq" role="3clF45" />
14176+
</node>
14177+
<node concept="q3mfD" id="x6l$aozcWg" role="jymVt">
14178+
<property role="TrG5h" value="deactivate" />
14179+
<ref role="2VtyIY" to="90d:3zLwYDe0BDO" resolve="deactivate" />
14180+
<node concept="3Tm1VV" id="x6l$aozcWi" role="1B3o_S" />
14181+
<node concept="3clFbS" id="x6l$aozcWk" role="3clF47">
14182+
<node concept="RRSsy" id="x6l$aoC5nO" role="3cqZAp">
14183+
<property role="RRSoG" value="h1akgim/info" />
14184+
<node concept="Xl_RD" id="x6l$aoC5nP" role="RRSoy">
14185+
<property role="Xl_RC" value="ExtensionPoint implementation DefaultIdentifierConfiguratorExtension is deactivated" />
14186+
</node>
14187+
</node>
14188+
</node>
14189+
<node concept="3cqZAl" id="x6l$aozcWn" role="3clF45" />
14190+
</node>
14191+
<node concept="2tJIrI" id="x6l$aoyUxl" role="jymVt" />
14192+
<node concept="q3mfD" id="x6l$aoyUxm" role="jymVt">
14193+
<property role="TrG5h" value="get" />
14194+
<ref role="2VtyIY" to="90d:3zLwYDe0svr" resolve="get" />
14195+
<node concept="3Tm1VV" id="x6l$aoyUxo" role="1B3o_S" />
14196+
<node concept="3clFbS" id="x6l$aoyUxq" role="3clF47">
14197+
<node concept="3cpWs6" id="2TlZyI4POS2" role="3cqZAp">
14198+
<node concept="2ShNRf" id="2TlZyI4PP1Q" role="3cqZAk">
14199+
<node concept="HV5vD" id="x6l$aozcRE" role="2ShVmc">
14200+
<property role="373rjd" value="true" />
14201+
<ref role="HV5vE" node="3NUSEp5y2Ea" resolve="DefaultIdentifierConfigurator" />
14202+
</node>
14203+
</node>
14204+
</node>
14205+
</node>
14206+
<node concept="q3mfm" id="x6l$aoyUxr" role="3clF45">
14207+
<ref role="q3mfh" to="90d:3zLwYDe0sv$" />
14208+
<ref role="1QQUv3" node="x6l$aoyUxm" resolve="get" />
14209+
</node>
14210+
</node>
14211+
</node>
1410314212
</model>
1410414213

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/behavior.mps‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
2424
<import index="nu60" ref="r:cfd59c48-ecc8-4b0c-8ae8-6d876c46ebbb(org.iets3.core.expr.toplevel.behavior)" />
2525
<import index="yv47" ref="r:da65683e-ff6f-430d-ab68-32a77df72c93(org.iets3.core.expr.toplevel.structure)" />
26+
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
27+
<import index="gdgh" ref="r:e4d9478b-ae0e-416e-be60-73d136571015(org.iets3.core.base.behavior)" implicit="true" />
2628
</imports>
2729
<registry>
2830
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -34,11 +36,13 @@
3436
</concept>
3537
<concept id="1225194413805" name="jetbrains.mps.lang.behavior.structure.ConceptConstructorDeclaration" flags="in" index="13hLZK" />
3638
<concept id="1225194472830" name="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" flags="ng" index="13i0hz">
39+
<property id="5864038008284099149" name="isStatic" index="2Ki8OM" />
3740
<property id="1225194472832" name="isVirtual" index="13i0it" />
3841
<property id="1225194472834" name="isAbstract" index="13i0iv" />
3942
<reference id="1225194472831" name="overriddenMethod" index="13i0hy" />
4043
</concept>
4144
<concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
45+
<concept id="1703835097132541506" name="jetbrains.mps.lang.behavior.structure.ThisConceptExpression" flags="ng" index="1fM9EW" />
4246
</language>
4347
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
4448
<concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
@@ -835,5 +839,81 @@
835839
<node concept="3clFbS" id="5crSXMDrDI" role="2VODD2" />
836840
</node>
837841
</node>
842+
<node concept="13h7C7" id="12O03AaUK2d">
843+
<ref role="13h7C2" to="kelk:3vxfdxbcBqr" resolve="MessageDefinition" />
844+
<node concept="13i0hz" id="12O03AaUKcE" role="13h7CS">
845+
<property role="TrG5h" value="allowUmlaute" />
846+
<property role="2Ki8OM" value="true" />
847+
<ref role="13i0hy" to="gdgh:5YygIlbih$m" resolve="allowUmlaute" />
848+
<node concept="3clFbS" id="12O03AaUKcH" role="3clF47">
849+
<node concept="3clFbF" id="3NUSEp5ykHk" role="3cqZAp">
850+
<node concept="2YIFZM" id="6fmG8CYTZvW" role="3clFbG">
851+
<ref role="1Pybhc" to="xfg9:6fmG8CYTWg1" resolve="IdentifierConfiguratorAccess" />
852+
<ref role="37wK5l" to="xfg9:3NUSEp5y9$n" resolve="allowUmlautsInIdentifiers" />
853+
<node concept="1fM9EW" id="6fmG8CYU4Nq" role="37wK5m" />
854+
</node>
855+
</node>
856+
</node>
857+
<node concept="10P_77" id="12O03AaUKdl" role="3clF45" />
858+
<node concept="3Tm1VV" id="12O03AaUKdm" role="1B3o_S" />
859+
</node>
860+
<node concept="13i0hz" id="12O03AaUKdx" role="13h7CS">
861+
<property role="TrG5h" value="allowParagraph" />
862+
<property role="2Ki8OM" value="true" />
863+
<ref role="13i0hy" to="gdgh:4ZH31cjGRan" resolve="allowParagraph" />
864+
<node concept="3clFbS" id="12O03AaUKd$" role="3clF47">
865+
<node concept="3clFbF" id="12O03AaUKY4" role="3cqZAp">
866+
<node concept="2YIFZM" id="12O03AaUL0z" role="3clFbG">
867+
<ref role="37wK5l" to="xfg9:3NUSEp5yd8T" resolve="allowParagraphsInIdentifiers" />
868+
<ref role="1Pybhc" to="xfg9:6fmG8CYTWg1" resolve="IdentifierConfiguratorAccess" />
869+
<node concept="1fM9EW" id="12O03AaUL0$" role="37wK5m" />
870+
</node>
871+
</node>
872+
</node>
873+
<node concept="10P_77" id="12O03AaUL62" role="3clF45" />
874+
<node concept="3Tm1VV" id="12O03AaUL63" role="1B3o_S" />
875+
</node>
876+
<node concept="13hLZK" id="12O03AaUK2e" role="13h7CW">
877+
<node concept="3clFbS" id="12O03AaUK2f" role="2VODD2" />
878+
</node>
879+
</node>
880+
<node concept="13h7C7" id="12O03AaX8ML">
881+
<ref role="13h7C2" to="kelk:3vxfdxbdUeD" resolve="MessageArg" />
882+
<node concept="13i0hz" id="12O03AaX8MW" role="13h7CS">
883+
<property role="TrG5h" value="allowUmlaute" />
884+
<property role="2Ki8OM" value="true" />
885+
<ref role="13i0hy" to="gdgh:5YygIlbih$m" resolve="allowUmlaute" />
886+
<node concept="3clFbS" id="12O03AaX8MZ" role="3clF47">
887+
<node concept="3clFbF" id="12O03AaX9xz" role="3cqZAp">
888+
<node concept="2YIFZM" id="12O03AaX9x$" role="3clFbG">
889+
<ref role="37wK5l" to="xfg9:3NUSEp5y9$n" resolve="allowUmlautsInIdentifiers" />
890+
<ref role="1Pybhc" to="xfg9:6fmG8CYTWg1" resolve="IdentifierConfiguratorAccess" />
891+
<node concept="1fM9EW" id="12O03AaX9x_" role="37wK5m" />
892+
</node>
893+
</node>
894+
</node>
895+
<node concept="10P_77" id="12O03AaX8NB" role="3clF45" />
896+
<node concept="3Tm1VV" id="12O03AaX8NC" role="1B3o_S" />
897+
</node>
898+
<node concept="13i0hz" id="12O03AaX8NN" role="13h7CS">
899+
<property role="TrG5h" value="allowParagraph" />
900+
<property role="2Ki8OM" value="true" />
901+
<ref role="13i0hy" to="gdgh:4ZH31cjGRan" resolve="allowParagraph" />
902+
<node concept="3clFbS" id="12O03AaX8NQ" role="3clF47">
903+
<node concept="3clFbF" id="12O03AaX9FY" role="3cqZAp">
904+
<node concept="2YIFZM" id="12O03AaX9Io" role="3clFbG">
905+
<ref role="37wK5l" to="xfg9:3NUSEp5yd8T" resolve="allowParagraphsInIdentifiers" />
906+
<ref role="1Pybhc" to="xfg9:6fmG8CYTWg1" resolve="IdentifierConfiguratorAccess" />
907+
<node concept="1fM9EW" id="12O03AaX9Ip" role="37wK5m" />
908+
</node>
909+
</node>
910+
</node>
911+
<node concept="10P_77" id="12O03AaX8Oq" role="3clF45" />
912+
<node concept="3Tm1VV" id="12O03AaX8Or" role="1B3o_S" />
913+
</node>
914+
<node concept="13hLZK" id="12O03AaX8MM" role="13h7CW">
915+
<node concept="3clFbS" id="12O03AaX8MN" role="2VODD2" />
916+
</node>
917+
</node>
838918
</model>
839919

0 commit comments

Comments
 (0)