Handle return type of function declaration on new line

sheetalkamat · sheetalkamat · commit 7a682de47e1e · 2018-10-31T09:22:27.000-07:00
Fixes #677
diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
@@ -648,7 +648,7 @@ repository:
       '4': { name: storage.type.function.ts }
       '5': { name: keyword.generator.asterisk.ts }
       '6': { name: meta.definition.function.ts entity.name.function.ts }
-    end: (?=$|^|;)|(?<=\})
+    end: (?={{endOfStatement}})|(?<=\})
     patterns:
     - include: '#function-name'
     - include: '#function-body'
diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage
@@ -2050,7 +2050,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?=$|^|;)|(?&lt;=\})</string>
+        <string>(?=;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|(?&lt;=\})</string>
         <key>patterns</key>
         <array>
           <dict>
diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage
@@ -2054,7 +2054,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?=$|^|;)|(?&lt;=\})</string>
+        <string>(?=;|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))|(?&lt;=\})</string>
         <key>patterns</key>
         <array>
           <dict>
diff --git a/tests/baselines/Issue193.baseline.txt b/tests/baselines/Issue193.baseline.txt
@@ -37,10 +37,10 @@ Grammar: TypeScript.tmLanguage
                                  source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts
 >{
  ^
- source.ts meta.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
 >}
  ^
- source.ts meta.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
 >
  ^
  source.ts
@@ -65,10 +65,10 @@ Grammar: TypeScript.tmLanguage
                                 source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts
 >{
  ^
- source.ts meta.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
 >}
  ^
- source.ts meta.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
 >
  ^
  source.ts
diff --git a/tests/baselines/Issue346.baseline.txt b/tests/baselines/Issue346.baseline.txt
diff --git a/tests/baselines/Issue346.txt b/tests/baselines/Issue346.txt
@@ -45,9 +45,9 @@ Grammar: TypeScript.tmLanguage
 >
 >		for (let i = 0; i < b.length; i++) b[i] = Math.sin(TAU440 * t++/s * Math.sin(t++/s*.5))
                                                                   ^
-                                                                  [11, 66]: source.ts meta.block.ts meta.block.ts keyword.operator.arithmetic.ts 
+                                                                  [11, 66]: source.ts meta.function.ts meta.block.ts meta.function.ts meta.block.ts keyword.operator.arithmetic.ts 
                                                                                    ^
-                                                                                   [11, 83]: source.ts meta.block.ts meta.block.ts keyword.operator.arithmetic.ts 
+                                                                                   [11, 83]: source.ts meta.function.ts meta.block.ts meta.function.ts meta.block.ts keyword.operator.arithmetic.ts 
 >
 >		postMessage(b)
 >	}
diff --git a/tests/baselines/Issue384.baseline.txt b/tests/baselines/Issue384.baseline.txt
@@ -53,7 +53,7 @@ Grammar: TypeScript.tmLanguage
                          source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts
 >
  ^
- source.ts
+ source.ts meta.function.ts
 >export function X(): void
  ^^^^^^
  source.ts meta.function.ts keyword.control.export.ts
diff --git a/tests/baselines/Issue405.baseline.txt b/tests/baselines/Issue405.baseline.txt
@@ -27,53 +27,53 @@ Grammar: TypeScript.tmLanguage
            source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
 >  (a: string)
  ^^
- source.ts meta.arrow.ts
+ source.ts meta.function.ts
    ^
-   source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
+   source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
     ^
-    source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts
+    source.ts meta.function.ts meta.parameters.ts variable.parameter.ts
      ^
-     source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
+     source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
       ^
-      source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts
+      source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts
        ^^^^^^
-       source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
+       source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
              ^
