Handle inline comment inside arrow parenthesis

Fixes #686
microsoft · Nov 20, 2018 · 72cb5cd · 72cb5cd
1 parent c6c261f
commit 72cb5cd
Show file tree

Hide file tree

Showing 5 changed files with 130 additions and 46 deletions.
diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
@@ -72,7 +72,7 @@ variables:
     # sure shot arrow functions even if => is on new line
     (
       {{typeParameters}}?
-      [(]\s*
+      [(]\s*({{inlineComment}}\s*)*
       (
         ([)]\s*:) |                                                                                       # ():
         ((\.\.\.\s*)?{{identifier}}\s*:)                                                                  # [(]param: | [(]...param:
@@ -84,7 +84,7 @@ variables:
     # arrow function possible to detect only with => on same line
     (
       {{typeParameters}}?                                                                                 # typeparameters
-      \(\s*(([_$[:alpha:]]|{{matchingBraces}}|{{matchingBrackets}}|(\.\.\.\s*[_$[:alpha:]]))([^()]|{{matchingParenthesis}})*)?\)   # parameters
+      \(\s*({{inlineComment}}\s*)*(([_$[:alpha:]]|{{matchingBraces}}|{{matchingBrackets}}|(\.\.\.\s*[_$[:alpha:]]))([^()]|{{matchingParenthesis}})*)?\)   # parameters
       (\s*:{{returnTypeOfArrow}})?                                                                        # return type
       \s*=>                                                                                               # arrow operator
     )