Use dedent for unpadding (babel/babel-eslint#456)

This commit is contained in:
Andres Suarez 2017-03-25 19:32:05 -04:00
parent 711c1e2f4b
commit d78b0debd7
5 changed files with 7 additions and 16 deletions

View File

@ -36,6 +36,7 @@
"homepage": "https://github.com/babel/babel-eslint", "homepage": "https://github.com/babel/babel-eslint",
"devDependencies": { "devDependencies": {
"babel-eslint": "^7.0.0", "babel-eslint": "^7.0.0",
"dedent": "^0.7.0",
"eslint": "^3.18.0", "eslint": "^3.18.0",
"eslint-config-babel": "^6.0.0", "eslint-config-babel": "^6.0.0",
"eslint-plugin-flowtype": "^2.30.3", "eslint-plugin-flowtype": "^2.30.3",

View File

@ -2,7 +2,7 @@ var assert = require("assert");
var babelEslint = require(".."); var babelEslint = require("..");
var espree = require("espree"); var espree = require("espree");
var util = require("util"); var util = require("util");
var unpad = require("../utils/unpad"); var unpad = require("dedent");
// Checks if the source ast implements the target ast. Ignores extra keys on source ast // Checks if the source ast implements the target ast. Ignores extra keys on source ast
function assertImplementsAST(target, source, path) { function assertImplementsAST(target, source, path) {

View File

@ -1,7 +1,7 @@
/*eslint-env mocha*/ /*eslint-env mocha*/
"use strict"; "use strict";
var eslint = require("eslint"); var eslint = require("eslint");
var unpad = require("../utils/unpad"); var unpad = require("dedent");
function verifyAndAssertMessages(code, rules, expectedMessages, sourceType, overrideConfig) { function verifyAndAssertMessages(code, rules, expectedMessages, sourceType, overrideConfig) {
var config = { var config = {

View File

@ -1,14 +0,0 @@
// Remove padding from a string.
function unpad(str) {
const lines = str.split("\n");
const m = lines[1] && lines[1].match(/^\s+/);
if (!m) {
return str;
}
const spaces = m[0].length;
return lines.map(
(line) => line.slice(spaces)
).join("\n").trim();
}
module.exports = unpad;

View File

@ -222,6 +222,10 @@ debug@^2.1.1, debug@^2.2.0:
dependencies: dependencies:
ms "0.7.2" ms "0.7.2"
dedent@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
deep-is@~0.1.3: deep-is@~0.1.3:
version "0.1.3" version "0.1.3"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"