aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/snippets.json18
-rw-r--r--src/test.el24
2 files changed, 21 insertions, 21 deletions
diff --git a/conf/snippets.json b/conf/snippets.json
index 12208c0..1d4e51e 100644
--- a/conf/snippets.json
+++ b/conf/snippets.json
@@ -181,7 +181,7 @@
"ols:r": "outline-style:ridge;",
"ols:i": "outline-style:inset;",
"ols:o": "outline-style:outset;",
- "olc": "outline-color:#${1:000};",
+ "olc": "outline-color:${1:#000};",
"olc:i": "outline-color:invert;",
"bfv": "backface-visibility:|;",
"bfv:h": "backface-visibility:hidden;",
@@ -194,7 +194,7 @@
"bdcl": "border-collapse:|;",
"bdcl:c": "border-collapse:collapse;",
"bdcl:s": "border-collapse:separate;",
- "bdc": "border-color:#${1:000};",
+ "bdc": "border-color:${1:#000};",
"bdc:t": "border-color:transparent;",
"bdi": "border-image:url(|);",
"bdi:n": "border-image:none;",
@@ -257,7 +257,7 @@
"bdt:n": "border-top:none;",
"bdts": "border-top-style:|;",
"bdts:n": "border-top-style:none;",
- "bdtc": "border-top-color:#${1:000};",
+ "bdtc": "border-top-color:${1:#000};",
"bdtc:t": "border-top-color:transparent;",
"bdr": "border-right:|;",
"br": "border-right:|;",
@@ -265,7 +265,7 @@
"bdr:n": "border-right:none;",
"bdrst": "border-right-style:|;",
"bdrst:n": "border-right-style:none;",
- "bdrc": "border-right-color:#${1:000};",
+ "bdrc": "border-right-color:${1:#000};",
"bdrc:t": "border-right-color:transparent;",
"bdb": "border-bottom:|;",
"bb": "border-bottom:|;",
@@ -273,7 +273,7 @@
"bdb:n": "border-bottom:none;",
"bdbs": "border-bottom-style:|;",
"bdbs:n": "border-bottom-style:none;",
- "bdbc": "border-bottom-color:#${1:000};",
+ "bdbc": "border-bottom-color:${1:#000};",
"bdbc:t": "border-bottom-color:transparent;",
"bdl": "border-left:|;",
"bl": "border-left:|;",
@@ -281,7 +281,7 @@
"bdl:n": "border-left:none;",
"bdls": "border-left-style:|;",
"bdls:n": "border-left-style:none;",
- "bdlc": "border-left-color:#${1:000};",
+ "bdlc": "border-left-color:${1:#000};",
"bdlc:t": "border-left-color:transparent;",
"bdrs": "border-radius:|;",
"bdtrrs": "border-top-right-radius:|;",
@@ -292,7 +292,7 @@
"bg+": "background:${1:#fff} url(${2}) ${3:0} ${4:0} ${5:no-repeat};",
"bg:n": "background:none;",
"bg:ie": "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1:x}.png',sizingMethod='${2:crop}');",
- "bgc": "background-color:#${1:fff};",
+ "bgc": "background-color:${1:#fff};",
"bgc:t": "background-color:transparent;",
"bgi": "background-image:url(|);",
"bgi:n": "background-image:none;",
@@ -325,7 +325,7 @@
"bgsz:a": "background-size:auto;",
"bgsz:ct": "background-size:contain;",
"bgsz:cv": "background-size:cover;",
- "c": "color:#${1:000};",
+ "c": "color:${1:#000};",
"c:r": "color:rgb(${1:0}, ${2:0}, ${3:0});",
"c:ra": "color:rgba(${1:0}, ${2:0}, ${3:0}, .${4:5});",
"cm": "/* |${child} */",
@@ -514,7 +514,7 @@
"fw:b": "font-weight:bold;",
"fw:br": "font-weight:bolder;",
"fw:lr": "font-weight:lighter;",
- "fs": "font-style:${italic};",
+ "fs": "font-style:italic;",
"fs:n": "font-style:normal;",
"fs:i": "font-style:italic;",
"fs:o": "font-style:oblique;",
diff --git a/src/test.el b/src/test.el
index b5140b9..96e4d6b 100644
--- a/src/test.el
+++ b/src/test.el
@@ -552,9 +552,9 @@
"fs" ("font-style: italic;")
"xxxxxx 0 auto 0e auto!" ("xxxxxx: 0px auto 0em auto !important;")
"p auto+m auto+bg+#F00 x.jpg 10 10 repeat-x"
- ("padding: auto;"
- "margin: auto;"
- "background: #F00 url(x.jpg) 10px 10px repeat-x;")
+ ("padding: auto;"
+ "margin: auto;"
+ "background: #F00 url(x.jpg) 10px 10px repeat-x;")
"-bdrs" ("-webkit-border-radius: ;"
"-moz-border-radius: ;"
"border-radius: ;")
@@ -569,8 +569,8 @@
"@m print 1" ("@media print {"
" 1px"
"}")
- "@i http://github.com/smihica/index.css"
- ("@import url(http://github.com/smihica/index.css);")
+ "@i https://example/index.css"
+ ("@import url(https://example/index.css);")
)
;; lorem generator test
@@ -622,13 +622,13 @@
(let ((emmet-indent-after-insert t))
(emmet-run-test-case "Indentation via indent-region"
#'emmet-indent-test
- '((("div>ul>li*3") . "<div>\n <ul>\n <li></li>\n <li></li>\n <li></li>\n </ul>\n</div>"))))
+ '((("div>ul>li*3") . "<div>\n <ul>\n <li></li>\n <li></li>\n <li></li>\n </ul>\n</div>"))))
(let ((emmet-indent-after-insert nil)
(emmet-indentation 2))
(emmet-run-test-case "Indentation via emmet-indentation"
#'emmet-indent-test
- '((("div>ul>li*3") . "<div>\n <ul>\n <li></li>\n <li></li>\n <li></li>\n </ul>\n</div>"))))
+ '((("div>ul>li*3") . "<div>\n <ul>\n <li></li>\n <li></li>\n <li></li>\n </ul>\n</div>"))))
;; Old tests for previous indent behavior last seen:
;; commit: f56174e5905a40583b47f9737abee3af8da3faeb
@@ -649,20 +649,20 @@
(emmet-run-test-case "Wrap with markup on text with brackets and markup"
#'emmet-wrap-with-markup-test
- '((("div>ul>li") . "<div>\n <ul>\n <li>This is gnarly text with $$$s and <span>markup</span> and end brackets}}s</li>\n </ul>\n</div>")))
+ '((("div>ul>li") . "<div>\n <ul>\n <li>This is gnarly text with $$$s and <span>markup</span> and end brackets}}s</li>\n </ul>\n</div>")))
(emmet-run-test-case "Wrap with markup multiplier"
#'emmet-wrap-with-markup-test
- '((("div>ul>li*3") . "<div>\n <ul>\n <li>This is gnarly text with $$$s and <span>markup</span> and end brackets}}s</li>\n <li>This is gnarly text with $$$s and <span>markup</span> and end brackets}}s</li>\n <li>This is gnarly text with $$$s and <span>markup</span> and end brackets}}s</li>\n </ul>\n</div>")))
+ '((("div>ul>li*3") . "<div>\n <ul>\n <li>This is gnarly text with $$$s and <span>markup</span> and end brackets}}s</li>\n <li>This is gnarly text with $$$s and <span>markup</span> and end brackets}}s</li>\n <li>This is gnarly text with $$$s and <span>markup</span> and end brackets}}s</li>\n </ul>\n</div>")))
(emmet-run-test-case "Wrap with multiline content"
#'emmet-wrap-with-markup-test
- '((("div>ul>li" "I am some\nmultiline\n text") . "<div>\n <ul>\n <li>I am some\n multiline\n text</li>\n </ul>\n</div>")))
+ '((("div>ul>li" "I am some\nmultiline\n text") . "<div>\n <ul>\n <li>I am some\n multiline\n text</li>\n </ul>\n</div>")))
(emmet-run-test-case "Wrap with per-line markup (trailing *)"
#'emmet-wrap-with-markup-test
'((("div>ul>li*" "I am some\nmultiline\n text") .
- "<div>\n <ul>\n <li>I am some</li>\n <li>multiline</li>\n <li>text</li>\n </ul>\n</div>")))
+ "<div>\n <ul>\n <li>I am some</li>\n <li>multiline</li>\n <li> text</li>\n </ul>\n</div>")))
;; Regression test for #54 (broken emmet-find-left-bound behavior
;; after tag with attributes)
@@ -708,7 +708,7 @@
(emmet-run-test-case "JSX's className 2"
#'emmet-expand-jsx-className?-test
- '(((".jsx>ul.lis>li.itm{x}*2") . "<div className=\"jsx\">\n <ul className=\"lis\">\n <li className=\"itm\">x</li>\n <li className=\"itm\">x</li>\n </ul>\n</div>")))
+ '(((".jsx>ul.lis>li.itm{x}*2") . "<div className=\"jsx\">\n <ul className=\"lis\">\n <li className=\"itm\">x</li>\n <li className=\"itm\">x</li>\n </ul>\n</div>")))
(defun emmet-self-closing-tag-style-test (lis)
(let ((es (car lis))