| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | // CodeMirror, copyright (c) by Marijn Haverbeke and others |
| 2 | -// Distributed under an MIT license: https://codemirror.net/LICENSE | |
| 2 | +// Distributed under an MIT license: http://codemirror.net/LICENSE | |
| 3 | 3 | |
| 4 | 4 | (function(mod) { |
| 5 | 5 | if (typeof exports == "object" && typeof module == "object") // CommonJS |
| 6 | 6 | mod(require("../../lib/codemirror")); |
| @@ -28,10 +28,9 @@ | ||
| 28 | 28 | colorKeywords = parserConfig.colorKeywords || {}, |
| 29 | 29 | valueKeywords = parserConfig.valueKeywords || {}, |
| 30 | 30 | allowNested = parserConfig.allowNested, |
| 31 | 31 | lineComment = parserConfig.lineComment, |
| 32 | - supportsAtComponent = parserConfig.supportsAtComponent === true, | |
| 33 | - highlightNonStandardPropertyKeywords = config.highlightNonStandardPropertyKeywords !== false; | |
| 32 | + supportsAtComponent = parserConfig.supportsAtComponent === true; | |
| 34 | 33 | |
| 35 | 34 | var type, override; |
| 36 | 35 | function ret(style, tp) { type = tp; return style; } |
| 37 | 36 | |
| @@ -63,9 +62,9 @@ | ||
| 63 | 62 | } else if (ch === "-") { |
| 64 | 63 | if (/[\d.]/.test(stream.peek())) { |
| 65 | 64 | stream.eatWhile(/[\w.%]/); |
| 66 | 65 | return ret("number", "unit"); |
| 67 | - } else if (stream.match(/^-[\w\\\-]*/)) { | |
| 66 | + } else if (stream.match(/^-[\w\\\-]+/)) { | |
| 68 | 67 | stream.eatWhile(/[\w\\\-]/); |
| 69 | 68 | if (stream.match(/^\s*:/, false)) |
| 70 | 69 | return ret("variable-2", "variable-definition"); |
| 71 | 70 | return ret("variable-2", "variable"); |
| @@ -77,13 +76,14 @@ | ||
| 77 | 76 | } else if (ch == "." && stream.match(/^-?[_a-z][_a-z0-9-]*/i)) { |
| 78 | 77 | return ret("qualifier", "qualifier"); |
| 79 | 78 | } else if (/[:;{}\[\]\(\)]/.test(ch)) { |
| 80 | 79 | return ret(null, ch); |
| 81 | - } else if (stream.match(/[\w-.]+(?=\()/)) { | |
| 82 | - if (/^(url(-prefix)?|domain|regexp)$/.test(stream.current().toLowerCase())) { | |
| 83 | - state.tokenize = tokenParenthesized; | |
| 84 | - } | |
| 85 | - return ret("variable callee", "variable"); | |
| 80 | + } else if ((ch == "u" && stream.match(/rl(-prefix)?\(/)) || | |
| 81 | + (ch == "d" && stream.match("omain(")) || | |
| 82 | + (ch == "r" && stream.match("egexp("))) { | |
| 83 | + stream.backUp(1); | |
| 84 | + state.tokenize = tokenParenthesized; | |
| 85 | + return ret("property", "word"); | |
| 86 | 86 | } else if (/[\w\\\-]/.test(ch)) { |
| 87 | 87 | stream.eatWhile(/[\w\\\-]/); |
| 88 | 88 | return ret("property", "word"); |
| 89 | 89 | } else { |
| @@ -161,18 +161,18 @@ | ||
| 161 | 161 | if (type == "{") { |
| 162 | 162 | return pushContext(state, stream, "block"); |
| 163 | 163 | } else if (type == "}" && state.context.prev) { |
| 164 | 164 | return popContext(state); |
| 165 | - } else if (supportsAtComponent && /@component/i.test(type)) { | |
| 165 | + } else if (supportsAtComponent && /@component/.test(type)) { | |
| 166 | 166 | return pushContext(state, stream, "atComponentBlock"); |
| 167 | - } else if (/^@(-moz-)?document$/i.test(type)) { | |
| 167 | + } else if (/^@(-moz-)?document$/.test(type)) { | |
| 168 | 168 | return pushContext(state, stream, "documentTypes"); |
| 169 | - } else if (/^@(media|supports|(-moz-)?document|import)$/i.test(type)) { | |
| 169 | + } else if (/^@(media|supports|(-moz-)?document|import)$/.test(type)) { | |
| 170 | 170 | return pushContext(state, stream, "atBlock"); |
| 171 | - } else if (/^@(font-face|counter-style)/i.test(type)) { | |
| 171 | + } else if (/^@(font-face|counter-style)/.test(type)) { | |
| 172 | 172 | state.stateArg = type; |
| 173 | 173 | return "restricted_atBlock_before"; |
| 174 | - } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/i.test(type)) { | |
| 174 | + } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) { | |
| 175 | 175 | return "keyframes"; |
| 176 | 176 | } else if (type && type.charAt(0) == "@") { |
| 177 | 177 | return pushContext(state, stream, "at"); |
| 178 | 178 | } else if (type == "hash") { |
| @@ -197,9 +197,9 @@ | ||
| 197 | 197 | if (propertyKeywords.hasOwnProperty(word)) { |
| 198 | 198 | override = "property"; |
| 199 | 199 | return "maybeprop"; |
| 200 | 200 | } else if (nonStandardPropertyKeywords.hasOwnProperty(word)) { |
| 201 | - override = highlightNonStandardPropertyKeywords ? "string-2" : "property"; | |
| 201 | + override = "string-2"; | |
| 202 | 202 | return "maybeprop"; |
| 203 | 203 | } else if (allowNested) { |
| 204 | 204 | override = stream.match(/^\s*:(?:\s|$)/, false) ? "property" : "tag"; |
| 205 | 205 | return "block"; |
| @@ -291,9 +291,9 @@ | ||
| 291 | 291 | override = "keyword"; |
| 292 | 292 | else if (propertyKeywords.hasOwnProperty(word)) |
| 293 | 293 | override = "property"; |
| 294 | 294 | else if (nonStandardPropertyKeywords.hasOwnProperty(word)) |
| 295 | - override = highlightNonStandardPropertyKeywords ? "string-2" : "property"; | |
| 295 | + override = "string-2"; | |
| 296 | 296 | else if (valueKeywords.hasOwnProperty(word)) |
| 297 | 297 | override = "atom"; |
| 298 | 298 | else if (colorKeywords.hasOwnProperty(word)) |
| 299 | 299 | override = "keyword"; |
| @@ -442,151 +442,119 @@ | ||
| 442 | 442 | "max-color", "color-index", "min-color-index", "max-color-index", |
| 443 | 443 | "monochrome", "min-monochrome", "max-monochrome", "resolution", |
| 444 | 444 | "min-resolution", "max-resolution", "scan", "grid", "orientation", |
| 445 | 445 | "device-pixel-ratio", "min-device-pixel-ratio", "max-device-pixel-ratio", |
| 446 | - "pointer", "any-pointer", "hover", "any-hover", "prefers-color-scheme" | |
| 446 | + "pointer", "any-pointer", "hover", "any-hover" | |
| 447 | 447 | ], mediaFeatures = keySet(mediaFeatures_); |
| 448 | 448 | |
| 449 | 449 | var mediaValueKeywords_ = [ |
| 450 | 450 | "landscape", "portrait", "none", "coarse", "fine", "on-demand", "hover", |
| 451 | - "interlace", "progressive", | |
| 452 | - "dark", "light" | |
| 451 | + "interlace", "progressive" | |
| 453 | 452 | ], mediaValueKeywords = keySet(mediaValueKeywords_); |
| 454 | 453 | |
| 455 | 454 | var propertyKeywords_ = [ |
| 456 | 455 | "align-content", "align-items", "align-self", "alignment-adjust", |
| 457 | - "alignment-baseline", "all", "anchor-point", "animation", "animation-delay", | |
| 456 | + "alignment-baseline", "anchor-point", "animation", "animation-delay", | |
| 458 | 457 | "animation-direction", "animation-duration", "animation-fill-mode", |
| 459 | 458 | "animation-iteration-count", "animation-name", "animation-play-state", |
| 460 | - "animation-timing-function", "appearance", "azimuth", "backdrop-filter", | |
| 461 | - "backface-visibility", "background", "background-attachment", | |
| 462 | - "background-blend-mode", "background-clip", "background-color", | |
| 463 | - "background-image", "background-origin", "background-position", | |
| 464 | - "background-position-x", "background-position-y", "background-repeat", | |
| 465 | - "background-size", "baseline-shift", "binding", "bleed", "block-size", | |
| 466 | - "bookmark-label", "bookmark-level", "bookmark-state", "bookmark-target", | |
| 467 | - "border", "border-bottom", "border-bottom-color", "border-bottom-left-radius", | |
| 468 | - "border-bottom-right-radius", "border-bottom-style", "border-bottom-width", | |
| 469 | - "border-collapse", "border-color", "border-image", "border-image-outset", | |
| 459 | + "animation-timing-function", "appearance", "azimuth", "backface-visibility", | |
| 460 | + "background", "background-attachment", "background-blend-mode", "background-clip", | |
| 461 | + "background-color", "background-image", "background-origin", "background-position", | |
| 462 | + "background-repeat", "background-size", "baseline-shift", "binding", | |
| 463 | + "bleed", "bookmark-label", "bookmark-level", "bookmark-state", | |
| 464 | + "bookmark-target", "border", "border-bottom", "border-bottom-color", | |
| 465 | + "border-bottom-left-radius", "border-bottom-right-radius", | |
| 466 | + "border-bottom-style", "border-bottom-width", "border-collapse", | |
| 467 | + "border-color", "border-image", "border-image-outset", | |
| 470 | 468 | "border-image-repeat", "border-image-slice", "border-image-source", |
| 471 | - "border-image-width", "border-left", "border-left-color", "border-left-style", | |
| 472 | - "border-left-width", "border-radius", "border-right", "border-right-color", | |
| 473 | - "border-right-style", "border-right-width", "border-spacing", "border-style", | |
| 474 | - "border-top", "border-top-color", "border-top-left-radius", | |
| 475 | - "border-top-right-radius", "border-top-style", "border-top-width", | |
| 476 | - "border-width", "bottom", "box-decoration-break", "box-shadow", "box-sizing", | |
| 477 | - "break-after", "break-before", "break-inside", "caption-side", "caret-color", | |
| 478 | - "clear", "clip", "color", "color-profile", "column-count", "column-fill", | |
| 479 | - "column-gap", "column-rule", "column-rule-color", "column-rule-style", | |
| 480 | - "column-rule-width", "column-span", "column-width", "columns", "contain", | |
| 481 | - "content", "counter-increment", "counter-reset", "crop", "cue", "cue-after", | |
| 482 | - "cue-before", "cursor", "direction", "display", "dominant-baseline", | |
| 483 | - "drop-initial-after-adjust", "drop-initial-after-align", | |
| 484 | - "drop-initial-before-adjust", "drop-initial-before-align", "drop-initial-size", | |
| 485 | - "drop-initial-value", "elevation", "empty-cells", "fit", "fit-position", | |
| 486 | - "flex", "flex-basis", "flex-direction", "flex-flow", "flex-grow", | |
| 487 | - "flex-shrink", "flex-wrap", "float", "float-offset", "flow-from", "flow-into", | |
| 488 | - "font", "font-family", "font-feature-settings", "font-kerning", | |
| 489 | - "font-language-override", "font-optical-sizing", "font-size", | |
| 490 | - "font-size-adjust", "font-stretch", "font-style", "font-synthesis", | |
| 491 | - "font-variant", "font-variant-alternates", "font-variant-caps", | |
| 492 | - "font-variant-east-asian", "font-variant-ligatures", "font-variant-numeric", | |
| 493 | - "font-variant-position", "font-variation-settings", "font-weight", "gap", | |
| 494 | - "grid", "grid-area", "grid-auto-columns", "grid-auto-flow", "grid-auto-rows", | |
| 495 | - "grid-column", "grid-column-end", "grid-column-gap", "grid-column-start", | |
| 496 | - "grid-gap", "grid-row", "grid-row-end", "grid-row-gap", "grid-row-start", | |
| 497 | - "grid-template", "grid-template-areas", "grid-template-columns", | |
| 498 | - "grid-template-rows", "hanging-punctuation", "height", "hyphens", "icon", | |
| 499 | - "image-orientation", "image-rendering", "image-resolution", "inline-box-align", | |
| 500 | - "inset", "inset-block", "inset-block-end", "inset-block-start", "inset-inline", | |
| 501 | - "inset-inline-end", "inset-inline-start", "isolation", "justify-content", | |
| 502 | - "justify-items", "justify-self", "left", "letter-spacing", "line-break", | |
| 503 | - "line-height", "line-height-step", "line-stacking", "line-stacking-ruby", | |
| 469 | + "border-image-width", "border-left", "border-left-color", | |
| 470 | + "border-left-style", "border-left-width", "border-radius", "border-right", | |
| 471 | + "border-right-color", "border-right-style", "border-right-width", | |
| 472 | + "border-spacing", "border-style", "border-top", "border-top-color", | |
| 473 | + "border-top-left-radius", "border-top-right-radius", "border-top-style", | |
| 474 | + "border-top-width", "border-width", "bottom", "box-decoration-break", | |
| 475 | + "box-shadow", "box-sizing", "break-after", "break-before", "break-inside", | |
| 476 | + "caption-side", "caret-color", "clear", "clip", "color", "color-profile", "column-count", | |
| 477 | + "column-fill", "column-gap", "column-rule", "column-rule-color", | |
| 478 | + "column-rule-style", "column-rule-width", "column-span", "column-width", | |
| 479 | + "columns", "content", "counter-increment", "counter-reset", "crop", "cue", | |
| 480 | + "cue-after", "cue-before", "cursor", "direction", "display", | |
| 481 | + "dominant-baseline", "drop-initial-after-adjust", | |
| 482 | + "drop-initial-after-align", "drop-initial-before-adjust", | |
| 483 | + "drop-initial-before-align", "drop-initial-size", "drop-initial-value", | |
| 484 | + "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis", | |
| 485 | + "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap", | |
| 486 | + "float", "float-offset", "flow-from", "flow-into", "font", "font-feature-settings", | |
| 487 | + "font-family", "font-kerning", "font-language-override", "font-size", "font-size-adjust", | |
| 488 | + "font-stretch", "font-style", "font-synthesis", "font-variant", | |
| 489 | + "font-variant-alternates", "font-variant-caps", "font-variant-east-asian", | |
| 490 | + "font-variant-ligatures", "font-variant-numeric", "font-variant-position", | |
| 491 | + "font-weight", "grid", "grid-area", "grid-auto-columns", "grid-auto-flow", | |
| 492 | + "grid-auto-rows", "grid-column", "grid-column-end", "grid-column-gap", | |
| 493 | + "grid-column-start", "grid-gap", "grid-row", "grid-row-end", "grid-row-gap", | |
| 494 | + "grid-row-start", "grid-template", "grid-template-areas", "grid-template-columns", | |
| 495 | + "grid-template-rows", "hanging-punctuation", "height", "hyphens", | |
| 496 | + "icon", "image-orientation", "image-rendering", "image-resolution", | |
| 497 | + "inline-box-align", "justify-content", "justify-items", "justify-self", "left", "letter-spacing", | |
| 498 | + "line-break", "line-height", "line-stacking", "line-stacking-ruby", | |
| 504 | 499 | "line-stacking-shift", "line-stacking-strategy", "list-style", |
| 505 | 500 | "list-style-image", "list-style-position", "list-style-type", "margin", |
| 506 | - "margin-bottom", "margin-left", "margin-right", "margin-top", "marks", | |
| 507 | - "marquee-direction", "marquee-loop", "marquee-play-count", "marquee-speed", | |
| 508 | - "marquee-style", "mask-clip", "mask-composite", "mask-image", "mask-mode", | |
| 509 | - "mask-origin", "mask-position", "mask-repeat", "mask-size","mask-type", | |
| 510 | - "max-block-size", "max-height", "max-inline-size", | |
| 511 | - "max-width", "min-block-size", "min-height", "min-inline-size", "min-width", | |
| 512 | - "mix-blend-mode", "move-to", "nav-down", "nav-index", "nav-left", "nav-right", | |
| 513 | - "nav-up", "object-fit", "object-position", "offset", "offset-anchor", | |
| 514 | - "offset-distance", "offset-path", "offset-position", "offset-rotate", | |
| 515 | - "opacity", "order", "orphans", "outline", "outline-color", "outline-offset", | |
| 516 | - "outline-style", "outline-width", "overflow", "overflow-style", | |
| 517 | - "overflow-wrap", "overflow-x", "overflow-y", "padding", "padding-bottom", | |
| 518 | - "padding-left", "padding-right", "padding-top", "page", "page-break-after", | |
| 519 | - "page-break-before", "page-break-inside", "page-policy", "pause", | |
| 520 | - "pause-after", "pause-before", "perspective", "perspective-origin", "pitch", | |
| 521 | - "pitch-range", "place-content", "place-items", "place-self", "play-during", | |
| 522 | - "position", "presentation-level", "punctuation-trim", "quotes", | |
| 523 | - "region-break-after", "region-break-before", "region-break-inside", | |
| 524 | - "region-fragment", "rendering-intent", "resize", "rest", "rest-after", | |
| 525 | - "rest-before", "richness", "right", "rotate", "rotation", "rotation-point", | |
| 526 | - "row-gap", "ruby-align", "ruby-overhang", "ruby-position", "ruby-span", | |
| 527 | - "scale", "scroll-behavior", "scroll-margin", "scroll-margin-block", | |
| 528 | - "scroll-margin-block-end", "scroll-margin-block-start", "scroll-margin-bottom", | |
| 529 | - "scroll-margin-inline", "scroll-margin-inline-end", | |
| 530 | - "scroll-margin-inline-start", "scroll-margin-left", "scroll-margin-right", | |
| 531 | - "scroll-margin-top", "scroll-padding", "scroll-padding-block", | |
| 532 | - "scroll-padding-block-end", "scroll-padding-block-start", | |
| 533 | - "scroll-padding-bottom", "scroll-padding-inline", "scroll-padding-inline-end", | |
| 534 | - "scroll-padding-inline-start", "scroll-padding-left", "scroll-padding-right", | |
| 535 | - "scroll-padding-top", "scroll-snap-align", "scroll-snap-type", | |
| 536 | - "shape-image-threshold", "shape-inside", "shape-margin", "shape-outside", | |
| 537 | - "size", "speak", "speak-as", "speak-header", "speak-numeral", | |
| 538 | - "speak-punctuation", "speech-rate", "stress", "string-set", "tab-size", | |
| 539 | - "table-layout", "target", "target-name", "target-new", "target-position", | |
| 540 | - "text-align", "text-align-last", "text-combine-upright", "text-decoration", | |
| 501 | + "margin-bottom", "margin-left", "margin-right", "margin-top", | |
| 502 | + "marks", "marquee-direction", "marquee-loop", | |
| 503 | + "marquee-play-count", "marquee-speed", "marquee-style", "max-height", | |
| 504 | + "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index", | |
| 505 | + "nav-left", "nav-right", "nav-up", "object-fit", "object-position", | |
| 506 | + "opacity", "order", "orphans", "outline", | |
| 507 | + "outline-color", "outline-offset", "outline-style", "outline-width", | |
| 508 | + "overflow", "overflow-style", "overflow-wrap", "overflow-x", "overflow-y", | |
| 509 | + "padding", "padding-bottom", "padding-left", "padding-right", "padding-top", | |
| 510 | + "page", "page-break-after", "page-break-before", "page-break-inside", | |
| 511 | + "page-policy", "pause", "pause-after", "pause-before", "perspective", | |
| 512 | + "perspective-origin", "pitch", "pitch-range", "place-content", "place-items", "place-self", "play-during", "position", | |
| 513 | + "presentation-level", "punctuation-trim", "quotes", "region-break-after", | |
| 514 | + "region-break-before", "region-break-inside", "region-fragment", | |
| 515 | + "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness", | |
| 516 | + "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang", | |
| 517 | + "ruby-position", "ruby-span", "shape-image-threshold", "shape-inside", "shape-margin", | |
| 518 | + "shape-outside", "size", "speak", "speak-as", "speak-header", | |
| 519 | + "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set", | |
| 520 | + "tab-size", "table-layout", "target", "target-name", "target-new", | |
| 521 | + "target-position", "text-align", "text-align-last", "text-decoration", | |
| 541 | 522 | "text-decoration-color", "text-decoration-line", "text-decoration-skip", |
| 542 | - "text-decoration-skip-ink", "text-decoration-style", "text-emphasis", | |
| 543 | - "text-emphasis-color", "text-emphasis-position", "text-emphasis-style", | |
| 544 | - "text-height", "text-indent", "text-justify", "text-orientation", | |
| 545 | - "text-outline", "text-overflow", "text-rendering", "text-shadow", | |
| 546 | - "text-size-adjust", "text-space-collapse", "text-transform", | |
| 547 | - "text-underline-position", "text-wrap", "top", "touch-action", "transform", "transform-origin", | |
| 548 | - "transform-style", "transition", "transition-delay", "transition-duration", | |
| 549 | - "transition-property", "transition-timing-function", "translate", | |
| 550 | - "unicode-bidi", "user-select", "vertical-align", "visibility", "voice-balance", | |
| 551 | - "voice-duration", "voice-family", "voice-pitch", "voice-range", "voice-rate", | |
| 552 | - "voice-stress", "voice-volume", "volume", "white-space", "widows", "width", | |
| 553 | - "will-change", "word-break", "word-spacing", "word-wrap", "writing-mode", "z-index", | |
| 523 | + "text-decoration-style", "text-emphasis", "text-emphasis-color", | |
| 524 | + "text-emphasis-position", "text-emphasis-style", "text-height", | |
| 525 | + "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow", | |
| 526 | + "text-size-adjust", "text-space-collapse", "text-transform", "text-underline-position", | |
| 527 | + "text-wrap", "top", "transform", "transform-origin", "transform-style", | |
| 528 | + "transition", "transition-delay", "transition-duration", | |
| 529 | + "transition-property", "transition-timing-function", "unicode-bidi", | |
| 530 | + "user-select", "vertical-align", "visibility", "voice-balance", "voice-duration", | |
| 531 | + "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress", | |
| 532 | + "voice-volume", "volume", "white-space", "widows", "width", "will-change", "word-break", | |
| 533 | + "word-spacing", "word-wrap", "z-index", | |
| 554 | 534 | // SVG-specific |
| 555 | 535 | "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color", |
| 556 | 536 | "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events", |
| 557 | 537 | "color-interpolation", "color-interpolation-filters", |
| 558 | 538 | "color-rendering", "fill", "fill-opacity", "fill-rule", "image-rendering", |
| 559 | - "marker", "marker-end", "marker-mid", "marker-start", "paint-order", "shape-rendering", "stroke", | |
| 539 | + "marker", "marker-end", "marker-mid", "marker-start", "shape-rendering", "stroke", | |
| 560 | 540 | "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", |
| 561 | 541 | "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-rendering", |
| 562 | 542 | "baseline-shift", "dominant-baseline", "glyph-orientation-horizontal", |
| 563 | - "glyph-orientation-vertical", "text-anchor", "writing-mode", | |
| 543 | + "glyph-orientation-vertical", "text-anchor", "writing-mode" | |
| 564 | 544 | ], propertyKeywords = keySet(propertyKeywords_); |
| 565 | 545 | |
| 566 | 546 | var nonStandardPropertyKeywords_ = [ |
| 567 | - "border-block", "border-block-color", "border-block-end", | |
| 568 | - "border-block-end-color", "border-block-end-style", "border-block-end-width", | |
| 569 | - "border-block-start", "border-block-start-color", "border-block-start-style", | |
| 570 | - "border-block-start-width", "border-block-style", "border-block-width", | |
| 571 | - "border-inline", "border-inline-color", "border-inline-end", | |
| 572 | - "border-inline-end-color", "border-inline-end-style", | |
| 573 | - "border-inline-end-width", "border-inline-start", "border-inline-start-color", | |
| 574 | - "border-inline-start-style", "border-inline-start-width", | |
| 575 | - "border-inline-style", "border-inline-width", "margin-block", | |
| 576 | - "margin-block-end", "margin-block-start", "margin-inline", "margin-inline-end", | |
| 577 | - "margin-inline-start", "padding-block", "padding-block-end", | |
| 578 | - "padding-block-start", "padding-inline", "padding-inline-end", | |
| 579 | - "padding-inline-start", "scroll-snap-stop", "scrollbar-3d-light-color", | |
| 580 | 547 | "scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color", |
| 581 | 548 | "scrollbar-face-color", "scrollbar-highlight-color", "scrollbar-shadow-color", |
| 582 | - "scrollbar-track-color", "searchfield-cancel-button", "searchfield-decoration", | |
| 583 | - "searchfield-results-button", "searchfield-results-decoration", "shape-inside", "zoom" | |
| 549 | + "scrollbar-3d-light-color", "scrollbar-track-color", "shape-inside", | |
| 550 | + "searchfield-cancel-button", "searchfield-decoration", "searchfield-results-button", | |
| 551 | + "searchfield-results-decoration", "zoom" | |
| 584 | 552 | ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_); |
| 585 | 553 | |
| 586 | 554 | var fontProperties_ = [ |
| 587 | - "font-display", "font-family", "src", "unicode-range", "font-variant", | |
| 588 | - "font-feature-settings", "font-stretch", "font-weight", "font-style" | |
| 555 | + "font-family", "src", "unicode-range", "font-variant", "font-feature-settings", | |
| 556 | + "font-stretch", "font-weight", "font-style" | |
| 589 | 557 | ], fontProperties = keySet(fontProperties_); |
| 590 | 558 | |
| 591 | 559 | var counterDescriptors_ = [ |
| 592 | 560 | "additive-symbols", "fallback", "negative", "pad", "prefix", "range", |
| @@ -626,9 +594,9 @@ | ||
| 626 | 594 | "above", "absolute", "activeborder", "additive", "activecaption", "afar", |
| 627 | 595 | "after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate", |
| 628 | 596 | "always", "amharic", "amharic-abegede", "antialiased", "appworkspace", |
| 629 | 597 | "arabic-indic", "armenian", "asterisks", "attr", "auto", "auto-flow", "avoid", "avoid-column", "avoid-page", |
| 630 | - "avoid-region", "axis-pan", "background", "backwards", "baseline", "below", "bidi-override", "binary", | |
| 598 | + "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary", | |
| 631 | 599 | "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box", |
| 632 | 600 | "both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel", |
| 633 | 601 | "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "calc", "cambodian", |
| 634 | 602 | "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret", |
| @@ -650,9 +618,9 @@ | ||
| 650 | 618 | "ethiopic-halehame-gez", "ethiopic-halehame-om-et", |
| 651 | 619 | "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et", |
| 652 | 620 | "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig", |
| 653 | 621 | "ethiopic-numeric", "ew-resize", "exclusion", "expanded", "extends", "extra-condensed", |
| 654 | - "extra-expanded", "fantasy", "fast", "fill", "fill-box", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes", | |
| 622 | + "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes", | |
| 655 | 623 | "forwards", "from", "geometricPrecision", "georgian", "graytext", "grid", "groove", |
| 656 | 624 | "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hard-light", "hebrew", |
| 657 | 625 | "help", "hidden", "hide", "higher", "highlight", "highlighttext", |
| 658 | 626 | "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "hue", "icon", "ignore", |
| @@ -665,9 +633,9 @@ | ||
| 665 | 633 | "landscape", "lao", "large", "larger", "left", "level", "lighter", "lighten", |
| 666 | 634 | "line-through", "linear", "linear-gradient", "lines", "list-item", "listbox", "listitem", |
| 667 | 635 | "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian", |
| 668 | 636 | "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian", |
| 669 | - "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "manipulation", "match", "matrix", "matrix3d", | |
| 637 | + "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "match", "matrix", "matrix3d", | |
| 670 | 638 | "media-controls-background", "media-current-time-display", |
| 671 | 639 | "media-fullscreen-button", "media-mute-button", "media-play-button", |
| 672 | 640 | "media-return-to-realtime-button", "media-rewind-button", |
| 673 | 641 | "media-seek-back-button", "media-seek-forward-button", "media-slider", |
| @@ -674,15 +642,15 @@ | ||
| 674 | 642 | "media-sliderthumb", "media-time-remaining-display", "media-volume-slider", |
| 675 | 643 | "media-volume-slider-container", "media-volume-sliderthumb", "medium", |
| 676 | 644 | "menu", "menulist", "menulist-button", "menulist-text", |
| 677 | 645 | "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic", |
| 678 | - "mix", "mongolian", "monospace", "move", "multiple", "multiple_mask_images", "multiply", "myanmar", "n-resize", | |
| 646 | + "mix", "mongolian", "monospace", "move", "multiple", "multiply", "myanmar", "n-resize", | |
| 679 | 647 | "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop", |
| 680 | 648 | "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap", |
| 681 | 649 | "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "opacity", "open-quote", |
| 682 | 650 | "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset", |
| 683 | 651 | "outside", "outside-shape", "overlay", "overline", "padding", "padding-box", |
| 684 | - "painted", "page", "paused", "persian", "perspective", "pinch-zoom", "plus-darker", "plus-lighter", | |
| 652 | + "painted", "page", "paused", "persian", "perspective", "plus-darker", "plus-lighter", | |
| 685 | 653 | "pointer", "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d", |
| 686 | 654 | "progress", "push-button", "radial-gradient", "radio", "read-only", |
| 687 | 655 | "read-write", "read-write-plaintext-only", "rectangle", "region", |
| 688 | 656 | "relative", "repeat", "repeating-linear-gradient", |
| @@ -698,10 +666,10 @@ | ||
| 698 | 666 | "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal", |
| 699 | 667 | "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow", |
| 700 | 668 | "small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali", |
| 701 | 669 | "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "space-evenly", "spell-out", "square", |
| 702 | - "square-button", "start", "static", "status-bar", "stretch", "stroke", "stroke-box", "sub", | |
| 703 | - "subpixel-antialiased", "svg_masks", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table", | |
| 670 | + "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub", | |
| 671 | + "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table", | |
| 704 | 672 | "table-caption", "table-cell", "table-column", "table-column-group", |
| 705 | 673 | "table-footer-group", "table-header-group", "table-row", "table-row-group", |
| 706 | 674 | "tamil", |
| 707 | 675 | "telugu", "text", "text-bottom", "text-top", "textarea", "textfield", "thai", |
| @@ -709,12 +677,12 @@ | ||
| 709 | 677 | "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er", |
| 710 | 678 | "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top", |
| 711 | 679 | "trad-chinese-formal", "trad-chinese-informal", "transform", |
| 712 | 680 | "translate", "translate3d", "translateX", "translateY", "translateZ", |
| 713 | - "transparent", "ultra-condensed", "ultra-expanded", "underline", "unidirectional-pan", "unset", "up", | |
| 681 | + "transparent", "ultra-condensed", "ultra-expanded", "underline", "unset", "up", | |
| 714 | 682 | "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal", |
| 715 | 683 | "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url", |
| 716 | - "var", "vertical", "vertical-text", "view-box", "visible", "visibleFill", "visiblePainted", | |
| 684 | + "var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted", | |
| 717 | 685 | "visibleStroke", "visual", "w-resize", "wait", "wave", "wider", |
| 718 | 686 | "window", "windowframe", "windowtext", "words", "wrap", "wrap-reverse", "x-large", "x-small", "xor", |
| 719 | 687 | "xx-large", "xx-small" |
| 720 | 688 | ], valueKeywords = keySet(valueKeywords_); |
| @@ -824,9 +792,9 @@ | ||
| 824 | 792 | } |
| 825 | 793 | }, |
| 826 | 794 | "@": function(stream) { |
| 827 | 795 | if (stream.eat("{")) return [null, "interpolation"]; |
| 828 | - if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/i, false)) return false; | |
| 796 | + if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/, false)) return false; | |
| 829 | 797 | stream.eatWhile(/[\w\\\-]/); |
| 830 | 798 | if (stream.match(/^\s*:/, false)) |
| 831 | 799 | return ["variable-2", "variable-definition"]; |
| 832 | 800 | return ["variable-2", "variable"]; |