-             source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts
+             source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts
 >{
  ^
- source.ts meta.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
 >  var r = true;
  ^^
- source.ts meta.block.ts
+ source.ts meta.function.ts meta.block.ts
    ^^^
-   source.ts meta.block.ts meta.var.expr.ts storage.type.ts
+   source.ts meta.function.ts meta.block.ts meta.var.expr.ts storage.type.ts
       ^
-      source.ts meta.block.ts meta.var.expr.ts
+      source.ts meta.function.ts meta.block.ts meta.var.expr.ts
        ^
-       source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
+       source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
         ^
-        source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+        source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
          ^
-         source.ts meta.block.ts meta.var.expr.ts keyword.operator.assignment.ts
+         source.ts meta.function.ts meta.block.ts meta.var.expr.ts keyword.operator.assignment.ts
           ^
-          source.ts meta.block.ts meta.var.expr.ts
+          source.ts meta.function.ts meta.block.ts meta.var.expr.ts
            ^^^^
-           source.ts meta.block.ts meta.var.expr.ts constant.language.boolean.true.ts
+           source.ts meta.function.ts meta.block.ts meta.var.expr.ts constant.language.boolean.true.ts
                ^
-               source.ts meta.block.ts punctuation.terminator.statement.ts
+               source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
 >  return true
  ^^
- source.ts meta.block.ts
+ source.ts meta.function.ts meta.block.ts
    ^^^^^^
-   source.ts meta.block.ts keyword.control.flow.ts
+   source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
          ^
-         source.ts meta.block.ts
+         source.ts meta.function.ts meta.block.ts
           ^^^^
-          source.ts meta.block.ts constant.language.boolean.true.ts
+          source.ts meta.function.ts meta.block.ts constant.language.boolean.true.ts
 >}
  ^
- source.ts meta.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
 >
  ^
  source.ts
@@ -86,59 +86,59 @@ Grammar: TypeScript.tmLanguage
           source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
 >  (a: string): boolean
  ^^
- source.ts meta.arrow.ts
+ source.ts meta.function.ts
    ^
-   source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
+   source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
     ^
-    source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts
+    source.ts meta.function.ts meta.parameters.ts variable.parameter.ts
      ^
-     source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
+     source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
       ^
-      source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts
+      source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts
        ^^^^^^
-       source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
+       source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
              ^
-             source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts
+             source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts
               ^
-              source.ts meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts
+              source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts
                ^
-               source.ts meta.arrow.ts meta.return.type.arrow.ts
+               source.ts meta.function.ts meta.return.type.ts
                 ^^^^^^^
-                source.ts meta.arrow.ts meta.return.type.arrow.ts support.type.primitive.ts
+                source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts
 >{
  ^
- source.ts meta.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
 >  var r = true;
  ^^
- source.ts meta.block.ts
+ source.ts meta.function.ts meta.block.ts
    ^^^
-   source.ts meta.block.ts meta.var.expr.ts storage.type.ts
+   source.ts meta.function.ts meta.block.ts meta.var.expr.ts storage.type.ts
       ^
-      source.ts meta.block.ts meta.var.expr.ts
+      source.ts meta.function.ts meta.block.ts meta.var.expr.ts
        ^
-       source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
+       source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
         ^
-        source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+        source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
          ^
-         source.ts meta.block.ts meta.var.expr.ts keyword.operator.assignment.ts
+         source.ts meta.function.ts meta.block.ts meta.var.expr.ts keyword.operator.assignment.ts
           ^
-          source.ts meta.block.ts meta.var.expr.ts
+          source.ts meta.function.ts meta.block.ts meta.var.expr.ts
            ^^^^
-           source.ts meta.block.ts meta.var.expr.ts constant.language.boolean.true.ts
+           source.ts meta.function.ts meta.block.ts meta.var.expr.ts constant.language.boolean.true.ts
                ^
-               source.ts meta.block.ts punctuation.terminator.statement.ts
+               source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
 >  return true
  ^^
- source.ts meta.block.ts
+ source.ts meta.function.ts meta.block.ts
    ^^^^^^
-   source.ts meta.block.ts keyword.control.flow.ts
+   source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
          ^
-         source.ts meta.block.ts
+         source.ts meta.function.ts meta.block.ts
           ^^^^
-          source.ts meta.block.ts constant.language.boolean.true.ts
+          source.ts meta.function.ts meta.block.ts constant.language.boolean.true.ts
 >}
  ^
- source.ts meta.block.ts punctuation.definition.block.ts
+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
 >
  ^
  source.ts
