Skip to content

Commit

Permalink
Merge pull request #712 from IETS3/bugfix/MessageHandlerSupportIdenti…
Browse files Browse the repository at this point in the history 
…fierConfiguration

Enable usage of MessageHandler and MessageArg with umlauts or paragraphs
  • Loading branch information
@arimer
arimer authored Mar 5, 2024
2 parents 312b08e + 903b968 commit 5e28f89
Show file tree
Hide file tree
Showing 8 changed files with 1,620 additions and 36 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project are documented in this file.
Format of the log 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.

## March 2024

- *MessageDefiniton* uses *extensionPoint/IdentifierConfigurator/* that allows the user to decide to use german umlauts and paragraphs in it.
- This extensionPoint got a new method to select which implementation will be chosen.


## February 2024

### Added
Expand Down
117 changes: 113 additions & 4 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@
<property id="1176718929932" name="isFinal" index="3TUv4t" />
<child id="1068431790190" name="initializer" index="33vP2m" />
</concept>
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
</concept>
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
</concept>
Expand Down Expand Up @@ -335,10 +338,15 @@
</concept>
</language>
<language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
<concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA">
<property id="5858074156537516431" name="text" index="x79VB" />
</concept>
<concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
<concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
<child id="8465538089690331502" name="body" index="TZ5H$" />
<child id="5383422241790532083" name="tags" index="3nqlJM" />
</concept>
<concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
<concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
<child id="8970989240999019149" name="part" index="1dT_Ay" />
</concept>
Expand Down Expand Up @@ -379,6 +387,12 @@
<language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
<concept id="1176544042499" name="jetbrains.mps.lang.typesystem.structure.Node_TypeOperation" flags="nn" index="3JvlWi" />
</language>
<language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
<concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
<property id="2034914114981261751" name="severity" index="RRSoG" />
<child id="2034914114981261753" name="message" index="RRSoy" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1204834851141" name="jetbrains.mps.lang.smodel.structure.PoundExpression" flags="ng" index="25Kdxt">
<child id="1204834868751" name="expression" index="25KhWn" />
Expand Down Expand Up @@ -546,9 +560,6 @@
<node concept="3uibUv" id="6MNhNeUh6na" role="EKbjA">
<ref role="3uigEE" to="2ahs:6MNhNeUeM9i" resolve="IStopAndReturn" />
</node>
<node concept="3uibUv" id="4TtBy4czRM6" role="EKbjA">
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
</node>
<node concept="3Tm1VV" id="UN2ftLWgA9" role="1B3o_S" />
<node concept="3clFb_" id="UN2ftLXFXP" role="jymVt">
<property role="1EzhhJ" value="false" />
Expand Down Expand Up @@ -672,14 +683,14 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="4TtBy4czSoi" role="jymVt" />
<node concept="3UR2Jj" id="3iq6R$ZyJbu" role="lGtFl">
<node concept="TZ5HA" id="3iq6R$ZyJbv" role="TZ5H$">
<node concept="1dT_AC" id="3iq6R$ZyJbw" role="1dT_Ay">
<property role="1dT_AB" value="Represents 'none' value of an optional type." />
</node>
</node>
</node>
<node concept="2tJIrI" id="4TtBy4czSoi" role="jymVt" />
<node concept="3clFb_" id="4TtBy4czRUR" role="jymVt">
<property role="TrG5h" value="compareTo" />
<node concept="3Tm1VV" id="4TtBy4czRUS" role="1B3o_S" />
Expand Down Expand Up @@ -739,6 +750,9 @@
</node>
</node>
<node concept="2tJIrI" id="29KNCeybCV7" role="jymVt" />
<node concept="3uibUv" id="4TtBy4czRM6" role="EKbjA">
<ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
</node>
</node>
<node concept="312cEu" id="12WRc298rqY">
<property role="TrG5h" value="SpecificErrorValue" />
Expand Down Expand Up @@ -13316,6 +13330,29 @@
<property role="3GE5qa" value="identConfig" />
<property role="TrG5h" value="IdentifierConfigurator" />
<property role="1sVAO0" value="true" />
<node concept="2tJIrI" id="12O03AaWLfx" role="jymVt" />
<node concept="3clFb_" id="12O03AaWLhs" role="jymVt">
<property role="TrG5h" value="getPriorityLevel" />
<node concept="10Oyi0" id="12O03AaWLht" role="3clF45" />
<node concept="3Tm1VV" id="12O03AaWLhu" role="1B3o_S" />
<node concept="3clFbS" id="12O03AaWLhv" role="3clF47">
<node concept="3cpWs6" id="3joh7TIXYo1" role="3cqZAp">
<node concept="3cmrfG" id="3joh7TIXZxF" role="3cqZAk">
<property role="3cmrfH" value="0" />
</node>
</node>
</node>
<node concept="P$JXv" id="3joh7TIXZKS" role="lGtFl">
<node concept="TZ5HA" id="3joh7TIXZKT" role="TZ5H$">
<node concept="1dT_AC" id="3joh7TIXZKU" role="1dT_Ay">
<property role="1dT_AB" value="You have to return a greater number if your implementation should be taken into account." />
</node>
</node>
<node concept="x79VA" id="3joh7TIXZKV" role="3nqlJM">
<property role="x79VB" value="0 as default" />
</node>
</node>
</node>
<node concept="2tJIrI" id="3NUSEp5xIaF" role="jymVt" />
<node concept="3clFb_" id="3NUSEp5xVog" role="jymVt">
<property role="TrG5h" value="allowUmlautsInIdentifiers" />
Expand Down Expand Up @@ -13354,6 +13391,23 @@
<property role="3GE5qa" value="identConfig" />
<property role="TrG5h" value="DefaultIdentifierConfigurator" />
<node concept="2tJIrI" id="3NUSEp5y2Eb" role="jymVt" />
<node concept="2tJIrI" id="12O03AaWL$w" role="jymVt" />
<node concept="3clFb_" id="12O03AaWLED" role="jymVt">
<property role="TrG5h" value="getPriorityLevel" />
<node concept="10Oyi0" id="12O03AaWLEE" role="3clF45" />
<node concept="3Tm1VV" id="12O03AaWLEF" role="1B3o_S" />
<node concept="3clFbS" id="12O03AaWLEH" role="3clF47">
<node concept="3clFbF" id="12O03AaWLEK" role="3cqZAp">
<node concept="3cmrfG" id="12O03AaWLEJ" role="3clFbG">
<property role="3cmrfH" value="0" />
</node>
</node>
</node>
<node concept="2AHcQZ" id="12O03AaWLEI" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" />
</node>
</node>
<node concept="2tJIrI" id="12O03AaWLXx" role="jymVt" />
<node concept="3clFb_" id="3NUSEp5y2Je" role="jymVt">
<property role="TrG5h" value="allowUmlautsInIdentifiers" />
<node concept="37vLTG" id="6fmG8CYU4m0" role="3clF46">
Expand Down Expand Up @@ -14100,5 +14154,60 @@
<ref role="3uigEE" node="34s7_UnUH2A" resolve="TypesystemCustomizer" />
</node>
</node>
<node concept="1lYeZD" id="x6l$aoyUxg">
<property role="TrG5h" value="DefaultIdentifierConfiguratorExtension" />
<property role="3GE5qa" value="identConfig" />
<ref role="1lYe$Y" node="3NUSEp5xVSm" resolve="identifierConfigurator" />
<node concept="3Tm1VV" id="x6l$aoyUxh" role="1B3o_S" />
<node concept="2tJIrI" id="x6l$aoyUxi" role="jymVt" />
<node concept="q3mfD" id="x6l$aozcTj" role="jymVt">
<property role="TrG5h" value="activate" />
<ref role="2VtyIY" to="90d:3zLwYDe0CPy" resolve="activate" />
<node concept="3Tm1VV" id="x6l$aozcTl" role="1B3o_S" />
<node concept="3clFbS" id="x6l$aozcTn" role="3clF47">
<node concept="RRSsy" id="x6l$aoC4YD" role="3cqZAp">
<property role="RRSoG" value="h1akgim/info" />
<node concept="Xl_RD" id="x6l$aoC4YF" role="RRSoy">
<property role="Xl_RC" value="ExtensionPoint implementation DefaultIdentifierConfiguratorExtension is activated" />
</node>
</node>
</node>
<node concept="3cqZAl" id="x6l$aozcTq" role="3clF45" />
</node>
<node concept="q3mfD" id="x6l$aozcWg" role="jymVt">
<property role="TrG5h" value="deactivate" />
<ref role="2VtyIY" to="90d:3zLwYDe0BDO" resolve="deactivate" />
<node concept="3Tm1VV" id="x6l$aozcWi" role="1B3o_S" />
<node concept="3clFbS" id="x6l$aozcWk" role="3clF47">
<node concept="RRSsy" id="x6l$aoC5nO" role="3cqZAp">
<property role="RRSoG" value="h1akgim/info" />
<node concept="Xl_RD" id="x6l$aoC5nP" role="RRSoy">
<property role="Xl_RC" value="ExtensionPoint implementation DefaultIdentifierConfiguratorExtension is deactivated" />
</node>
</node>
</node>
<node concept="3cqZAl" id="x6l$aozcWn" role="3clF45" />
</node>
<node concept="2tJIrI" id="x6l$aoyUxl" role="jymVt" />
<node concept="q3mfD" id="x6l$aoyUxm" role="jymVt">
<property role="TrG5h" value="get" />
<ref role="2VtyIY" to="90d:3zLwYDe0svr" resolve="get" />
<node concept="3Tm1VV" id="x6l$aoyUxo" role="1B3o_S" />
<node concept="3clFbS" id="x6l$aoyUxq" role="3clF47">
<node concept="3cpWs6" id="2TlZyI4POS2" role="3cqZAp">
<node concept="2ShNRf" id="2TlZyI4PP1Q" role="3cqZAk">
<node concept="HV5vD" id="x6l$aozcRE" role="2ShVmc">
<property role="373rjd" value="true" />
<ref role="HV5vE" node="3NUSEp5y2Ea" resolve="DefaultIdentifierConfigurator" />
</node>
</node>
</node>
</node>
<node concept="q3mfm" id="x6l$aoyUxr" role="3clF45">
<ref role="q3mfh" to="90d:3zLwYDe0sv$" />
<ref role="1QQUv3" node="x6l$aoyUxm" resolve="get" />
</node>
</node>
</node>
</model>

80 changes: 80 additions & 0 deletions ...languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/models/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
<import index="nu60" ref="r:cfd59c48-ecc8-4b0c-8ae8-6d876c46ebbb(org.iets3.core.expr.toplevel.behavior)" />
<import index="yv47" ref="r:da65683e-ff6f-430d-ab68-32a77df72c93(org.iets3.core.expr.toplevel.structure)" />
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
<import index="gdgh" ref="r:e4d9478b-ae0e-416e-be60-73d136571015(org.iets3.core.base.behavior)" implicit="true" />
</imports>
<registry>
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
Expand All @@ -34,11 +36,13 @@
</concept>
<concept id="1225194413805" name="jetbrains.mps.lang.behavior.structure.ConceptConstructorDeclaration" flags="in" index="13hLZK" />
<concept id="1225194472830" name="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" flags="ng" index="13i0hz">
<property id="5864038008284099149" name="isStatic" index="2Ki8OM" />
<property id="1225194472832" name="isVirtual" index="13i0it" />
<property id="1225194472834" name="isAbstract" index="13i0iv" />
<reference id="1225194472831" name="overriddenMethod" index="13i0hy" />
</concept>
<concept id="1225194691553" name="jetbrains.mps.lang.behavior.structure.ThisNodeExpression" flags="nn" index="13iPFW" />
<concept id="1703835097132541506" name="jetbrains.mps.lang.behavior.structure.ThisConceptExpression" flags="ng" index="1fM9EW" />
</language>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
<concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
Expand Down Expand Up @@ -835,5 +839,81 @@
<node concept="3clFbS" id="5crSXMDrDI" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="12O03AaUK2d">
<ref role="13h7C2" to="kelk:3vxfdxbcBqr" resolve="MessageDefinition" />
<node concept="13i0hz" id="12O03AaUKcE" role="13h7CS">
<property role="TrG5h" value="allowUmlaute" />
<property role="2Ki8OM" value="true" />
<ref role="13i0hy" to="gdgh:5YygIlbih$m" resolve="allowUmlaute" />
<node concept="3clFbS" id="12O03AaUKcH" role="3clF47">
<node concept="3clFbF" id="3NUSEp5ykHk" role="3cqZAp">
<node concept="2YIFZM" id="6fmG8CYTZvW" role="3clFbG">
<ref role="1Pybhc" to="xfg9:6fmG8CYTWg1" resolve="IdentifierConfiguratorAccess" />
<ref role="37wK5l" to="xfg9:3NUSEp5y9$n" resolve="allowUmlautsInIdentifiers" />
<node concept="1fM9EW" id="6fmG8CYU4Nq" role="37wK5m" />
</node>
</node>
</node>
<node concept="10P_77" id="12O03AaUKdl" role="3clF45" />
<node concept="3Tm1VV" id="12O03AaUKdm" role="1B3o_S" />
</node>
<node concept="13i0hz" id="12O03AaUKdx" role="13h7CS">
<property role="TrG5h" value="allowParagraph" />
<property role="2Ki8OM" value="true" />
<ref role="13i0hy" to="gdgh:4ZH31cjGRan" resolve="allowParagraph" />
<node concept="3clFbS" id="12O03AaUKd$" role="3clF47">
<node concept="3clFbF" id="12O03AaUKY4" role="3cqZAp">
<node concept="2YIFZM" id="12O03AaUL0z" role="3clFbG">
<ref role="37wK5l" to="xfg9:3NUSEp5yd8T" resolve="allowParagraphsInIdentifiers" />
<ref role="1Pybhc" to="xfg9:6fmG8CYTWg1" resolve="IdentifierConfiguratorAccess" />
<node concept="1fM9EW" id="12O03AaUL0$" role="37wK5m" />
</node>
</node>
</node>
<node concept="10P_77" id="12O03AaUL62" role="3clF45" />
<node concept="3Tm1VV" id="12O03AaUL63" role="1B3o_S" />
</node>
<node concept="13hLZK" id="12O03AaUK2e" role="13h7CW">
<node concept="3clFbS" id="12O03AaUK2f" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="12O03AaX8ML">
<ref role="13h7C2" to="kelk:3vxfdxbdUeD" resolve="MessageArg" />
<node concept="13i0hz" id="12O03AaX8MW" role="13h7CS">
<property role="TrG5h" value="allowUmlaute" />
<property role="2Ki8OM" value="true" />
<ref role="13i0hy" to="gdgh:5YygIlbih$m" resolve="allowUmlaute" />
<node concept="3clFbS" id="12O03AaX8MZ" role="3clF47">
<node concept="3clFbF" id="12O03AaX9xz" role="3cqZAp">
<node concept="2YIFZM" id="12O03AaX9x$" role="3clFbG">
<ref role="37wK5l" to="xfg9:3NUSEp5y9$n" resolve="allowUmlautsInIdentifiers" />
<ref role="1Pybhc" to="xfg9:6fmG8CYTWg1" resolve="IdentifierConfiguratorAccess" />
<node concept="1fM9EW" id="12O03AaX9x_" role="37wK5m" />
</node>
</node>
</node>
<node concept="10P_77" id="12O03AaX8NB" role="3clF45" />
<node concept="3Tm1VV" id="12O03AaX8NC" role="1B3o_S" />
</node>
<node concept="13i0hz" id="12O03AaX8NN" role="13h7CS">
<property role="TrG5h" value="allowParagraph" />
<property role="2Ki8OM" value="true" />
<ref role="13i0hy" to="gdgh:4ZH31cjGRan" resolve="allowParagraph" />
<node concept="3clFbS" id="12O03AaX8NQ" role="3clF47">
<node concept="3clFbF" id="12O03AaX9FY" role="3cqZAp">
<node concept="2YIFZM" id="12O03AaX9Io" role="3clFbG">
<ref role="37wK5l" to="xfg9:3NUSEp5yd8T" resolve="allowParagraphsInIdentifiers" />
<ref role="1Pybhc" to="xfg9:6fmG8CYTWg1" resolve="IdentifierConfiguratorAccess" />
<node concept="1fM9EW" id="12O03AaX9Ip" role="37wK5m" />
</node>
</node>
</node>
<node concept="10P_77" id="12O03AaX8Oq" role="3clF45" />
<node concept="3Tm1VV" id="12O03AaX8Or" role="1B3o_S" />
</node>
<node concept="13hLZK" id="12O03AaX8MM" role="13h7CW">
<node concept="3clFbS" id="12O03AaX8MN" role="2VODD2" />
</node>
</node>
</model>

Loading

0 comments on commit 5e28f89

Please sign in to comment.