Skip to content

Commit

Permalink
Fix column position for font-family-name-quotes rule (#5955)
Browse files Browse the repository at this point in the history 
This change fixes a column position of a `font-family-name-quotes` problem to include quotes.

```css
a { font-family: "Arial"; }
/* Before:        ↑ */

a { font-family: "Arial"; }
/* After:        ↑ */
```
  • Loading branch information
@ybiquitous
ybiquitous committed Mar 8, 2022
1 parent 696d5d1 commit dbfc408
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 61 deletions.
94 changes: 45 additions & 49 deletions lib/rules/font-family-name-quotes/__tests__/index.js
View file
Expand Up @@ -92,19 +92,19 @@ testRule({
code: 'a { font-family: "Lucida Grande", "Arial", "sans-serif"; }',
message: messages.rejected('sans-serif'),
line: 1,
column: 45,
column: 44,
},
{
code: 'a { font: 1em "Lucida Grande", "Arial", "sans-serif"; }',
message: messages.rejected('sans-serif'),
line: 1,
column: 42,
column: 41,
},
{
code: 'a { fOnT-fAmIlY: "Lucida Grande", "Arial", "sans-serif"; }',
message: messages.rejected('sans-serif'),
line: 1,
column: 45,
column: 44,
},
{
code: 'a { font-family: Lucida Grande, "Arial", sans-serif; }',
Expand All @@ -121,18 +121,26 @@ testRule({
{
code: 'a { font-family: "inherit"; }',
message: messages.rejected('inherit'),
line: 1,
column: 18,
},
{
code: "a { font-family: 'system-ui', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', sans-serif; }",
message: messages.rejected('system-ui'),
line: 1,
column: 18,
},
{
code: "a { font-family: system-ui, '-apple-system', BlinkMacSystemFont, 'Segoe UI', 'Roboto', sans-serif; }",
message: messages.rejected('-apple-system'),
line: 1,
column: 29,
},
{
code: "a { font-family: system-ui, -apple-system, 'BlinkMacSystemFont', 'Segoe UI', 'Roboto', sans-serif; }",
message: messages.rejected('BlinkMacSystemFont'),
line: 1,
column: 44,
},
{
code: 'a { font: italic 300 16px/30px Arial, serif; }',
Expand Down Expand Up @@ -255,43 +263,61 @@ testRule({
code: 'a { font-family: "Lucida Grande", Arial, "sans-serif"; }',
message: messages.rejected('sans-serif'),
line: 1,
column: 43,
column: 42,
},
{
code: 'a { font-family: Red/Black, Arial, sans-serif; }',
message: messages.expected('Red/Black'),
line: 1,
column: 18,
},
{
code: 'a { font-family: Arial, Ahem!, sans-serif; }',
message: messages.expected('Ahem!'),
line: 1,
column: 25,
},
{
code: 'a { font-family: Hawaii 5-0, Arial, sans-serif; }',
message: messages.expected('Hawaii 5-0'),
line: 1,
column: 18,
},
{
code: 'a { font-family: Times, Times New Roman, serif; }',
message: messages.expected('Times New Roman'),
line: 1,
column: 25,
},
{
code: 'a { font-family: Something6; }',
message: messages.expected('Something6'),
line: 1,
column: 18,
},
{
code: 'a { font-family: snake_case; }',
message: messages.expected('snake_case'),
line: 1,
column: 18,
},
{
code: 'a { font-family: "Arial"; }',
message: messages.rejected('Arial'),
line: 1,
column: 18,
},
{
code: "a { font-family: '-apple-system', BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; }",
message: messages.rejected('-apple-system'),
line: 1,
column: 18,
},
{
code: "a { font-family: -apple-system, 'BlinkMacSystemFont', 'Segoe UI', Roboto, sans-serif; }",
message: messages.rejected('BlinkMacSystemFont'),
line: 1,
column: 33,
},
],
});
Expand Down Expand Up @@ -342,51 +368,61 @@ testRule({
code: 'a { font: 1em "Lucida Grande", Arial, sans-serif; }',
message: messages.rejected('Lucida Grande'),
line: 1,
column: 16,
column: 15,
},
{
code: 'a { font-family: "Lucida Grande", Arial, sans-serif; }',
message: messages.rejected('Lucida Grande'),
line: 1,
column: 19,
column: 18,
},
{
code: 'a { fOnT-fAmIlY: "Lucida Grande", Arial, sans-serif; }',
message: messages.rejected('Lucida Grande'),
line: 1,
column: 19,
column: 18,
},
{
code: 'a { FONT-FAMILY: "Lucida Grande", Arial, sans-serif; }',
message: messages.rejected('Lucida Grande'),
line: 1,
column: 19,
column: 18,
},
{
code: 'a { font-family: Lucida Grande, Arial, "sans-serif"; }',
message: messages.rejected('sans-serif'),
line: 1,
column: 41,
column: 40,
},
{
code: 'a { font-family: Red/Black, Arial, sans-serif; }',
message: messages.expected('Red/Black'),
line: 1,
column: 18,
},
{
code: 'a { font-family: Arial, Ahem!, sans-serif; }',
message: messages.expected('Ahem!'),
line: 1,
column: 25,
},
{
code: 'a { font-family: Hawaii 5-0, Arial, sans-serif; }',
message: messages.expected('Hawaii 5-0'),
line: 1,
column: 18,
},
{
code: "a { font-family: '-apple-system', BlinkMacSystemFont, Segoe UI, Roboto, sans-serif; }",
message: messages.rejected('-apple-system'),
line: 1,
column: 18,
},
{
code: "a { font-family: -apple-system, 'BlinkMacSystemFont', Segoe UI, Roboto, sans-serif; }",
message: messages.rejected('BlinkMacSystemFont'),
line: 1,
column: 33,
},
],
});
Expand All @@ -400,36 +436,26 @@ testRule({
code: 'a { font-family: "Lucida Grande", "Arial", "sans-serif"; }',
fixed: 'a { font-family: "Lucida Grande", "Arial", sans-serif; }',
message: messages.rejected('sans-serif'),
line: 1,
column: 45,
},
{
code: 'a { font: 1em "Lucida Grande", "Arial", "sans-serif"; }',
fixed: 'a { font: 1em "Lucida Grande", "Arial", sans-serif; }',
message: messages.rejected('sans-serif'),
line: 1,
column: 42,
},
{
code: 'a { fOnT-fAmIlY: "Lucida Grande", "Arial", "sans-serif"; }',
fixed: 'a { fOnT-fAmIlY: "Lucida Grande", "Arial", sans-serif; }',
message: messages.rejected('sans-serif'),
line: 1,
column: 45,
},
{
code: 'a { font-family: Lucida Grande, "Arial", sans-serif; }',
fixed: 'a { font-family: "Lucida Grande", "Arial", sans-serif; }',
message: messages.expected('Lucida Grande'),
line: 1,
column: 18,
},
{
code: "a { font-family: 'Lucida Grande', Arial, sans-serif; }",
fixed: 'a { font-family: \'Lucida Grande\', "Arial", sans-serif; }',
message: messages.expected('Arial'),
line: 1,
column: 35,
},
{
code: 'a { font-family: "inherit"; }',
Expand Down Expand Up @@ -458,36 +484,26 @@ testRule({
code: 'a { font: italic 300 16px/30px Arial, serif; }',
fixed: 'a { font: italic 300 16px/30px "Arial", serif; }',
message: messages.expected('Arial'),
line: 1,
column: 32,
},
{
code: 'a { font: italic 1000 16px/30px Arial, serif; }',
fixed: 'a { font: italic 1000 16px/30px "Arial", serif; }',
message: messages.expected('Arial'),
line: 1,
column: 33,
},
{
code: 'a { font: italic 892 16px/30px Arial, serif; }',
fixed: 'a { font: italic 892 16px/30px "Arial", serif; }',
message: messages.expected('Arial'),
line: 1,
column: 32,
},
{
code: 'a { font-family: \u1100; }',
fixed: 'a { font-family: "\u1100"; }',
message: messages.expected('\u1100'),
line: 1,
column: 18,
},
{
code: 'a { font-family: ሀ; }',
fixed: 'a { font-family: "ሀ"; }',
message: messages.expected('ሀ'),
line: 1,
column: 18,
},
{
code: "a { font-family: -apple-system, Hawaii 5-0, 'BlinkMacSystemFont', Segoe UI, 'Roboto', 'sans-serif'; }",
Expand All @@ -514,36 +530,26 @@ testRule({
code: 'a { font: 1em Lucida Grande, Arial, sans-serif; }',
fixed: 'a { font: 1em "Lucida Grande", Arial, sans-serif; }',
message: messages.expected('Lucida Grande'),
line: 1,
column: 15,
},
{
code: 'a { font-family: Lucida Grande, Arial, sans-serif; }',
fixed: 'a { font-family: "Lucida Grande", Arial, sans-serif; }',
message: messages.expected('Lucida Grande'),
line: 1,
column: 18,
},
{
code: 'a { fOnT-fAmIlY: Lucida Grande, Arial, sans-serif; }',
fixed: 'a { fOnT-fAmIlY: "Lucida Grande", Arial, sans-serif; }',
message: messages.expected('Lucida Grande'),
line: 1,
column: 18,
},
{
code: 'a { FONT-FAMILY: Lucida Grande, Arial, sans-serif; }',
fixed: 'a { FONT-FAMILY: "Lucida Grande", Arial, sans-serif; }',
message: messages.expected('Lucida Grande'),
line: 1,
column: 18,
},
{
code: 'a { font-family: "Lucida Grande", Arial, "sans-serif"; }',
fixed: 'a { font-family: "Lucida Grande", Arial, sans-serif; }',
message: messages.rejected('sans-serif'),
line: 1,
column: 43,
},
{
code: 'a { font-family: Red/Black, Arial, sans-serif; }',
Expand Down Expand Up @@ -618,36 +624,26 @@ testRule({
code: 'a { font: 1em "Lucida Grande", Arial, sans-serif; }',
fixed: 'a { font: 1em Lucida Grande, Arial, sans-serif; }',
message: messages.rejected('Lucida Grande'),
line: 1,
column: 16,
},
{
code: 'a { font-family: "Lucida Grande", Arial, sans-serif; }',
fixed: 'a { font-family: Lucida Grande, Arial, sans-serif; }',
message: messages.rejected('Lucida Grande'),
line: 1,
column: 19,
},
{
code: 'a { fOnT-fAmIlY: "Lucida Grande", Arial, sans-serif; }',
fixed: 'a { fOnT-fAmIlY: Lucida Grande, Arial, sans-serif; }',
message: messages.rejected('Lucida Grande'),
line: 1,
column: 19,
},
{
code: 'a { FONT-FAMILY: "Lucida Grande", Arial, sans-serif; }',
fixed: 'a { FONT-FAMILY: Lucida Grande, Arial, sans-serif; }',
message: messages.rejected('Lucida Grande'),
line: 1,
column: 19,
},
{
code: 'a { font-family: Lucida Grande, Arial, "sans-serif"; }',
fixed: 'a { font-family: Lucida Grande, Arial, sans-serif; }',
message: messages.rejected('sans-serif'),
line: 1,
column: 41,
},
{
code: 'a { font-family: Red/Black, Arial, sans-serif; }',
Expand Down

0 comments on commit dbfc408

Please sign in to comment.