fixes

Author: jurgenvinju

src/org/rascalmpl/library/lang/rascal/format/Rascal.rsc

@@ -1068,25 +1068,6 @@ list[Box] flatString((StringTemplate) `if(<{Expression ","}+ conds>) { <Statemen
         L("}")
     ];
 
-/* Concrete fragments*/
-
-// "(" LAYOUTLIST l1 Sym symbol LAYOUTLIST l2 ")" LAYOUTLIST l3 "`" ConcretePart* parts "`";
-// Box toBox((Concrete) `(<LAYOUTLIST _><Sym symbol><LAYOUTLIST _>)<LAYOUTLIST _>\`<ConcretePart* parts>\`)`)
-//     = V();
-
-
-/*
-lexical ConcretePart
-  = @category="string" text   : ![`\<\>\\\n]+ !>> ![`\<\>\\\n]
-  | newline: "\n" [\ \t \u00A0 \u1680 \u2000-\u200A \u202F \u205F \u3000]* "\'"
-  | @category="variable" hole : ConcreteHole hole
-  | @category="string" lt: "\\\<"
-  | @category="string" gt: "\\\>"
-  | @category="string" bq: "\\`"
-  | @category="string" bs: "\\\\"
-  ;
-*/
-
 /* Types */
 
 Box toBox((FunctionType) `<Type typ>(<{TypeArg ","}* args>)`)

src/org/rascalmpl/library/util/Formatters.rsc

@@ -202,15 +202,13 @@ private Symbol delabel(label(_, Symbol s)) = delabel(s);
 private Symbol delabel(conditional(Symbol s, _)) = delabel(s);
 private default Symbol delabel(Symbol s) = s;
 
-int stubCounter = 1;
-
 @synopsis{Generates a string formatter that produces ((TextEdit))s for downstream processing.}
 list[TextEdit](str) stringEdits(type[&G <: Tree] grammar, Style style, FormattingOptions opts=fo()) {
     &G(str, loc) p = parser(grammar);
-    loc stub = |tmp:///| + "formatted<stubCounter>.txt";
-    stubCounter = stubCounter + 1;
 
     return list[TextEdit] (str input) {
+        loc stub = |tmp:///| + "formatted<md5Hash(input)>.txt";
+
         &G tree = p(input, stub);
         try {
             return layoutDiff(tree, p(format(style(tree), opts=opts[ci=asIs()]), stub), ci=opts.caseInsensitivity);
@@ -244,10 +242,10 @@ parameter (a substring). For example: `#Statement` and `if (true) false;`.
 }
 list[TextEdit](type[Tree], str) subStringEdits(type[&G <: Tree] grammar, Style style, FormattingOptions opts=fo()) {
     Tree(type[Tree], str, loc) p = parsers(grammar);
-    loc stub = |tmp:///| + "formatted-<stubCounter>.txt";
-    stubCounter = stubCounter + 1;
 
     return list[TextEdit] (type[Tree] nonterminal, str input) {
+        loc stub = |tmp:///| + "formatted<md5Hash(input)>.txt";
+
         &G tree = p(nonterminal, input, stub);
         try {
             return layoutDiff(tree, p(nonterminal, format(style(tree), opts=opts[ci=asIs()]), stub), ci=opts.caseInsensitivity);