Handle function expressions to consume line ending of single line com…

…ment since we rely on lookback of function completion (}) Fixes #455 after making change in comments to not consume line endings
microsoft · Aug 21, 2018 · ebb42d0 · ebb42d0
1 parent 486f645
commit ebb42d0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
@@ -655,6 +655,7 @@ repository:
     end: (?<=\})
     patterns:
     - include: '#function-name'
+    - include: '#single-line-comment-consuming-line-ending'
     - include: '#function-body'
 
   function-name:

diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage
@@ -2078,6 +2078,10 @@
             <key>include</key>
             <string>#function-name</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#single-line-comment-consuming-line-ending</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#function-body</string>

diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage
@@ -2082,6 +2082,10 @@
             <key>include</key>
             <string>#function-name</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#single-line-comment-consuming-line-ending</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#function-body</string>