Merge pull request #772 from JetBrains/bugfix/multiline_dummy_role

Multiline: Add a dummy role
JetBrains · Feb 19, 2024 · de3cd0b · de3cd0b
2 parents 87f878c + 3d40993
commit de3cd0b
Show file tree

Hide file tree

Showing 8 changed files with 390 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 - com.mbeddr.mpsutil.editor.querylist: Dynamic generated nodes (without a model) can now be used in query lists if `read-only` is set to true.
 
+### Fixed
+
+- de.slisson.mps.editor.multiline.runtime: An issue was fixed where pressing shift+enter didn't enter a new line in the current text but in the next collection in the editor.
+
 ## January 2024
 
 ### Fixed

diff --git a/.../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/.../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -1292,6 +1292,11 @@
             <ref role="3bR37D" to="ffeo:39HJr_hyAl1" resolve="jetbrains.mps.ide.vcs.core" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5zhZs$9uFat" role="3bR37C">
+          <node concept="3bR9La" id="5zhZs$9uFau" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="m$_wf" id="1sO539bGQvt" role="3989C9">
@@ -18411,6 +18416,11 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="5zhZs$8X86Y" role="3bR37C">
+          <node concept="3bR9La" id="5zhZs$8X86Z" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="7qi8mU1OzdF" role="2G$12L">
         <property role="BnDLt" value="true" />

diff --git a/code/multiline/languages/demolang/demolang.mpl b/code/multiline/languages/demolang/demolang.mpl
@@ -12,6 +12,9 @@
   </facets>
   <accessoryModels />
   <sourcePath />
+  <dependencies>
+    <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
+  </dependencies>
   <languageVersions>
     <language slang="l:31c91def-a131-41a1-9018-102874f49a12:de.slisson.mps.editor.multiline" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -50,8 +53,12 @@
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="26a9201d-e70b-4755-acd6-40baf7a63b3a(de.slisson.mps.editor.multiline.demolang)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
   <extendedLanguages />
 </language>

diff --git a/code/multiline/languages/demolang/languageModels/editor.mps b/code/multiline/languages/demolang/languageModels/editor.mps
@@ -82,6 +82,7 @@
       <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
+      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
@@ -318,5 +319,26 @@
       <ref role="1NtTu8" to="kyaz:4WxvFC4UpxF" resolve="text" />
     </node>
   </node>
+  <node concept="24kQdi" id="5zhZs$8WZWf">
+    <ref role="1XX52x" to="kyaz:5zhZs$8WZbn" resolve="SelectionTest" />
+    <node concept="3EZMnI" id="5zhZs$8X0wY" role="2wV5jI">
+      <node concept="2iRkQZ" id="5zhZs$8X0wZ" role="2iSdaV" />
+      <node concept="3F0ifn" id="5zhZs$8X0wV" role="3EZMnx">
+        <property role="3F0ifm" value="Selection test" />
+      </node>
+      <node concept="3F0ifn" id="5zhZs$8X0x4" role="3EZMnx" />
+      <node concept="3F1sOY" id="5zhZs$8X0xb" role="3EZMnx">
+        <ref role="1NtTu8" to="kyaz:5zhZs$8WZLa" resolve="cls" />
+      </node>
+      <node concept="3F0ifn" id="5zhZs$8X0xg" role="3EZMnx" />
+      <node concept="2v7bAL" id="5zhZs$8X0xr" role="3EZMnx">
+        <ref role="1NtTu8" to="kyaz:5zhZs$8WZL5" resolve="text1" />
+      </node>
+      <node concept="3F0ifn" id="5zhZs$8X0xx" role="3EZMnx" />
+      <node concept="3F0A7n" id="5zhZs$8X0xK" role="3EZMnx">
+        <ref role="1NtTu8" to="kyaz:5zhZs$8WZL7" resolve="text2" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/multiline/languages/demolang/languageModels/structure.mps b/code/multiline/languages/demolang/languageModels/structure.mps
@@ -7,6 +7,7 @@
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
   </imports>
   <registry>
@@ -83,5 +84,27 @@
       <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
     </node>
   </node>
+  <node concept="1TIwiD" id="5zhZs$8WZbn">
+    <property role="EcuMT" value="6400175585350644439" />
+    <property role="TrG5h" value="SelectionTest" />
+    <property role="19KtqR" value="true" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <node concept="1TJgyj" id="5zhZs$8WZLa" role="1TKVEi">
+      <property role="IQ2ns" value="6400175585350646858" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="cls" />
+      <ref role="20lvS9" to="tpee:fz12cDA" resolve="ClassConcept" />
+    </node>
+    <node concept="1TJgyi" id="5zhZs$8WZL5" role="1TKVEl">
+      <property role="IQ2nx" value="6400175585350646853" />
+      <property role="TrG5h" value="text1" />
+      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
+    </node>
+    <node concept="1TJgyi" id="5zhZs$8WZL7" role="1TKVEl">
+      <property role="IQ2nx" value="6400175585350646855" />
+      <property role="TrG5h" value="text2" />
+      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
+    </node>
+  </node>
 </model>