Do not add space at end of line in diff algorithm (#9726)

Author: sjoelund

OMCompiler/Compiler/Parsers/SimpleModelicaParser.mo

@@ -2309,7 +2309,7 @@ algorithm
     // print(String(diffEnum) + ":\n");
     // print(parseTreeStr(tree));
     // print("\n");
-    (_, treeLast) := List.first(diffLocal);
+    (diffEnum, treeLast) := List.first(diffLocal);
     (firstTreeSecondLast, firstTreeLast) := match treeLast
       case {} then (EMPTY(),EMPTY());
       case {firstTreeLast} then (EMPTY(),firstTreeLast);
@@ -2423,6 +2423,14 @@ algorithm
       case ((diffEnum1,tree1)::(diffEnum2, tree2)::diffLocal)
         guard diffEnum1==diffEnum2
         then (diffEnum1, listAppend(tree1, tree2))::diffLocal;
+
+      // ADD(WS) NEWLINE => NEWLINE
+      case (Diff.Add,tree1)::(diffLocal as ((Diff.Equal,tree2)::_))
+        guard tokenId(lastToken(firstTreeLast))==TokenId.WHITESPACE and tokenId(firstToken(tree2))==TokenId.NEWLINE
+        algorithm
+          diff := (Diff.Add,removeLastTokenInTrees(tree1))::diff;
+        then diffLocal;
+
       // A normal tree :)
       case diff1::diffLocal
         algorithm
@@ -2438,7 +2446,7 @@ algorithm
   hasAddedWS := false;
   for d in diff loop
     _ := match d
-      case (Diff.Add,_)
+      case (Diff.Add,tree)
         algorithm
           for t in tree loop
             _ := match firstNTokensInTree_reverse(t, 2)
@@ -2834,7 +2842,7 @@ function lastToken
   output Token token;
 algorithm
   token := match t
-    case EMPTY() then fail();
+    case EMPTY() algorithm if debug then print("lastToken fail\n"); end if; then fail();
     case LEAF() then t.token;
     case NODE() then lastToken(List.last(t.nodes));
   end match;
@@ -2900,7 +2908,7 @@ function makeNode
   input ParseTree label = EMPTY();
   output ParseTree node;
 algorithm
-  node := match (nodes,label)
+  node := match (list(n for n guard not isEmpty(n) in nodes),label)
     case ({},EMPTY()) then EMPTY();
     case ({node},EMPTY()) then node;
     else NODE(label, nodes);

testsuite/openmodelica/diff/Makefile

@@ -33,6 +33,7 @@ ticket4153.mos \
 ticket4368.mos \
 ticket5360.mos \
 ticket5949.mos \
+TrueHoldWithReset.mos \
 TwoWayFlowElementBuoyancy.mos \
 UTF8.mos \
 ticket4781.mos

testsuite/openmodelica/diff/TrueHoldWithReset.mos

@@ -0,0 +1,34 @@
+// Check that there is no extra space added after modification
+// depends: TrueHoldWithResetBefore.mo
+// status: correct
+
+before:=readFile("TrueHoldWithResetBefore.mo");
+loadFile("TrueHoldWithResetAfter.mo");
+after:=list();
+getErrorString();
+diffModelicaFileListings(
+  before,
+  after,
+  OpenModelica.Scripting.DiffFormat.plain,
+  failOnSemanticsChange=true);
+getErrorString();
+// Result:
+// "within;
+// block TrueHoldWithReset
+//   Modelica.StateGraph.InitialStep initialStep
+//     \"Initial step\";
+// end TrueHoldWithReset;
+// "
+// true
+// "block TrueHoldWithReset
+//   Modelica.StateGraph.InitialStep initialStep(nIn = 1, nOut = 1) \"Initial step\";
+// end TrueHoldWithReset;"
+// ""
+// "within;
+// block TrueHoldWithReset
+//   Modelica.StateGraph.InitialStep initialStep(nIn = 1, nOut = 1)
+//     \"Initial step\";
+// end TrueHoldWithReset;
+// "
+// ""
+// endResult

testsuite/openmodelica/diff/TrueHoldWithResetAfter.mo

@@ -0,0 +1,5 @@
+within;
+block TrueHoldWithReset
+  Modelica.StateGraph.InitialStep initialStep(nIn = 1, nOut = 1)
+    "Initial step";
+end TrueHoldWithReset;

testsuite/openmodelica/diff/TrueHoldWithResetBefore.mo

@@ -0,0 +1,5 @@
+within;
+block TrueHoldWithReset
+  Modelica.StateGraph.InitialStep initialStep
+    "Initial step";
+end TrueHoldWithReset;