diff --git a/packages/compiler-core/__tests__/__snapshots__/parse.spec.ts.snap b/packages/compiler-core/__tests__/__snapshots__/parse.spec.ts.snap
index 9f15cab6504..4ee503197ef 100644
--- a/packages/compiler-core/__tests__/__snapshots__/parse.spec.ts.snap
+++ b/packages/compiler-core/__tests__/__snapshots__/parse.spec.ts.snap
@@ -54,6 +54,7 @@ exports[`compiler: parse > Edge Cases > invalid html 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -252,6 +253,7 @@ exports[`compiler: parse > Edge Cases > self closing multiple tag 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -466,6 +468,7 @@ exports[`compiler: parse > Edge Cases > valid html 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -501,6 +504,7 @@ exports[`compiler: parse > Errors > CDATA_IN_HTML_CONTENT > <![CDATA[cdata]]> 1`
   "cached": [],
   "children": [],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -553,6 +557,7 @@ exports[`compiler: parse > Errors > CDATA_IN_HTML_CONTENT > <template><![CDATA[c
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -646,6 +651,7 @@ exports[`compiler: parse > Errors > CDATA_IN_HTML_CONTENT > <template><svg><![CD
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -816,6 +822,7 @@ exports[`compiler: parse > Errors > DUPLICATE_ATTRIBUTE > <template><div id="" i
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -886,6 +893,7 @@ exports[`compiler: parse > Errors > EOF_BEFORE_TAG_NAME > <template>< 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -956,6 +964,7 @@ exports[`compiler: parse > Errors > EOF_BEFORE_TAG_NAME > <template></ 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1031,6 +1040,7 @@ exports[`compiler: parse > Errors > EOF_IN_CDATA > <template><svg><![CDATA[ 1`]
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1124,6 +1134,7 @@ exports[`compiler: parse > Errors > EOF_IN_CDATA > <template><svg><![CDATA[cdata
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1176,6 +1187,7 @@ exports[`compiler: parse > Errors > EOF_IN_COMMENT > <template><!-- 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1246,6 +1258,7 @@ exports[`compiler: parse > Errors > EOF_IN_COMMENT > <template><!--comment 1`] =
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1298,6 +1311,7 @@ exports[`compiler: parse > Errors > EOF_IN_TAG > <div></div 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1350,6 +1364,7 @@ exports[`compiler: parse > Errors > EOF_IN_TAG > <template><div  1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1402,6 +1417,7 @@ exports[`compiler: parse > Errors > EOF_IN_TAG > <template><div 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1454,6 +1470,7 @@ exports[`compiler: parse > Errors > EOF_IN_TAG > <template><div id  1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1506,6 +1523,7 @@ exports[`compiler: parse > Errors > EOF_IN_TAG > <template><div id = 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1558,6 +1576,7 @@ exports[`compiler: parse > Errors > EOF_IN_TAG > <template><div id 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1610,6 +1629,7 @@ exports[`compiler: parse > Errors > EOF_IN_TAG > <template><div id="abc 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1662,6 +1682,7 @@ exports[`compiler: parse > Errors > EOF_IN_TAG > <template><div id="abc" 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1732,6 +1753,7 @@ exports[`compiler: parse > Errors > EOF_IN_TAG > <template><div id="abc"/ 1`] =
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1784,6 +1806,7 @@ exports[`compiler: parse > Errors > EOF_IN_TAG > <template><div id='abc 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1836,6 +1859,7 @@ exports[`compiler: parse > Errors > EOF_IN_TAG > <template><div id='abc' 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1906,6 +1930,7 @@ exports[`compiler: parse > Errors > EOF_IN_TAG > <template><div id='abc'/ 1`] =
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -1976,6 +2001,7 @@ exports[`compiler: parse > Errors > EOF_IN_TAG > <template><div id=abc / 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -2028,6 +2054,7 @@ exports[`compiler: parse > Errors > EOF_IN_TAG > <template><div id=abc 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -2151,6 +2178,7 @@ exports[`compiler: parse > Errors > MISSING_ATTRIBUTE_VALUE > <template><div id=
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -2274,6 +2302,7 @@ exports[`compiler: parse > Errors > MISSING_ATTRIBUTE_VALUE > <template><div id=
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -2397,6 +2426,7 @@ exports[`compiler: parse > Errors > MISSING_ATTRIBUTE_VALUE > <template><div id=
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -2449,6 +2479,7 @@ exports[`compiler: parse > Errors > MISSING_END_TAG_NAME > <template></></templa
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -2572,6 +2603,7 @@ exports[`compiler: parse > Errors > UNEXPECTED_CHARACTER_IN_ATTRIBUTE_NAME > <te
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -2695,6 +2727,7 @@ exports[`compiler: parse > Errors > UNEXPECTED_CHARACTER_IN_ATTRIBUTE_NAME > <te
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -2818,6 +2851,7 @@ exports[`compiler: parse > Errors > UNEXPECTED_CHARACTER_IN_ATTRIBUTE_NAME > <te
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -2941,6 +2975,7 @@ exports[`compiler: parse > Errors > UNEXPECTED_CHARACTER_IN_UNQUOTED_ATTRIBUTE_V
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -3064,6 +3099,7 @@ exports[`compiler: parse > Errors > UNEXPECTED_CHARACTER_IN_UNQUOTED_ATTRIBUTE_V
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -3187,6 +3223,7 @@ exports[`compiler: parse > Errors > UNEXPECTED_CHARACTER_IN_UNQUOTED_ATTRIBUTE_V
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -3310,6 +3347,7 @@ exports[`compiler: parse > Errors > UNEXPECTED_CHARACTER_IN_UNQUOTED_ATTRIBUTE_V
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -3433,6 +3471,7 @@ exports[`compiler: parse > Errors > UNEXPECTED_CHARACTER_IN_UNQUOTED_ATTRIBUTE_V
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -3540,6 +3579,7 @@ exports[`compiler: parse > Errors > UNEXPECTED_EQUALS_SIGN_BEFORE_ATTRIBUTE_NAME
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -3663,6 +3703,7 @@ exports[`compiler: parse > Errors > UNEXPECTED_EQUALS_SIGN_BEFORE_ATTRIBUTE_NAME
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -3715,6 +3756,7 @@ exports[`compiler: parse > Errors > UNEXPECTED_QUESTION_MARK_INSTEAD_OF_TAG_NAME
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -3853,6 +3895,7 @@ exports[`compiler: parse > Errors > UNEXPECTED_SOLIDUS_IN_TAG > <template><div a
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -3923,6 +3966,7 @@ exports[`compiler: parse > Errors > X_INVALID_END_TAG > <svg><![CDATA[</div>]]><
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -3993,6 +4037,7 @@ exports[`compiler: parse > Errors > X_INVALID_END_TAG > <svg><!--</div>--></svg>
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -4045,6 +4090,7 @@ exports[`compiler: parse > Errors > X_INVALID_END_TAG > <template></div></div></
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -4097,6 +4143,7 @@ exports[`compiler: parse > Errors > X_INVALID_END_TAG > <template></div></templa
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -4185,6 +4232,7 @@ exports[`compiler: parse > Errors > X_INVALID_END_TAG > <template>{{'</div>'}}</
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -4255,6 +4303,7 @@ exports[`compiler: parse > Errors > X_INVALID_END_TAG > <template>a </ b</templa
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -4325,6 +4374,7 @@ exports[`compiler: parse > Errors > X_INVALID_END_TAG > <textarea></div></textar
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -4449,6 +4499,7 @@ exports[`compiler: parse > Errors > X_MISSING_DYNAMIC_DIRECTIVE_ARGUMENT_END > <
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -4524,6 +4575,7 @@ exports[`compiler: parse > Errors > X_MISSING_END_TAG > <template><div> 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -4599,6 +4651,7 @@ exports[`compiler: parse > Errors > X_MISSING_END_TAG > <template><div></templat
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -4669,6 +4722,7 @@ exports[`compiler: parse > Errors > X_MISSING_INTERPOLATION_END > <div>{{ foo</d
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -4716,6 +4770,7 @@ exports[`compiler: parse > Errors > X_MISSING_INTERPOLATION_END > {{ 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -4763,6 +4818,7 @@ exports[`compiler: parse > Errors > X_MISSING_INTERPOLATION_END > {{ foo 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
@@ -4828,6 +4884,7 @@ exports[`compiler: parse > Errors > X_MISSING_INTERPOLATION_END > {{}} 1`] = `
     },
   ],
   "codegenNode": undefined,
+  "comments": [],
   "components": [],
   "directives": [],
   "helpers": Set {},
diff --git a/packages/compiler-core/__tests__/codegen.spec.ts b/packages/compiler-core/__tests__/codegen.spec.ts
index 34386ce6930..09b2f8a55f2 100644
--- a/packages/compiler-core/__tests__/codegen.spec.ts
+++ b/packages/compiler-core/__tests__/codegen.spec.ts
@@ -42,6 +42,7 @@ function createRoot(options: Partial<RootNode> = {}): RootNode {
     type: NodeTypes.ROOT,
     source: '',
     children: [],
+    comments: [],
     helpers: new Set(),
     components: [],
     directives: [],
diff --git a/packages/compiler-core/__tests__/parse.spec.ts b/packages/compiler-core/__tests__/parse.spec.ts
index 8d32981524b..d27eab844d3 100644
--- a/packages/compiler-core/__tests__/parse.spec.ts
+++ b/packages/compiler-core/__tests__/parse.spec.ts
@@ -2,10 +2,12 @@ import type { ParserOptions } from '../src/options'
 import { ErrorCodes } from '../src/errors'
 import {
   type CommentNode,
+  CommentTypes,
   ConstantTypes,
   type DirectiveNode,
   type ElementNode,
   ElementTypes,
+  type InTagCommentNode,
   type InterpolationNode,
   Namespaces,
   NodeTypes,
@@ -1171,6 +1173,70 @@ describe('compiler: parse', () => {
       })
     })
 
+    test('in-tag line comments', () => {
+      const ast = baseParse(`<Comp
+        // @vue-expect-error
+        :selected-id="selectedId"
+        // note
+        disabled
+        @click="onClick"
+        // tail
+      />`)
+
+      expect(ast.comments.map(comment => comment.content)).toStrictEqual([
+        ' @vue-expect-error',
+        ' note',
+        ' tail',
+      ])
+
+      const comment = ast.comments[0] as InTagCommentNode
+      expect(comment).toMatchObject({
+        type: NodeTypes.COMMENT,
+        kind: CommentTypes.IN_TAG_LINE,
+        content: ' @vue-expect-error',
+        contentLoc: {
+          source: ' @vue-expect-error',
+        },
+        loc: {
+          source: '// @vue-expect-error',
+        },
+      })
+    })
+
+    test('in-tag line comment can directly follow tag name', () => {
+      const onError = vi.fn()
+      const ast = baseParse(`<div// note>`, { onError })
+
+      const comment = ast.comments[0] as InTagCommentNode
+      expect(comment).toMatchObject({
+        type: NodeTypes.COMMENT,
+        kind: CommentTypes.IN_TAG_LINE,
+        content: ' note>',
+        loc: {
+          source: '// note>',
+        },
+      })
+      expect(onError).toHaveBeenCalledWith(
+        expect.objectContaining({
+          code: ErrorCodes.EOF_IN_TAG,
+        }),
+      )
+    })
+
+    test('in-tag line comments are preserved regardless of comments option', () => {
+      const astOptionNoComment = baseParse(`<div\n  // note\n/>`, {
+        comments: false,
+      })
+      const astOptionWithComments = baseParse(`<div\n  // note\n/>`, {
+        comments: true,
+      })
+
+      expect(astOptionNoComment.children).toHaveLength(1)
+      expect(astOptionWithComments.children).toHaveLength(1)
+      expect(astOptionNoComment.comments).toHaveLength(1)
+      expect(astOptionWithComments.comments).toHaveLength(1)
+    })
+
     // https://github.com/vuejs/core/issues/4251
     test('class attribute should ignore whitespace when parsed', () => {
       const ast = baseParse('<div class=" \n\t c \t\n "></div>')
diff --git a/packages/compiler-core/src/ast.ts b/packages/compiler-core/src/ast.ts
index 520a43c93b0..2506c4e3dfe 100644
--- a/packages/compiler-core/src/ast.ts
+++ b/packages/compiler-core/src/ast.ts
@@ -67,6 +67,10 @@ export enum ElementTypes {
   TEMPLATE,
 }
 
+export enum CommentTypes {
+  IN_TAG_LINE,
+}
+
 export interface Node {
   type: NodeTypes
   loc: SourceLocation
@@ -105,6 +109,7 @@ export interface RootNode extends Node {
   type: NodeTypes.ROOT
   source: string
   children: TemplateChildNode[]
+  comments: RootCommentNode[]
   helpers: Set<symbol>
   components: string[]
   directives: string[]
@@ -183,6 +188,13 @@ export interface CommentNode extends Node {
   content: string
 }
 
+export interface InTagCommentNode extends Node {
+  type: NodeTypes.COMMENT
+  kind: CommentTypes.IN_TAG_LINE
+  content: string
+  contentLoc: SourceLocation
+}
+
 export interface AttributeNode extends Node {
   type: NodeTypes.ATTRIBUTE
   name: string
@@ -210,6 +222,8 @@ export interface DirectiveNode extends Node {
   forParseResult?: ForParseResult
 }
 
+export type RootCommentNode = InTagCommentNode
+
 /**
  * Static types have several levels.
  * Higher levels implies lower levels. e.g. a node that can be stringified
@@ -596,6 +610,7 @@ export function createRoot(
     type: NodeTypes.ROOT,
     source,
     children,
+    comments: [],
     helpers: new Set(),
     components: [],
     directives: [],
diff --git a/packages/compiler-core/src/parser.ts b/packages/compiler-core/src/parser.ts
index b4c017edd83..4d96419f7e2 100644
--- a/packages/compiler-core/src/parser.ts
+++ b/packages/compiler-core/src/parser.ts
@@ -1,5 +1,6 @@
 import {
   type AttributeNode,
+  CommentTypes,
   ConstantTypes,
   type DirectiveNode,
   type ElementNode,
@@ -419,6 +420,16 @@ const tokenizer = new Tokenizer(stack, {
     }
   },
 
+  onjslinecomment(start, end) {
+    currentRoot!.comments.push({
+      type: NodeTypes.COMMENT,
+      kind: CommentTypes.IN_TAG_LINE,
+      content: getSlice(start, end),
+      contentLoc: getLoc(start, end),
+      loc: getLoc(start - 2, end),
+    })
+  },
+
   onend() {
     const end = currentInput.length
     // EOF ERRORS
diff --git a/packages/compiler-core/src/tokenizer.ts b/packages/compiler-core/src/tokenizer.ts
index c6084e1cac0..fc3280fb032 100644
--- a/packages/compiler-core/src/tokenizer.ts
+++ b/packages/compiler-core/src/tokenizer.ts
@@ -125,6 +125,7 @@ export enum State {
   CDATASequence,
   InSpecialComment,
   InCommentLike,
+  InJsLineComment,
 
   // Special tags
   BeforeSpecialS, // Decide if we deal with `<script` or `<style`
@@ -199,6 +200,7 @@ export interface Callbacks {
   ondirmodifier(start: number, endIndex: number): void
 
   oncomment(start: number, endIndex: number): void
+  onjslinecomment(start: number, endIndex: number): void
   oncdata(start: number, endIndex: number): void
 
   onprocessinginstruction(start: number, endIndex: number): void
@@ -331,6 +333,14 @@ export default class Tokenizer {
     return this.buffer.charCodeAt(this.index + 1)
   }
 
+  private isInTagLineCommentOpen(): boolean {
+    return (
+      !this.inSFCRoot &&
+      this.buffer.charCodeAt(this.index) === CharCodes.Slash &&
+      this.peek() === CharCodes.Slash
+    )
+  }
+
   private stateText(c: number): void {
     if (c === CharCodes.Lt) {
       if (this.index > this.sectionStart) {
@@ -545,6 +555,20 @@ export default class Tokenizer {
     }
   }
 
+  private startInTagLineComment(): void {
+    this.state = State.InJsLineComment
+    this.sectionStart = this.index + 2
+    this.index++
+  }
+
+  private stateInJsLineComment(c: number): void {
+    if (c === CharCodes.NewLine || c === CharCodes.CarriageReturn) {
+      this.cbs.onjslinecomment(this.sectionStart, this.index)
+      this.sectionStart = this.index + 1
+      this.state = State.BeforeAttrName
+    }
+  }
+
   private startSpecial(sequence: Uint8Array, offset: number) {
     this.enterRCDATA(sequence, offset)
     this.state = State.SpecialStartSequence
@@ -594,7 +618,11 @@ export default class Tokenizer {
     }
   }
   private stateInTagName(c: number): void {
-    if (isEndOfTagSection(c)) {
+    if (c === CharCodes.Slash && this.peek() === CharCodes.Slash) {
+      this.cbs.onopentagname(this.sectionStart, this.index)
+      this.sectionStart = -1
+      this.startInTagLineComment()
+    } else if (isEndOfTagSection(c)) {
       this.handleTagName(c)
     }
   }
@@ -654,6 +682,8 @@ export default class Tokenizer {
         this.state = State.Text
       }
       this.sectionStart = this.index + 1
+    } else if (this.isInTagLineCommentOpen()) {
+      this.startInTagLineComment()
     } else if (c === CharCodes.Slash) {
       this.state = State.InSelfClosingTag
       if ((__DEV__ || !__BROWSER__) && this.peek() !== CharCodes.Gt) {
@@ -779,6 +809,9 @@ export default class Tokenizer {
   private stateAfterAttrName(c: number): void {
     if (c === CharCodes.Eq) {
       this.state = State.BeforeAttrValue
+    } else if (this.isInTagLineCommentOpen()) {
+      this.cbs.onattribend(QuoteType.NoValue, this.sectionStart)
+      this.startInTagLineComment()
     } else if (c === CharCodes.Slash || c === CharCodes.Gt) {
       this.cbs.onattribend(QuoteType.NoValue, this.sectionStart)
       this.sectionStart = -1
@@ -1005,6 +1038,10 @@ export default class Tokenizer {
           this.stateInCommentLike(c)
           break
         }
+        case State.InJsLineComment: {
+          this.stateInJsLineComment(c)
+          break
+        }
         case State.InSpecialComment: {
           this.stateInSpecialComment(c)
           break
@@ -1130,6 +1167,13 @@ export default class Tokenizer {
   private handleTrailingData() {
     const endIndex = this.buffer.length
 
+    if (this.state === State.InJsLineComment) {
+      this.cbs.onjslinecomment(this.sectionStart, endIndex)
+      this.sectionStart = endIndex
+      this.state = State.BeforeAttrName
+      return
+    }
+
     // If there is no remaining data, we are done.
     if (this.sectionStart >= endIndex) {
       return