diff --git a/tests/baselines/Issue428.baseline.txt b/tests/baselines/Issue428.baseline.txt
@@ -28,30 +28,30 @@ Grammar: TypeScript.tmLanguage
                  source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
 >  (a: number): string 
  ^^
- source.ts meta.arrow.ts
+ source.ts meta.function.ts
    ^
-   source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
+   source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
     ^
-    source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts
+    source.ts meta.function.ts meta.parameters.ts variable.parameter.ts
      ^
-     source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
+     source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
       ^
-      source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts
+      source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts
        ^^^^^^
-       source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
+       source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
              ^
-             source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts
+             source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts
               ^
-              source.ts meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts
+              source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts
                ^
-               source.ts meta.arrow.ts meta.return.type.arrow.ts
+               source.ts meta.function.ts meta.return.type.ts
                 ^^^^^^
-                source.ts meta.arrow.ts meta.return.type.arrow.ts support.type.primitive.ts
-                      ^^
-                      source.ts meta.arrow.ts meta.return.type.arrow.ts
+                source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts
+                      ^
+                      source.ts meta.function.ts meta.return.type.ts
 >
  ^
- source.ts meta.arrow.ts meta.return.type.arrow.ts
+ source.ts meta.function.ts
 >export function funct
  ^^^^^^
  source.ts meta.function.ts keyword.control.export.ts
@@ -65,33 +65,33 @@ Grammar: TypeScript.tmLanguage
                  source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
 >  (a: number): number
  ^^
- source.ts meta.arrow.ts
+ source.ts meta.function.ts
    ^
-   source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
+   source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
     ^
-    source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts
+    source.ts meta.function.ts meta.parameters.ts variable.parameter.ts
      ^
-     source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
+     source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
       ^
-      source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts
+      source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts
        ^^^^^^
-       source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
+       source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
              ^
-             source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts
+             source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts
               ^
-              source.ts meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts
+              source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts
                ^
-               source.ts meta.arrow.ts meta.return.type.arrow.ts
+               source.ts meta.function.ts meta.return.type.ts
                 ^^^^^^
-                source.ts meta.arrow.ts meta.return.type.arrow.ts support.type.primitive.ts
+                source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts
 >
  ^
- source.ts meta.arrow.ts meta.return.type.arrow.ts
+ source.ts meta.function.ts
 >// this is implementation
  ^^
- source.ts meta.arrow.ts meta.return.type.arrow.ts comment.line.double-slash.ts punctuation.definition.comment.ts
+ source.ts meta.function.ts comment.line.double-slash.ts punctuation.definition.comment.ts
    ^^^^^^^^^^^^^^^^^^^^^^^
-   source.ts meta.arrow.ts meta.return.type.arrow.ts comment.line.double-slash.ts
+   source.ts meta.function.ts comment.line.double-slash.ts
 >export function funct
  ^^^^^^
  source.ts meta.function.ts keyword.control.export.ts
@@ -105,34 +105,34 @@ Grammar: TypeScript.tmLanguage
                  source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
 >  (a: number): any {
  ^^
- source.ts meta.arrow.ts
+ source.ts meta.function.ts
    ^
-   source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
+   source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
     ^
-    source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts
+    source.ts meta.function.ts meta.parameters.ts variable.parameter.ts
      ^
-     source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
+     source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
       ^
-      source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts
+      source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts
        ^^^^^^
-       source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
+       source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
              ^
-             source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts
+             source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts
               ^
-              source.ts meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts
+              source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts
                ^
-               source.ts meta.arrow.ts meta.return.type.arrow.ts
+               source.ts meta.function.ts meta.return.type.ts
                 ^^^
-                source.ts meta.arrow.ts meta.return.type.arrow.ts support.type.primitive.ts
+                source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts
                    ^
-                   source.ts meta.arrow.ts meta.return.type.arrow.ts
+                   source.ts meta.function.ts meta.return.type.ts
                     ^
-                    source.ts meta.block.ts punctuation.definition.block.ts
+                    source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
 >  
  ^^^
- source.ts meta.block.ts
+ source.ts meta.function.ts meta.block.ts
 >  }
  ^^
