Refactor code-style

Author: wooorm

.prettierignore

@@ -0,0 +1 @@
+coverage/

index.js

@@ -1,146 +1,153 @@
-'use strict';
+'use strict'
 
-var path = require('path');
-var gitDiffTree = require('git-diff-tree');
-var findUp = require('vfile-find-up');
+var path = require('path')
+var gitDiffTree = require('git-diff-tree')
+var findUp = require('vfile-find-up')
 
-module.exports = diff;
+module.exports = diff
 
-var own = {}.hasOwnProperty;
+var own = {}.hasOwnProperty
 
-var previousRange;
+var previousRange
 
 function diff() {
-  var cache = {};
+  var cache = {}
 
-  return transform;
+  return transform
 
   function transform(tree, file, next) {
-    var base = file.dirname;
-    var commitRange = process.env.TRAVIS_COMMIT_RANGE;
-    var range = (commitRange || '').split(/\.{3}/);
+    var base = file.dirname
+    var commitRange = process.env.TRAVIS_COMMIT_RANGE
+    var range = (commitRange || '').split(/\.{3}/)
 
     if (!base || !commitRange || range.length !== 2) {
-      return next();
+      return next()
     }
 
     if (commitRange !== previousRange) {
-      cache = {};
-      previousRange = commitRange;
+      cache = {}
+      previousRange = commitRange
     }
 
     if (own.call(cache, base)) {
-      tick(cache[base]);
+      tick(cache[base])
     } else {
-      findUp.one('.git', file.dirname, function (err, git) {
-        /* istanbul ignore if - never happens */
-        if (err) {
-          return next(err);
-        }
+      findUp.one('.git', file.dirname, ongit)
+    }
 
-        /* istanbul ignore if - not testable in a Git repo... */
-        if (!git) {
-          return next(new Error('Not in a git repository'));
-        }
+    function ongit(err, git) {
+      /* istanbul ignore if - never happens */
+      if (err) {
+        return next(err)
+      }
+
+      /* istanbul ignore if - not testable in a Git repo... */
+      if (!git) {
+        return next(new Error('Not in a git repository'))
+      }
 
-        cache[base] = git.dirname;
-        tick(git.dirname);
-      });
+      cache[base] = git.dirname
+      tick(git.dirname)
     }
 
     function tick(root) {
-      var diffs = {};
+      var diffs = {}
+      var revs = {originalRev: range[0], rev: range[1]}
 
-      gitDiffTree(path.join(root, '.git'), {originalRev: range[0], rev: range[1]})
+      gitDiffTree(path.join(root, '.git'), revs)
         .on('error', next)
         .on('data', ondata)
-        .on('end', onend);
+        .on('end', onend)
 
       function ondata(type, data) {
-        var info = type === 'patch' && parse(data);
-        var fp;
+        var info = type === 'patch' && parse(data)
+        var fp
 
         if (info) {
-          fp = path.resolve(root, info.path);
+          fp = path.resolve(root, info.path)
 
           /* istanbul ignore else - long diffs. */
           if (!(fp in diffs)) {
-            diffs[fp] = [];
+            diffs[fp] = []
           }
 
-          diffs[fp] = diffs[fp].concat(info.ranges);
+          diffs[fp] = diffs[fp].concat(info.ranges)
         }
       }
 
       function onend() {
-        tock(diffs);
+        tock(diffs)
       }
 
       function tock(patches) {
-        var fp = path.resolve(file.cwd, file.path);
-        var ranges = patches[fp];
+        var fp = path.resolve(file.cwd, file.path)
+        var ranges = patches[fp]
 
         /* Unchanged file. */
         if (!ranges || ranges.length === 0) {
-          file.messages = [];
-          return next();
+          file.messages = []
+          return next()
         }
 
-        file.messages = file.messages.filter(function (message) {
-          var line = message.line;
+        file.messages = file.messages.filter(filter)
+
+        next()
+
+        function filter(message) {
+          var line = message.line
 
-          return ranges.some(function (range) {
-            return line >= range[0] && line <= range[1];
-          });
-        });
+          return ranges.some(some)
 
-        next();
+          function some(range) {
+            return line >= range[0] && line <= range[1]
+          }
+        }
       }
     }
   }
 }
 
 function parse(data) {
-  var lines = data.lines;
-  var line = lines[0];
-  var re = /^@@ -(\d+),?(\d+)? \+(\d+),?(\d+)? @@/;
-  var match = line.match(re);
-  var result = {path: data.bPath};
-  var ranges = [];
-  var start;
-  var index;
-  var length;
-  var position;
-  var no;
+  var lines = data.lines
+  var line = lines[0]
+  var re = /^@@ -(\d+),?(\d+)? \+(\d+),?(\d+)? @@/
+  var match = line.match(re)
+  var result = {path: data.bPath}
+  var ranges = []
+  var start
+  var index
+  var length
+  var position
+  var no
 
   /* istanbul ignore if - should not happen, maybe if
    * Git returns weird diffs? */
   if (!match) {
-    return;
+    return
   }
 
-  index = 0;
-  length = lines.length;
-  start = parseInt(match[3], 10) - 1;
-  result.ranges = ranges;
+  index = 0
+  length = lines.length
+  start = parseInt(match[3], 10) - 1
+  result.ranges = ranges
 
   while (++index < length) {
-    line = lines[index];
+    line = lines[index]
 
     if (line.charAt(0) !== '+') {
-      position = null;
-      continue;
+      position = null
+      continue
     }
 
-    no = start + index;
+    no = start + index
 
     if (position === null || position === undefined) {
-      position = ranges.length;
-      ranges.push([no, no]);
+      position = ranges.length
+      ranges.push([no, no])
     } else {
-      ranges[position][1] = no;
+      ranges[position][1] = no
     }
   }
 
-  return result;
+  return result
 }

