Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/parser/htmlScanner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export function createScanner(input: string, initialOffset = 0, initialState: Sc
let lastTypeValue: string | undefined;

function nextElementName(): string {
return stream.advanceIfRegExp(/^[_:\w][_:\w-.\d]*/).toLowerCase();
return stream.advanceIfRegExp(/^[_:\w][_:\w.\d-]*/).toLowerCase();
}

function nextAttributeName(): string {
Expand Down
45 changes: 45 additions & 0 deletions src/test/scanner.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -831,4 +831,49 @@ suite('HTML Scanner', () => {
}]);
});

test('Tag with Hyphenated Name (Vue custom element)', () => {
assertTokens([{
input: '<s-c-feature>content</s-c-feature>',
tokens: [
{ offset: 0, type: TokenType.StartTagOpen },
{ offset: 1, type: TokenType.StartTag, content: 's-c-feature' },
{ offset: 12, type: TokenType.StartTagClose },
{ offset: 13, type: TokenType.Content },
{ offset: 20, type: TokenType.EndTagOpen },
{ offset: 22, type: TokenType.EndTag, content: 's-c-feature' },
{ offset: 33, type: TokenType.EndTagClose }
]
}
]);
});

test('Self-closing Tag with Hyphenated Name', () => {
assertTokens([{
input: '<my-component />',
tokens: [
{ offset: 0, type: TokenType.StartTagOpen },
{ offset: 1, type: TokenType.StartTag, content: 'my-component' },
{ offset: 13, type: TokenType.Whitespace },
{ offset: 14, type: TokenType.StartTagSelfClose }
]
}
]);
});

test('Tag with Hyphenated Name and Attributes', () => {
assertTokens([{
input: '<el-button type="primary">',
tokens: [
{ offset: 0, type: TokenType.StartTagOpen },
{ offset: 1, type: TokenType.StartTag, content: 'el-button' },
{ offset: 10, type: TokenType.Whitespace },
{ offset: 11, type: TokenType.AttributeName },
{ offset: 15, type: TokenType.DelimiterAssign },
{ offset: 16, type: TokenType.AttributeValue },
{ offset: 25, type: TokenType.StartTagClose }
]
}
]);
});

});
Loading