From af8c1307f7b0a1e6f07a33c006359dc94adff3c5 Mon Sep 17 00:00:00 2001
From: Emily Eisenberg <emily@khanacademy.org>
Date: Wed, 22 Apr 2015 18:55:20 -0700
Subject: [PATCH] Add better lint checking.

Summary:
Make the lint checker check more files. Also, make arc run the
linter.

Test Plan:
 - `arc lint`
 - `make lint`

Reviewers: kevinb, alpert

Reviewed By: alpert

Differential Revision: https://phabricator.khanacademy.org/D17509
---
 .arcconfig                              | 6 +++++-
 Makefile                                | 2 +-
 contrib/auto-render/auto-render-spec.js | 7 +++++++
 contrib/auto-render/auto-render.js      | 5 +++--
 server.js                               | 8 ++++----
 test/katex-spec.js                      | 6 ++++++
 6 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/.arcconfig b/.arcconfig
index 881195119..5024ed817 100644
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,4 +1,8 @@
 {
     "project_id": "KaTeX",
-    "conduit_uri": "https://phabricator.khanacademy.org/"
+    "conduit_uri": "https://phabricator.khanacademy.org/",
+    "lint.engine": "ArcanistSingleLintEngine",
+    "lint.engine.single.linter": "ArcanistScriptAndRegexLinter",
+    "linter.scriptandregex.regex": "/^(?P<file>\\S+): line (?P<line>\\d+), col \\d+, (?P<message>.*)$/m",
+    "linter.scriptandregex.script": "make lint || true"
 }
diff --git a/Makefile b/Makefile
index d5d517d5f..74bb686de 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ export UGLIFYJS = $(realpath ./node_modules/.bin/uglifyjs) \
 setup:
 	npm install
 
-lint: katex.js $(wildcard src/*.js)
+lint: katex.js server.js cli.js $(wildcard src/*.js) $(wildcard test/*.js) $(wildcard contrib/*/*.js)
 	./node_modules/.bin/jshint $^
 
 build/katex.js: katex.js $(wildcard src/*.js)
diff --git a/contrib/auto-render/auto-render-spec.js b/contrib/auto-render/auto-render-spec.js
index c64b15e20..8402c443a 100644
--- a/contrib/auto-render/auto-render-spec.js
+++ b/contrib/auto-render/auto-render-spec.js
@@ -1,3 +1,9 @@
+/* global beforeEach: false */
+/* global jasmine: false */
+/* global expect: false */
+/* global it: false */
+/* global describe: false */
+
 var splitAtDelimiters = require("./splitAtDelimiters");
 
 beforeEach(function() {
@@ -28,6 +34,7 @@ beforeEach(function() {
                         var correct = result[i];
 
                         var good = true;
+                        var diff;
 
                         if (real.type !== correct.type) {
                             good = false;
diff --git a/contrib/auto-render/auto-render.js b/contrib/auto-render/auto-render.js
index b3d3de636..6eb2f93b4 100644
--- a/contrib/auto-render/auto-render.js
+++ b/contrib/auto-render/auto-render.js
@@ -1,3 +1,5 @@
+/* global katex */
+
 var splitAtDelimiters = require("./splitAtDelimiters");
 
 var splitWithDelimiters = function(text, delimiters) {
@@ -48,9 +50,8 @@ var renderElem = function(elem, delimiters, ignoredTags) {
             if (shouldRender) {
                 renderElem(childNode, delimiters, ignoredTags);
             }
-        } else {
-            // Something else, ignore
         }
+        // Otherwise, it's something else, and ignore it.
     }
 };
 
diff --git a/server.js b/server.js
index b6b1f5d60..bf66e2414 100644
--- a/server.js
+++ b/server.js
@@ -61,10 +61,10 @@ app.get("/katex.css", function(req, res, next) {
     });
 });
 
-app.use(express.static(path.join(__dirname, "static")));
-app.use(express.static(path.join(__dirname, "build")));
-app.use("/test", express.static(path.join(__dirname, "test")));
-app.use("/contrib", express.static(path.join(__dirname, "contrib")));
+app.use(express["static"](path.join(__dirname, "static")));
+app.use(express["static"](path.join(__dirname, "build")));
+app.use("/test", express["static"](path.join(__dirname, "test")));
+app.use("/contrib", express["static"](path.join(__dirname, "contrib")));
 
 app.use(function(err, req, res, next) {
     console.error(err.stack);
diff --git a/test/katex-spec.js b/test/katex-spec.js
index ed102cb07..de8df3538 100644
--- a/test/katex-spec.js
+++ b/test/katex-spec.js
@@ -1,3 +1,9 @@
+/* global beforeEach: false */
+/* global jasmine: false */
+/* global expect: false */
+/* global it: false */
+/* global describe: false */
+
 var buildHTML = require("../src/buildHTML");
 var buildMathML = require("../src/buildMathML");
 var katex = require("../katex");