Skip to content

Commit c051a4a

Browse files
slissonslisson
committed
fix(react): checking rule for model name didn't check the full name
It only checked if the model name ends with `.modelix` which is not sufficient.
1 parent 1822ec9 commit c051a4a

File tree

1 file changed

+83
-22
lines changed

1 file changed

+83
-22
lines changed

‎mps/modules/org.modelix.mps.react/models/org.modelix.mps.react.typesystem.mps‎

Lines changed: 83 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<import index="8xo1" ref="r:41b64586-29ed-47f5-b907-44be07261bbc(org.modelix.mps.react.structure)" />
1313
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
1414
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
15-
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
15+
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
16+
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" implicit="true" />
1617
</imports>
1718
<registry>
1819
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -42,6 +43,8 @@
4243
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
4344
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
4445
</concept>
46+
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
47+
<concept id="1225271221393" name="jetbrains.mps.baseLanguage.structure.NPENotEqualsExpression" flags="nn" index="17QLQc" />
4548
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
4649
<child id="5680397130376446158" name="type" index="1tU5fm" />
4750
</concept>
@@ -61,12 +64,8 @@
6164
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
6265
</concept>
6366
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
64-
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
65-
<child id="1081516765348" name="expression" index="3fr31v" />
66-
</concept>
6767
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
6868
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
69-
<child id="1068499141038" name="actualArgument" index="37wK5m" />
7069
</concept>
7170
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
7271
<reference id="1107535924139" name="classifier" index="3uigEE" />
@@ -168,8 +167,9 @@
168167
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
169168
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
170169
</concept>
171-
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
172-
<concept id="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
170+
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
171+
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
172+
</concept>
173173
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
174174
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
175175
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
@@ -962,36 +962,97 @@
962962
<node concept="18kY7G" id="1XYAF4M7x2r">
963963
<property role="TrG5h" value="check_ReactModule" />
964964
<node concept="3clFbS" id="1XYAF4M7x2s" role="18ibNy">
965-
<node concept="3clFbJ" id="1XYAF4M7xmd" role="3cqZAp">
966-
<node concept="3fqX7Q" id="1XYAF4M7xDg" role="3clFbw">
967-
<node concept="2OqwBi" id="1XYAF4M7_pK" role="3fr31v">
968-
<node concept="2OqwBi" id="1XYAF4M7zpc" role="2Oq$k0">
969-
<node concept="2OqwBi" id="1XYAF4M7yqo" role="2Oq$k0">
970-
<node concept="1YBJjd" id="1XYAF4M7xWo" role="2Oq$k0">
971-
<ref role="1YBMHb" node="1XYAF4M7x2u" resolve="reactModule" />
965+
<node concept="3cpWs8" id="6Ddb4_fOfdM" role="3cqZAp">
966+
<node concept="3cpWsn" id="6Ddb4_fOfdP" role="3cpWs9">
967+
<property role="TrG5h" value="expected" />
968+
<node concept="17QB3L" id="6Ddb4_fOfdK" role="1tU5fm" />
969+
<node concept="3cpWs3" id="6Ddb4_fOiOC" role="33vP2m">
970+
<node concept="Xl_RD" id="6Ddb4_fOiOF" role="3uHU7w">
971+
<property role="Xl_RC" value=".modelix" />
972+
</node>
973+
<node concept="2OqwBi" id="6Ddb4_fOhmJ" role="3uHU7B">
974+
<node concept="2OqwBi" id="6Ddb4_fOgOA" role="2Oq$k0">
975+
<node concept="2OqwBi" id="6Ddb4_fOgsf" role="2Oq$k0">
976+
<node concept="2JrnkZ" id="6Ddb4_fOgbj" role="2Oq$k0">
977+
<node concept="1YBJjd" id="6Ddb4_fOff3" role="2JrQYb">
978+
<ref role="1YBMHb" node="1XYAF4M7x2u" resolve="reactModule" />
979+
</node>
980+
</node>
981+
<node concept="liA8E" id="6Ddb4_fOgFy" role="2OqNvi">
982+
<ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
983+
</node>
972984
</node>
973-
<node concept="I4A8Y" id="1XYAF4M7yVg" role="2OqNvi" />
985+
<node concept="liA8E" id="6Ddb4_fOhaY" role="2OqNvi">
986+
<ref role="37wK5l" to="mhbf:~SModel.getModule()" resolve="getModule" />
987+
</node>
988+
</node>
989+
<node concept="liA8E" id="6Ddb4_fOhKj" role="2OqNvi">
990+
<ref role="37wK5l" to="lui2:~SModule.getModuleName()" resolve="getModuleName" />
974991
</node>
975-
<node concept="LkI2h" id="1XYAF4M7zQD" role="2OqNvi" />
976992
</node>
977-
<node concept="liA8E" id="1XYAF4M7A$I" role="2OqNvi">
978-
<ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
979-
<node concept="Xl_RD" id="1XYAF4M7A$K" role="37wK5m">
980-
<property role="Xl_RC" value=".modelix" />
993+
</node>
994+
</node>
995+
</node>
996+
<node concept="3cpWs8" id="6Ddb4_fOjaU" role="3cqZAp">
997+
<node concept="3cpWsn" id="6Ddb4_fOjaX" role="3cpWs9">
998+
<property role="TrG5h" value="actual" />
999+
<node concept="17QB3L" id="6Ddb4_fOjaS" role="1tU5fm" />
1000+
<node concept="2OqwBi" id="6Ddb4_fOkyM" role="33vP2m">
1001+
<node concept="2OqwBi" id="6Ddb4_fOjO4" role="2Oq$k0">
1002+
<node concept="2OqwBi" id="6Ddb4_fOjpz" role="2Oq$k0">
1003+
<node concept="liA8E" id="6Ddb4_fOjDZ" role="2OqNvi">
1004+
<ref role="37wK5l" to="mhbf:~SNode.getModel()" resolve="getModel" />
1005+
</node>
1006+
<node concept="2JrnkZ" id="6Ddb4_fOjpC" role="2Oq$k0">
1007+
<node concept="1YBJjd" id="6Ddb4_fOjev" role="2JrQYb">
1008+
<ref role="1YBMHb" node="1XYAF4M7x2u" resolve="reactModule" />
1009+
</node>
1010+
</node>
1011+
</node>
1012+
<node concept="liA8E" id="6Ddb4_fOk3d" role="2OqNvi">
1013+
<ref role="37wK5l" to="mhbf:~SModel.getName()" resolve="getName" />
9811014
</node>
9821015
</node>
1016+
<node concept="liA8E" id="6Ddb4_fOkIx" role="2OqNvi">
1017+
<ref role="37wK5l" to="mhbf:~SModelName.getLongName()" resolve="getLongName" />
1018+
</node>
9831019
</node>
9841020
</node>
1021+
</node>
1022+
<node concept="3clFbJ" id="1XYAF4M7xmd" role="3cqZAp">
9851023
<node concept="3clFbS" id="1XYAF4M7xmf" role="3clFbx">
9861024
<node concept="2MkqsV" id="1XYAF4M7AV5" role="3cqZAp">
987-
<node concept="Xl_RD" id="1XYAF4M7Be8" role="2MkJ7o">
988-
<property role="Xl_RC" value="the model containing React editor definitions must be named modelix." />
1025+
<node concept="3cpWs3" id="6Ddb4_fOnic" role="2MkJ7o">
1026+
<node concept="37vLTw" id="6Ddb4_fOnif" role="3uHU7w">
1027+
<ref role="3cqZAo" node="6Ddb4_fOjaX" resolve="actual" />
1028+
</node>
1029+
<node concept="3cpWs3" id="6Ddb4_fOn7L" role="3uHU7B">
1030+
<node concept="3cpWs3" id="6Ddb4_fOn2R" role="3uHU7B">
1031+
<node concept="Xl_RD" id="1XYAF4M7Be8" role="3uHU7B">
1032+
<property role="Xl_RC" value="Node expected to be in a model named " />
1033+
</node>
1034+
<node concept="37vLTw" id="6Ddb4_fOn5d" role="3uHU7w">
1035+
<ref role="3cqZAo" node="6Ddb4_fOfdP" resolve="expected" />
1036+
</node>
1037+
</node>
1038+
<node concept="Xl_RD" id="6Ddb4_fOn7O" role="3uHU7w">
1039+
<property role="Xl_RC" value=", but is " />
1040+
</node>
1041+
</node>
9891042
</node>
9901043
<node concept="1YBJjd" id="1XYAF4M7ByS" role="1urrMF">
9911044
<ref role="1YBMHb" node="1XYAF4M7x2u" resolve="reactModule" />
9921045
</node>
9931046
</node>
9941047
</node>
1048+
<node concept="17QLQc" id="6Ddb4_fOlka" role="3clFbw">
1049+
<node concept="37vLTw" id="6Ddb4_fOl$7" role="3uHU7w">
1050+
<ref role="3cqZAo" node="6Ddb4_fOjaX" resolve="actual" />
1051+
</node>
1052+
<node concept="37vLTw" id="6Ddb4_fOkOy" role="3uHU7B">
1053+
<ref role="3cqZAo" node="6Ddb4_fOfdP" resolve="expected" />
1054+
</node>
1055+
</node>
9951056
</node>
9961057
</node>
9971058
<node concept="1YaCAy" id="1XYAF4M7x2u" role="1YuTPh">

0 commit comments

Comments
 (0)