Skip to content

React misc features and fixes #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slisson merged 7 commits into from
Jan 25, 2025
Merged

React misc features and fixes #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
25edfca
fix(react): generate java lambdas instead of anonymous classes
slisson Jan 23, 2025
a7aa2b0
feat(react): MPS model checker integration
slisson Jan 12, 2025
88fdf7c
feat(react): re-added deprecated method in ModelCheckerIntegration
slisson Jan 24, 2025
4e7ed03
fix(react): use stable API in OpenNodeInWebEditorAction
slisson Jan 24, 2025
909059c
fix(react): handle null values in properties of the generic component
slisson Jan 24, 2025
afdff62
feat(react): make mui.Grid2 available
slisson Jan 24, 2025
b1a7688
feat(react): several usability improvements of the react language
slisson Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion commitlint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ module.exports = {
"deps",
"projectional-editor",
"mps-plugin",
"interpreter"
"interpreter",
"react"
],
],
"subject-case": [0, 'never'],
Expand Down
724 changes: 517 additions & 207 deletions ...lix.mps.react/generator/templates/org.modelix.mps.react.generator.templates@generator.mps
View file
Open in desktop

Large diffs are not rendered by default.

100 changes: 100 additions & 0 deletions mps/modules/org.modelix.mps.react/models/org.modelix.mps.react.behavior.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@
<languages>
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
<use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
<use id="d8f591ec-4d86-4af2-9f92-a9e93c803ffa" name="jetbrains.mps.lang.scopes" version="0" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports>
<import index="8xo1" ref="r:41b64586-29ed-47f5-b907-44be07261bbc(org.modelix.mps.react.structure)" />
<import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
<import index="tpek" ref="r:00000000-0000-4000-0000-011c895902c0(jetbrains.mps.baseLanguage.behavior)" implicit="true" />
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
</imports>
<registry>
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
Expand Down Expand Up @@ -38,6 +41,9 @@
<concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
<child id="1137022507850" name="body" index="2VODD2" />
</concept>
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
</concept>
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
Expand All @@ -46,18 +52,21 @@
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
</concept>
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
<child id="5680397130376446158" name="type" index="1tU5fm" />
</concept>
<concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
<child id="1068580123133" name="returnType" index="3clF45" />
<child id="1068580123134" name="parameter" index="3clF46" />
<child id="1068580123135" name="body" index="3clF47" />
</concept>
<concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
<child id="1068580123156" name="expression" index="3clFbG" />
</concept>
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
<property id="4467513934994662257" name="forceMultiLine" index="TyiWK" />
<child id="1068580123160" name="condition" index="3clFbw" />
<child id="1068580123161" name="ifTrue" index="3clFbx" />
</concept>
Expand All @@ -74,6 +83,13 @@
<child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
</concept>
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
<reference id="1107535924139" name="classifier" index="3uigEE" />
</concept>
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
Expand All @@ -82,6 +98,7 @@
<child id="1178549979242" name="visibility" index="1B3o_S" />
</concept>
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
</language>
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
<concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
Expand All @@ -90,6 +107,15 @@
<child id="1199569916463" name="body" index="1bW5cS" />
</concept>
</language>
<language id="d8f591ec-4d86-4af2-9f92-a9e93c803ffa" name="jetbrains.mps.lang.scopes">
<concept id="8077936094962944991" name="jetbrains.mps.lang.scopes.structure.ComeFromExpression" flags="nn" index="iy1fb">
<reference id="8077936094962945822" name="link" index="iy1sa" />
</concept>
<concept id="8077936094962911282" name="jetbrains.mps.lang.scopes.structure.ParentScope" flags="nn" index="iy90A" />
<concept id="8077936094962850237" name="jetbrains.mps.lang.scopes.structure.CompositeWithParentScopeExpression" flags="nn" index="iyS6D">
<child id="8077936094962969171" name="expr" index="iy797" />
</concept>
</language>
<language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
<concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
<reference id="5455284157994012188" name="link" index="2pIpSl" />
Expand Down Expand Up @@ -118,6 +144,14 @@
<reference id="1145383142433" name="elementConcept" index="2I9WkF" />
</concept>
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
<concept id="1180028149140" name="jetbrains.mps.lang.smodel.structure.Concept_IsSuperConceptOfOperation" flags="nn" index="2Za9M6">
<child id="1180028346304" name="conceptArgument" index="2ZaTVi" />
</concept>
<concept id="2644386474301421077" name="jetbrains.mps.lang.smodel.structure.LinkIdRefExpression" flags="nn" index="359W_D">
<reference id="2644386474301421078" name="conceptDeclaration" index="359W_E" />
<reference id="2644386474301421079" name="linkDeclaration" index="359W_F" />
</concept>
<concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
</concept>
Expand Down Expand Up @@ -518,5 +552,71 @@
<node concept="3clFbS" id="1hCkroLBYJT" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="2vPZMAnZU0y">
<ref role="13h7C2" to="8xo1:7GLg2tFqfT1" resolve="IReactComponent" />
<node concept="13hLZK" id="2vPZMAnZU0z" role="13h7CW">
<node concept="3clFbS" id="2vPZMAnZU0$" role="2VODD2" />
</node>
</node>
<node concept="13h7C7" id="2vPZMAnZU8L">
<ref role="13h7C2" to="8xo1:7GLg2tFqfTf" resolve="GenericReactComponent" />
<node concept="13hLZK" id="2vPZMAnZU8M" role="13h7CW">
<node concept="3clFbS" id="2vPZMAnZU8N" role="2VODD2" />
</node>
<node concept="13i0hz" id="6Ddb4_fOXZV" role="13h7CS">
<property role="TrG5h" value="getScope" />
<ref role="13i0hy" to="tpcu:52_Geb4QDV$" resolve="getScope" />
<node concept="3Tm1VV" id="6Ddb4_fOXZW" role="1B3o_S" />
<node concept="3clFbS" id="6Ddb4_fOY05" role="3clF47">
<node concept="3clFbJ" id="6Ddb4_fPdmn" role="3cqZAp">
<property role="TyiWK" value="true" />
<node concept="3clFbS" id="6Ddb4_fPdmp" role="3clFbx">
<node concept="3cpWs6" id="6Ddb4_fPv7D" role="3cqZAp">
<node concept="iyS6D" id="6Ddb4_fPv7F" role="3cqZAk">
<node concept="2YIFZM" id="6Ddb4_fPv7G" role="iy797">
<ref role="37wK5l" to="o8zo:6t3ylNOzI9Y" resolve="forNamedElements" />
<ref role="1Pybhc" to="o8zo:7ipADkTevLm" resolve="SimpleRoleScope" />
<node concept="13iPFW" id="6Ddb4_fPv7H" role="37wK5m" />
<node concept="359W_D" id="6Ddb4_fPv7I" role="37wK5m">
<ref role="359W_E" to="8xo1:7GLg2tFqfTf" resolve="GenericReactComponent" />
<ref role="359W_F" to="8xo1:4Dhs5Nildlt" resolve="stateVariables" />
</node>
</node>
</node>
</node>
</node>
<node concept="1Wc70l" id="6Ddb4_fPg1W" role="3clFbw">
<node concept="iy1fb" id="6Ddb4_fPnAL" role="3uHU7w">
<ref role="iy1sa" to="8xo1:7GLg2tFrln8" resolve="children" />
</node>
<node concept="2OqwBi" id="6Ddb4_fPdY$" role="3uHU7B">
<node concept="37vLTw" id="6Ddb4_fPdq4" role="2Oq$k0">
<ref role="3cqZAo" node="6Ddb4_fOY06" resolve="kind" />
</node>
<node concept="2Za9M6" id="6Ddb4_fPeNp" role="2OqNvi">
<node concept="chp4Y" id="6Ddb4_fPeXl" role="2ZaTVi">
<ref role="cht4Q" to="8xo1:4Dhs5NildkH" resolve="StateVariable" />
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs6" id="6Ddb4_fP0kJ" role="3cqZAp">
<node concept="iy90A" id="6Ddb4_fPvhZ" role="3cqZAk" />
</node>
</node>
<node concept="37vLTG" id="6Ddb4_fOY06" role="3clF46">
<property role="TrG5h" value="kind" />
<node concept="3bZ5Sz" id="6Ddb4_fOY07" role="1tU5fm" />
</node>
<node concept="37vLTG" id="6Ddb4_fOY08" role="3clF46">
<property role="TrG5h" value="child" />
<node concept="3Tqbb2" id="6Ddb4_fOY09" role="1tU5fm" />
</node>
<node concept="3uibUv" id="6Ddb4_fOY0a" role="3clF45">
<ref role="3uigEE" to="o8zo:3fifI_xCtN$" resolve="Scope" />
</node>
</node>
</node>
</model>

