fix edge case issues with bracket counting

Author: zebzhao

.gitignore

@@ -1 +1,5 @@
-# Created by .ignore support plugin (hsz.mobi)
+node_modules
+.~
+*~
+coverage
+bower_components

file.js

@@ -0,0 +1,35 @@
+module.exports = function(config){
+    config.set({
+
+        basePath : './',
+
+        logLevel: config.LOG_DEBUG,
+
+        files : [
+            'src/indent.js',
+            'tests/utils.js',
+            'tests/**/*.spec.js'
+        ],
+
+        exclude : [
+        ],
+
+        reporters: ['progress', 'coverage'],
+
+        preprocessors: {
+            "src/indent.js": ['coverage']
+        },
+
+        autoWatch : false,
+
+        frameworks: ['jasmine'],
+
+        browsers : ['PhantomJS'],
+
+        plugins : [
+            'karma-jasmine',
+            'karma-phantomjs-launcher',
+            'karma-coverage'
+        ]
+    });
+};

karma.conf.js

@@ -0,0 +1,40 @@
+{
+  "name": "indent.js",
+  "version": "0.1.0",
+  "description": "Fast minimalistic auto indentation of JavaScript, CSS, and HTML.",
+  "main": "indent.js",
+  "directories": {
+    "test": "tests"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "jasmine-core": "^2.2.0",
+    "karma": "^0.12.31",
+    "karma-coverage": "^0.3.1",
+    "karma-jasmine": "^0.3.5",
+    "karma-phantomjs-launcher": "^0.1.4",
+    "gulp": "^3.9",
+    "gulp-clean": "^0.3.1",
+    "gulp-concat": "^2.6.0",
+    "gulp-uglify": "^1.4.1"
+  },
+  "scripts": {
+    "test": "karma start karma.conf.js --single-run",
+    "start": "http-server -a localhost -p 8123 -c-1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://[email protected]/jswriter/jsindenter.git"
+  },
+  "keywords": [
+    "indent",
+    "small",
+    "reformat",
+    "js",
+    "css",
+    "html"
+  ],
+  "author": "Zeb Zhao",
+  "license": "MIT",
+  "homepage": "https://bitbucket.org/jswriter/jsindenter#readme"
+}

package.json

