remove is-keyword-js in favor of esutils #856

This commit is contained in:
Sebastian McKenzie 2015-02-22 10:51:27 +11:00
parent f3288ddb1f
commit b44a6eb297
2 changed files with 5 additions and 4 deletions

View File

@ -1,8 +1,8 @@
var lineNumbers = require("line-numbers");
var repeating = require("repeating"); var repeating = require("repeating");
var jsTokens = require("js-tokens"); var jsTokens = require("js-tokens");
var isJSKeyword = require("is-keyword-js"); var esutils = require("esutils");
var chalk = require("chalk"); var chalk = require("chalk");
var lineNumbers = require("line-numbers");
var ary = require("lodash/function/ary"); var ary = require("lodash/function/ary");
var defs = { var defs = {
@ -25,9 +25,10 @@ var newline = /\r\n|[\n\r\u2028\u2029]/;
var highlight = function (text) { var highlight = function (text) {
var tokenType = function (match) { var tokenType = function (match) {
var token = jsTokens.matchToToken(match); var token = jsTokens.matchToToken(match);
if (token.type === "name" && isJSKeyword(token.value)) { if (token.type === "name" && esutils.keyword.isKeywordES6(token.value)) {
return "keyword"; return "keyword";
} }
if (token.type === "punctuation") { if (token.type === "punctuation") {
switch (token.value) { switch (token.value) {
case "{": case "{":
@ -41,6 +42,7 @@ var highlight = function (text) {
return "square"; return "square";
} }
} }
return token.type; return token.type;
}; };

View File

@ -49,7 +49,6 @@
"fs-readdir-recursive": "^0.1.0", "fs-readdir-recursive": "^0.1.0",
"globals": "^6.2.0", "globals": "^6.2.0",
"is-integer": "^1.0.4", "is-integer": "^1.0.4",
"is-keyword-js": "^1.0.3",
"js-tokens": "~0.4.1", "js-tokens": "~0.4.1",
"leven": "^1.0.1", "leven": "^1.0.1",
"line-numbers": "~0.2.0", "line-numbers": "~0.2.0",