33 changes: 5 additions & 28 deletions mps/modules/org.modelix.mps.react/models/org.modelix.mps.react.constraints.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@
<concept id="1202989658459" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_parentNode" flags="nn" index="nLn13" />
<concept id="8966504967485224688" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_contextNode" flags="nn" index="2rP1CM" />
<concept id="5564765827938091039" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="ig" index="3dgokm" />
<concept id="8401916545537438642" name="jetbrains.mps.lang.constraints.structure.InheritedNodeScopeFactory" flags="ng" index="1dDu$B">
<reference id="8401916545537438643" name="kind" index="1dDu$A" />
</concept>
<concept id="1163200368514" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSetHandler" flags="in" index="3k9gUc" />
<concept id="1163200647017" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_referenceNode" flags="nn" index="3kakTB" />
<concept id="1163202640154" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_newReferentNode" flags="nn" index="3khVwk" />
Expand Down Expand Up @@ -134,9 +137,6 @@
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
</concept>
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
<concept id="3562215692195599741" name="jetbrains.mps.lang.smodel.structure.SLinkImplicitSelect" flags="nn" index="13MTOL">
<reference id="3562215692195600259" name="link" index="13MTZf" />
</concept>
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
<concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
Expand Down Expand Up @@ -470,31 +470,8 @@
<ref role="1M2myG" to="8xo1:4Dhs5NilDPI" resolve="StateVariableReference" />
<node concept="1N5Pfh" id="4Dhs5Nim6nd" role="1Mr941">
<ref role="1N5Vy1" to="8xo1:4Dhs5NilDPP" resolve="decl" />
<node concept="3dgokm" id="4Dhs5Nim6oT" role="1N6uqs">
<node concept="3clFbS" id="4Dhs5Nim6oU" role="2VODD2">
<node concept="3clFbF" id="4Dhs5Nim6sB" role="3cqZAp">
<node concept="2YIFZM" id="4Dhs5Nim6wk" role="3clFbG">
<ref role="37wK5l" to="o8zo:4IP40Bi3eAf" resolve="forNamedElements" />
<ref role="1Pybhc" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
<node concept="2OqwBi" id="4Dhs5Nimb3K" role="37wK5m">
<node concept="2OqwBi" id="4Dhs5Nim6Ji" role="2Oq$k0">
<node concept="2rP1CM" id="4Dhs5Nim6yG" role="2Oq$k0" />
<node concept="z$bX8" id="4Dhs5Nim72Y" role="2OqNvi">
<node concept="1xMEDy" id="4Dhs5Nim8UY" role="1xVPHs">
<node concept="chp4Y" id="4Dhs5Nim8XZ" role="ri$Ld">
<ref role="cht4Q" to="8xo1:7GLg2tFqfTf" resolve="GenericReactComponent" />
</node>
</node>
<node concept="1xIGOp" id="4Dhs5Nim96j" role="1xVPHs" />
</node>
</node>
<node concept="13MTOL" id="4Dhs5NimdjY" role="2OqNvi">
<ref role="13MTZf" to="8xo1:4Dhs5Nildlt" resolve="stateVariables" />
</node>
</node>
</node>
</node>
</node>
<node concept="1dDu$B" id="6Ddb4_fPGnX" role="1N6uqs">
<ref role="1dDu$A" to="8xo1:4Dhs5NildkH" resolve="StateVariable" />
</node>
</node>
</node>
Expand Down
Loading
Loading