From 52af0d27b5a3ac03f27cb8cdca3f99f5eb5e7279 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 5 May 2015 15:25:48 +0200 Subject: [PATCH 1/7] Update eslint to 0.20.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a942d39..9f486025 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "emmet": "git://github.com/cloud9ide/emmet-core.git#2ff6dc06ad", "engine.io": "~1.5.1", "engine.io-client": "~1.5.1", - "eslint": "git://github.com/cloud9ide/eslint.git#e2d052aafd81ea0aa6d1d4fd9f88f3613e386160", + "eslint": "git://github.com/cloud9ide/eslint.git#dc500e81162bf0cb4747a4a415c121b0c46975cb", "http-error": "~0.0.5", "less": "^2.4.0", "mime": "~1.2.9", From 1c88925601500ff264c9e109716ef73c7482490d Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 5 May 2015 15:30:53 +0200 Subject: [PATCH 2/7] Update browserified eslint --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9f486025..f7207a92 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "c9.ide.language.html.diff": "#a7311cfc9f", "c9.ide.language.javascript": "#8479d0a9c1", "c9.ide.language.javascript.immediate": "#9a2cce9121", - "c9.ide.language.javascript.eslint": "#8832423ad1", + "c9.ide.language.javascript.eslint": "#0a1bd5d947", "c9.ide.language.javascript.tern": "#7aab8b0b6a", "c9.ide.language.javascript.infer": "#cfec494a3c", "c9.ide.language.jsonalyzer": "#21b64e5820", From a16f73ebc7385518de4ce9de552a5f79edb6c82a Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 5 May 2015 16:48:47 +0200 Subject: [PATCH 3/7] Don't override global require --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f7207a92..11c0cef2 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "c9.ide.language.html.diff": "#a7311cfc9f", "c9.ide.language.javascript": "#8479d0a9c1", "c9.ide.language.javascript.immediate": "#9a2cce9121", - "c9.ide.language.javascript.eslint": "#0a1bd5d947", + "c9.ide.language.javascript.eslint": "#dde8c5708d", "c9.ide.language.javascript.tern": "#7aab8b0b6a", "c9.ide.language.javascript.infer": "#cfec494a3c", "c9.ide.language.jsonalyzer": "#21b64e5820", From 6aacc02211599b56a9d76cd660fa6f585d88d176 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 5 May 2015 16:48:57 +0200 Subject: [PATCH 4/7] Make exception explicit --- plugins/c9.ide.ace/ace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/c9.ide.ace/ace.js b/plugins/c9.ide.ace/ace.js index a06b159e..d8f6d7a0 100644 --- a/plugins/c9.ide.ace/ace.js +++ b/plugins/c9.ide.ace/ace.js @@ -149,7 +149,7 @@ define(function(require, exports, module) { // fixes a problem with Ace architect loading /lib/ace // creating a conflict with themes - if (theme.isDark === undefined) + if (!theme || theme.isDark === undefined) throw new Error(); } catch (e) { From 8f5aa5caf6674f11226371c20e5d4690b539d7c5 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 5 May 2015 16:49:10 +0200 Subject: [PATCH 5/7] Don't show language warning when collab is not yet installed --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 11c0cef2..99b8b08c 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "c9.ide.language.javascript.eslint": "#dde8c5708d", "c9.ide.language.javascript.tern": "#7aab8b0b6a", "c9.ide.language.javascript.infer": "#cfec494a3c", - "c9.ide.language.jsonalyzer": "#21b64e5820", + "c9.ide.language.jsonalyzer": "#dab3edfca5", "c9.ide.collab": "#da4d09ae6a", "c9.ide.local": "#2bfd7ff051", "c9.ide.find": "#6cc6d3379d", From 18c03d5486db393b5174ca4af06a553e0aea7c67 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 5 May 2015 17:20:51 +0200 Subject: [PATCH 6/7] Support new eslint 0.20.0 --- .eslintrc | 4 ++++ package.json | 2 +- plugins/c9.fs/mock/test_es6.js | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.eslintrc b/.eslintrc index e6595427..21a2ea9c 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,3 +1,6 @@ +ecmaFeatures: + jsx: true + env: node: true browser: true @@ -5,6 +8,7 @@ env: builtin: true mocha: true jasmine: false + es6: false rules: handle-callback-err: 1 diff --git a/package.json b/package.json index 99b8b08c..06827288 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "c9.ide.language.html.diff": "#a7311cfc9f", "c9.ide.language.javascript": "#8479d0a9c1", "c9.ide.language.javascript.immediate": "#9a2cce9121", - "c9.ide.language.javascript.eslint": "#dde8c5708d", + "c9.ide.language.javascript.eslint": "#129a16dafb", "c9.ide.language.javascript.tern": "#7aab8b0b6a", "c9.ide.language.javascript.infer": "#cfec494a3c", "c9.ide.language.jsonalyzer": "#dab3edfca5", diff --git a/plugins/c9.fs/mock/test_es6.js b/plugins/c9.fs/mock/test_es6.js index dc01bb65..f73b6ab7 100644 --- a/plugins/c9.fs/mock/test_es6.js +++ b/plugins/c9.fs/mock/test_es6.js @@ -45,6 +45,10 @@ array; var qux = {left}; qux; var {p,q} = { p: 1, q: 2}; +p; +q; + +class Blie {} class Model extends Blie { constructor(properties) { From f3b07981f69efdd7ebd57f1e0d7d666f4a4708a9 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 5 May 2015 17:22:37 +0200 Subject: [PATCH 7/7] Cut tests some more slack Hopefully closes +6921 ;) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 06827288..6bbf9ed8 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ }, "licenses": [], "c9plugins": { - "c9.ide.language": "#8ef952c6c2", + "c9.ide.language": "#77f75c7635", "c9.ide.language.css": "#ef8a28943e", "c9.ide.language.generic": "#32986699ac", "c9.ide.language.html": "#bbe81afed1",