Skip to content

Commit b2fe900

Browse files
author
Alexander Pann
committed
mbeddr.doc: migrate ToDoCommentWord to TodoWord where it is possible
1 parent 5012a45 commit b2fe900

File tree

3 files changed

+207
-1
lines changed

3 files changed

+207
-1
lines changed

‎code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/doc.mpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<language namespace="com.mbeddr.doc" uuid="2374bc90-7e37-41f1-a9c4-c2e35194c36a" languageVersion="4" moduleVersion="0">
2+
<language namespace="com.mbeddr.doc" uuid="2374bc90-7e37-41f1-a9c4-c2e35194c36a" languageVersion="5" moduleVersion="0">
33
<models>
44
<modelRoot contentPath="${module}" type="default">
55
<sourceRoot location="languageModels" />
@@ -277,6 +277,7 @@
277277
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
278278
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
279279
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
280+
<module reference="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" version="0" />
280281
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
281282
<module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
282283
<module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />

‎code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/constraints.mps

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1619,5 +1619,40 @@
16191619
</node>
16201620
</node>
16211621
</node>
1622+
<node concept="1M2fIO" id="7Usggi76oNI">
1623+
<property role="3GE5qa" value="words.structuredComment" />
1624+
<ref role="1M2myG" to="2c95:1q0W02ZOmHb" resolve="ToDoCommentWord" />
1625+
<node concept="9S07l" id="7Usggi76oNJ" role="9Vyp8">
1626+
<node concept="3clFbS" id="7Usggi76oNK" role="2VODD2">
1627+
<node concept="3cpWs8" id="7Usggi76tOk" role="3cqZAp">
1628+
<node concept="3cpWsn" id="7Usggi76tOl" role="3cpWs9">
1629+
<property role="TrG5h" value="ancestor" />
1630+
<node concept="3Tqbb2" id="7Usggi76tOm" role="1tU5fm">
1631+
<ref role="ehGHo" to="2c95:5L$H31Kgq3f" resolve="IDocumentLike" />
1632+
</node>
1633+
<node concept="2OqwBi" id="7Usggi76tOn" role="33vP2m">
1634+
<node concept="nLn13" id="7Usggi76tOo" role="2Oq$k0" />
1635+
<node concept="2Xjw5R" id="7Usggi76tOp" role="2OqNvi">
1636+
<node concept="1xMEDy" id="7Usggi76tOq" role="1xVPHs">
1637+
<node concept="chp4Y" id="7Usggi76tOr" role="ri$Ld">
1638+
<ref role="cht4Q" to="2c95:5L$H31Kgq3f" resolve="IDocumentLike" />
1639+
</node>
1640+
</node>
1641+
<node concept="1xIGOp" id="7Usggi76tOs" role="1xVPHs" />
1642+
</node>
1643+
</node>
1644+
</node>
1645+
</node>
1646+
<node concept="3clFbF" id="7Usggi76tOt" role="3cqZAp">
1647+
<node concept="2OqwBi" id="7Usggi76tOu" role="3clFbG">
1648+
<node concept="37vLTw" id="7Usggi76tOv" role="2Oq$k0">
1649+
<ref role="3cqZAo" node="7Usggi76tOl" resolve="ancestor" />
1650+
</node>
1651+
<node concept="3w_OXm" id="7Usggi76uc3" role="2OqNvi" />
1652+
</node>
1653+
</node>
1654+
</node>
1655+
</node>
1656+
</node>
16221657
</model>
16231658

