Add an escaped quote to the sample.

streetsidesoftware · Mar 11, 2018 · b72c310 · b72c310
1 parent 8993c2d
commit b72c310
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 20 deletions.
diff --git a/fixtures/grammar/src/sample.ts b/fixtures/grammar/src/sample.ts
@@ -7,7 +7,7 @@
  * It will contain a mix of stuff.
  */
 
-const greeting = 'Hello World.';
+const greeting = 'Hello World. Don\'t worry, be happy.';
 // alias for uniqueFilterFnGenerator
 export const uniqueFn = uniqueFilterFnGenerator;
 

diff --git a/fixtures/grammar/tokenized/sample.ts.json b/fixtures/grammar/tokenized/sample.ts.json
@@ -147,7 +147,7 @@
       "tokens": []
     },
     {
-      "line": "const greeting = 'Hello World.';",
+      "line": "const greeting = 'Hello World. Don\\'t worry, be happy.';",
       "lineNumber": 10,
       "tokens": [
         {
@@ -216,16 +216,35 @@
         },
         {
           "startIndex": 18,
-          "endIndex": 30,
+          "endIndex": 34,
           "scopes": [
             "source.ts",
             "meta.var.expr.ts",
             "string.quoted.single.ts"
           ]
         },
         {
-          "startIndex": 30,
-          "endIndex": 31,
+          "startIndex": 34,
+          "endIndex": 36,
+          "scopes": [
+            "source.ts",
+            "meta.var.expr.ts",
+            "string.quoted.single.ts",
+            "constant.character.escape.ts"
+          ]
+        },
+        {
+          "startIndex": 36,
+          "endIndex": 54,
+          "scopes": [
+            "source.ts",
+            "meta.var.expr.ts",
+            "string.quoted.single.ts"
+          ]
+        },
+        {
+          "startIndex": 54,
+          "endIndex": 55,
           "scopes": [
             "source.ts",
             "meta.var.expr.ts",
@@ -234,8 +253,8 @@
           ]
         },
         {
-          "startIndex": 31,
-          "endIndex": 32,
+          "startIndex": 55,
+          "endIndex": 56,
           "scopes": [
             "source.ts",
             "punctuation.terminator.statement.ts"

diff --git a/fixtures/grammar/tokenized/sample.ts.md b/fixtures/grammar/tokenized/sample.ts.md
@@ -53,7 +53,7 @@
 
 **9:** *blank line*
 
-**10:** ```const greeting = 'Hello World.';```
+**10:** ```const greeting = 'Hello World. Don\'t worry, be happy.';```
 
 | text | scope |
 | -- | -- |
@@ -64,7 +64,9 @@
 | ``` = ``` | source.ts meta.var.expr.ts keyword.operator.assignment.ts |
 | ```   ``` | source.ts meta.var.expr.ts |
 | ``` ' ``` | source.ts meta.var.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts |
-| ``` Hello World. ``` | source.ts meta.var.expr.ts string.quoted.single.ts |
+| ``` Hello World. Don ``` | source.ts meta.var.expr.ts string.quoted.single.ts |
+| ``` \' ``` | source.ts meta.var.expr.ts string.quoted.single.ts constant.character.escape.ts |
+| ``` t worry, be happy. ``` | source.ts meta.var.expr.ts string.quoted.single.ts |
 | ``` ' ``` | source.ts meta.var.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts |
 | ``` ; ``` | source.ts punctuation.terminator.statement.ts |
 

diff --git a/fixtures/grammar/tokenized/sample.ts.txt b/fixtures/grammar/tokenized/sample.ts.txt
@@ -29,17 +29,20 @@ sample.ts
 
 9 
 
-10 const greeting = 'Hello World.';
-  const          =>  source.ts meta.var.expr.ts storage.type.ts
-                 =>  source.ts meta.var.expr.ts
-  greeting       =>  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
-                 =>  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
-  =              =>  source.ts meta.var.expr.ts keyword.operator.assignment.ts
-                 =>  source.ts meta.var.expr.ts
-  '              =>  source.ts meta.var.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts
-  Hello World.   =>  source.ts meta.var.expr.ts string.quoted.single.ts
-  '              =>  source.ts meta.var.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts
-  ;              =>  source.ts punctuation.terminator.statement.ts
+10 const greeting = 'Hello World. Don\'t worry, be happy.';
+  const                =>  source.ts meta.var.expr.ts storage.type.ts
+                       =>  source.ts meta.var.expr.ts
+  greeting             =>  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts
+                           variable.other.readwrite.ts
+                       =>  source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+  =                    =>  source.ts meta.var.expr.ts keyword.operator.assignment.ts
+                       =>  source.ts meta.var.expr.ts
+  '                    =>  source.ts meta.var.expr.ts string.quoted.single.ts punctuation.definition.string.begin.ts
+  Hello World. Don     =>  source.ts meta.var.expr.ts string.quoted.single.ts
+  \'                   =>  source.ts meta.var.expr.ts string.quoted.single.ts constant.character.escape.ts
+  t worry, be happy.   =>  source.ts meta.var.expr.ts string.quoted.single.ts
+  '                    =>  source.ts meta.var.expr.ts string.quoted.single.ts punctuation.definition.string.end.ts
+  ;                    =>  source.ts punctuation.terminator.statement.ts
 
 11 // alias for uniqueFilterFnGenerator
   //                                   =>  source.ts comment.line.double-slash.ts punctuation.definition.comment.ts