Skip to content

Fix SCSS property removal #14

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 1 commit into
base: main
Choose a base branch
from
Open

Fix SCSS property removal #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions src/sort.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,14 @@ export const sortProperties = (): void => {
let nextLine: string = lines[i + 1];

while (!nextLine.trim().endsWith('}') && !nextLine.trim().endsWith('{')) {
// Check if the next line is a CSS property
if (nextLine.trim().includes(':')) {
properties.push(nextLine.trim());
const trimmedLine: string = nextLine.trim();
// Check if the next line is a CSS property or scss directive
if (
trimmedLine.includes(':') ||
trimmedLine.startsWith('@extend') ||
trimmedLine.startsWith('@include')
) {
properties.push(trimmedLine);
}
i++;
nextLine = lines[i + 1];
Expand All @@ -50,11 +55,10 @@ export const sortProperties = (): void => {
// Sort the properties according to the ORDERED_PROPERTIES constant
let seenProperties: Set<string> = new Set();
properties = properties.filter(prop => {
let propName: string = prop.split(':')[0].trim();
if (seenProperties.has(propName)) {
if (seenProperties.has(prop)) {
return false;
}
seenProperties.add(propName);
seenProperties.add(prop);
return true;
});
properties.sort((a, b) => ORDERED_PROPERTIES.indexOf(a.split(':')[0].trim()) - ORDERED_PROPERTIES.indexOf(b.split(':')[0].trim()));
Expand Down