Merge pull request #1176 from IETS3/bugfix/use_indent_layout_when_pos…

…sible
IETS3 · Dec 11, 2024 · 3e4143f · 3e4143f
2 parents 0e062e5 + 4605d10
commit 3e4143f
Show file tree

Hide file tree

Showing 51 changed files with 1,163 additions and 1,094 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project are documented in this file.
 Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
 
+## December 2024
+
+### Changed
+
+- The line wrapping ability of some concepts was improved.
+
 ## November 2024
 
 ### Fixed

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps
@@ -20,7 +20,6 @@
       <concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
         <child id="1140524464360" name="cellLayout" index="2czzBx" />
       </concept>
-      <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
       <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
       <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
       <concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
@@ -202,7 +201,7 @@
               <property role="VOm3f" value="true" />
             </node>
           </node>
-          <node concept="2iRfu4" id="2GQBRFCFw0_" role="2iSdaV" />
+          <node concept="l2Vlx" id="1ASK_Hec6P6" role="2iSdaV" />
           <node concept="pkWqt" id="2ZalWa8IziB" role="pqm2j">
             <node concept="3clFbS" id="2ZalWa8IziC" role="2VODD2">
               <node concept="3clFbF" id="2ZalWa8IzpN" role="3cqZAp">

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps
diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.components.req/models/editor.mps
@@ -24,8 +24,8 @@
       <concept id="1078308402140" name="jetbrains.mps.lang.editor.structure.CellModel_Custom" flags="sg" stub="8104358048506730068" index="gc7cB">
         <child id="1176795024817" name="cellProvider" index="3YsKMw" />
       </concept>
-      <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
       <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
+      <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
@@ -159,7 +159,7 @@
             </node>
           </node>
         </node>
-        <node concept="2iRfu4" id="cJpacq5XBF" role="2iSdaV" />
+        <node concept="l2Vlx" id="1ASK_HedIzs" role="2iSdaV" />
       </node>
       <node concept="gc7cB" id="cJpacq6vPB" role="3EZMnx">
         <node concept="3VJUX4" id="cJpacq6vPC" role="3YsKMw">

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/models/editor.mps
@@ -20,6 +20,7 @@
         <child id="1140524464360" name="cellLayout" index="2czzBx" />
       </concept>
       <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
+      <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
       <concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
       <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
         <child id="1080736633877" name="cellModel" index="2wV5jI" />
@@ -273,7 +274,7 @@
         <ref role="1NtTu8" to="330h:5ZLQMNq2g6M" resolve="traceTargets" />
         <node concept="2iRfu4" id="5ZLQMNq2kcu" role="2czzBx" />
       </node>
-      <node concept="2iRfu4" id="5ZLQMNq2iky" role="2iSdaV" />
+      <node concept="l2Vlx" id="1ASK_HedI_5" role="2iSdaV" />
     </node>
   </node>
   <node concept="24kQdi" id="5ZLQMNq2l6u">
@@ -330,7 +331,7 @@
       <node concept="3F1sOY" id="5ZLQMNq2laq" role="3EZMnx">
         <ref role="1NtTu8" to="330h:5ZLQMNq2hPN" resolve="scope" />
       </node>
-      <node concept="2iRfu4" id="5ZLQMNq2l6z" role="2iSdaV" />
+      <node concept="l2Vlx" id="1ASK_HedI_6" role="2iSdaV" />
     </node>
   </node>
   <node concept="24kQdi" id="1lUgLJUk$sf">
@@ -397,14 +398,13 @@
       <node concept="3F1sOY" id="378sigX35nl" role="3EZMnx">
         <ref role="1NtTu8" to="330h:378sigX35lr" resolve="scope" />
       </node>
-      <node concept="2iRfu4" id="378sigX35m4" role="2iSdaV" />
+      <node concept="l2Vlx" id="1ASK_HedI_7" role="2iSdaV" />
     </node>
   </node>
   <node concept="24kQdi" id="378sigX4OUJ">
     <property role="3GE5qa" value="result" />
     <ref role="1XX52x" to="330h:378sigX3YpU" resolve="UntracedResult" />
     <node concept="3EZMnI" id="378sigX4OV4" role="2wV5jI">
-      <node concept="2iRfu4" id="378sigX4OV7" role="2iSdaV" />
       <node concept="1iCGBv" id="6_Ift$_CY$T" role="3EZMnx">
         <ref role="1NtTu8" to="330h:378sigX3YpV" resolve="element" />
         <node concept="1sVBvm" id="6_Ift$_CY$U" role="1sWHZn">