‎code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/migration.mps

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,18 +144,26 @@
144144
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
145145
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
146146
</concept>
147+
<concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
148+
<child id="1144104376918" name="parameter" index="1xVPHs" />
149+
</concept>
147150
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
148151
<concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC" />
149152
<concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
150153
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
151154
<concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
152155
<child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
153156
</concept>
157+
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
154158
<concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
155159
<reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
156160
</concept>
157161
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
158162
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
163+
<concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
164+
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
165+
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
166+
</concept>
159167
<concept id="1140131837776" name="jetbrains.mps.lang.smodel.structure.Node_ReplaceWithAnotherOperation" flags="nn" index="1P9Npp">
160168
<child id="1140131861877" name="replacementNode" index="1P9ThW" />
161169
</concept>
@@ -751,5 +759,167 @@
751759
<ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
752760
</node>
753761
</node>
762+
<node concept="3SyAh_" id="7Usggi76_4v">
763+
<property role="qMTe8" value="4" />
764+
<property role="TrG5h" value="MigrateToDoCommentWordToToDoWordIfPossible" />
765+
<node concept="3Tm1VV" id="7Usggi76_4w" role="1B3o_S" />
766+
<node concept="3tTeZs" id="7Usggi76_4x" role="jymVt">
767+
<property role="3tTeZt" value="&lt;no execute after&gt;" />
768+
<ref role="3tTeZr" to="slm6:7ay_HjIMt1a" resolve="execute after" />
769+
</node>
770+
<node concept="3tTeZs" id="7Usggi76_4y" role="jymVt">
771+
<property role="3tTeZt" value="&lt;no required data&gt;" />
772+
<ref role="3tTeZr" to="slm6:5TUCQr2FPTh" resolve="requires annotation data" />
773+
</node>
774+
<node concept="3tTeZs" id="7Usggi76_4z" role="jymVt">
775+
<property role="3tTeZt" value="&lt;no produced data&gt;" />
776+
<ref role="3tTeZr" to="slm6:5TUCQr2C271" resolve="produces annotation data" />
777+
</node>
778+
<node concept="2tJIrI" id="7Usggi76_4$" role="jymVt" />
779+
<node concept="3tYpMH" id="7Usggi76_4_" role="jymVt">
780+
<property role="TrG5h" value="isRerunnable" />
781+
<property role="3tYpME" value="true" />
782+
<ref role="25KYV2" to="slm6:1JWcQ2VeWIs" resolve="isRerunnable" />
783+
<node concept="3Tm1VV" id="7Usggi76_4A" role="1B3o_S" />
784+
<node concept="10P_77" id="7Usggi76_4B" role="1tU5fm" />
785+
</node>
786+
<node concept="3tTeZs" id="7Usggi76_4C" role="jymVt">
787+
<property role="3tTeZt" value="&lt;description&gt;" />
788+
<ref role="3tTeZr" to="slm6:1_lSsE3RFpE" resolve="description" />
789+
</node>
790+
<node concept="q3mfD" id="7Usggi76_4D" role="jymVt">
791+
<property role="TrG5h" value="execute" />
792+
<ref role="2VtyIY" to="slm6:4ubqdNOF9cA" resolve="execute" />
793+
<node concept="3Tm1VV" id="7Usggi76_4F" role="1B3o_S" />
794+
<node concept="3clFbS" id="7Usggi76_4H" role="3clF47">
795+
<node concept="1DcWWT" id="7Usggi76_E6" role="3cqZAp">
796+
<node concept="3cpWsn" id="7Usggi76_E7" role="1Duv9x">
797+
<property role="TrG5h" value="mdl" />
798+
<node concept="H_c77" id="7Usggi76_E8" role="1tU5fm" />
799+
</node>
800+
<node concept="2OqwBi" id="7Usggi76_E9" role="1DdaDG">
801+
<node concept="37vLTw" id="7Usggi76_Ea" role="2Oq$k0">
802+
<ref role="3cqZAo" node="7Usggi76_4J" resolve="m" />
803+
</node>
804+
<node concept="liA8E" id="7Usggi76_Eb" role="2OqNvi">
805+
<ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
806+
</node>
807+
</node>
808+
<node concept="3clFbS" id="7Usggi76_Ec" role="2LFqv$">
809+
<node concept="3clFbF" id="7Usggi76_Ed" role="3cqZAp">
810+
<node concept="2OqwBi" id="7Usggi76_Ee" role="3clFbG">
811+
<node concept="2OqwBi" id="7Usggi76_Ef" role="2Oq$k0">
812+
<node concept="2OqwBi" id="7Usggi76_Eg" role="2Oq$k0">
813+
<node concept="37vLTw" id="7Usggi76_Eh" role="2Oq$k0">
814+
<ref role="3cqZAo" node="7Usggi76_E7" resolve="mdl" />
815+
</node>
816+
<node concept="2SmgA7" id="7Usggi76_Ei" role="2OqNvi">
817+
<node concept="chp4Y" id="7Usggi76_Ej" role="1dBWTz">
818+
<ref role="cht4Q" to="2c95:1q0W02ZOmHb" resolve="ToDoCommentWord" />
819+
</node>
820+
</node>
821+
</node>
822+
<node concept="3zZkjj" id="7Usggi76_Ek" role="2OqNvi">
823+
<node concept="1bVj0M" id="7Usggi76_El" role="23t8la">
824+
<node concept="3clFbS" id="7Usggi76_Em" role="1bW5cS">
825+
<node concept="3clFbF" id="7Usggi76_En" role="3cqZAp">
826+
<node concept="2OqwBi" id="7Usggi76G6n" role="3clFbG">
827+
<node concept="2OqwBi" id="7Usggi76_Eo" role="2Oq$k0">
828+
<node concept="37vLTw" id="7Usggi76_Eq" role="2Oq$k0">
829+
<ref role="3cqZAo" node="7Usggi76_Et" resolve="it" />
830+
</node>
831+
<node concept="2Xjw5R" id="7Usggi76DTv" role="2OqNvi">
832+
<node concept="1xMEDy" id="7Usggi76DTx" role="1xVPHs">
833+
<node concept="chp4Y" id="7Usggi76EOB" role="ri$Ld">
834+
<ref role="cht4Q" to="2c95:5L$H31Kgq3f" resolve="IDocumentLike" />
835+
</node>
836+
</node>
837+
<node concept="1xIGOp" id="7Usggi76FyS" role="1xVPHs" />
838+
</node>
839+
</node>
840+
<node concept="3x8VRR" id="7Usggi76HL1" role="2OqNvi" />
841+
</node>
842+
</node>
843+
</node>
844+
<node concept="gl6BB" id="7Usggi76_Et" role="1bW2Oz">
845+
<property role="TrG5h" value="it" />
846+
<node concept="2jxLKc" id="7Usggi76_Eu" role="1tU5fm" />
847+
</node>
848+
</node>
849+
</node>
850+
</node>
851+
<node concept="2es0OD" id="7Usggi76_Ev" role="2OqNvi">
852+
<node concept="1bVj0M" id="7Usggi76_Ew" role="23t8la">
853+
<node concept="3clFbS" id="7Usggi76_Ex" role="1bW5cS">
854+
<node concept="3cpWs8" id="7Usggi76IkL" role="3cqZAp">
855+
<node concept="3cpWsn" id="7Usggi76IkO" role="3cpWs9">
856+
<property role="TrG5h" value="newWord" />
857+
<node concept="3Tqbb2" id="7Usggi76IkK" role="1tU5fm">
858+
<ref role="ehGHo" to="2c95:3EhlX7RwIOz" resolve="ToDoWord" />
859+
</node>
860+
<node concept="2pJPEk" id="7Usggi76INQ" role="33vP2m">
861+
<node concept="2pJPED" id="7Usggi76INS" role="2pJPEn">
862+
<ref role="2pJxaS" to="2c95:3EhlX7RwIOz" resolve="ToDoWord" />
863+
<node concept="2pIpSj" id="7Usggi76IVJ" role="2pJxcM">
864+
<ref role="2pIpSl" to="2c95:3EhlX7RwJXK" resolve="text" />
865+
<node concept="36biLy" id="7Usggi76J1V" role="28nt2d">
866+
<node concept="2OqwBi" id="7Usggi76Js8" role="36biLW">
867+
<node concept="37vLTw" id="7Usggi76J8o" role="2Oq$k0">
868+
<ref role="3cqZAo" node="7Usggi76_EC" resolve="it" />
869+
</node>
870+
<node concept="3TrEf2" id="7Usggi76Kdg" role="2OqNvi">
871+
<ref role="3Tt5mk" to="2c95:1q0W02ZOmHf" resolve="text" />
872+
</node>
873+
</node>
874+
</node>
875+
</node>
876+
</node>
877+
</node>
878+
</node>
879+
</node>
880+
<node concept="3clFbF" id="7Usggi76Ky8" role="3cqZAp">
881+
<node concept="2OqwBi" id="7Usggi76KGL" role="3clFbG">
882+
<node concept="37vLTw" id="7Usggi76Ky6" role="2Oq$k0">
883+
<ref role="3cqZAo" node="7Usggi76_EC" resolve="it" />
884+
</node>
885+
<node concept="1P9Npp" id="7Usggi76L1B" role="2OqNvi">
886+
<node concept="37vLTw" id="7Usggi76L8p" role="1P9ThW">
887+
<ref role="3cqZAo" node="7Usggi76IkO" resolve="newWord" />
888+
</node>
889+
</node>
890+
</node>
891+
</node>
892+
</node>
893+
<node concept="gl6BB" id="7Usggi76_EC" role="1bW2Oz">
894+
<property role="TrG5h" value="it" />
895+
<node concept="2jxLKc" id="7Usggi76_ED" role="1tU5fm" />
896+
</node>
897+
</node>
898+
</node>
899+
</node>
900+
</node>
901+
</node>
902+
</node>
903+
</node>
904+
<node concept="ffn8J" id="7Usggi76_4J" role="3clF46">
905+
<property role="TrG5h" value="m" />
906+
<ref role="ffrpq" to="slm6:7fCCGqboj9J" resolve="m" />
907+
<node concept="3uibUv" id="7Usggi76_4I" role="1tU5fm">
908+
<ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
909+
</node>
910+
</node>
911+
<node concept="q3mfm" id="7Usggi76_4K" role="3clF45">
912+
<ref role="q3mfh" to="slm6:4F5w8gPXEEe" />
913+
<ref role="1QQUv3" node="7Usggi76_4D" resolve="execute" />
914+
</node>
915+
</node>
916+
<node concept="3tTeZs" id="7Usggi76_4L" role="jymVt">
917+
<property role="3tTeZt" value="&lt;no result checking&gt;" />
918+
<ref role="3tTeZr" to="slm6:1JWcQ2VeXpD" resolve="check" />
919+
</node>
920+
<node concept="3uibUv" id="7Usggi76_4O" role="1zkMxy">
921+
<ref role="3uigEE" to="slm6:5TUCQr2ybBO" resolve="HasMigrationScriptReference" />
922+
</node>
923+
</node>
754924
</model>
755925

0 commit comments

Comments
 (0)