- source.ts meta.block.ts
+ source.ts meta.function.ts meta.block.ts
    ^
-   source.ts meta.block.ts punctuation.definition.block.ts
+   source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
diff --git a/tests/baselines/Issue677.baseline.txt b/tests/baselines/Issue677.baseline.txt
diff --git a/tests/cases/Issue677.ts b/tests/cases/Issue677.ts

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,10 @@ Grammar: TypeScript.tmLanguage`
`37`	`37`	`source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts`
`38`	`38`	`>{`
`39`	`39`	`^`
`40`		`- source.ts meta.block.ts punctuation.definition.block.ts`
	`40`	`+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts`
`41`	`41`	`>}`
`42`	`42`	`^`
`43`		`- source.ts meta.block.ts punctuation.definition.block.ts`
	`43`	`+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts`
`44`	`44`	`>`
`45`	`45`	`^`
`46`	`46`	`source.ts`
`@@ -65,10 +65,10 @@ Grammar: TypeScript.tmLanguage`
`65`	`65`	`source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts`
`66`	`66`	`>{`
`67`	`67`	`^`
`68`		`- source.ts meta.block.ts punctuation.definition.block.ts`
	`68`	`+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts`
`69`	`69`	`>}`
`70`	`70`	`^`
`71`		`- source.ts meta.block.ts punctuation.definition.block.ts`
	`71`	`+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts`
`72`	`72`	`>`
`73`	`73`	`^`
`74`	`74`	`source.ts`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,9 @@ Grammar: TypeScript.tmLanguage`
`45`	`45`	`>`
`46`	`46`	`> for (let i = 0; i < b.length; i++) b[i] = Math.sin(TAU440 * t++/s * Math.sin(t++/s*.5))`
`47`	`47`	`^`
`48`		`- [11, 66]: source.ts meta.block.ts meta.block.ts keyword.operator.arithmetic.ts`
	`48`	`+ [11, 66]: source.ts meta.function.ts meta.block.ts meta.function.ts meta.block.ts keyword.operator.arithmetic.ts`
`49`	`49`	`^`
`50`		`- [11, 83]: source.ts meta.block.ts meta.block.ts keyword.operator.arithmetic.ts`
	`50`	`+ [11, 83]: source.ts meta.function.ts meta.block.ts meta.function.ts meta.block.ts keyword.operator.arithmetic.ts`