@@ -445,6 +445,7 @@
           </node>
         </node>
       </node>
+      <node concept="l2Vlx" id="1ASK_HedI_8" role="2iSdaV" />
     </node>
   </node>
 </model>

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.attributes/models/editor.mps
@@ -45,7 +45,6 @@
       <concept id="1078308402140" name="jetbrains.mps.lang.editor.structure.CellModel_Custom" flags="sg" stub="8104358048506730068" index="gc7cB">
         <child id="1176795024817" name="cellProvider" index="3YsKMw" />
       </concept>
-      <concept id="1106270549637" name="jetbrains.mps.lang.editor.structure.CellLayout_Horizontal" flags="nn" index="2iRfu4" />
       <concept id="1106270571710" name="jetbrains.mps.lang.editor.structure.CellLayout_Vertical" flags="nn" index="2iRkQZ" />
       <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
       <concept id="1237307900041" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentStyleClassItem" flags="ln" index="lj46D" />
@@ -632,7 +631,6 @@
                   </node>
                 </node>
               </node>
-              <node concept="2iRfu4" id="3Nl4besgRzm" role="2iSdaV" />
               <node concept="VPM3Z" id="3Nl4besgRzn" role="3F10Kt">
                 <property role="VOm3f" value="false" />
               </node>
@@ -642,6 +640,7 @@
               <node concept="3F1sOY" id="3Nl4besgRzp" role="3EZMnx">
                 <ref role="1NtTu8" to="138:1HqphBIBJyQ" resolve="value" />
               </node>
+              <node concept="l2Vlx" id="1ASK_HedIzf" role="2iSdaV" />
             </node>
           </node>
           <node concept="pkWqt" id="3Nl4besgRzq" role="1p_IA6">
@@ -674,14 +673,13 @@
           </node>
         </node>
       </node>
-      <node concept="2iRfu4" id="1HqphBIQDHN" role="2iSdaV" />
+      <node concept="l2Vlx" id="1ASK_HedIze" role="2iSdaV" />
     </node>
   </node>
   <node concept="24kQdi" id="1HqphBIZ3zL">
     <property role="3GE5qa" value="attributes" />
     <ref role="1XX52x" to="138:1HqphBIxQFX" resolve="IValueAttribute" />
     <node concept="3EZMnI" id="1HqphBIQDqs" role="2wV5jI">
-      <node concept="2iRfu4" id="1HqphBIQDqt" role="2iSdaV" />
       <node concept="1HlG4h" id="1HqphBIQDc5" role="3EZMnx">
         <node concept="1HfYo3" id="1HqphBIQDc7" role="1HlULh">
           <node concept="3TQlhw" id="1HqphBIQDc9" role="1Hhtcw">
@@ -710,6 +708,7 @@
       <node concept="3F1sOY" id="1HqphBIQDAI" role="3EZMnx">
         <ref role="1NtTu8" to="138:1HqphBIBJyQ" resolve="value" />
       </node>
+      <node concept="l2Vlx" id="1ASK_HedIzg" role="2iSdaV" />
     </node>
   </node>
   <node concept="PKFIW" id="4um6WxnZYeG">
@@ -911,7 +910,6 @@
           </node>
         </node>
       </node>
-      <node concept="2iRfu4" id="165w3u_zeWp" role="2iSdaV" />
       <node concept="pkWqt" id="5yaPPfdA2S5" role="pqm2j">
         <node concept="3clFbS" id="5yaPPfdA2S6" role="2VODD2">
           <node concept="3clFbF" id="5yaPPfdA4p1" role="3cqZAp">
@@ -924,6 +922,7 @@
           </node>
         </node>
       </node>
+      <node concept="l2Vlx" id="1ASK_HedIzh" role="2iSdaV" />
     </node>
   </node>
   <node concept="24kQdi" id="43MQ47XI4aS">
@@ -939,7 +938,7 @@
       <node concept="3F1sOY" id="43MQ47XI4cO" role="3EZMnx">
         <ref role="1NtTu8" to="138:43MQ47XHSpR" resolve="value" />
       </node>
-      <node concept="2iRfu4" id="43MQ47XI4b2" role="2iSdaV" />
+      <node concept="l2Vlx" id="1ASK_HedIzi" role="2iSdaV" />
     </node>
   </node>
   <node concept="24kQdi" id="4fgA7QrG5MD">