Skip to content

Commit 95418a6

Browse files
committed
simplify
1 parent bb5c311 commit 95418a6

File tree

1 file changed

+8
-20
lines changed
  • packages/svelte/src/compiler/phases/2-analyze/css

1 file changed

+8
-20
lines changed

packages/svelte/src/compiler/phases/2-analyze/css/css-prune.js

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -155,24 +155,12 @@ function apply_selector(relative_selectors, rule, element) {
155155

156156
if (!relative_selector) return false;
157157

158-
const possible_match = relative_selector_might_apply_to_node(relative_selector, rule, element);
159-
160-
if (!possible_match) {
158+
if (!relative_selector_might_apply_to_node(relative_selector, rule, element)) {
161159
return false;
162160
}
163161

164-
if (relative_selector.combinator) {
165-
const matched = apply_combinator(
166-
relative_selector.combinator,
167-
relative_selector,
168-
parent_selectors,
169-
rule,
170-
element
171-
);
172-
173-
if (!matched) {
174-
return false;
175-
}
162+
if (!apply_combinator(relative_selector, parent_selectors, rule, element)) {
163+
return false;
176164
}
177165

178166
if (!is_outer_global(relative_selector)) {
@@ -185,16 +173,16 @@ function apply_selector(relative_selectors, rule, element) {
185173
}
186174

187175
/**
188-
*
189-
* @param {Compiler.Css.Combinator} combinator
190176
* @param {Compiler.Css.RelativeSelector} relative_selector
191177
* @param {Compiler.Css.RelativeSelector[]} parent_selectors
192178
* @param {Compiler.Css.Rule} rule
193179
* @param {Compiler.AST.RegularElement | Compiler.AST.SvelteElement | Compiler.AST.RenderTag | Compiler.AST.Component | Compiler.AST.SvelteComponent | Compiler.AST.SvelteSelf} node
194180
* @returns {boolean}
195181
*/
196-
function apply_combinator(combinator, relative_selector, parent_selectors, rule, node) {
197-
const name = combinator.name;
182+
function apply_combinator(relative_selector, parent_selectors, rule, node) {
183+
if (!relative_selector.combinator) return true;
184+
185+
const name = relative_selector.combinator.name;
198186

199187
switch (name) {
200188
case ' ':
@@ -209,7 +197,7 @@ function apply_combinator(combinator, relative_selector, parent_selectors, rule,
209197

210198
if (parent.type === 'SnippetBlock') {
211199
for (const site of parent.metadata.sites) {
212-
if (apply_combinator(combinator, relative_selector, parent_selectors, rule, site)) {
200+
if (apply_combinator(relative_selector, parent_selectors, rule, site)) {
213201
return true;
214202
}
215203
}

0 commit comments

Comments
 (0)