package.json

@@ -28,6 +28,7 @@
     "execa": "^0.10.0",
     "nlcst-to-string": "^2.0.0",
     "nyc": "^11.1.0",
+    "prettier": "^1.12.1",
     "remark-cli": "^5.0.0",
     "remark-preset-wooorm": "^4.0.0",
     "retext": "^5.0.0",
@@ -39,21 +40,27 @@
     "xo": "^0.21.0"
   },
   "scripts": {
-    "build-md": "remark . -qfo",
-    "build": "npm run build-md",
-    "lint": "xo",
+    "format": "remark . -qfo && prettier --write '**/*.js' && xo --fix",
     "test-api": "node test",
     "test-coverage": "nyc --reporter lcov tape test/index.js",
-    "test": "npm run build && npm run lint && npm run test-coverage"
+    "test": "npm run format && npm run test-coverage"
   },
   "nyc": {
     "check-coverage": true,
     "lines": 100,
     "functions": 100,
     "branches": 100
   },
+  "prettier": {
+    "tabWidth": 2,
+    "useTabs": false,
+    "singleQuote": true,
+    "bracketSpacing": false,
+    "semi": false,
+    "trailingComma": "none"
+  },
   "xo": {
-    "space": true,
+    "prettier": true,
     "esnext": false,
     "rules": {
       "no-var": "off",

readme.md

@@ -51,34 +51,36 @@ index 360b225..5a96b86 100644
 We have some natural language checking in `lint.js`:
 
 ```js
-var diff = require('unified-diff');
-var vfile = require('to-vfile');
-var unified = require('unified');
-var markdown = require('remark-parse');
-var stringify = require('remark-stringify');
-var remark2retext = require('remark-retext');
-var english = require('retext-english');
-var repetition = require('retext-repeated-words');
-var article = require('retext-indefinite-article');
-var report = require('vfile-reporter');
-
-vfile.read('readme.md', function (err, file) {
-  if (err) throw err;
+var diff = require('unified-diff')
+var vfile = require('to-vfile')
+var unified = require('unified')
+var markdown = require('remark-parse')
+var stringify = require('remark-stringify')
+var remark2retext = require('remark-retext')
+var english = require('retext-english')
+var repetition = require('retext-repeated-words')
+var article = require('retext-indefinite-article')
+var report = require('vfile-reporter')
+
+vfile.read('readme.md', function(err, file) {
+  if (err) throw err
 
   unified()
     .use(markdown)
-    .use(remark2retext, unified()
-      .use(english)
-      .use(repetition)
-      .use(article)
+    .use(
+      remark2retext,
+      unified()
+        .use(english)
+        .use(repetition)
+        .use(article)
     )
     .use(stringify)
     .use(diff)
-    .process(file, function (err) {
-      console.error(report(err || file));
-      process.exit(err || file.messages.length ? 1 : 0);
-    });
-});
+    .process(file, function(err) {
+      console.error(report(err || file))
+      process.exit(err || file.messages.length ? 1 : 0)
+    })
+})
 ```
 
 `lint.js` is hooked up to run on Travis in `.travis.yml` like so: