Skip to content

some DRY-er newline management #23

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

Merged
merged 1 commit into from
Dec 13, 2023
Merged

some DRY-er newline management #23

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
32 changes: 17 additions & 15 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import parse from 'css-tree/parser'

const NEWLINE = '\n'

/**
* Indent a string
* @param {number} size
Expand Down Expand Up @@ -81,7 +83,7 @@ function print_selectorlist(node, indent_level, css) {
}

if (selector !== node.children.last) {
buffer += `,\n`
buffer += `,` + NEWLINE
}
}
return buffer
Expand Down Expand Up @@ -191,7 +193,7 @@ function print_block(node, indent_level, css) {
return ' {}'
}

let buffer = ' {\n'
let buffer = ' {' + NEWLINE

indent_level++

Expand All @@ -200,25 +202,25 @@ function print_block(node, indent_level, css) {
for (let child of children) {
if (child.type === 'Declaration') {
buffer += print_declaration(child, indent_level, css) + ';'
} else if (child.type === 'Rule') {
} else {
if (prev_type === 'Declaration') {
buffer += '\n'
buffer += NEWLINE
}
buffer += print_rule(child, indent_level, css)
} else if (child.type === 'Atrule') {
if (prev_type === 'Declaration') {
buffer += '\n'

if (child.type === 'Rule') {
buffer += print_rule(child, indent_level, css)
} else if (child.type === 'Atrule') {
buffer += print_atrule(child, indent_level, css)
} else {
buffer += print_unknown(child, indent_level, css)
}
buffer += print_atrule(child, indent_level, css)
} else {
buffer += print_unknown(child, indent_level, css)
}

if (child !== children.last) {
buffer += '\n'
buffer += NEWLINE

if (child.type !== 'Declaration') {
buffer += '\n'
buffer += NEWLINE
}
}

Expand All @@ -227,7 +229,7 @@ function print_block(node, indent_level, css) {

indent_level--

buffer += '\n'
buffer += NEWLINE
buffer += indent(indent_level) + '}'

return buffer
Expand Down Expand Up @@ -400,7 +402,7 @@ function print(node, indent_level = 0, css) {
}

if (child !== children.last) {
buffer += '\n\n'
buffer += NEWLINE + NEWLINE
}
}

Expand Down