From a46fc7b11ed10b9790f19122fcd96b871e5f475b Mon Sep 17 00:00:00 2001
From: David Lomas <david.lomas@knowinnovation.com>
Date: Wed, 23 Oct 2024 12:00:07 +0100
Subject: [PATCH 1/5] Add option to treat comments as empty space when
 enforcing rules

---
 .../multiline-html-element-content-newline.js | 11 +++++--
 .../multiline-html-element-content-newline.js | 29 +++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/lib/rules/multiline-html-element-content-newline.js b/lib/rules/multiline-html-element-content-newline.js
index afe89bd2f..5cd272a42 100644
--- a/lib/rules/multiline-html-element-content-newline.js
+++ b/lib/rules/multiline-html-element-content-newline.js
@@ -23,7 +23,8 @@ function parseOptions(options) {
     {
       ignores: ['pre', 'textarea', ...INLINE_ELEMENTS],
       ignoreWhenEmpty: true,
-      allowEmptyLines: false
+      allowEmptyLines: false,
+      ignoreComments: false
     },
     options
   )
@@ -80,7 +81,10 @@ module.exports = {
           },
           allowEmptyLines: {
             type: 'boolean'
-          }
+          },
+          ignoreComments: {
+            type: 'boolean'
+          },
         },
         additionalProperties: false
       }
@@ -98,6 +102,7 @@ module.exports = {
     const ignores = options.ignores
     const ignoreWhenEmpty = options.ignoreWhenEmpty
     const allowEmptyLines = options.allowEmptyLines
+    const ignoreComments = options.ignoreComments
     const sourceCode = context.getSourceCode()
     const template =
       sourceCode.parserServices.getTemplateBodyTokenStore &&
@@ -149,7 +154,7 @@ module.exports = {
          * @type {SourceCode.CursorWithCountOptions}
          */
         const getTokenOption = {
-          includeComments: true,
+          includeComments: !ignoreComments,
           filter: (token) => token.type !== 'HTMLWhitespace'
         }
         if (
diff --git a/tests/lib/rules/multiline-html-element-content-newline.js b/tests/lib/rules/multiline-html-element-content-newline.js
index 36aa9cfe4..892004dcd 100644
--- a/tests/lib/rules/multiline-html-element-content-newline.js
+++ b/tests/lib/rules/multiline-html-element-content-newline.js
@@ -170,6 +170,16 @@ tester.run('multiline-html-element-content-newline', rule, {
       options: [{ allowEmptyLines: true }]
     },
 
+    {
+      code: `
+        <template>
+          <div>  <!-- comment -->
+            contents
+          </div>
+        </template>`,
+      options: [{ allowEmptyLines: true, ignoreComments: true }]
+    },
+
     // self closing
     `
       <template>
@@ -611,6 +621,25 @@ content
         'Expected 1 line break before closing tag (`</div>`), but no line breaks found.'
       ]
     },
+    {
+      code: `
+        <template>
+          <div>  <!-- comment -->
+            contents
+          </div>
+        </template>`,
+      output: `
+        <template>
+          <div>
+<!-- comment -->
+            contents
+          </div>
+        </template>`,
+      options: [{ allowEmptyLines: true, ignoreComments: false }],
+      errors: [
+        'Expected 1 line break after opening tag (`<div>`), but no line breaks found.'
+      ]
+    },
     // mustache
     {
       code: `

From f2d4d6a268ac3332304a68bf130d1803aae19dc1 Mon Sep 17 00:00:00 2001
From: David Lomas <david.lomas@knowinnovation.com>
Date: Wed, 23 Oct 2024 12:07:15 +0100
Subject: [PATCH 2/5] Lint fix

---
 lib/rules/multiline-html-element-content-newline.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rules/multiline-html-element-content-newline.js b/lib/rules/multiline-html-element-content-newline.js
index 5cd272a42..5bafba371 100644
--- a/lib/rules/multiline-html-element-content-newline.js
+++ b/lib/rules/multiline-html-element-content-newline.js
@@ -84,7 +84,7 @@ module.exports = {
           },
           ignoreComments: {
             type: 'boolean'
-          },
+          }
         },
         additionalProperties: false
       }

From 5f57e49d60088aeb453f2b3b38288740b237dcc7 Mon Sep 17 00:00:00 2001
From: David Lomas <david.lomas@knowinnovation.com>
Date: Thu, 24 Oct 2024 16:15:14 +0100
Subject: [PATCH 3/5] Add for singleline- version of rule; update tests

---
 .../singleline-html-element-content-newline.js      |  9 +++++++--
 .../rules/multiline-html-element-content-newline.js |  1 -
 .../singleline-html-element-content-newline.js      | 13 +++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/rules/singleline-html-element-content-newline.js b/lib/rules/singleline-html-element-content-newline.js
index bdccf92b6..9574700e1 100644
--- a/lib/rules/singleline-html-element-content-newline.js
+++ b/lib/rules/singleline-html-element-content-newline.js
@@ -24,7 +24,8 @@ function parseOptions(options) {
       ignores: ['pre', 'textarea', ...INLINE_ELEMENTS],
       externalIgnores: [],
       ignoreWhenNoAttributes: true,
-      ignoreWhenEmpty: true
+      ignoreWhenEmpty: true,
+      ignoreComments: false
     },
     options
   )
