prettier 1.12.0 → 1.12.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/parser-postcss.js CHANGED
@@ -40286,22 +40286,78 @@ function parseNestedCSS(node) {
40286
40286
  parseNestedCSS(node[key]);
40287
40287
  }
40288
40288
 
40289
- if (typeof node.selector === "string" && node.selector.trim().length > 0) {
40290
- let selector = node.raws.selector
40291
- ? node.raws.selector.raw
40292
- : node.selector;
40289
+ if (!node.type) {
40290
+ return node;
40291
+ }
40292
+
40293
+ if (!node.raws) {
40294
+ node.raws = {};
40295
+ }
40296
+
40297
+ let selector = "";
40298
+
40299
+ if (typeof node.selector === "string") {
40300
+ selector =
40301
+ node.raws.selector && node.raws.selector.raw
40302
+ ? node.raws.selector.raw
40303
+ : node.selector;
40293
40304
 
40294
- if (node.raws.between && node.raws.between.trim()) {
40305
+ if (node.raws.between && node.raws.between.trim().length > 0) {
40295
40306
  selector += node.raws.between;
40296
40307
  }
40297
40308
 
40309
+ node.raws.selector = selector;
40310
+ }
40311
+
40312
+ let value = "";
40313
+
40314
+ if (typeof node.value === "string") {
40315
+ value =
40316
+ node.raws.value && node.raws.value.raw
40317
+ ? node.raws.value.raw
40318
+ : node.value;
40319
+
40320
+ value = value.trim();
40321
+
40322
+ node.raws.value = selector;
40323
+ }
40324
+
40325
+ let params = "";
40326
+
40327
+ if (typeof node.params === "string") {
40328
+ params =
40329
+ node.raws.params && node.raws.params.raw
40330
+ ? node.raws.params.raw
40331
+ : node.params;
40332
+
40333
+ if (node.raws.afterName && node.raws.afterName.trim().length > 0) {
40334
+ params = node.raws.afterName + params;
40335
+ }
40336
+
40337
+ if (node.raws.between && node.raws.between.trim().length > 0) {
40338
+ params = params + node.raws.between;
40339
+ }
40340
+
40341
+ params = params.trim();
40342
+
40343
+ node.raws.params = params;
40344
+ }
40345
+
40346
+ // Ignore LESS mixin declaration
40347
+ if (selector.trim().length > 0) {
40298
40348
  if (selector.startsWith("@") && selector.endsWith(":")) {
40299
40349
  return node;
40300
40350
  }
40301
40351
 
40352
+ // Ignore LESS mixins
40353
+ if (node.mixin) {
40354
+ node.selector = parseValue(selector);
40355
+
40356
+ return node;
40357
+ }
40358
+
40302
40359
  try {
40303
40360
  node.selector = parseSelector(selector);
40304
- node.raws.selector = selector;
40305
40361
  } catch (e) {
40306
40362
  // Fail silently. It's better to print it as is than to try and parse it
40307
40363
  // Note: A common failure is for SCSS nested properties. `background:
@@ -40318,15 +40374,8 @@ function parseNestedCSS(node) {
40318
40374
  return node;
40319
40375
  }
40320
40376
 
40321
- if (
40322
- node.type &&
40323
- node.type !== "css-comment-yaml" &&
40324
- typeof node.value === "string" &&
40325
- node.value.trim().length > 0
40326
- ) {
40377
+ if (node.type !== "css-comment-yaml" && value.length > 0) {
40327
40378
  try {
40328
- let value = node.raws.value ? node.raws.value.raw : node.value;
40329
-
40330
40379
  const defaultSCSSDirectiveIndex = value.match(DEFAULT_SCSS_DIRECTIVE);
40331
40380
 
40332
40381
  if (defaultSCSSDirectiveIndex) {
@@ -40364,26 +40413,7 @@ function parseNestedCSS(node) {
40364
40413
  return node;
40365
40414
  }
40366
40415
 
40367
- if (node.type === "css-atrule" && typeof node.params === "string") {
40368
- let params =
40369
- node.raws.params && node.raws.params.raw
40370
- ? node.raws.params.raw
40371
- : node.params;
40372
-
40373
- if (node.raws.afterName.trim()) {
40374
- params = node.raws.afterName + params;
40375
- }
40376
-
40377
- if (node.raws.between.trim()) {
40378
- params = params + node.raws.between;
40379
- }
40380
-
40381
- params = params.trim();
40382
-
40383
- if (params.length === 0) {
40384
- return node;
40385
- }
40386
-
40416
+ if (node.type === "css-atrule" && params.length > 0) {
40387
40417
  const name = node.name;
40388
40418
  const lowercasedName = node.name.toLowerCase();
40389
40419