Skip to content
This repository has been archived by the owner on Nov 5, 2021. It is now read-only.

New rule for non-teminated string in yaml #48

Merged
merged 2 commits into from
Oct 17, 2018
Merged

New rule for non-teminated string in yaml #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c59dd6a
New rule for non-teminated string in yaml
TiagoDanin Oct 3, 2018
290e35d
Merge remote-tracking branch 'origin/master' into pr/TiagoDanin/48
alexdima Oct 17, 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
9 changes: 9 additions & 0 deletions src/yaml/yaml.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,15 @@ testTokenization('yaml', [
}]
}],

//String
[{
line: '\'\'\'',
tokens: [
{ startIndex: 0, type: 'string.yaml' },
{ startIndex: 2, type: 'string.invalid.yaml' },
]
}],

// Block Scalar
[{
line: '>',
Expand Down
4 changes: 3 additions & 1 deletion src/yaml/yaml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ export const language = <ILanguage>{

// Start Flow Scalars (quoted strings)
flowScalars: [
[/"([^"\\]|\\.)*$/, 'string.invalid'],
[/'([^'\\]|\\.)*$/, 'string.invalid'],
[/'[^']*'/, 'string'],
[/"/, 'string', '@doubleQuotedString']
],
Expand All @@ -197,7 +199,7 @@ export const language = <ILanguage>{
[/[^\\"]+/, 'string'],
[/@escapes/, 'string.escape'],
[/\\./, 'string.escape.invalid'],
[/"/, 'string', '@pop']
[/"/, 'string', '@pop']
],

// Start Block Scalar
Expand Down