Merge pull request +15845 from c9/revert-15837-revert-15833-ide-eslint

Revert "Revert "update eslint""
This commit is contained in:
Harutyun Amirjanyan 2017-12-07 17:42:35 +04:00 committed by GitHub
commit 0a3b292ff0
7 changed files with 75223 additions and 41016 deletions

View File

@ -0,0 +1,133 @@
// build script to bundle eslint and eslint-plugin-react in a format usable by language worker
var path = require("path");
var fs = require("fs");
function changeFile(filepath, handler, ignoreBackup) {
var value;
try {
value = fs.readFileSync(filepath + ".bak", "utf8");
} catch (e) {
value = fs.readFileSync(filepath, "utf8");
// backup the file in case the script is invoked again without clean npm install
if (!ignoreBackup)
fs.writeFileSync(filepath + ".bak", value, "utf8");
}
if (typeof handler == "function") {
value = handler(value);
} else {
handler.forEach(function(v) {
value = safeReplace(value, ...v);
});
}
fs.writeFileSync(filepath, value, "utf8");
}
function safeReplace(src, pattern, value, count) {
var matchCount = 0;
var replacer = value
if (typeof replacer == "string") {
replacer = function(...args) {
// expand placeholders of form $i in the replacement string
return value.replace(/[$](\d)/g, (_, i) => args[i]);
}
}
src = src.replace(pattern, function(...args) {
matchCount++;
return replacer(...args);
});
if (count != undefined && count != matchCount)
throw new Error(`expected "${pattern}" to match ${count} times instead of ${n}`);
return src;
}
var loadRulesPath = require.resolve("eslint/lib/load-rules");
var contents = `module.exports = function() {
var rules = {`;
var ruleNames = fs.readdirSync(path.join(loadRulesPath, "../rules"));
ruleNames.forEach(function(file) {
if (file.endsWith(".js")) {
file = file.slice(0, -3);
contents += ' "' + file + '": ' + 'require("eslint/lib/rules/' + file + '"),\n';
}
});
contents += `}\n
var jsxRules = require("eslint-plugin-react").rules;
Object.keys(jsxRules).forEach(function(key) { rules["react/" + key] = jsxRules[key]; })
return rules
};
`;
changeFile(loadRulesPath, function() { return contents });
changeFile(require.resolve("eslint/lib/linter"), [
[/^/, `//a
require('core-js/es6');
require('core-js/fn/symbol');
require('core-js/fn/set');
require('core-js/fn/array/from');
require('core-js/fn/array/find-index');
require('core-js/fn/string/raw');
require('core-js/fn/map');
require('core-js/fn/weak-map');
require("regenerator-runtime/runtime");
`.replace(/^\s*/gm, ""), 1],
['require(config.parser)', 'require("espree")', 1],
[`require("./config/config-validator")`, `{validateRuleOptions: x=>x}`, 1]
]);
changeFile(require.resolve("espree/espree"), function(src) {
return src.replace(/acornOptions = {[^}\s]*/g, 'acornOptions = {allowImportExportEverywhere:true,')
.replace(/(function isValid(?:Node|Token)\(\w+\) {)(?!ret)/g, "$1return true;");
});
var webpack = require("webpack");
var outputPath = __dirname + "/../worker/eslint_browserified.js";
webpack({
entry: "eslint/lib/linter",
module: {
rules: [{
test: /\.js$/,
include: [
path.resolve(__dirname)
],
enforce: 'pre',
loader: "babel-loader",
options: {
presets: ["es2015"],
compact: false,
plugins: ["babel-plugin-unassert"]
},
}]
},
output: {
path: path.dirname(outputPath),
filename: path.basename(outputPath),
library: "eslint",
// libraryTarget: "window",
libraryTarget: "amd"
},
resolve: {
unsafeCache: true,
}
}, (err, stats) => {
if (err || stats.hasErrors()) {
return console.log(err, stats);
}
var commentRe = /^(;)?(?:\s*(?:\/\/.+\n|\/\*(?:[^*]|\*(?!\/))*\*\/))+(?: *\n)?/gm;
changeFile(outputPath, function(src) {
return "// generated using packager/eslint.js\n"
+ src.replace(commentRe, "$1")
.replace('define("eslint", ', "define(")
.replace("if (severityValue === 0 || severityValue === 1 || severityValue === 2) {", "if (typeof severityValue === 'number') {")
.replace(/^ {4,}/gm, function(indentation) {
return indentation.replace(indentation.length % 4 ? / {2}/g : / {4}/g, "\t");
});
}, true);
});

View File

@ -0,0 +1,15 @@
{
"dependencies": {
"babel": "^6.23.0",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-plugin-unassert": "^2.1.2",
"babel-polyfill": "^6.26.0",
"babel-preset-es2015": "^6.24.1",
"core-js": "^2.5.1",
"eslint": "^4.12.0",
"eslint-plugin-react": "7.4.0",
"regenerator-runtime": "^0.11.0",
"webpack": "^3.8.1"
}
}

File diff suppressed because one or more lines are too long

View File

@ -8,7 +8,8 @@ define(function(require, exports, module) {
var baseLanguageHandler = require('plugins/c9.ide.language/base_handler');
var workerUtil = require('plugins/c9.ide.language/worker_util');
// var acorn = require("acorn/dist/acorn");
var linter = require("./eslint_browserified");
var Linter = require("./eslint_browserified");
var linter = new Linter();
var handler = module.exports = Object.create(baseLanguageHandler);
var util = require("plugins/c9.ide.language/worker_util");
var yaml = require("./js-yaml");
@ -32,7 +33,7 @@ var defaultParserOptions = {
jsx: true, // enable JSX
experimentalObjectRestSpread: true
},
ecmaVersion: 6,
ecmaVersion: 8,
// sourceType: "module"
};
var defaultGlobals = require("plugins/c9.ide.language.javascript/scope_analyzer").GLOBALS;
@ -77,11 +78,6 @@ handler.init = function(callback) {
rules["handle-callback-err"] = 1;
rules["no-new-require"] = 2;
for (var r in rules) {
if (!(r in linter.defaults().rules))
throw new Error("Unknown rule: ", r);
}
loadConfigFile(true, function(err) {
if (err) console.error(err);
util.$watchDir("/", handler);
@ -159,7 +155,7 @@ handler.analyzeSync = function(value, ast, path) {
config.globals = config.globals || defaultGlobals;
config.parserOptions = config.parserOptions || defaultParserOptions;
if (config.parserOptions.ecmaVersion == null)
config.parserOptions.ecmaVersion = 7;
config.parserOptions.ecmaVersion = 8;
if (config.parserOptions.ecmaFeatures == null)
config.parserOptions.ecmaFeatures = defaultParserOptions.ecmaFeatures;
if (config.parserOptions.ecmaFeatures.experimentalObjectRestSpread == null)
@ -172,7 +168,7 @@ handler.analyzeSync = function(value, ast, path) {
args: handler.isFeatureEnabled("unusedFunctionArgs") ? "all" : "none"
}
];
config.rules["jsx-uses-vars"] = 2;
config.rules["react/jsx-uses-vars"] = 2;
config.rules["no-undef"] =
handler.isFeatureEnabled("undeclaredVars") ? 1 : 0;
@ -221,6 +217,7 @@ handler.analyzeSync = function(value, ast, path) {
// work around column offset bug
m.column--;
m.line--;
var ec;
if (m.message.match(/is not defined|was used before it was defined|is already declared|is already defined|unexpected identifier|defined but never used/i)) {

View File

@ -11,14 +11,30 @@ define(function(require, exports, module) {
var assert = require("assert");
var LanguageWorker = require('../c9.ide.language.core/worker').LanguageWorker;
var EventEmitter = require("ace/lib/event_emitter").EventEmitter;
var emitter;
var worker;
describe("Jump To Definition", function() {
this.timeout(1000000);
beforeEach(function() {
// preload the handlers
require("plugins/c9.ide.language.javascript/scope_analyzer");
require("plugins/c9.ide.language.javascript/jumptodef");
require("plugins/c9.ide.language.javascript/parse");
emitter = Object.create(EventEmitter);
emitter.emit = emitter._dispatchEvent;
worker = new LanguageWorker(emitter);
worker.register("plugins/c9.ide.language.javascript/scope_analyzer");
worker.register("plugins/c9.ide.language.javascript/jumptodef");
worker.register("plugins/c9.ide.language.javascript/parse");
});
it("test jump to definition should point to variable declaration", function(next) {
disabledFeatures = { jshint: true };
var emitter = Object.create(EventEmitter);
emitter.emit = emitter._dispatchEvent;
emitter.on("definition", function(def) {
assert.equal(def.results[0].row, 0);
assert.equal(def.results[0].column, 4);
@ -32,16 +48,10 @@ define(function(require, exports, module) {
}
});
});
var worker = new LanguageWorker(emitter);
worker.register("plugins/c9.ide.language.javascript/scope_analyzer");
worker.register("plugins/c9.ide.language.javascript/jumptodef");
worker.register("plugins/c9.ide.language.javascript/parse");
worker.switchFile("test.js", false, "javascript", "var ab = 4; console.log(ab);", null, "");
});
it("test jump to definition on a position without code should still return a result", function(next) {
disabledFeatures = { jshint: true };
var emitter = Object.create(EventEmitter);
emitter.emit = emitter._dispatchEvent;
var definitionListener = function() {definitionListener.callCount += 1;};
definitionListener.callCount = 0;
emitter.on("definition", definitionListener);
@ -53,10 +63,6 @@ define(function(require, exports, module) {
}
});
});
var worker = new LanguageWorker(emitter);
worker.register("plugins/c9.ide.language.javascript/scope_analyzer");
worker.register("plugins/c9.ide.language.javascript/jumptodef");
worker.register("plugins/c9.ide.language.javascript/parse");
worker.switchFile("test.js", false, "javascript", "var ab = 4; console.log(ab); ", null, "");
// definition listener should not be called
@ -67,8 +73,6 @@ define(function(require, exports, module) {
});
it("test isJumpToDefinitionAvailable should return true when available", function(next) {
disabledFeatures = { jshint: true };
var emitter = Object.create(EventEmitter);
emitter.emit = emitter._dispatchEvent;
emitter.on("isJumpToDefinitionAvailableResult", function(res) {
assert.equal(res.value, true);
next();
@ -81,16 +85,10 @@ define(function(require, exports, module) {
}
});
});
var worker = new LanguageWorker(emitter);
worker.register("plugins/c9.ide.language.javascript/scope_analyzer");
worker.register("plugins/c9.ide.language.javascript/jumptodef");
worker.register("plugins/c9.ide.language.javascript/parse");
worker.switchFile("test.js", false, "javascript", "var ab = 4; console.log(ab);", null, "");
});
it("test isJumpToDefinitionAvailable should return false when not available", function(next) {
disabledFeatures = { jshint: true };
var emitter = Object.create(EventEmitter);
emitter.emit = emitter._dispatchEvent;
emitter.on("isJumpToDefinitionAvailableResult", function(res) {
assert.equal(res.value, false);
next();
@ -103,10 +101,6 @@ define(function(require, exports, module) {
}
});
});
var worker = new LanguageWorker(emitter);
worker.register("plugins/c9.ide.language.javascript/scope_analyzer");
worker.register("plugins/c9.ide.language.javascript/jumptodef");
worker.register("plugins/c9.ide.language.javascript/parse");
worker.switchFile("test.js", false, "javascript", "var ab = 4; console.log(ab);", null, "");
});
});

View File

@ -38,8 +38,7 @@ require(["plugins/c9.ide.language/test_base"], function(base) {
}, 0);
});
// TODO: make sure this works in the ci server
it.skip("has three markers initially", function(done) {
it("has three markers initially", function(done) {
jsSession.on("changeAnnotation", function onAnnos() {
if (!jsSession.getAnnotations().length)
return;

View File

@ -13,7 +13,7 @@ var address = system.args[1];
var filter = system.args[2];
var branch = system.args[3];
var logAll = false;
var logAll = true;
if (!address) console.log("# No address, running against: ", TEST_SUITE_URL);
if (filter) console.log("# Filter tests by ", filter);
if (!address) address = TEST_SUITE_URL;
@ -168,9 +168,8 @@ page.open(address, function(status) {
watchForTimeout(name);
log("# %s", name);
window.c9Test.run(name, function(errors, out) {
log("# %s", name);
out.tests.forEach(function(test, i) {
count++;
if (test.state == "passed") return log("ok %s %s", count, test.title);