diff --git a/.vscode/settings.json b/.vscode/settings.json index dc06e421..49a30770 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,12 +3,12 @@ "javascript","json","jsonc" ], "editor.codeActionsOnSave": { - "source.fixAll.eslint": true, - "source.fixAll.stylelint": true, + "source.fixAll.eslint": "explicit", + "source.fixAll.stylelint": "explicit" }, "[stylus]": { "editor.codeActionsOnSave": { - "source.fixAll.stylelint": false, + "source.fixAll.stylelint": "never", } }, "stylelint.validate": [ diff --git a/tests/fixtures/@css/parsed-win.json b/tests/fixtures/@css/parsed-win.json index 0728a098..f68b7579 100644 --- a/tests/fixtures/@css/parsed-win.json +++ b/tests/fixtures/@css/parsed-win.json @@ -49,13 +49,13 @@ }, "type": "decl", "source": { + "input": { + "file": "input.styl" + }, "start": { "line": 3, "column": 9 }, - "input": { - "file": "input.styl" - }, "end": { "line": 3, "column": 19 @@ -66,13 +66,13 @@ } ], "source": { + "input": { + "file": "input.styl" + }, "start": { "line": 2, "column": 5 }, - "input": { - "file": "input.styl" - }, "end": { "line": 4, "column": 5 diff --git a/tests/fixtures/@css/parsed.json b/tests/fixtures/@css/parsed.json index f1bb8dd7..0f102b4b 100644 --- a/tests/fixtures/@css/parsed.json +++ b/tests/fixtures/@css/parsed.json @@ -49,13 +49,13 @@ }, "type": "decl", "source": { + "input": { + "file": "input.styl" + }, "start": { "line": 3, "column": 9 }, - "input": { - "file": "input.styl" - }, "end": { "line": 3, "column": 19 @@ -66,13 +66,13 @@ } ], "source": { + "input": { + "file": "input.styl" + }, "start": { "line": 2, "column": 5 }, - "input": { - "file": "input.styl" - }, "end": { "line": 4, "column": 5 diff --git a/tests/fixtures/sample-css-literal/sample-css-literal01/parsed-win.json b/tests/fixtures/sample-css-literal/sample-css-literal01/parsed-win.json index 2ae56fe9..780b5536 100644 --- a/tests/fixtures/sample-css-literal/sample-css-literal01/parsed-win.json +++ b/tests/fixtures/sample-css-literal/sample-css-literal01/parsed-win.json @@ -73,13 +73,13 @@ }, "type": "decl", "source": { + "input": { + "file": "input.styl" + }, "start": { "line": 5, "column": 9 }, - "input": { - "file": "input.styl" - }, "end": { "line": 5, "column": 68 @@ -95,13 +95,13 @@ }, "type": "decl", "source": { + "input": { + "file": "input.styl" + }, "start": { "line": 6, "column": 9 }, - "input": { - "file": "input.styl" - }, "end": { "line": 6, "column": 74 @@ -112,13 +112,13 @@ } ], "source": { + "input": { + "file": "input.styl" + }, "start": { "line": 4, "column": 5 }, - "input": { - "file": "input.styl" - }, "end": { "line": 7, "column": 5 diff --git a/tests/fixtures/sample-css-literal/sample-css-literal01/parsed.json b/tests/fixtures/sample-css-literal/sample-css-literal01/parsed.json index 91225965..66892753 100644 --- a/tests/fixtures/sample-css-literal/sample-css-literal01/parsed.json +++ b/tests/fixtures/sample-css-literal/sample-css-literal01/parsed.json @@ -73,13 +73,13 @@ }, "type": "decl", "source": { + "input": { + "file": "input.styl" + }, "start": { "line": 5, "column": 9 }, - "input": { - "file": "input.styl" - }, "end": { "line": 5, "column": 68 @@ -95,13 +95,13 @@ }, "type": "decl", "source": { + "input": { + "file": "input.styl" + }, "start": { "line": 6, "column": 9 }, - "input": { - "file": "input.styl" - }, "end": { "line": 6, "column": 74 @@ -112,13 +112,13 @@ } ], "source": { + "input": { + "file": "input.styl" + }, "start": { "line": 4, "column": 5 }, - "input": { - "file": "input.styl" - }, "end": { "line": 7, "column": 5 diff --git a/tests/fixtures/syntax-error01/error.json b/tests/fixtures/syntax-error01/error.json index e808cf5f..5192b5b8 100644 --- a/tests/fixtures/syntax-error01/error.json +++ b/tests/fixtures/syntax-error01/error.json @@ -5,8 +5,8 @@ "line": 6, "column": 23, "input": { - "line": 6, "column": 23, + "line": 6, "source": "body\n font 14px/1.5 Helvetica, arial, sans-serif\n button\n button.button\n input[type='button']\n input[type='submit']" } } \ No newline at end of file diff --git a/tests/fixtures/syntax-error02-@css/error.json b/tests/fixtures/syntax-error02-@css/error.json index e4bea40d..5e38d3ae 100644 --- a/tests/fixtures/syntax-error02-@css/error.json +++ b/tests/fixtures/syntax-error02-@css/error.json @@ -5,8 +5,8 @@ "line": 3, "column": 5, "input": { - "line": 3, "column": 5, + "line": 3, "source": "\n@css {\n css error\n}" } } \ No newline at end of file diff --git a/tests/integration/autoprefixer/fixtures/indent01/autoprefix.css b/tests/integration/autoprefixer/fixtures/indent01/autoprefix.css index 0332f092..ed157991 100644 --- a/tests/integration/autoprefixer/fixtures/indent01/autoprefix.css +++ b/tests/integration/autoprefixer/fixtures/indent01/autoprefix.css @@ -1,5 +1,5 @@ -@media (-webkit-min-device-pixel-ratio: 2), (-o-min-device-pixel-ratio: 2/1), (min-resolution: 2dppx) { +@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 2dppx) { .image { background-image: url(image@2x.png); diff --git a/tests/integration/autoprefixer/fixtures/indent01/autoprefix.styl b/tests/integration/autoprefixer/fixtures/indent01/autoprefix.styl index a18f28d2..981cd9e9 100644 --- a/tests/integration/autoprefixer/fixtures/indent01/autoprefix.styl +++ b/tests/integration/autoprefixer/fixtures/indent01/autoprefix.styl @@ -1,5 +1,5 @@ -@media (-webkit-min-device-pixel-ratio: 2), (-o-min-device-pixel-ratio: 2/1), (min-resolution: 2dppx) +@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 2dppx) .image background-image url(image@2x.png) diff --git a/tests/integration/autoprefixer/fixtures/sample-autoprefixer01/autoprefix.css b/tests/integration/autoprefixer/fixtures/sample-autoprefixer01/autoprefix.css index 2fb28060..10848dd5 100644 --- a/tests/integration/autoprefixer/fixtures/sample-autoprefixer01/autoprefix.css +++ b/tests/integration/autoprefixer/fixtures/sample-autoprefixer01/autoprefix.css @@ -21,7 +21,7 @@ .image { background-image: url(image@1x.png); } -@media (-webkit-min-device-pixel-ratio: 2), (-o-min-device-pixel-ratio: 2/1), (min-resolution: 2dppx) { +@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 2dppx) { .image { background-image: url(image@2x.png); } diff --git a/tests/integration/autoprefixer/fixtures/sample-autoprefixer01/autoprefix.styl b/tests/integration/autoprefixer/fixtures/sample-autoprefixer01/autoprefix.styl index 416ba3ad..6b0b7227 100644 --- a/tests/integration/autoprefixer/fixtures/sample-autoprefixer01/autoprefix.styl +++ b/tests/integration/autoprefixer/fixtures/sample-autoprefixer01/autoprefix.styl @@ -16,6 +16,6 @@ .image background-image url(image@1x.png) -@media (-webkit-min-device-pixel-ratio: 2), (-o-min-device-pixel-ratio: 2/1), (min-resolution: 2dppx) +@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 2dppx) .image background-image url(image@2x.png) \ No newline at end of file diff --git a/tests/integration/autoprefixer/fixtures/sample-autoprefixer04/autoprefix.css b/tests/integration/autoprefixer/fixtures/sample-autoprefixer04/autoprefix.css index dcfdc8f9..e2392b53 100644 --- a/tests/integration/autoprefixer/fixtures/sample-autoprefixer04/autoprefix.css +++ b/tests/integration/autoprefixer/fixtures/sample-autoprefixer04/autoprefix.css @@ -1,6 +1,5 @@ .a { -webkit-transition: 1s; - -o-transition: 1s; transition: 1s; /* will be prefixed */ } diff --git a/tests/integration/autoprefixer/fixtures/sample-autoprefixer04/autoprefix.styl b/tests/integration/autoprefixer/fixtures/sample-autoprefixer04/autoprefix.styl index ebf170db..4f28f7d4 100644 --- a/tests/integration/autoprefixer/fixtures/sample-autoprefixer04/autoprefix.styl +++ b/tests/integration/autoprefixer/fixtures/sample-autoprefixer04/autoprefix.styl @@ -1,6 +1,5 @@ .a -webkit-transition 1s // will be prefixed; - -o-transition 1s // will be prefixed; transition 1s // will be prefixed .b diff --git a/tests/integration/stylelint/fixtures/test05/warnings.json b/tests/integration/stylelint/fixtures/test05/warnings.json index cf6ad533..c0dea70e 100644 --- a/tests/integration/stylelint/fixtures/test05/warnings.json +++ b/tests/integration/stylelint/fixtures/test05/warnings.json @@ -9,10 +9,10 @@ "text": "Expected empty line before at-rule (at-rule-empty-line-before)" }, { - "line": 2, - "column": 11, - "endLine": 2, - "endColumn": 12, + "line": 3, + "column": 1, + "endLine": 3, + "endColumn": 2, "rule": "declaration-block-semicolon-newline-after", "severity": "error", "text": "Expected newline after \";\" in a multi-line declaration block (declaration-block-semicolon-newline-after)"