Improved indentation normalization

lib/utils/editor.js

@@ -94,7 +94,6 @@ define(function(require, exports, module) {
 				indentation: resources.getVariable('indentation')
 			}, options);
 
-			var reIndent = /^\t+/;
 			var indent = function(tabs) {
 				return utils.repeatString(options.indentation, tabs.length);
 			};
@@ -104,7 +103,9 @@ define(function(require, exports, module) {
 			// normailze indentation if it’s not tabs
 			if (options.indentation !== '\t') {
 				lines = lines.map(function(line) {
-					return line.replace(reIndent, indent);
+					return line.replace(/^\s+/, function(space) {
+						return space.replace(/\t/g, indent);
+					});
 				});
 			}
 

test/utils.js

@@ -0,0 +1,21 @@
+var assert = require('assert');
+var utils = require('../lib/utils/common');
+var editorUtils = require('../lib/utils/editor');
+
+describe('Utils', function() {
+	var normalize = function(str, options) {
+		return editorUtils.normalize(str, utils.extend({
+			indentation: '  '
+		}, options || {}));
+	};
+
+	it('normalize simple indentation', function() {
+		assert.equal(normalize('\ta\n\tb'), '  a\n  b');
+		assert.equal(normalize('\t\t\ta\n\t\tb'), '      a\n    b');
+	});
+
+	it('normalize mixed indentation', function() {
+		assert.equal(normalize('   \ta\n \tb'), '     a\n   b');
+		assert.equal(normalize(' \t a\n   \tb'), '    a\n     b');
+	});
+});