Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Forbid comments with more than two dashes #87

Merged
winstliu merged 8 commits into from
Jul 1, 2018
Merged

Forbid comments with more than two dashes #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
236c266
:bug: Forbid comments from ending in triple dash
TangSteven Jun 27, 2018
346967c
Update xml-spec.coffee
TangSteven Jun 28, 2018
0c67c40
Update xml-spec.coffee
TangSteven Jun 28, 2018
d633e8b
Invalidate comments with more than two dashes
TangSteven Jun 28, 2018
d535ac1
Invalidate comments with more than two dashes
TangSteven Jun 28, 2018
0a04e02
Split JSP and XML comments
TangSteven Jun 29, 2018
9be7176
Update xml-spec.coffee
TangSteven Jun 29, 2018
71718a5
Update xml-spec.coffee
TangSteven Jun 29, 2018
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
32 changes: 26 additions & 6 deletions grammars/xml.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,29 @@
}
]
'comments':
'begin': '<[!%]--'
'captures':
'0':
'name': 'punctuation.definition.comment.xml'
'end': '--%?>'
'name': 'comment.block.xml'
'patterns': [
{
'begin': '<%--'
'captures':
'0':
'name': 'punctuation.definition.comment.xml'
'end': '--%>'
'name': 'comment.block.xml'
}
{
'begin': '<!--'
'captures':
'0':
'name': 'punctuation.definition.comment.xml'
'end': '-->'
'name': 'comment.block.xml'
'patterns': [
{
'begin': '--(?!>)'
'captures':
'0':
'name': 'invalid.illegal.bad-comments-or-CDATA.xml'
}
]
}
]
15 changes: 14 additions & 1 deletion spec/xml-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,19 @@ describe "XML grammar", ->
expect(lines[2][1]).toEqual value: '<!--', scopes: ['text.xml', 'meta.tag.sgml.doctype.xml', 'meta.internalsubset.xml', 'comment.block.xml', 'punctuation.definition.comment.xml']
expect(lines[3][1]).toEqual value: '<!--', scopes: ['text.xml', 'meta.tag.sgml.doctype.xml', 'meta.internalsubset.xml', 'comment.block.xml', 'punctuation.definition.comment.xml']

it 'tokenizes comment endings with more than two dashes as invalid', ->
{tokens} = grammar.tokenizeLine('<!-- invalid comment --->')
expect(tokens[0]).toEqual value: '<!--', scopes: ['text.xml', 'comment.block.xml', 'punctuation.definition.comment.xml']
expect(tokens[1]).toEqual value: ' invalid comment ', scopes: ['text.xml', 'comment.block.xml']
expect(tokens[2]).toEqual value: '--', scopes: ['text.xml', 'comment.block.xml', 'invalid.illegal.bad-comments-or-CDATA.xml']

it 'tokenizes comments with two dashes not followed by ">" as invalid', ->
{tokens} = grammar.tokenizeLine('<!-- invalid -- comment -->')
expect(tokens[0]).toEqual value: '<!--', scopes: ['text.xml', 'comment.block.xml', 'punctuation.definition.comment.xml']
expect(tokens[1]).toEqual value: ' invalid ', scopes: ['text.xml', 'comment.block.xml']
expect(tokens[2]).toEqual value: '--', scopes: ['text.xml', 'comment.block.xml', 'invalid.illegal.bad-comments-or-CDATA.xml']
expect(tokens[3]).toEqual value: ' comment -->', scopes: ['text.xml', 'comment.block.xml']

it "tokenizes empty element meta.tag.no-content.xml", ->
{tokens} = grammar.tokenizeLine('<n></n>')
expect(tokens[0]).toEqual value: '<', scopes: ['text.xml', 'meta.tag.no-content.xml', 'punctuation.definition.tag.xml']
Expand All @@ -41,7 +54,7 @@ describe "XML grammar", ->
</el>
"""
expect(linesWithIndent[1][1]).toEqual value: 'attrName', scopes: ['text.xml', 'meta.tag.xml', 'entity.other.attribute-name.localname.xml']

linesWithoutIndent = grammar.tokenizeLines """
<el
attrName="attrValue">
Expand Down