From 91bd566674780046aa730026ca592858d90fda21 Mon Sep 17 00:00:00 2001 From: jeddy3 Date: Sun, 5 Sep 2021 19:19:37 +0100 Subject: [PATCH 1/4] Fix false negatives for grid shorthands --- .../__tests__/index.js | 49 ++++++++++++++----- .../named-grid-areas-no-invalid/index.js | 2 +- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/lib/rules/named-grid-areas-no-invalid/__tests__/index.js b/lib/rules/named-grid-areas-no-invalid/__tests__/index.js index f713b296df..1ce577005d 100644 --- a/lib/rules/named-grid-areas-no-invalid/__tests__/index.js +++ b/lib/rules/named-grid-areas-no-invalid/__tests__/index.js @@ -17,7 +17,7 @@ testRule({ }, { code: stripIndent` - a { + a { grid-template-areas: "head head" "nav main" "nav foot"; @@ -25,8 +25,8 @@ testRule({ }, { code: stripIndent` - a { - grid-template-areas: + a { + grid-template-areas: /* "" */ "head head" "nav main" /* "a b c" */ "nav foot" /* "" */; @@ -52,8 +52,17 @@ testRule({ }, { code: stripIndent` - a { - grid-template-areas: /* "comment" */ none /* "comment " */; + a { + grid-template-areas: /* "comment" */ none /* "comment " */; + }`, + }, + { + code: stripIndent` + a { + grid-template: + "a a a" 40px + "b c c" 40px + "b c c" 40px / 1fr 1fr 1fr; }`, }, ], @@ -80,10 +89,10 @@ testRule({ }, { code: stripIndent` - a { + a { grid-template-areas: "header header header header" "main main . sidebar" - "footer footer footer header"; + "footer footer footer header"; }`, message: messages.expectedRectangle('header'), line: 2, @@ -103,8 +112,8 @@ testRule({ }, { code: stripIndent` - a { grid-template-areas: - ""; + a { grid-template-areas: + ""; }`, message: messages.expectedToken(), line: 2, @@ -120,9 +129,9 @@ testRule({ }, { code: stripIndent` - a { + a { grid-template-areas: /* none */ - "" /* none */; + "" /* none */; }`, message: messages.expectedToken(), line: 3, @@ -134,5 +143,23 @@ testRule({ line: 1, column: 26, }, + { + code: stripIndent` + a { + grid-template: + "a a" 40px + "b c c" 40px + "b c c" 40px / 1fr 1fr 1fr; + }`, + message: messages.expectedSameNumber(), + line: 3, + column: 3, + }, + { + code: `a { grid: "" 200px "b" min-content; }`, + message: messages.expectedToken(), + line: 1, + column: 11, + }, ], }); diff --git a/lib/rules/named-grid-areas-no-invalid/index.js b/lib/rules/named-grid-areas-no-invalid/index.js index 8d66bbd4a1..1814e71d35 100644 --- a/lib/rules/named-grid-areas-no-invalid/index.js +++ b/lib/rules/named-grid-areas-no-invalid/index.js @@ -25,7 +25,7 @@ const rule = (primary) => { return; } - root.walkDecls(/^grid-template-areas$/i, (decl) => { + root.walkDecls(/^grid$|^grid-template|$^grid-template-areas|$/i, (decl) => { const { value } = decl; if (value.toLowerCase().trim() === 'none') return; From 89b7bc52e58909e7a5a51c38dd609a05610198f2 Mon Sep 17 00:00:00 2001 From: Richard Hallows Date: Mon, 6 Sep 2021 14:33:56 +0100 Subject: [PATCH 2/4] Update lib/rules/named-grid-areas-no-invalid/index.js Co-authored-by: Masafumi Koba <473530+ybiquitous@users.noreply.github.com> --- lib/rules/named-grid-areas-no-invalid/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rules/named-grid-areas-no-invalid/index.js b/lib/rules/named-grid-areas-no-invalid/index.js index 1814e71d35..91e5c3e0ae 100644 --- a/lib/rules/named-grid-areas-no-invalid/index.js +++ b/lib/rules/named-grid-areas-no-invalid/index.js @@ -25,7 +25,7 @@ const rule = (primary) => { return; } - root.walkDecls(/^grid$|^grid-template|$^grid-template-areas|$/i, (decl) => { + root.walkDecls(/^(?:grid|grid-template|grid-template-areas)$/i, (decl) => { const { value } = decl; if (value.toLowerCase().trim() === 'none') return; From 80f5ab35644d4721b1781c1d957088fc5cec66cd Mon Sep 17 00:00:00 2001 From: Richard Hallows Date: Mon, 6 Sep 2021 14:34:02 +0100 Subject: [PATCH 3/4] Update lib/rules/named-grid-areas-no-invalid/__tests__/index.js Co-authored-by: Masafumi Koba <473530+ybiquitous@users.noreply.github.com> --- lib/rules/named-grid-areas-no-invalid/__tests__/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rules/named-grid-areas-no-invalid/__tests__/index.js b/lib/rules/named-grid-areas-no-invalid/__tests__/index.js index 1ce577005d..e49bc06daa 100644 --- a/lib/rules/named-grid-areas-no-invalid/__tests__/index.js +++ b/lib/rules/named-grid-areas-no-invalid/__tests__/index.js @@ -113,7 +113,7 @@ testRule({ { code: stripIndent` a { grid-template-areas: - ""; + ""; }`, message: messages.expectedToken(), line: 2, From 778b1d7137961b24bace612a1a23a3383d39372c Mon Sep 17 00:00:00 2001 From: jeddy3 Date: Mon, 6 Sep 2021 16:16:14 +0100 Subject: [PATCH 4/4] Fix column position --- lib/rules/named-grid-areas-no-invalid/__tests__/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rules/named-grid-areas-no-invalid/__tests__/index.js b/lib/rules/named-grid-areas-no-invalid/__tests__/index.js index e49bc06daa..4855c7fddb 100644 --- a/lib/rules/named-grid-areas-no-invalid/__tests__/index.js +++ b/lib/rules/named-grid-areas-no-invalid/__tests__/index.js @@ -117,7 +117,7 @@ testRule({ }`, message: messages.expectedToken(), line: 2, - column: 4, + column: 2, }, { code: 'a { grid-template-areas: "" "" ""; }',