`51`	`51`	`>`
`52`	`52`	`> postMessage(b)`
`53`	`53`	`> }`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ Grammar: TypeScript.tmLanguage`
`53`	`53`	`source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts`
`54`	`54`	`>`
`55`	`55`	`^`
`56`		`- source.ts`
	`56`	`+ source.ts meta.function.ts`
`57`	`57`	`>export function X(): void`
`58`	`58`	`^^^^^^`
`59`	`59`	`source.ts meta.function.ts keyword.control.export.ts`
Original file line number	Diff line number	Diff line change
`@@ -27,53 +27,53 @@ Grammar: TypeScript.tmLanguage`
`27`	`27`	`source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts`
`28`	`28`	`> (a: string)`
`29`	`29`	`^^`
`30`		`- source.ts meta.arrow.ts`
	`30`	`+ source.ts meta.function.ts`
`31`	`31`	`^`
`32`		`- source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts`
	`32`	`+ source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts`
`33`	`33`	`^`
`34`		`- source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts`
	`34`	`+ source.ts meta.function.ts meta.parameters.ts variable.parameter.ts`
`35`	`35`	`^`
`36`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts`
	`36`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts`
`37`	`37`	`^`
`38`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts`
	`38`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts`
`39`	`39`	`^^^^^^`
`40`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts`
	`40`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts`
`41`	`41`	`^`
`42`		`- source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts`
	`42`	`+ source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts`
`43`	`43`	`>{`
`44`	`44`	`^`
`45`		`- source.ts meta.block.ts punctuation.definition.block.ts`
	`45`	`+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts`
`46`	`46`	`> var r = true;`
`47`	`47`	`^^`
`48`		`- source.ts meta.block.ts`
	`48`	`+ source.ts meta.function.ts meta.block.ts`
`49`	`49`	`^^^`
`50`		`- source.ts meta.block.ts meta.var.expr.ts storage.type.ts`
	`50`	`+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts storage.type.ts`
`51`	`51`	`^`
`52`		`- source.ts meta.block.ts meta.var.expr.ts`
	`52`	`+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts`
`53`	`53`	`^`
`54`		`- source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts`
	`54`	`+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts`
`55`	`55`	`^`
`56`		`- source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts`
	`56`	`+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts`
`57`	`57`	`^`
`58`		`- source.ts meta.block.ts meta.var.expr.ts keyword.operator.assignment.ts`
	`58`	`+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts keyword.operator.assignment.ts`
`59`	`59`	`^`
`60`		`- source.ts meta.block.ts meta.var.expr.ts`
	`60`	`+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts`
`61`	`61`	`^^^^`
`62`		`- source.ts meta.block.ts meta.var.expr.ts constant.language.boolean.true.ts`
	`62`	`+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts constant.language.boolean.true.ts`
`63`	`63`	`^`
`64`		`- source.ts meta.block.ts punctuation.terminator.statement.ts`
	`64`	`+ source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts`
`65`	`65`	`> return true`
`66`	`66`	`^^`
`67`		`- source.ts meta.block.ts`
	`67`	`+ source.ts meta.function.ts meta.block.ts`
`68`	`68`	`^^^^^^`
`69`		`- source.ts meta.block.ts keyword.control.flow.ts`
	`69`	`+ source.ts meta.function.ts meta.block.ts keyword.control.flow.ts`
`70`	`70`	`^`
`71`		`- source.ts meta.block.ts`
	`71`	`+ source.ts meta.function.ts meta.block.ts`
`72`	`72`	`^^^^`
`73`		`- source.ts meta.block.ts constant.language.boolean.true.ts`
	`73`	`+ source.ts meta.function.ts meta.block.ts constant.language.boolean.true.ts`
`74`	`74`	`>}`
`75`	`75`	`^`
`76`		`- source.ts meta.block.ts punctuation.definition.block.ts`
	`76`	`+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts`
`77`	`77`	`>`
`78`	`78`	`^`
`79`	`79`	`source.ts`
`@@ -86,59 +86,59 @@ Grammar: TypeScript.tmLanguage`
`86`	`86`	`source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts`
`87`	`87`	`> (a: string): boolean`
`88`	`88`	`^^`
`89`		`- source.ts meta.arrow.ts`
	`89`	`+ source.ts meta.function.ts`
`90`	`90`	`^`
`91`		`- source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts`
	`91`	`+ source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts`
`92`	`92`	`^`
`93`		`- source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts`
	`93`	`+ source.ts meta.function.ts meta.parameters.ts variable.parameter.ts`
`94`	`94`	`^`
`95`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts`
	`95`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts`
`96`	`96`	`^`
`97`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts`
	`97`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts`
`98`	`98`	`^^^^^^`
`99`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts`
	`99`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts`
`100`	`100`	`^`
`101`		`- source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts`
	`101`	`+ source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts`
`102`	`102`	`^`
`103`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts`
	`103`	`+ source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts`
`104`	`104`	`^`
`105`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts`
	`105`	`+ source.ts meta.function.ts meta.return.type.ts`
`106`	`106`	`^^^^^^^`
`107`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts support.type.primitive.ts`
	`107`	`+ source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts`
`108`	`108`	`>{`
`109`	`109`	`^`
`110`		`- source.ts meta.block.ts punctuation.definition.block.ts`
	`110`	`+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts`
`111`	`111`	`> var r = true;`
`112`	`112`	`^^`
`113`		`- source.ts meta.block.ts`
	`113`	`+ source.ts meta.function.ts meta.block.ts`
`114`	`114`	`^^^`
`115`		`- source.ts meta.block.ts meta.var.expr.ts storage.type.ts`
	`115`	`+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts storage.type.ts`
