Merge pull request #4 from anka-213/fix-textmate-grammar

Add support for char literals in textmate grammar

Author: ChrisPenner

language-configuration.json

@@ -13,18 +13,24 @@
     ],
     // symbols that are auto closed when typing
     "autoClosingPairs": [
-        ["{", "}"],
-        ["[", "]"],
-        ["(", ")"],
-        ["\"", "\""],
-        ["'", "'"]
+         // Should not autoclose in char literals,
+         // but the only option is string literals, so that'll have to do
+        { "open": "{", "close": "}", "notIn": ["string"] },
+        { "open": "{-", "close": "-}", "notIn": ["string"] },
+        { "open": "[", "close": "]", "notIn": ["string"] },
+        { "open": "(", "close": ")", "notIn": ["string"] },
+        { "open": "\"", "close": "\"", "notIn": ["string"] },
+        { "open": "`", "close": "`", "notIn": ["string", "comment"]},
     ],
     // symbols that can be used to surround a selection
     "surroundingPairs": [
         ["{", "}"],
         ["[", "]"],
         ["(", ")"],
         ["\"", "\""],
-        ["'", "'"]
-    ]
+        ["`", "`"]
+    ],
+    "folding": {
+      "offSide": true
+    }
 }

syntaxes/unison.tmLanguage.json

@@ -9,6 +9,8 @@
     "include": "#numeric"
   },{
     "include": "#text"
+  },{
+    "include": "#char"
   },{
     "include": "#match_with"
   },{
@@ -69,6 +71,8 @@
         "include": "#eof_comment"
       },{
         "include": "#line_comment"
+      },{
+        "include": "#block_comment"
       }]
     },
     "eof_comment": {
@@ -155,13 +159,37 @@
     },
     "text": {
       "name": "string.quoted.double.unison",
-      "match": "(\")(.*?)(\")",
+      "begin": "\"",
+      "end": "\"",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.unison"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.unison"
+        }
+      },
+      "patterns": [
+        {
+          "name": "constant.character.escape.unison",
+          "match": "\\\\."
+        }
+      ]
+    },
+    "char": {
+      "name": "string.quoted.single.unison",
+      "match": "([?])(([\\\\].)|([^\\\\]))",
       "captures": {
         "1": {
           "name": "punctuation.definition.string.begin.unison"
         },
         "3": {
-          "name": "punctuation.definition.string.end.unison"
+          "name": "constant.character.escape.unison"
+        },
+        "4": {
+          "name": "string.quoted.single.unison"
         }
       }
     },