From a221e046291af9ba576ea44e4355dd2b564658ff Mon Sep 17 00:00:00 2001 From: Romain Menke Date: Fri, 31 Jan 2025 19:27:41 +0100 Subject: [PATCH 1/3] test semicolon positions --- cases/semicolons.css | 5 ++ cases/semicolons.json | 142 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 143 insertions(+), 4 deletions(-) diff --git a/cases/semicolons.css b/cases/semicolons.css index a195239..761ed07 100644 --- a/cases/semicolons.css +++ b/cases/semicolons.css @@ -2,3 +2,8 @@ a {;; color: black; ; ; } + +aaa{b:c;} +a{b:cc}; +@a bbbb; +/* ^ */ diff --git a/cases/semicolons.json b/cases/semicolons.json index 5539fbd..099e933 100644 --- a/cases/semicolons.json +++ b/cases/semicolons.json @@ -1,6 +1,6 @@ { "raws": { - "semicolon": false, + "semicolon": true, "after": "" }, "type": "root", @@ -49,13 +49,147 @@ } }, "selector": "a" + }, + { + "raws": { + "before": "\n\n", + "between": "", + "semicolon": true, + "after": "" + }, + "type": "rule", + "nodes": [ + { + "raws": { + "before": "", + "between": ":" + }, + "type": "decl", + "source": { + "end": { + "column": 8, + "line": 6, + "offset": 43 + }, + "start": { + "column": 5, + "line": 6, + "offset": 39 + } + }, + "prop": "b", + "value": "c" + } + ], + "source": { + "end": { + "column": 9, + "line": 6, + "offset": 44 + }, + "start": { + "column": 1, + "line": 6, + "offset": 35 + } + }, + "selector": "aaa" + }, + { + "raws": { + "before": "\n", + "between": "", + "semicolon": false, + "after": "", + "ownSemicolon": ";" + }, + "type": "rule", + "nodes": [ + { + "raws": { + "before": "", + "between": ":" + }, + "type": "decl", + "source": { + "end": { + "column": 6, + "line": 7, + "offset": 51 + }, + "start": { + "column": 3, + "line": 7, + "offset": 47 + } + }, + "prop": "b", + "value": "cc" + } + ], + "source": { + "end": { + "column": 7, + "line": 7, + "offset": 52 + }, + "start": { + "column": 1, + "line": 7, + "offset": 45 + } + }, + "selector": "a" + }, + { + "raws": { + "before": "\n", + "between": "", + "afterName": " " + }, + "type": "atrule", + "name": "a", + "source": { + "end": { + "column": 8, + "line": 8, + "offset": 62 + }, + "start": { + "column": 1, + "line": 8, + "offset": 54 + } + }, + "params": "bbbb" + }, + { + "raws": { + "before": "\n", + "left": " ", + "right": " " + }, + "type": "comment", + "source": { + "end": { + "column": 11, + "line": 9, + "offset": 74 + }, + "start": { + "column": 1, + "line": 9, + "offset": 63 + } + }, + "text": "^" } ], "source": { "end": { - "column": 2, - "line": 4, - "offset": 33 + "column": 12, + "line": 9, + "offset": 74 }, "start": { "column": 1, From eff73ccfef7d93cffabc94b64ae2036fa5133ecf Mon Sep 17 00:00:00 2001 From: Romain Menke Date: Fri, 31 Jan 2025 19:27:59 +0100 Subject: [PATCH 2/3] set correct expect values --- cases/semicolons.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cases/semicolons.json b/cases/semicolons.json index 099e933..66452bc 100644 --- a/cases/semicolons.json +++ b/cases/semicolons.json @@ -129,9 +129,9 @@ ], "source": { "end": { - "column": 7, + "column": 8, "line": 7, - "offset": 52 + "offset": 53 }, "start": { "column": 1, From f3ae2f2a830239f389a9c07e59fe32473e5c9e7d Mon Sep 17 00:00:00 2001 From: Romain Menke Date: Fri, 31 Jan 2025 20:24:32 +0100 Subject: [PATCH 3/3] one more test --- cases/semicolons.css | 1 + cases/semicolons.json | 66 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 57 insertions(+), 10 deletions(-) diff --git a/cases/semicolons.css b/cases/semicolons.css index 761ed07..12f8429 100644 --- a/cases/semicolons.css +++ b/cases/semicolons.css @@ -5,5 +5,6 @@ a {;; aaa{b:c;} a{b:cc}; +a{b:c} ; @a bbbb; /* ^ */ diff --git a/cases/semicolons.json b/cases/semicolons.json index 66452bc..2762b8f 100644 --- a/cases/semicolons.json +++ b/cases/semicolons.json @@ -145,15 +145,39 @@ "raws": { "before": "\n", "between": "", - "afterName": " " + "semicolon": false, + "after": "", + "ownSemicolon": " ;" }, - "type": "atrule", - "name": "a", + "type": "rule", + "nodes": [ + { + "raws": { + "before": "", + "between": ":" + }, + "type": "decl", + "source": { + "end": { + "column": 5, + "line": 8, + "offset": 59 + }, + "start": { + "column": 3, + "line": 8, + "offset": 56 + } + }, + "prop": "b", + "value": "c" + } + ], "source": { "end": { "column": 8, "line": 8, - "offset": 62 + "offset": 63 }, "start": { "column": 1, @@ -161,6 +185,28 @@ "offset": 54 } }, + "selector": "a" + }, + { + "raws": { + "before": "\n", + "between": "", + "afterName": " " + }, + "type": "atrule", + "name": "a", + "source": { + "end": { + "column": 8, + "line": 9, + "offset": 71 + }, + "start": { + "column": 1, + "line": 9, + "offset": 63 + } + }, "params": "bbbb" }, { @@ -173,13 +219,13 @@ "source": { "end": { "column": 11, - "line": 9, - "offset": 74 + "line": 10, + "offset": 83 }, "start": { "column": 1, - "line": 9, - "offset": 63 + "line": 10, + "offset": 72 } }, "text": "^" @@ -188,8 +234,8 @@ "source": { "end": { "column": 12, - "line": 9, - "offset": 74 + "line": 10, + "offset": 83 }, "start": { "column": 1,