`116`	`116`	`^`
`117`		`- source.ts meta.block.ts meta.var.expr.ts`
	`117`	`+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts`
`118`	`118`	`^`
`119`		`- source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts`
	`119`	`+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts`
`120`	`120`	`^`
`121`		`- source.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts`
	`121`	`+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts`
`122`	`122`	`^`
`123`		`- source.ts meta.block.ts meta.var.expr.ts keyword.operator.assignment.ts`
	`123`	`+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts keyword.operator.assignment.ts`
`124`	`124`	`^`
`125`		`- source.ts meta.block.ts meta.var.expr.ts`
	`125`	`+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts`
`126`	`126`	`^^^^`
`127`		`- source.ts meta.block.ts meta.var.expr.ts constant.language.boolean.true.ts`
	`127`	`+ source.ts meta.function.ts meta.block.ts meta.var.expr.ts constant.language.boolean.true.ts`
`128`	`128`	`^`
`129`		`- source.ts meta.block.ts punctuation.terminator.statement.ts`
	`129`	`+ source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts`
`130`	`130`	`> return true`
`131`	`131`	`^^`
`132`		`- source.ts meta.block.ts`
	`132`	`+ source.ts meta.function.ts meta.block.ts`
`133`	`133`	`^^^^^^`
`134`		`- source.ts meta.block.ts keyword.control.flow.ts`
	`134`	`+ source.ts meta.function.ts meta.block.ts keyword.control.flow.ts`
`135`	`135`	`^`
`136`		`- source.ts meta.block.ts`
	`136`	`+ source.ts meta.function.ts meta.block.ts`
`137`	`137`	`^^^^`
`138`		`- source.ts meta.block.ts constant.language.boolean.true.ts`
	`138`	`+ source.ts meta.function.ts meta.block.ts constant.language.boolean.true.ts`
`139`	`139`	`>}`
`140`	`140`	`^`
`141`		`- source.ts meta.block.ts punctuation.definition.block.ts`
	`141`	`+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts`
`142`	`142`	`>`
`143`	`143`	`^`
`144`	`144`	`source.ts`
Original file line number	Diff line number	Diff line change
`@@ -28,30 +28,30 @@ Grammar: TypeScript.tmLanguage`
`28`	`28`	`source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts`
`29`	`29`	`> (a: number): string`
`30`	`30`	`^^`
`31`		`- source.ts meta.arrow.ts`
	`31`	`+ source.ts meta.function.ts`
`32`	`32`	`^`
`33`		`- source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts`
	`33`	`+ source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts`
`34`	`34`	`^`
`35`		`- source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts`
	`35`	`+ source.ts meta.function.ts meta.parameters.ts variable.parameter.ts`
`36`	`36`	`^`
`37`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts`
	`37`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts`
`38`	`38`	`^`
`39`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts`
	`39`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts`
`40`	`40`	`^^^^^^`
`41`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts`
	`41`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts`
`42`	`42`	`^`
`43`		`- source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts`
	`43`	`+ source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts`
`44`	`44`	`^`
`45`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts`
	`45`	`+ source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts`
`46`	`46`	`^`
`47`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts`
	`47`	`+ source.ts meta.function.ts meta.return.type.ts`
`48`	`48`	`^^^^^^`
`49`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts support.type.primitive.ts`
`50`		`- ^^`
`51`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts`
	`49`	`+ source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts`
	`50`	`+ ^`
	`51`	`+ source.ts meta.function.ts meta.return.type.ts`
