Skip to content
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

Jump to bottom

Merge maintenance/mps20232 into master #948

Merged
merged 5 commits into from
Sep 12, 2024
Merged

Merge maintenance/mps20232 into master #948

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e418118
only re-export Annotations in MPS.Kotlin
alexanderpann Sep 11, 2024
80e43db
Merge pull request #946 from JetBrains/bugfix/kotlin_stubs_wrong_expo…
alexanderpann Sep 12, 2024
e705ee0
Merge maintenance/mps20232 into merge/mps20223
github-actions[bot] Sep 12, 2024
ff3f177
Merge pull request #947 from JetBrains/merge/mps20223
alexanderpann Sep 12, 2024
b394077
Merge master into merge/mps20232
github-actions[bot] Sep 12, 2024
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
17 changes: 17 additions & 0 deletions ...ammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/constraints.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,10 @@
<concept id="4303308395523096213" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_childConcept" flags="ng" index="2DD5aU" />
<concept id="1147467115080" name="jetbrains.mps.lang.constraints.structure.NodePropertyConstraint" flags="ng" index="EnEH3">
<reference id="1147467295099" name="applicableProperty" index="EomxK" />
<child id="1147468630220" name="propertyGetter" index="EtsB7" />
<child id="1212097481299" name="propertyValidator" index="QCWH9" />
</concept>
<concept id="1147467790433" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertyGetter" flags="in" index="Eqf_E" />
<concept id="6738154313879680265" name="jetbrains.mps.lang.constraints.structure.ConstraintFunctionParameter_childNode" flags="nn" index="2H4GUG" />
<concept id="1212096972063" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertyValidator" flags="in" index="QB0g5" />
<concept id="5564765827938091039" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_ReferentSearchScope_Scope" flags="ig" index="3dgokm" />
Expand Down Expand Up @@ -288,5 +290,20 @@
</node>
</node>
</node>
<node concept="1M2fIO" id="5mI4pZCf5xd">
<ref role="1M2myG" to="ibwz:6oKG1kMxn82" resolve="LocalVariableDeclaration" />
<node concept="EnEH3" id="5mI4pZCf5ye" role="1MhHOB">
<ref role="EomxK" to="ibwz:qT5MFml3Gb" resolve="static" />
<node concept="Eqf_E" id="5mI4pZCfVIT" role="EtsB7">
<node concept="3clFbS" id="5mI4pZCfVIU" role="2VODD2">
<node concept="3clFbF" id="5mI4pZCfVQ7" role="3cqZAp">
<node concept="3clFbT" id="5mI4pZCfVQ6" role="3clFbG">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
</node>
</node>
</node>
</model>