aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEtienne Prud’homme2016-05-20 14:10:46 -0400
committerSimen Heggestøyl2016-05-22 12:54:02 +0200
commit162bc021a1cb4d7f578d1635a55bb7c38084f044 (patch)
tree68c4c227dd33afa606e62a4450f3b167bdf60698
parentf2d03334814cff85013135366a46a85f3124f7f0 (diff)
downloademacs-162bc021a1cb4d7f578d1635a55bb7c38084f044.tar.gz
emacs-162bc021a1cb4d7f578d1635a55bb7c38084f044.zip
Add completion of colors in CSS mode
* lisp/textmodes/css-mode.el (css-value-class-alist): Add CSS colors from "CSS Color Module Level 3". * test/lisp/textmodes/css-mode-tests.el (css-test-property-values): Update test.
-rw-r--r--lisp/textmodes/css-mode.el35
-rw-r--r--test/lisp/textmodes/css-mode-tests.el2
2 files changed, 33 insertions, 4 deletions
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index cf407effa7e..060af332179 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -463,9 +463,8 @@ further value candidates, since that list would be infinite.")
463 (bg-size length percentage "auto" "cover" "contain") 463 (bg-size length percentage "auto" "cover" "contain")
464 (box "border-box" "padding-box" "content-box") 464 (box "border-box" "padding-box" "content-box")
465 (color 465 (color
466 "aqua" "black" "blue" "fuchsia" "gray" "green" "lime" "maroon" 466 "rgb()" "rgba()" "hsl()" "hsla()" named-color "transparent"
467 "navy" "olive" "orange" "purple" "red" "silver" "teal" "white" 467 "currentColor")
468 "yellow" "transparent")
469 (common-lig-values "common-ligatures" "no-common-ligatures") 468 (common-lig-values "common-ligatures" "no-common-ligatures")
470 (contextual-alt-values "contextual" "no-contextual") 469 (contextual-alt-values "contextual" "no-contextual")
471 (counter "counter()" "counters()") 470 (counter "counter()" "counters()")
@@ -504,6 +503,36 @@ further value candidates, since that list would be infinite.")
504 (line-width length "thin" "medium" "thick") 503 (line-width length "thin" "medium" "thick")
505 (linear-gradient "linear-gradient()") 504 (linear-gradient "linear-gradient()")
506 (margin-width "auto" length percentage) 505 (margin-width "auto" length percentage)
506 (named-color
507 "aliceblue" "antiquewhite" "aqua" "aquamarine" "azure" "beige"
508 "bisque" "black" "blanchedalmond" "blue" "blueviolet" "brown"
509 "burlywood" "cadetblue" "chartreuse" "chocolate" "coral"
510 "cornflowerblue" "cornsilk" "crimson" "cyan" "darkblue"
511 "darkcyan" "darkgoldenrod" "darkgray" "darkgreen" "darkkhaki"
512 "darkmagenta" "darkolivegreen" "darkorange" "darkorchid"
513 "darkred" "darksalmon" "darkseagreen" "darkslateblue"
514 "darkslategray" "darkturquoise" "darkviolet" "deeppink"
515 "deepskyblue" "dimgray" "dodgerblue" "firebrick" "floralwhite"
516 "forestgreen" "fuchsia" "gainsboro" "ghostwhite" "gold"
517 "goldenrod" "gray" "green" "greenyellow" "honeydew" "hotpink"
518 "indianred" "indigo" "ivory" "khaki" "lavender" "lavenderblush"
519 "lawngreen" "lemonchiffon" "lightblue" "lightcoral" "lightcyan"
520 "lightgoldenrodyellow" "lightgray" "lightgreen" "lightpink"
521 "lightsalmon" "lightseagreen" "lightskyblue" "lightslategray"
522 "lightsteelblue" "lightyellow" "lime" "limegreen" "linen"
523 "magenta" "maroon" "mediumaquamarine" "mediumblue" "mediumorchid"
524 "mediumpurple" "mediumseagreen" "mediumslateblue"
525 "mediumspringgreen" "mediumturquoise" "mediumvioletred"
526 "midnightblue" "mintcream" "mistyrose" "moccasin" "navajowhite"
527 "navy" "oldlace" "olive" "olivedrab" "orange" "orangered"
528 "orchid" "palegoldenrod" "palegreen" "paleturquoise"
529 "palevioletred" "papayawhip" "peachpuff" "peru" "pink" "plum"
530 "powderblue" "purple" "rebeccapurple" "red" "rosybrown"
531 "royalblue" "saddlebrown" "salmon" "sandybrown" "seagreen"
532 "seashell" "sienna" "silver" "skyblue" "slateblue" "slategray"
533 "snow" "springgreen" "steelblue" "tan" "teal" "thistle" "tomato"
534 "turquoise" "violet" "wheat" "white" "whitesmoke" "yellow"
535 "yellowgreen")
507 (number "calc()") 536 (number "calc()")
508 (numeric-figure-values "lining-nums" "oldstyle-nums") 537 (numeric-figure-values "lining-nums" "oldstyle-nums")
509 (numeric-fraction-values "diagonal-fractions" "stacked-fractions") 538 (numeric-fraction-values "diagonal-fractions" "stacked-fractions")
diff --git a/test/lisp/textmodes/css-mode-tests.el b/test/lisp/textmodes/css-mode-tests.el
index 80d678a161f..fd86fd2d878 100644
--- a/test/lisp/textmodes/css-mode-tests.el
+++ b/test/lisp/textmodes/css-mode-tests.el
@@ -58,7 +58,7 @@
58 58
59 ;; Check that the `color' property doesn't cause infinite recursion 59 ;; Check that the `color' property doesn't cause infinite recursion
60 ;; because it refers to the value class of the same name. 60 ;; because it refers to the value class of the same name.
61 (should (= (length (css--property-values "color")) 18))) 61 (should (= (length (css--property-values "color")) 147)))
62 62
63(ert-deftest css-test-property-value-cache () 63(ert-deftest css-test-property-value-cache ()
64 "Test that `css--property-value-cache' is in use." 64 "Test that `css--property-value-cache' is in use."