Skip to content

Add support for ordering css variables declaration #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for ordering css variables declaration #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88ccec5
Add support for ordering css variables declaration
Tofandel Aug 26, 2020
f4cc5ea
feat(custom properties order): add tests
Tofandel Aug 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/helpers/get-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const defaultSearchPlaces = (moduleName: string) => [
];

export function loadDefaults(): ConfigOpts {
// @ts-ignore
return safeLoad(
readFileSync(require.resolve('../config/default.yml'), {
encoding: 'utf8',
Expand Down
2 changes: 1 addition & 1 deletion src/resolvers/property-sort-order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default class PropertySortOrder extends BaseResolver {
const collectedDecl: SortNode[] = [];
const matchingIndices: number[] = [];
block.forEach('declaration', (declaration: Node, index: number) => {
const prop = declaration.first('property');
const prop = declaration.first('property') || declaration.first('customProperty');
if (prop) {
let nodeContainingName = prop.first('ident');

Expand Down
5 changes: 5 additions & 0 deletions test/sass/property-sort-order.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,8 @@
.disable-line-test
display: block
border: none // sass-lint:disable-line border-zero

.css-vars
--baz: 3px
background: #111
--bar: 1px
6 changes: 6 additions & 0 deletions test/sass/property-sort-order.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,9 @@
}

.empty-block-does-not-throw {}

.css-vars {
--baz: 3px;
background: #111;
--bar: 1px;
}
12 changes: 6 additions & 6 deletions test/src/resolvers/property-sort-order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('property-sort-order', () => {
const preResolve = lint(filename, options);
const postResolve = detect(ast.toString(), ValidFileType.scss, options);

expect(preResolve.warningCount).toBe(21);
expect(preResolve.warningCount).toBe(24);
expect(postResolve.warningCount).toBe(0);
});

Expand Down Expand Up @@ -62,7 +62,7 @@ describe('property-sort-order', () => {
const preResolve = lint(filename, options);
const postResolve = detect(ast.toString(), ValidFileType.scss, options);

expect(preResolve.warningCount).toBe(12);
expect(preResolve.warningCount).toBe(13);
expect(postResolve.warningCount).toBe(0);
});
});
Expand All @@ -83,7 +83,7 @@ describe('property-sort-order', () => {
const preResolve = lint(filename, options);
const postResolve = detect(ast.toString(), ValidFileType.scss, options);

expect(preResolve.warningCount).toBe(12);
expect(preResolve.warningCount).toBe(13);
expect(postResolve.warningCount).toBe(0);
});
});
Expand Down Expand Up @@ -137,7 +137,7 @@ describe('property-sort-order', () => {

const preResolve = lint(filename, options);
const postResolve = detect(ast.toString(), ValidFileType.sass, options);
expect(preResolve.warningCount).toBe(17);
expect(preResolve.warningCount).toBe(20);
expect(postResolve.warningCount).toBe(0);
});

Expand Down Expand Up @@ -180,7 +180,7 @@ describe('property-sort-order', () => {
const preResolve = lint(filename, options);
const postResolve = detect(ast.toString(), ValidFileType.sass, options);

expect(preResolve.warningCount).toBe(16);
expect(preResolve.warningCount).toBe(17);
expect(postResolve.warningCount).toBe(0);
});
});
Expand All @@ -201,7 +201,7 @@ describe('property-sort-order', () => {
const preResolve = lint(filename, options);
const postResolve = detect(ast.toString(), ValidFileType.sass, options);

expect(preResolve.warningCount).toBe(16);
expect(preResolve.warningCount).toBe(17);
expect(postResolve.warningCount).toBe(0);
});
});
Expand Down