| Index: lib/src/prism/components/prism-yaml.js
|
| diff --git a/lib/src/prism/components/prism-yaml.js b/lib/src/prism/components/prism-yaml.js
|
| index 6b45e8af3f02db3106f0090948bbbc4675442ad4..ce8f0836a6e9ba3f429b5b7dffdfac34efd28d78 100644
|
| --- a/lib/src/prism/components/prism-yaml.js
|
| +++ b/lib/src/prism/components/prism-yaml.js
|
| @@ -1,44 +1,44 @@
|
| Prism.languages.yaml = {
|
| 'scalar': {
|
| - pattern: /([\-:]\s*(![^\s]+)?[ \t]*[|>])[ \t]*(?:(\n[ \t]+)[^\r\n]+(?:\3[^\r\n]+)*)/,
|
| + pattern: /([\-:]\s*(![^\s]+)?[ \t]*[|>])[ \t]*(?:((?:\r?\n|\r)[ \t]+)[^\r\n]+(?:\3[^\r\n]+)*)/,
|
| lookbehind: true,
|
| alias: 'string'
|
| },
|
| - 'comment': /#[^\n]+/,
|
| + 'comment': /#.*/,
|
| 'key': {
|
| - pattern: /(\s*[:\-,[{\n?][ \t]*(![^\s]+)?[ \t]*)[^\n{[\]},#]+?(?=\s*:\s)/,
|
| + pattern: /(\s*[:\-,[{\r\n?][ \t]*(![^\s]+)?[ \t]*)[^\r\n{[\]},#]+?(?=\s*:\s)/,
|
| lookbehind: true,
|
| alias: 'atrule'
|
| },
|
| 'directive': {
|
| - pattern: /((^|\n)[ \t]*)%[^\n]+/,
|
| + pattern: /(^[ \t]*)%.+/m,
|
| lookbehind: true,
|
| alias: 'important'
|
| },
|
| 'datetime': {
|
| - pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)(\d{4}-\d\d?-\d\d?([tT]|[ \t]+)\d\d?:\d{2}:\d{2}(\.\d*)?[ \t]*(Z|[-+]\d\d?(:\d{2})?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d{2}(:\d{2}(\.\d*)?)?)(?=[ \t]*(\n|$|,|]|}))/,
|
| + pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)(\d{4}-\d\d?-\d\d?([tT]|[ \t]+)\d\d?:\d{2}:\d{2}(\.\d*)?[ \t]*(Z|[-+]\d\d?(:\d{2})?)?|\d{4}-\d{2}-\d{2}|\d\d?:\d{2}(:\d{2}(\.\d*)?)?)(?=[ \t]*($|,|]|}))/m,
|
| lookbehind: true,
|
| alias: 'number'
|
| },
|
| 'boolean': {
|
| - pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)(true|false)[ \t]*(?=\n|$|,|]|})/i,
|
| + pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)(true|false)[ \t]*(?=$|,|]|})/im,
|
| lookbehind: true,
|
| alias: 'important'
|
| },
|
| 'null': {
|
| - pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)(null|~)[ \t]*(?=\n|$|,|]|})/i,
|
| + pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)(null|~)[ \t]*(?=$|,|]|})/im,
|
| lookbehind: true,
|
| alias: 'important'
|
| },
|
| 'string': {
|
| - pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*')(?=[ \t]*(\n|$|,|]|}))/,
|
| + pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)("(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*')(?=[ \t]*($|,|]|}))/m,
|
| lookbehind: true
|
| },
|
| 'number': {
|
| - pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)[+\-]?(0x[\dA-Fa-f]+|0o[0-7]+|(\d+\.?\d*|\.?\d+)(e[\+\-]?\d+)?|\.inf|\.nan)[ \t]*(?=\n|$|,|]|})/i,
|
| + pattern: /([:\-,[{]\s*(![^\s]+)?[ \t]*)[+\-]?(0x[\da-f]+|0o[0-7]+|(\d+\.?\d*|\.?\d+)(e[\+\-]?\d+)?|\.inf|\.nan)[ \t]*(?=$|,|]|})/im,
|
| lookbehind: true
|
| },
|
| 'tag': /![^\s]+/,
|
| 'important': /[&*][\w]+/,
|
| - 'punctuation': /([:[\]{}\-,|>?]|---|\.\.\.)/
|
| + 'punctuation': /---|[:[\]{}\-,|>?]|\.\.\./
|
| };
|
|
|