fixes #428

prettydiff · Apr 7, 2017 · 633edc2 · 633edc2
1 parent 5baeeb2
commit 633edc2
Show file tree

Hide file tree

Showing 8 changed files with 2,421 additions and 1,729 deletions.
diff --git a/lib/csspretty.js b/lib/csspretty.js
diff --git a/lib/csvpretty.js b/lib/csvpretty.js
@@ -13,24 +13,31 @@
         options.csvchar = (typeof options.csvchar === "string")
             ? options.csvchar
             : ",";
-        options.source = (typeof options.source !== "string" || options.source === "" || (/^(\s+)$/).test(options.source) === true)
+        options.source  = (
+            typeof options.source !== "string" || options.source === "" || (/^(\s+)$/).test(options.source) === true
+        )
             ? "Error: no source supplied to csvpretty."
-            : options.source.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+            : options
+                .source
+                .replace(/\r\n/g, "\n")
+                .replace(/\r/g, "\n");
         (function csvpretty__tokenize() {
-            var input = options.source.split(""),
-                d = options.csvchar.length,
-                e = 0,
-                cell = [],
-                row = [],
-                quote = false,
+            var input      = options
+                    .source
+                    .split(""),
+                d          = options.csvchar.length,
+                e          = 0,
+                cell       = [],
+                row        = [],
+                quote      = false,
                 cellCrunch = function csvpretty__tokenize_cellCrunch() {
                     var str = cell.join("");
                     cell = [];
                     if (str !== "") {
                         row.push(str);
                     }
                 },
-                parse = function csvpretty__tokenize_parse(item, index, arr) {
+                parse      = function csvpretty__tokenize_parse(item, index, arr) {
                     if (quote === false) {
                         if (cell.length === 0 && item === "\"" && (arr[index + 1] !== "\"" || arr[index + 2] === "\"")) {
                             quote = true;
@@ -54,7 +61,7 @@
                                     e = 1;
                                     do {
                                         arr[index + e] = "";
-                                        e = e + 1;
+                                        e              = e + 1;
                                     } while (e < d);
                                 } else if (item !== "") {
                                     cell.push(item);

diff --git a/lib/diffview.js b/lib/diffview.js
diff --git a/lib/language.js b/lib/language.js
@@ -84,29 +84,27 @@
     // [0] = language value for ace mode [1] = prettydiff language category from [0]
     // [2] = pretty formatting for text output to user
     language.auto = function language_auto(sample, defaultLang) {
-        var b         = [],
-            c         = 0,
-            vartest         = (/(((var)|(let)|(const)|(function)|(import))\s+(\w|\$)+[a-zA-Z0-9]*)/).test(sample),
-            finalstatic     = (/((((final)|(public)|(private))\s+static)|(static\s+void))/).test(sample),
-            output    = function language_auto_output(langname) {
+        var b           = [],
+            c           = 0,
+            vartest     = (
+                /(((var)|(let)|(const)|(function)|(import))\s+(\w|\$)+[a-zA-Z0-9]*)/
+            ).test(sample),
+            finalstatic = (/((((final)|(public)|(private))\s+static)|(static\s+void))/).test(
+                sample
+            ),
+            output      = function language_auto_output(langname) {
                 if (langname === "unknown") {
-                    return [
-                        defaultLang, language.setlangmode(defaultLang),
-                        "unknown"
-                    ];
+                    return [defaultLang, language.setlangmode(defaultLang), "unknown"];
                 }
                 if (langname === "xhtml" || langname === "markup") {
                     return ["xml", "html", "XHTML"];
                 }
                 if (langname === "tss") {
                     return ["tss", "tss", "Titanium Stylesheets"];
                 }
-                return [
-                    langname, language.setlangmode(langname),
-                    language.nameproper(langname)
-                ];
+                return [langname, language.setlangmode(langname), language.nameproper(langname)];
             },
-            cssA      = function language_auto_cssA() {
+            cssA        = function language_auto_cssA() {
                 if ((/\$[a-zA-Z]/).test(sample) === true || (/\{\s*(\w|\.|\$|#)+\s*\{/).test(sample) === true) {
                     return output("scss");
                 }
@@ -115,12 +113,14 @@
                 }
                 return output("css");
             },
-            notmarkup = function language_auto_notmarkup() {
+            notmarkup   = function language_auto_notmarkup() {
                 var d               = 0,
                     join            = "",
                     flaga           = false,
                     flagb           = false,
-                    publicprivate   = (/((public)|(private))\s+(static\s+)?(((v|V)oid)|(class)|(final))/).test(sample),
+                    publicprivate   = (
+                        /((public)|(private))\s+(static\s+)?(((v|V)oid)|(class)|(final))/
+                    ).test(sample),
                     javascriptA     = function language_auto_notmarkup_javascriptA() {
                         if (sample.indexOf("(") > -1 || sample.indexOf("=") > -1 || (sample.indexOf(";") > -1 && sample.indexOf("{") > -1)) {
                             if (vartest === false && ((/\n\s+#region\s/).test(sample) === true || (/\[\w+:/).test(sample) === true)) {
@@ -171,7 +171,7 @@
                         }
                         return output("css");
                     };
-                for (d = 1; d < c; d += 1) {
+                for (d = 1; d < c; d = d + 1) {
                     if (flaga === false) {
                         if (b[d] === "*" && b[d - 1] === "/") {
                             b[d - 1] = "";
@@ -215,7 +215,7 @@
                 }
                 return output("unknown");
             },
-            markup    = function language_auto_markup() {
+            markup      = function language_auto_markup() {
                 var html = function language_auto_markup_html() {
                     if ((/<%\s*\}/).test(sample) === true) {
                         return output("ejs");