Use arrow for short functions.

skygragon · skygragon · commit b8d84e6a491c · 2018-01-02T19:40:27.000+08:00
Signed-off-by: Eric Wang &lt;skygragon@gmail.com&gt;
diff --git a/lib/cache.js b/lib/cache.js
@@ -33,9 +33,7 @@ cache.del = function(k) {
 
 cache.list = function() {
   return fs.readdirSync(h.getCacheDir())
-    .filter(function(filename) {
-      return path.extname(filename) === '.json';
-    })
+    .filter(x => path.extname(x) === '.json')
     .map(function(filename) {
       const k = path.basename(filename, '.json');
       const stat = fs.statSync(h.getCacheFile(k));
diff --git a/lib/chalk.js b/lib/chalk.js
@@ -44,12 +44,12 @@ chalk.print = function(s) {
 chalk.wrap = function(pre, post) {
   pres.push(pre);
   posts.unshift(post);
-  const f = function(s) { return chalk.print(s); };
+  const f = x => chalk.print(x);
   Object.setPrototypeOf(f, chalk);
   return f;
 };
 
-function bgName(s) { return 'bg' + s[0].toUpperCase() + s.substr(1); }
+const bgName = x => 'bg' + x[0].toUpperCase() + x.substr(1);
 
 chalk.init = function() {
   require('./helper').getCodeDirData('colors').forEach(function(f) {
@@ -73,26 +73,20 @@ chalk.init = function() {
   _.chain(['black', 'blue', 'cyan', 'gray', 'green', 'magenta', 'red', 'white', 'yellow'])
   .each(function(color) {
     Object.defineProperty(chalk, color, {
-      get: function() {
-        return chalk.wrap(chalk.theme[color], style.color.close);
-      },
+      get:          () => chalk.wrap(chalk.theme[color], style.color.close),
       configurable: true
     });
     const bgcolor = bgName(color);
     Object.defineProperty(chalk, bgcolor, {
-      get: function() {
-        return chalk.wrap(chalk.theme[bgcolor], style.bgColor.close);
-      },
+      get:          () => chalk.wrap(chalk.theme[bgcolor], style.bgColor.close),
       configurable: true
     });
   });
 
   _.chain(['bold', 'dim', 'italic', 'inverse', 'strikethrough', 'underline'])
   .each(function(modifier) {
     Object.defineProperty(chalk, modifier, {
-      get: function() {
-        return chalk.wrap(style[modifier].open, style[modifier].close);
-      },
+      get:          () => chalk.wrap(style[modifier].open, style[modifier].close),
       configurable: true
     });
   });
diff --git a/lib/cli.js b/lib/cli.js
@@ -42,7 +42,7 @@ function initLogLevel() {
 
       // FIXME: hack HTTP request log, hope no one else use it...
       if (args.length > 0 && args[0].indexOf('REQUEST ') === 0) {
-        args = args.map(function(arg) { return h.printSafeHTTP(arg); });
+        args = args.map((x) => h.printSafeHTTP(x));
         log.trace.apply(log, args);
       } else {
         log.info.apply(log, args);
diff --git a/lib/commands/list.js b/lib/commands/list.js
@@ -52,16 +52,14 @@ cmd.handler = function(argv) {
       if (word.endsWith(word.substr(-1).repeat(6))) {
         log.warn('Hmmm...you might need a new keyboard?');
       }
-      problems = problems.filter(function(x) {
-        return x.name.toLowerCase().includes(word);
-      });
+      problems = problems.filter(x => x.name.toLowerCase().includes(word));
     }
 
     const stat = {};
     const KEYS = ['locked', 'starred', 'ac', 'notac', 'None', 'Easy', 'Medium', 'Hard'];
     KEYS.forEach(function(x) { stat[x] = 0; });
 
-    problems = _.sortBy(problems, function(x) { return -x.id; });
+    problems = _.sortBy(problems, x => -x.id);
     problems.forEach(function(problem) {
       stat[problem.level] = (stat[problem.level] || 0) + 1;
       stat[problem.state] = (stat[problem.state] || 0) + 1;
diff --git a/lib/commands/plugin.js b/lib/commands/plugin.js
@@ -73,9 +73,7 @@ cmd.handler = function(argv) {
 
   let plugins = Plugin.plugins;
   if (name) {
-    plugins = plugins.filter(function(p) {
-      return p.name === name;
-    });
+    plugins = plugins.filter(x => x.name === name);
   }
   if (plugins.length === 0) return log.error('Plugin not found!');
 
diff --git a/lib/commands/show.js b/lib/commands/show.js
@@ -79,19 +79,17 @@ function showProblem(problem, argv) {
   const taglist = [problem.category]
     .concat(problem.companies || [])
     .concat(problem.tags || [])
-    .map(function(x) { return h.badge(x, 'blue'); })
+    .map(x => h.badge(x, 'blue'))
     .join(' ');
   const langlist = problem.templates
-    .map(function(x) { return h.badge(x.value, 'yellow'); })
+    .map(x => h.badge(x.value, 'yellow'))
     .sort()
     .join(' ');
 
   let code;
   const needcode = argv.gen || argv.codeonly;
   if (needcode) {
-    const template = problem.templates.find(function(x) {
-      return x.value === argv.lang;
-    });
+    const template = problem.templates.find(x => x.value === argv.lang);
     if (!template) {
       log.fail('Not supported language "' + argv.lang + '"');
       log.warn('Supported languages: ' + langlist);
diff --git a/lib/commands/stat.js b/lib/commands/stat.js
@@ -44,20 +44,14 @@ const cmd = {
   }
 };
 
-function bar(c, n) {
-  return _.range(n)
-    .map(function(i) { return c; })
-    .join('');
-}
-
 function printLine(key, done, all) {
   const n = 30;
   const percent = (all > 0) ? done / all : 0;
   const x = Math.ceil(n * percent);
   log.printf(' %s\t%3d/%-3d (%.2f%%)  %s%s',
       h.prettyLevel(key), done, all, 100 * percent,
-      chalk.green(bar('█', x)),
-      chalk.red(bar('░', n - x)));
+      chalk.green('█'.repeat(x)),
+      chalk.red('░'.repeat(n - x)));
 }
 
 function showProgress(problems) {
@@ -105,7 +99,7 @@ function showGraph(problems) {
   if (groups > 5) groups = 5;
 
   const header = _.range(groups)
-    .map(function(x) { return sprintf('%5d%18d', x * 10 + 1, x * 10 + 10); })
+    .map(x => sprintf('%5d%18d', x * 10 + 1, x * 10 + 10))
     .join('');
   log.info('    ' + header);
 
@@ -214,7 +208,7 @@ cmd.handler = function(argv) {
     if (e) return log.fail(e);
 
     if (!argv.lock)
-      problems = problems.filter(function(x) { return !x.locked; });
+      problems = problems.filter(x => !x.locked);
 
     log.info();
     if (argv.graph)    showGraph(problems);
diff --git a/lib/commands/submission.js b/lib/commands/submission.js
@@ -81,16 +81,12 @@ function exportSubmission(problem, argv, cb) {
       return cb('No submissions?');
 
     // get obj list contain required filetype
-    submissions = submissions.filter(function(x) {
-      return argv.lang === 'all' || argv.lang === x.lang;
-    });
+    submissions = submissions.filter(x => argv.lang === 'all' || argv.lang === x.lang);
     if (submissions.length === 0)
       return cb('No submissions in required language.');
 
     // if no accepted, use the latest non-accepted one
-    const submission = submissions.find(function(x) {
-      return x.status_display === 'Accepted';
-    }) || submissions[0];
+    const submission = submissions.find(x => x.status_display === 'Accepted') || submissions[0];
     submission.ac = (submission.status_display === 'Accepted');
 
     const f = sprintf('%s/%d.%s.%s.%s%s',
@@ -128,7 +124,7 @@ cmd.handler = function(argv) {
   if (argv.all) {
     core.getProblems(function(e, problems) {
       if (e) return log.fail(e);
-      problems = problems.filter(function(q) { return q.state === 'ac' || q.state === 'notac'; });
+      problems = problems.filter(x => x.state === 'ac' || x.state === 'notac');
       q.addTasks(problems).run();
     });
     return;
diff --git a/lib/core.js b/lib/core.js
@@ -35,14 +35,13 @@ core.filters = {
 };
 
 function hasTag(o, tag) {
-  return Array.isArray(o) &&
-    o.some(function(x) { return x.indexOf(tag.toLowerCase()) >= 0; });
+  return Array.isArray(o) && o.some(x => x.indexOf(tag.toLowerCase()) >= 0);
 }
 
-function isLevel(x, q) { return x.level[0].toLowerCase() === q.toLowerCase(); }
-function isACed(x) { return x.state === 'ac'; }
-function isLocked(x) { return x.locked; }
-function isStarred(x) { return x.starred; }
+const isLevel = (x, q) => x.level[0].toLowerCase() === q.toLowerCase();
+const isACed = x => x.state === 'ac';
+const isLocked = x => x.locked;
+const isStarred = x => x.starred;
 
 const QUERY_HANDLERS = {
   e: isLevel,
@@ -66,7 +65,7 @@ core.filterProblems = function(opts, cb) {
     (opts.query || '').split('').forEach(function(q) {
       const f = QUERY_HANDLERS[q];
       if (!f) return;
-      problems = problems.filter(function(x) { return f(x, q); });
+      problems = problems.filter(x => f(x, q));
     });
 
     (opts.tag || []).forEach(function(t) {
diff --git a/lib/helper.js b/lib/helper.js
@@ -54,7 +54,7 @@ h.KEYS = {
   user:     '../user',
   stat:     '../stat',
   problems: 'problems',
-  problem:  function(p) { return p.id + '.' + p.slug + '.' + p.category; }
+  problem:  p => p.id + '.' + p.slug + '.' + p.category
 };
 
 h.isWindows = function() {
@@ -124,7 +124,7 @@ h.statusToName = function(sc) {
 };
 
 h.langToExt = function(lang) {
-  const res = LANGS.find(function(x) { return x.lang === lang; });
+  const res = LANGS.find(x => x.lang === lang);
   return res ? res.ext : '.raw';
 };
 
@@ -133,14 +133,14 @@ h.extToLang = function(fullpath) {
   if (fullpath.endsWith('.py3')) return 'python3';
 
   const res = _.chain(LANGS)
-    .filter(function(x) { return fullpath.endsWith(x.ext); })
-    .sortBy(function(x) { return -x.ext.length; })
+    .filter(x => fullpath.endsWith(x.ext))
+    .sortBy(x => -x.ext.length)
     .value();
   return res.length ? res[0].lang : 'unknown';
 };
 
 h.langToCommentStyle = function(lang) {
-  const res = LANGS.find(function(x) { return x.lang === lang; });
+  const res = LANGS.find(x => x.lang === lang);
 
   return (res && res.style === '#') ?
   {start: '#',  line: '#',  end: '#'} :
diff --git a/lib/log.js b/lib/log.js
@@ -43,7 +43,7 @@ log.init = function() {
       const args = _.toArray(arguments);
       if (name !== 'INFO') args.unshift('[' + name + ']');
 
-      let s = args.map(function(arg) { return arg.toString(); }).join(' ');
+      let s = args.map(x => x.toString()).join(' ');
       if (level.color) s = chalk[level.color](s);
 
       this.output(s);
diff --git a/lib/plugin.js b/lib/plugin.js
@@ -19,8 +19,8 @@ function Plugin(id, name, ver, desc, deps) {
 
   // only need deps for current platform
   this.deps = _.chain(deps || [])
-    .filter(function(x) { return ! x.includes(':') || x.includes(':' + process.platform); })
-    .map(function(x) { return x.split(':')[0]; })
+    .filter(x => ! x.includes(':') || x.includes(':' + process.platform))
+    .map(x => x.split(':')[0])
     .value();
 }
 
@@ -72,9 +72,7 @@ Plugin.init = function(head) {
 
   // chain the plugins together
   // the one has bigger `id` comes first
-  plugins = _.sortBy(plugins, function(p) {
-    return -p.id;
-  });
+  plugins = _.sortBy(plugins, x => -x.id);
 
   let last = head;
   plugins.forEach(function(p) {
diff --git a/lib/plugins/cache.js b/lib/plugins/cache.js
@@ -58,7 +58,7 @@ plugin.updateProblem = function(problem, kv) {
   const problems = cache.get(h.KEYS.problems);
   if (!problems) return false;
 
-  const _problem = problems.find(function(x) { return x.id === problem.id; });
+  const _problem = problems.find(x => x.id === problem.id);
   if (!_problem) return false;
 
   _.extend(_problem, kv);
diff --git a/lib/plugins/leetcode.js b/lib/plugins/leetcode.js
@@ -96,9 +96,7 @@ plugin.getCategoryProblems = function(category, cb) {
     session.saveUser(user);
 
     const problems = json.stat_status_pairs
-        .filter(function(p) {
-          return !p.stat.question__hide;
-        })
+        .filter(p => !p.stat.question__hide)
         .map(function(p) {
           return {
             state:    p.status || 'None',
@@ -246,9 +244,7 @@ function formatResult(result) {
   };
 
   x.error = _.chain(result)
-    .pick(function(v, k) {
-      return /_error$/.test(k) && v.length > 0;
-    })
+    .pick((v, k) => /_error$/.test(k) && v.length > 0)
     .values()
     .value();
 
diff --git a/test/test_plugin.js b/test/test_plugin.js
@@ -43,7 +43,7 @@ describe('plugin', function() {
       Plugin.init(core);
       assert.deepEqual(Plugin.plugins.length, 3);
 
-      var names = Plugin.plugins.map(function(p) { return p.name; });
+      var names = Plugin.plugins.map(p => p.name);
       assert.deepEqual(names, ['Retry', 'Cache', 'Leetcode']);
 
       assert.equal(core.next, retry);

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,7 @@ cmd.handler = function(argv) {`
`73`	`73`
`74`	`74`	`let plugins = Plugin.plugins;`
`75`	`75`	`if (name) {`
`76`		`- plugins = plugins.filter(function(p) {`
`77`		`- return p.name === name;`
`78`		`- });`
	`76`	`+ plugins = plugins.filter(x => x.name === name);`
`79`	`77`	`}`
`80`	`78`	`if (plugins.length === 0) return log.error('Plugin not found!');`
`81`	`79`