`52`	`52`	`>`
`53`	`53`	`^`
`54`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts`
	`54`	`+ source.ts meta.function.ts`
`55`	`55`	`>export function funct`
`56`	`56`	`^^^^^^`
`57`	`57`	`source.ts meta.function.ts keyword.control.export.ts`
`@@ -65,33 +65,33 @@ Grammar: TypeScript.tmLanguage`
`65`	`65`	`source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts`
`66`	`66`	`> (a: number): number`
`67`	`67`	`^^`
`68`		`- source.ts meta.arrow.ts`
	`68`	`+ source.ts meta.function.ts`
`69`	`69`	`^`
`70`		`- source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts`
	`70`	`+ source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts`
`71`	`71`	`^`
`72`		`- source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts`
	`72`	`+ source.ts meta.function.ts meta.parameters.ts variable.parameter.ts`
`73`	`73`	`^`
`74`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts`
	`74`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts`
`75`	`75`	`^`
`76`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts`
	`76`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts`
`77`	`77`	`^^^^^^`
`78`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts`
	`78`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts`
`79`	`79`	`^`
`80`		`- source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts`
	`80`	`+ source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts`
`81`	`81`	`^`
`82`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts`
	`82`	`+ source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts`
`83`	`83`	`^`
`84`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts`
	`84`	`+ source.ts meta.function.ts meta.return.type.ts`
`85`	`85`	`^^^^^^`
`86`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts support.type.primitive.ts`
	`86`	`+ source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts`
`87`	`87`	`>`
`88`	`88`	`^`
`89`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts`
	`89`	`+ source.ts meta.function.ts`
`90`	`90`	`>// this is implementation`
`91`	`91`	`^^`
`92`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts comment.line.double-slash.ts punctuation.definition.comment.ts`
	`92`	`+ source.ts meta.function.ts comment.line.double-slash.ts punctuation.definition.comment.ts`
`93`	`93`	`^^^^^^^^^^^^^^^^^^^^^^^`
`94`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts comment.line.double-slash.ts`
	`94`	`+ source.ts meta.function.ts comment.line.double-slash.ts`
`95`	`95`	`>export function funct`
`96`	`96`	`^^^^^^`
`97`	`97`	`source.ts meta.function.ts keyword.control.export.ts`
`@@ -105,34 +105,34 @@ Grammar: TypeScript.tmLanguage`
`105`	`105`	`source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts`
`106`	`106`	`> (a: number): any {`
`107`	`107`	`^^`
`108`		`- source.ts meta.arrow.ts`
	`108`	`+ source.ts meta.function.ts`
`109`	`109`	`^`
`110`		`- source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts`
	`110`	`+ source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts`
`111`	`111`	`^`
`112`		`- source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts`
	`112`	`+ source.ts meta.function.ts meta.parameters.ts variable.parameter.ts`
`113`	`113`	`^`
`114`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts`
	`114`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts`
`115`	`115`	`^`
`116`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts`
	`116`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts`
`117`	`117`	`^^^^^^`
`118`		`- source.ts meta.arrow.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts`
	`118`	`+ source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts`
`119`	`119`	`^`
`120`		`- source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts`
	`120`	`+ source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts`
`121`	`121`	`^`
`122`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts keyword.operator.type.annotation.ts`
	`122`	`+ source.ts meta.function.ts meta.return.type.ts keyword.operator.type.annotation.ts`
`123`	`123`	`^`
`124`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts`
	`124`	`+ source.ts meta.function.ts meta.return.type.ts`
`125`	`125`	`^^^`
`126`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts support.type.primitive.ts`
	`126`	`+ source.ts meta.function.ts meta.return.type.ts support.type.primitive.ts`
`127`	`127`	`^`
`128`		`- source.ts meta.arrow.ts meta.return.type.arrow.ts`
	`128`	`+ source.ts meta.function.ts meta.return.type.ts`
`129`	`129`	`^`
`130`		`- source.ts meta.block.ts punctuation.definition.block.ts`
	`130`	`+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts`
`131`	`131`	`>`
`132`	`132`	`^^^`
`133`		`- source.ts meta.block.ts`
	`133`	`+ source.ts meta.function.ts meta.block.ts`
`134`	`134`	`> }`
`135`	`135`	`^^`
`136`		`- source.ts meta.block.ts`
	`136`	`+ source.ts meta.function.ts meta.block.ts`
`137`	`137`	`^`
`138`		`- source.ts meta.block.ts punctuation.definition.block.ts`
	`138`	`+ source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts`