Spaces to tabs

fidian · Sep 7, 2017 · 0f8f25b · 0f8f25b
1 parent 7f61bcf
commit 0f8f25b
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 87 deletions.
diff --git a/bin/prettycss b/bin/prettycss
@@ -6,7 +6,8 @@ var fs = require('fs');
 var OptionParser = require('option-parser');
 var parser = new OptionParser();
 var options = {
-	beautifierConfig: {},
+	beautifierConfig: {
+        debug: true},
 	ignoreAllWarnings: false,
 	ignoreWarnings: [],
 	stdinRead: false,

diff --git a/lib/css/at-rule.js b/lib/css/at-rule.js
@@ -22,7 +22,7 @@ util.extend(At.prototype, base.base, {
 		});
 
 		if (this.block) {
-			out += this.block.toString();
+			out += this.block.toString("atblock");
 		}
 
 		return this.addWhitespace('at', out);

diff --git a/lib/css/block.js b/lib/css/block.js
@@ -28,11 +28,14 @@ util.extend(Block.prototype, base.base, {
 		this.debug('reparse finish', this.list);
 	},
 
-	toString: function () {
+	toString: function (whitespaceType) {
 		this.debug('toString', this.list);
 		var out = this.makeString(this.list);
+        console.log("OUT for", whitespaceType || "block");
+        console.log(out);
+        console.log("!!!done");
 		out = this.reindent(out);
-		out = this.addWhitespace('block', out);
+		out = this.addWhitespace(whitespaceType || 'block', out);
 		return out;
 	},
 

diff --git a/lib/css/values/text-shadow-single.js b/lib/css/values/text-shadow-single.js
@@ -19,7 +19,7 @@ util.extend(TextShadowSingle.prototype, base.base, {
 
 exports.parse = function (unparsedReal, bucket, container) {
 	var tss = new TextShadowSingle(bucket, container, unparsedReal);
-    tss.debug('parse', unparsedReal);
+	tss.debug('parse', unparsedReal);
 	var noneFound = false;
 	validate.call(tss, 'minimumCss', tss.firstToken(), 3);
 
@@ -29,38 +29,38 @@ exports.parse = function (unparsedReal, bucket, container) {
 
 	if (tss.unparsed.isContent('none')) {
 		noneFound = true;
-        tss.add(tss.unparsed.advance());
+		tss.add(tss.unparsed.advance());
 		return tss;
 	}
 
 	var c = bucket['color'].parse(tss.unparsed, bucket, tss);
 
 	if (c) {
-        tss.add(c);
-        tss.unparsed = c.unparsed;
+		tss.add(c);
+		tss.unparsed = c.unparsed;
 	}
 
 	var lengths = tss.repeatParser([ bucket['length'] ], 3);
 
 	if (lengths < 2) {
-        tss.debug('parse fail');
+		tss.debug('parse fail');
 		return null;
 	}
 
 	if (! c) {
 		c = bucket['color'].parse(tss.unparsed, bucket, tss);
 
 		if (c) {
-            tss.add(c);
-            tss.unparsed = c.unparsed;
+			tss.add(c);
+			tss.unparsed = c.unparsed;
 		}
 	}
 
 	if (! noneFound && tss.unparsed.isContent('none')) {
-        tss.add(tss.unparsed.advance());
+		tss.add(tss.unparsed.advance());
 	}
 
-    tss.warnIfInherit();
-    tss.debug('parse success', tss.unparsed);
+	tss.warnIfInherit();
+	tss.debug('parse success', tss.unparsed);
 	return tss;
 };
diff --git a/lib/css/values/text-shadow.js b/lib/css/values/text-shadow.js
@@ -17,7 +17,6 @@ util.extend(TextShadow.prototype, base.base, {
 
 exports.parse = function (unparsedReal, bucket, container) {
 	var ts = new TextShadow(bucket, container, unparsedReal);
-	var unparsed = unparsedReal.clone();
 	ts.debug('parse', unparsedReal);
 	validate.call(ts, 'minimumCss', ts.firstToken(), 3);
 

diff --git a/test/css/values/text-shadow-single-test.js b/test/css/values/text-shadow-single-test.js
@@ -2,52 +2,52 @@
 var util = require('./util');
 
 exports.batch = util.makeVows('text-shadow-single', {
-    'none': {
-        'tokens': ['IDENT'],
-        'toString': 'none',
-        'unparsed': [],
-        'warnings': ['css-minimum:3']
-    },
-    '12px': {
-        'tokens': ['UNIT'],
-        'toString': null,
-        'unparsed': ['UNIT'],
-        'warnings': null
-    },
-    '12px 12px watermelon': {
-        'tokens': ['UNIT', 'S', 'UNIT', 'S', 'IDENT'],
-        'toString': '12px 12px',
-        'unparsed': ['IDENT'],
-        'warnings': ['css-minimum:3']
-    },
-    '12px 12px blue 12px': {
-        'tokens': ['UNIT', 'S', 'UNIT', 'S', 'IDENT', 'S', 'UNIT'],
-        'toString': '12px 12px blue',
-        'unparsed': ['UNIT'],
-        'warnings': ['css-minimum:3']
-    },
-    'blue 12px 1px 5px': {
-        'tokens': ['IDENT', 'S', 'UNIT', 'S', 'UNIT', 'S', 'UNIT'],
-        'toString': 'blue 12px 1px 5px',
-        'unparsed': [],
-        'warnings': ['css-minimum:3']
-    },
-    '12px 12px inherit': {
-        'tokens': ['UNIT', 'S', 'UNIT', 'S', 'IDENT'],
-        'toString': '12px 12px inherit',
-        'unparsed': [],
-        'warnings': ['css-minimum:3', 'inherit-not-allowed']
-    },
-    'inherit': {
-        'tokens': ['IDENT'],
-        'toString': 'inherit',
-        'unparsed': [],
-        'warnings': ['css-minimum:3']
-    },
-    'invalidValue': {
-        'tokens': ['IDENT'],
-        'toString': null,
-        'unparsed': ['IDENT'],
-        'warnings': null
-    }
+	'none': {
+		'tokens': ['IDENT'],
+		'toString': 'none',
+		'unparsed': [],
+		'warnings': ['css-minimum:3']
+	},
+	'12px': {
+		'tokens': ['UNIT'],
+		'toString': null,
+		'unparsed': ['UNIT'],
+		'warnings': null
+	},
+	'12px 12px watermelon': {
+		'tokens': ['UNIT', 'S', 'UNIT', 'S', 'IDENT'],
+		'toString': '12px 12px',
+		'unparsed': ['IDENT'],
+		'warnings': ['css-minimum:3']
+	},
+	'12px 12px blue 12px': {
+		'tokens': ['UNIT', 'S', 'UNIT', 'S', 'IDENT', 'S', 'UNIT'],
+		'toString': '12px 12px blue',
+		'unparsed': ['UNIT'],
+		'warnings': ['css-minimum:3']
+	},
+	'blue 12px 1px 5px': {
+		'tokens': ['IDENT', 'S', 'UNIT', 'S', 'UNIT', 'S', 'UNIT'],
+		'toString': 'blue 12px 1px 5px',
+		'unparsed': [],
+		'warnings': ['css-minimum:3']
+	},
+	'12px 12px inherit': {
+		'tokens': ['UNIT', 'S', 'UNIT', 'S', 'IDENT'],
+		'toString': '12px 12px inherit',
+		'unparsed': [],
+		'warnings': ['css-minimum:3', 'inherit-not-allowed']
+	},
+	'inherit': {
+		'tokens': ['IDENT'],
+		'toString': 'inherit',
+		'unparsed': [],
+		'warnings': ['css-minimum:3']
+	},
+	'invalidValue': {
+		'tokens': ['IDENT'],
+		'toString': null,
+		'unparsed': ['IDENT'],
+		'warnings': null
+	}
 });
diff --git a/test/css/values/text-shadow-test.js b/test/css/values/text-shadow-test.js
@@ -2,28 +2,28 @@
 var util = require('./util');
 
 exports.batch = util.makeVows('text-shadow', {
-    'blue 12px 1px 5px, blue 12px 1px 5px': {
-        'tokens': ['IDENT', 'S', 'UNIT', 'S', 'UNIT', 'S', 'UNIT', 'OPERATOR', 'S', 'IDENT', 'S', 'UNIT', 'S', 'UNIT', 'S', 'UNIT'],
-        'toString': 'blue 12px 1px 5px, blue 12px 1px 5px',
-        'unparsed': [],
-        'warnings': ['css-minimum:3']
-    },
-    'none': {
-        'tokens': ['IDENT'],
-        'toString': 'none',
-        'unparsed': [],
-        'warnings': ['css-minimum:3']
-    },
-    'inherit': {
-        'tokens': ['IDENT'],
-        'toString': 'inherit',
-        'unparsed': [],
-        'warnings': ['css-minimum:3']
-    },
-    'invalidValue': {
-        'tokens': ['IDENT'],
-        'toString': null,
-        'unparsed': ['IDENT'],
-        'warnings': null
-    }
+	'blue 12px 1px 5px, blue 12px 1px 5px': {
+		'tokens': ['IDENT', 'S', 'UNIT', 'S', 'UNIT', 'S', 'UNIT', 'OPERATOR', 'S', 'IDENT', 'S', 'UNIT', 'S', 'UNIT', 'S', 'UNIT'],
+		'toString': 'blue 12px 1px 5px, blue 12px 1px 5px',
+		'unparsed': [],
+		'warnings': ['css-minimum:3']
+	},
+	'none': {
+		'tokens': ['IDENT'],
+		'toString': 'none',
+		'unparsed': [],
+		'warnings': ['css-minimum:3']
+	},
+	'inherit': {
+		'tokens': ['IDENT'],
+		'toString': 'inherit',
+		'unparsed': [],
+		'warnings': ['css-minimum:3']
+	},
+	'invalidValue': {
+		'tokens': ['IDENT'],
+		'toString': null,
+		'unparsed': ['IDENT'],
+		'warnings': null
+	}
 });