@@ -63,6 +64,9 @@ module.exports = {
           ignoreWhenEmpty: {
             type: 'boolean'
           },
+          ignoreComments: {
+            type: 'boolean'
+          },
           ignores: {
             type: 'array',
             items: { type: 'string' },
@@ -92,6 +96,7 @@ module.exports = {
     const ignores = new Set([...options.ignores, ...options.externalIgnores])
     const ignoreWhenNoAttributes = options.ignoreWhenNoAttributes
     const ignoreWhenEmpty = options.ignoreWhenEmpty
+    const ignoreComments = options.ignoreComments
     const sourceCode = context.getSourceCode()
     const template =
       sourceCode.parserServices.getTemplateBodyTokenStore &&
@@ -136,7 +141,7 @@ module.exports = {
 
         /** @type {SourceCode.CursorWithCountOptions} */
         const getTokenOption = {
-          includeComments: true,
+          includeComments: !ignoreComments,
           filter: (token) => token.type !== 'HTMLWhitespace'
         }
         if (
diff --git a/tests/lib/rules/multiline-html-element-content-newline.js b/tests/lib/rules/multiline-html-element-content-newline.js
index 892004dcd..7ec1d3cf8 100644
--- a/tests/lib/rules/multiline-html-element-content-newline.js
+++ b/tests/lib/rules/multiline-html-element-content-newline.js
@@ -169,7 +169,6 @@ tester.run('multiline-html-element-content-newline', rule, {
         </template>`,
       options: [{ allowEmptyLines: true }]
     },
-
     {
       code: `
         <template>
diff --git a/tests/lib/rules/singleline-html-element-content-newline.js b/tests/lib/rules/singleline-html-element-content-newline.js
index 52c01392b..9ce748e05 100644
--- a/tests/lib/rules/singleline-html-element-content-newline.js
+++ b/tests/lib/rules/singleline-html-element-content-newline.js
@@ -229,6 +229,19 @@ tester.run('singleline-html-element-content-newline', rule, {
           externalIgnores: ['IgnoreTag']
         }
       ]
+    },
+    // Ignore comments
+    {
+      code: `
+        <template>
+          <div><!-- comment --></div>
+          <div attr><!-- comment --></div>
+        </template>`,
+      options: [
+        {
+          ignoreComments: true
+        }
+      ]
     }
   ],
   invalid: [

From 415fae5120a200956e6ddde2caf0f0dc328207a9 Mon Sep 17 00:00:00 2001
From: David Lomas <david.lomas@knowinnovation.com>
Date: Thu, 24 Oct 2024 16:15:22 +0100
Subject: [PATCH 4/5] Add documentation

---
 .../multiline-html-element-content-newline.md | 22 ++++++++++++++++++-
 ...singleline-html-element-content-newline.md | 22 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/docs/rules/multiline-html-element-content-newline.md b/docs/rules/multiline-html-element-content-newline.md
index 1a55362f5..706b275de 100644
--- a/docs/rules/multiline-html-element-content-newline.md
+++ b/docs/rules/multiline-html-element-content-newline.md
@@ -82,7 +82,8 @@ This rule enforces a line break before and after the contents of a multiline ele
     "vue/multiline-html-element-content-newline": ["error", {
         "ignoreWhenEmpty": true,
         "ignores": ["pre", "textarea", ...INLINE_ELEMENTS],
-        "allowEmptyLines": false
+        "allowEmptyLines": false,
+        "ignoreComments": false
     }]
 }
 ```
@@ -93,6 +94,8 @@ This rule enforces a line break before and after the contents of a multiline ele
     default `["pre", "textarea", ...INLINE_ELEMENTS]`.
 - `allowEmptyLines` ... if `true`, it allows empty lines around content. If you want to disallow multiple empty lines, use [no-multiple-empty-lines] in combination.  
     default `false`
+- `ignoreComments` ... if `true`, it allows comments to be on the same line as the tag.
+    default `false`
 
 ::: info
   All inline non void elements can be found [here](https://github.com/vuejs/eslint-plugin-vue/blob/master/lib/utils/inline-non-void-elements.json).
@@ -143,6 +146,23 @@ This rule enforces a line break before and after the contents of a multiline ele
 
 </eslint-code-block>
 
+### `"ignoreComments": true`
+
+<eslint-code-block fix :rules="{'vue/multiline-html-element-content-newline': ['error', { ignoreComments: true }]}">
+
+```vue
+<template>
+  <!-- ✓ GOOD -->
+  <div class="red">  <!-- or "blue" -->
+    content
+  </div>
+</template>
+```
+
+</eslint-code-block>
+
+
+
 ## :books: Further Reading
 
 - [no-multiple-empty-lines]
diff --git a/docs/rules/singleline-html-element-content-newline.md b/docs/rules/singleline-html-element-content-newline.md
index 11531dcf7..c36ce3e58 100644
--- a/docs/rules/singleline-html-element-content-newline.md
+++ b/docs/rules/singleline-html-element-content-newline.md
@@ -58,7 +58,9 @@ This rule enforces a line break before and after the contents of a singleline el
     "ignoreWhenNoAttributes": true,
     "ignoreWhenEmpty": true,
     "ignores": ["pre", "textarea", ...INLINE_ELEMENTS],
-    "externalIgnores": []
+    "externalIgnores": [],
+    "ignoreComments": false
+
   }]
 }
 ```
@@ -71,6 +73,8 @@ This rule enforces a line break before and after the contents of a singleline el
     default `["pre", "textarea", ...INLINE_ELEMENTS]`
 - `externalIgnores` ... the configuration for external element names to ignore line breaks style, it allows avoiding overwrite the default value of ignores.
     default `[]`
+- `ignoreComments` ... if `true`, it allows comments (but not content, including whitespace) on a single line.
+    default `false`
 
 ::: info
   All inline non void elements can be found [here](https://github.com/vuejs/eslint-plugin-vue/blob/master/lib/utils/inline-non-void-elements.json).
@@ -110,6 +114,22 @@ This rule enforces a line break before and after the contents of a singleline el
 
 </eslint-code-block>
 
+### `"ignoreComments": true`
+
+<eslint-code-block fix :rules="{'vue/singleline-html-element-content-newline': ['error', {'ignoreComments': true}]}">
+
+```vue
+<template>
+  <!-- ✗ BAD -->
+  <div attr>content</div>
+
+  <!-- ✓ GOOD -->
+  <div attr><!-- comment --></div>
+</template>
+```
+
+</eslint-code-block>
+
 ## :rocket: Version
 
 This rule was introduced in eslint-plugin-vue v5.0.0

From 6cf8964381421e00ea1b062e3ec81145795c427c Mon Sep 17 00:00:00 2001
From: David Lomas <david.lomas@knowinnovation.com>
Date: Thu, 24 Oct 2024 16:18:56 +0100
Subject: [PATCH 5/5] Lint (no idea why this wasn't picked up locally...)

---
 docs/rules/multiline-html-element-content-newline.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/rules/multiline-html-element-content-newline.md b/docs/rules/multiline-html-element-content-newline.md
index 706b275de..6350c86fa 100644
--- a/docs/rules/multiline-html-element-content-newline.md
+++ b/docs/rules/multiline-html-element-content-newline.md
@@ -161,8 +161,6 @@ This rule enforces a line break before and after the contents of a multiline ele
 
 </eslint-code-block>
 
-
-
 ## :books: Further Reading
 
 - [no-multiple-empty-lines]