Fix typo and revert unneeded change

rascal-textmate-core/src/main/rascal/lang/textmate/Conversion.rsc

@@ -199,8 +199,7 @@ private list[ConversionUnit] addInnerRules(list[ConversionUnit] units) {
         // Convert all units in the group to match patterns (including,
         // optimistically, multi-line units as-if they are single-line)
         for (u <- group, !u.recursive) {
-            bool guard = nothing() := u.innerDelimiters.begin;
-            TmRule r = toTmRule(toRegExp(u.rsc, u.prod, guard = guard))
+            TmRule r = toTmRule(toRegExp(u.rsc, u.prod, guard = true))
                        [name = "/inner/single/<u.name>"];
             
             rules = insertIn(rules, (u: r));

rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Rascal.test

@@ -4,7 +4,7 @@
 # ^^^^^^^^^ Constant
 
 ### TODO: The following test shows that, currently, multi-line strings are
-### currently disabled. This is because the converter determines that:
+### disabled. This is because the converter determines that:
 ###   - `>` doesn't uniquely delineate interpolation (it could also be
 ###     greater-than in expressions or prioritize-before in grammars);
 ###   - `"` doesn't uniquely delineate strings (it could also be the end of

vscode-extension/syntaxes/pico.tmLanguage.json

@@ -137,7 +137,7 @@
       }
     },
     "/inner/single/type.nil": {
-      "match": "(nil\\-type)",
+      "match": "((?<=(?:[\\t-\\n\\r\\x{20}\\%]|(?:(?:^))))(?:nil\\-type))",
       "name": "/inner/single/type.nil",
       "captures": {
         "1": {
@@ -197,7 +197,7 @@
       }
     },
     "/inner/single/expression.strcon": {
-      "match": "((?:\\\")(?:(?:(?:\\\\)[\\\"\\\\])|[\\x{01}-\\!\\#-\\[\\]-\\x{10FFFF}])*?(?:\\\"))",
+      "match": "((?<=(?:[\\t-\\n\\r\\x{20}\\%]|(?:(?:^))))(?:(?:\\\")(?:(?:(?:\\\\)[\\\"\\\\])|[\\x{01}-\\!\\#-\\[\\]-\\x{10FFFF}])*?(?:\\\")))",
       "name": "/inner/single/expression.strcon",
       "captures": {
         "1": {