@@ -1,5 +1,5 @@
 (function(exports) {
-    exports.indenter = {
+    exports.indent = {
         indentCSS: indentJS,
         indentJS: indentJS,
         indentHTML: indentHTML
@@ -24,7 +24,7 @@
         {
             name: "regex",
             startToken: [function(string, rule) {
-                var re = /[,=:!&|?};][\s]*\/[^/]|^\/[^/]/;
+                var re = /[(,=:[!&|?{};][\s]*\/[^/]|^[\s]*\/[^/]/;
                 var startIndex = string.search(re);
                 if (startIndex != -1) {
                     startIndex = string.indexOf('/', startIndex);
@@ -112,18 +112,11 @@
         },
         {
             name: "bracket",
-            startToken: [/[^\(]\(/],
+            startToken: [/\(/],
             endToken: [/\)/],
             indent: true,
             advance: true
         },
-        {
-            name: "bracket",
-            startToken: [/^\(/],
-            endToken: [/\)/],
-            indent: false,
-            advance: true
-        },
         {
             name: "array",
             startToken: [/\[/],
@@ -141,7 +134,7 @@
         {
             name: "var",
             startToken: [/var[\s]+/],
-            endToken: [/\;/, /\=/],
+            endToken: [/\;/],
             indent: true
         },
         {
@@ -197,10 +190,10 @@
         var lines = code.split(/[\r]?\n/gi);
         var lineCount = lines.length;
         var newLines = [];
-        var indents = 0;
-        var indentAfter = 0;
+        var indentBuffer = [];
         var activeRules = [];
         var lastRule;
+        var indents = 0;
         var l = 0;
         var pos = 0;
         var matchEnd, matchStart;
@@ -216,17 +209,16 @@
                 if (matchEnd.matchIndex == -1) {
                     if (lastRule.ignore) {
                         // last rule is still active, and it's telling us to ignore.
-                        newLines[l] = getIndentation() + line;
                         incrementLine();
                         continue;
                     }
                 }
                 else if (lastRule.ignore || matchStart.matchIndex == -1 || matchEnd.matchIndex <= matchStart.matchIndex) {
-                    if (matchEnd.matchIndex == 0 && lastRule.indent) {
-                        indents--;
-                    }
-                    else if (lastRule.indent) {
-                        indentAfter--;
+                    if (lastRule.indent) {
+                        consumeIndentation();
+                        if (matchEnd.matchIndex == 0) {
+                            calculateIndents();
+                        }
                     }
                     pos = matchEnd.cursor;
                     removeLastRule();
@@ -239,7 +231,6 @@
             }
             else {
                 // No new token match end, no new match start
-                newLines[l] = getIndentation() + line;
                 incrementLine();
             }
         }
@@ -250,27 +241,59 @@
             pos = match.cursor;
             lastRule = match.rule;
             activeRules.push(lastRule);
-            if (lastRule.indent) indentAfter++;
+            if (lastRule.indent)
+                incrementIndentation();
         }
 
         function removeLastRule() {
             activeRules.pop();
             lastRule = activeRules[activeRules.length-1];
         }
 
-        function getIndentation() {
-            return (new Array(indents+1)).join(indentation);
+        function calculateIndents() {
+            indents = 0;
+            for (var b,i=0; i<indentBuffer.length; i++) {
+                b = indentBuffer[i];
+                if (b.open && b.line != l)
+                    indents++;
+            }
         }
 
         function incrementLine() {
+            newLines[l] = repeatString(indentation, indents) + line;
             l++;
             pos = 0;
-            if (indentAfter != 0) {
-                indents += indentAfter;
-                indentAfter = 0;
+            calculateIndents();
+        }
+
+        function incrementIndentation() {
+            var matched = indentBuffer[indentBuffer.length-1];
+            if (matched && matched.line == l) {
+                matched.indent++;
+            }
+            else {
+                indentBuffer.push({
+                    indent: 1,
+                    open: true,
+                    line: l
+                });
+            }
+        }
+
+        function consumeIndentation() {
+            var lastElem = indentBuffer[indentBuffer.length-1];
+            if (lastElem) {
+                lastElem.open = l == lastElem.line;
+                if (--lastElem.indent <= 0) {
+                    indentBuffer.pop();
+                }
             }
         }
     }
+ 
+    function repeatString(baseString, repeat) {
+        return (new Array(repeat+1)).join(baseString);
+    }
 
     function cleanEscapedChars(string) {
         return string.replace(/\\(u[0-9A-Za-z]{4}|u\{[0-9A-Za-z]{1,6}]\}|x[0-9A-Za-z]{2}|.)/g, '0');
@@ -334,39 +357,3 @@
         };
     }
 })(this);
-
-
-function hereDoc(f) {
-    return f.toString().
-    replace(/^[^\/]+\/\*!?/, '').
-    replace(/\*\/[^\/]+$/, '');
-}
-
-var fs = require('fs');
-var self = this;
-var code = `
-`
-var doc = hereDoc(function() {/*!
- if ((insideRule || enteringConditionalGroup) &&
- !(lookBack("&") || foundNestedPseudoClass()) &&
- !lookBack("(")) {
- // 'property: value' delimiter
- // which could be in a conditional group query
- insidePropertyValue = true;
- output.push(':');
- print.singleSpace();
- }
-  */})
-
-
-console.log(
-   self.indenter.indentJS(doc, '  ')
-);
-// fs.readFile( __dirname + '/file.js', function (err, data) {
-//     if (err) {
-//         throw err;
-//     }
-//     console.log(
-//         self.indenter.indentJS(data.toString(), '  ')
-//     );
-// });

jsindent.js renamed to src/indent.js

@@ -0,0 +1,34 @@
+describe('comment.spec.js', function() {
+    it('should ignore line comment', function() {
+        var input = hereDoc(function() {/*!
+if (last_type !== 'TK_END_EXPR') {
+if ((last_type !== 'TK_START_EXPR' || !(current_token.type === 'TK_RESERVED' && in_array(current_token.text, ['var', 'let', 'const']))) && flags.last_text !== ':') {
+// no need to force newline on 'var': for (var x = 0...)
+if (current_token.type === 'TK_RESERVED' && current_token.text === 'if' && flags.last_text === 'else') {
+// no newline for } else if {
+output.space_before_token = true;
+} else {
+print_newline();
+}
+}
+}
+*/
+        });
+        var expected = hereDoc(function() {/*!
+if (last_type !== 'TK_END_EXPR') {
+  if ((last_type !== 'TK_START_EXPR' || !(current_token.type === 'TK_RESERVED' && in_array(current_token.text, ['var', 'let', 'const']))) && flags.last_text !== ':') {
+    // no need to force newline on 'var': for (var x = 0...)
+    if (current_token.type === 'TK_RESERVED' && current_token.text === 'if' && flags.last_text === 'else') {
+      // no newline for } else if {
+      output.space_before_token = true;
+    } else {
+      print_newline();
+    }
+  }
+}
+
+*/
+        });
+        expect(indent.indentJS(input, '  ')).toEqual(expected);
+    });
+});