Revert "Add support for ES6 HTML-style comments"

This reverts commit bb0df12.

Author: winstliu

Diff for: grammars/javascript.cson

@@ -803,6 +803,15 @@
   {
     'include': '#comments'
   }
+  {
+    'captures':
+      '0':
+        'name': 'punctuation.definition.comment.html.js'
+      '2':
+        'name': 'punctuation.definition.comment.html.js'
+    'match': '(<!--|-->)'
+    'name': 'comment.block.html.js'
+  }
   {
     'match': '(?<!\\.)\\b(class|enum|function|interface)(?!\\s*:)\\b'
     'name': 'storage.type.js'
@@ -1620,15 +1629,15 @@
             'include': '#docblock'
           }
         ]
-        'end': '\\*/|(?=</script>)' # Unfortunately, we don't know when we're embedded, so this is as good as it gets
+        'end': '\\*/'
         'name': 'comment.block.documentation.js'
       }
       {
         'begin': '/\\*'
         'captures':
           '0':
             'name': 'punctuation.definition.comment.js'
-        'end': '\\*/|(?=</script>)' # Unfortunately, we don't know when we're embedded, so this is as good as it gets
+        'end': '\\*/'
         'name': 'comment.block.js'
       }
       {
@@ -1643,43 +1652,9 @@
             'beginCaptures':
               '0':
                 'name': 'punctuation.definition.comment.js'
-            'end': '$|(?=</script>)' # Unfortunately, we don't know when we're embedded, so this is as good as it gets
+            'end': '\\n'
             'name': 'comment.line.double-slash.js'
           }
         ]
       }
-      {
-        'begin': '(^[ \\t]+)?(?=<!--)'
-        'beginCaptures':
-          '1':
-            'name': 'punctuation.whitespace.comment.leading.js'
-        'end': '(?!\\G)'
-        'patterns': [
-          {
-            'begin': '<!--'
-            'beginCaptures':
-              '0':
-                'name': 'punctuation.definition.comment.html.js'
-            'end': '$|(?=</script>)' # Unfortunately, we don't know when we're embedded, so this is as good as it gets
-            'name': 'comment.line.html.js'
-          }
-        ]
-      }
-      {
-        'begin': '(^[ \\t]+)?(?=-->)'
-        'beginCaptures':
-          '1':
-            'name': 'punctuation.whitespace.comment.leading.js'
-        'end': '(?!\\G)'
-        'patterns': [
-          {
-            'begin': '-->'
-            'beginCaptures':
-              '0':
-                'name': 'punctuation.definition.comment.html.js'
-            'end': '$|(?=</script>)' # Unfortunately, we don't know when we're embedded, so this is as good as it gets
-            'name': 'comment.line.html.js'
-          }
-        ]
-      }
     ]

Diff for: spec/javascript-spec.coffee

@@ -1563,39 +1563,6 @@ describe "Javascript grammar", ->
       expect(tokens[7]).toEqual value: ', p2 ', scopes: ['source.js', 'meta.function.js', 'meta.parameters.js', 'comment.block.js']
       expect(tokens[8]).toEqual value: '*/', scopes: ['source.js', 'meta.function.js', 'meta.parameters.js', 'comment.block.js', 'punctuation.definition.comment.js']
 
-    it "tokenizes HTML-style comments correctly", ->
-      {tokens} = grammar.tokenizeLine '<!-- comment'
-      expect(tokens[0]).toEqual value: '<!--', scopes: ['source.js', 'comment.line.html.js', 'punctuation.definition.comment.html.js']
-      expect(tokens[1]).toEqual value: ' comment', scopes: ['source.js', 'comment.line.html.js']
-
-      {tokens} = grammar.tokenizeLine '--> comment'
-      expect(tokens[0]).toEqual value: '-->', scopes: ['source.js', 'comment.line.html.js', 'punctuation.definition.comment.html.js']
-      expect(tokens[1]).toEqual value: ' comment', scopes: ['source.js', 'comment.line.html.js']
-
-    it "stops comments when a </script> tag is encountered", ->
-      # HTML doesn't count comments if they're followed by a </script> tag.  Unfortunately we have
-      # no idea if we're embedded or not, so we err on the side of caution and always assume that we are :/
-
-      {tokens} = grammar.tokenizeLine '/* </script>'
-      expect(tokens[0]).toEqual value: '/*', scopes: ['source.js', 'comment.block.js', 'punctuation.definition.comment.js']
-      expect(tokens[1]).not.toEqual value: ' </script>', scopes: ['source.js', 'comment.block.js']
-
-      {tokens} = grammar.tokenizeLine '/** </script>'
-      expect(tokens[0]).toEqual value: '/**', scopes: ['source.js', 'comment.block.documentation.js', 'punctuation.definition.comment.js']
-      expect(tokens[1]).not.toEqual value: ' </script>', scopes: ['source.js', 'comment.block.documentation.js']
-
-      {tokens} = grammar.tokenizeLine '// </script>'
-      expect(tokens[0]).toEqual value: '//', scopes: ['source.js', 'comment.line.double-slash.js', 'punctuation.definition.comment.js']
-      expect(tokens[1]).not.toEqual value: ' </script>', scopes: ['source.js', 'comment.line.double-slash.js']
-
-      {tokens} = grammar.tokenizeLine '<!-- </script>'
-      expect(tokens[0]).toEqual value: '<!--', scopes: ['source.js', 'comment.line.html.js', 'punctuation.definition.comment.html.js']
-      expect(tokens[1]).not.toEqual value: ' </script>', scopes: ['source.js', 'comment.line.html.js']
-
-      {tokens} = grammar.tokenizeLine '--> </script>'
-      expect(tokens[0]).toEqual value: '-->', scopes: ['source.js', 'comment.line.html.js', 'punctuation.definition.comment.html.js']
-      expect(tokens[1]).not.toEqual value: ' </script>', scopes: ['source.js', 'comment.line.html.js']
-
   describe "console", ->
     it "tokenizes the console keyword", ->
       {tokens} = grammar.tokenizeLine('console;')