diff --git a/vue.YAML-tmLanguage b/vue.YAML-tmLanguage
index 3c8888f..2a36977 100644
--- a/vue.YAML-tmLanguage
+++ b/vue.YAML-tmLanguage
@@ -36,12 +36,9 @@ patterns:
 
 - name: comment.block.html
   begin: <!--
-  end: --\s*>
+  end: -->
   captures:
     '0': {name: punctuation.definition.comment.html}
-  patterns:
-  - name: invalid.illegal.bad-comments-or-CDATA.html
-    match: --
 
 - name: meta.tag.sgml.html
   begin: <!
@@ -465,7 +462,7 @@ repository:
 foldingStartMarker: |-
   (?x)
   (<(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)\b.*?>
-  |<!--(?!.*--\s*>)
+  |<!--(?!.*-->)
   |^<!--\ \#tminclude\ (?>.*?-->)$
   |<\?(?:php)?.*\b(if|for(each)?|while)\b.+:
   |\{\{?(if|foreach|capture|literal|foreach|php|section|strip)
@@ -475,7 +472,7 @@ foldingStartMarker: |-
 foldingStopMarker: |-
   (?x)
   (</(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)>
-  |^(?!.*?<!--).*?--\s*>
+  |^(?!.*?<!--).*?-->
   |^<!--\ end\ tminclude\ -->$
   |<\?(?:php)?.*\bend(if|for(each)?|while)\b
   |\{\{?/(if|foreach|capture|literal|foreach|php|section|strip)
diff --git a/vue.tmLanguage b/vue.tmLanguage
index a8bdbeb..de0d99d 100644
--- a/vue.tmLanguage
+++ b/vue.tmLanguage
@@ -9,7 +9,7 @@
 	<key>foldingStartMarker</key>
 	<string>(?x)
 (&lt;(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)\b.*?&gt;
-|&lt;!--(?!.*--\s*&gt;)
+|&lt;!--(?!.*--&gt;)
 |^&lt;!--\ \#tminclude\ (?&gt;.*?--&gt;)$
 |&lt;\?(?:php)?.*\b(if|for(each)?|while)\b.+:
 |\{\{?(if|foreach|capture|literal|foreach|php|section|strip)
@@ -18,7 +18,7 @@
 	<key>foldingStopMarker</key>
 	<string>(?x)
 (&lt;/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)&gt;
-|^(?!.*?&lt;!--).*?--\s*&gt;
+|^(?!.*?&lt;!--).*?--&gt;
 |^&lt;!--\ end\ tminclude\ --&gt;$
 |&lt;\?(?:php)?.*\bend(if|for(each)?|while)\b
 |\{\{?/(if|foreach|capture|literal|foreach|php|section|strip)
@@ -138,18 +138,9 @@
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>--\s*&gt;</string>
+			<string>--&gt;</string>
 			<key>name</key>
 			<string>comment.block.html</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>--</string>
-					<key>name</key>
-					<string>invalid.illegal.bad-comments-or-CDATA.html</string>
-				</dict>
-			</array>
 		</dict>
 		<dict>
 			<key>begin</key>