Consume single line comment endings for import declaration to correctly detect end of the import declaration

Fixes #774

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -1085,6 +1085,7 @@ repository:
         '5': { name: keyword.operator.assignment.ts }
       end: (?=;|$|^)
       patterns:
+        - include: '#single-line-comment-consuming-line-ending'
         - include: '#comment'
         - match: ({{identifier}})\s*{{propertyAccess}}
           captures:
@@ -1103,6 +1104,7 @@ repository:
       '3': { name: keyword.control.import.ts }
     end: (?<!{{lookBehindImport}})(?=;|$|^)
     patterns:
+    - include: '#single-line-comment-consuming-line-ending'
     - include: '#comment'
     - include: '#string'
     - begin: (?<={{lookBehindImport}})(?!\s*["'])

TypeScript.tmLanguage

@@ -3476,6 +3476,10 @@
             <string>(?=;|$|^)</string>
             <key>patterns</key>
             <array>
+              <dict>
+                <key>include</key>
+                <string>#single-line-comment-consuming-line-ending</string>
+              </dict>
               <dict>
                 <key>include</key>
                 <string>#comment</string>
@@ -3540,6 +3544,10 @@
         <string>(?&lt;!^import|[^\._$[:alnum:]]import)(?=;|$|^)</string>
         <key>patterns</key>
         <array>
+          <dict>
+            <key>include</key>
+            <string>#single-line-comment-consuming-line-ending</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#comment</string>

TypeScriptReact.tmLanguage

@@ -3498,6 +3498,10 @@
             <string>(?=;|$|^)</string>
             <key>patterns</key>
             <array>
+              <dict>
+                <key>include</key>
+                <string>#single-line-comment-consuming-line-ending</string>
+              </dict>
               <dict>
                 <key>include</key>
                 <string>#comment</string>
@@ -3562,6 +3566,10 @@
         <string>(?&lt;!^import|[^\._$[:alnum:]]import)(?=;|$|^)</string>
         <key>patterns</key>
         <array>
+          <dict>
+            <key>include</key>
+            <string>#single-line-comment-consuming-line-ending</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#comment</string>

tests/baselines/Issue485.baseline.txt

@@ -29,7 +29,7 @@ Grammar: TypeScript.tmLanguage
                   source.ts meta.import.ts
                    ^^
                    source.ts meta.import.ts comment.line.double-slash.ts punctuation.definition.comment.ts
-                     ^^^^^
+                     ^^^^^^
                      source.ts meta.import.ts comment.line.double-slash.ts
 >import b from 'b'
  ^^^^^^