From f6ab11619bdc6d8604a0540dad18941fc83500dc Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 17 Mar 2016 09:46:49 +0000 Subject: [PATCH 1/8] Add installation instructions --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8e9505b2..2b7f0e08 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "c9.ide.language.javascript.tern": "#b55d0069bb", "c9.ide.language.javascript.infer": "#325ac6880e", "c9.ide.language.jsonalyzer": "#4b329741b1", - "c9.ide.language.codeintel": "#046d39603b", + "c9.ide.language.codeintel": "#e0b64a6ed1", "c9.ide.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", From 0b227906a72a45c8ddbfe397f2244f09be3ff51d Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 17 Mar 2016 10:40:29 +0000 Subject: [PATCH 2/8] Add dialog to show installation guide --- configs/client-default.js | 8 ++++++-- package.json | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index d4f5985e..dd3d51c3 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -906,8 +906,12 @@ module.exports = function(options) { }); } - if (options.platform !== "win32") - plugins.push("plugins/c9.ide.language.codeintel/codeintel"); + if (options.platform !== "win32") { + plugins.push({ + packagePath: "plugins/c9.ide.language.codeintel/codeintel", + notInstalled: options.ssh || !hosted, + }); + } return plugins; }; diff --git a/package.json b/package.json index 2b7f0e08..25b5cd52 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "c9.ide.language.javascript.tern": "#b55d0069bb", "c9.ide.language.javascript.infer": "#325ac6880e", "c9.ide.language.jsonalyzer": "#4b329741b1", - "c9.ide.language.codeintel": "#e0b64a6ed1", + "c9.ide.language.codeintel": "#434e8345ef", "c9.ide.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", From e221c17bb8ff4db9522ff416ed086f46d18c71fb Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 17 Mar 2016 10:42:43 +0000 Subject: [PATCH 3/8] Improve preinstalled handling --- configs/client-default.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index dd3d51c3..7d3fe52d 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -909,7 +909,7 @@ module.exports = function(options) { if (options.platform !== "win32") { plugins.push({ packagePath: "plugins/c9.ide.language.codeintel/codeintel", - notInstalled: options.ssh || !hosted, + preinstalled: hosted && !options.ssh, }); } diff --git a/package.json b/package.json index 25b5cd52..8219d4fb 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "c9.ide.language.javascript.tern": "#b55d0069bb", "c9.ide.language.javascript.infer": "#325ac6880e", "c9.ide.language.jsonalyzer": "#4b329741b1", - "c9.ide.language.codeintel": "#434e8345ef", + "c9.ide.language.codeintel": "#0cfb862d32", "c9.ide.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", From 948a64c299c820ebd02d49840335dee7959e9735 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 17 Mar 2016 10:45:52 +0000 Subject: [PATCH 4/8] Ask user to install codeintel when not yet installed --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8219d4fb..37f939d2 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "c9.ide.language.javascript.tern": "#b55d0069bb", "c9.ide.language.javascript.infer": "#325ac6880e", "c9.ide.language.jsonalyzer": "#4b329741b1", - "c9.ide.language.codeintel": "#0cfb862d32", + "c9.ide.language.codeintel": "#06ce7d393c", "c9.ide.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", From eb8480e2dcb53ccbc7b57e6ca8e2592e82383a5f Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 17 Mar 2016 10:53:04 +0000 Subject: [PATCH 5/8] Show fewer deep completions for JavaScript --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 37f939d2..695f7023 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "c9.ide.language.javascript.immediate": "#c8b1e5767a", "c9.ide.language.javascript.eslint": "#3c57ed1720", "c9.ide.language.javascript.tern": "#b55d0069bb", - "c9.ide.language.javascript.infer": "#325ac6880e", + "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#4b329741b1", "c9.ide.language.codeintel": "#06ce7d393c", "c9.ide.collab": "#11a0d3c5ce", From ad5a3880436162139dde67ab3fb1f63a4503a8b2 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 17 Mar 2016 10:53:19 +0000 Subject: [PATCH 6/8] Don't complete after . in markdown --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 695f7023..6ebd4b92 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#db77f906a2", + "c9.ide.language": "#8d02f86043", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#92210f5a48", "c9.ide.language.html": "#22fdc74869", From ce7df6f43b29e1f3d6f2d6d4c4b0ea652e9e489d Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 17 Mar 2016 11:00:19 +0000 Subject: [PATCH 7/8] Fix numbering --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6ebd4b92..1d9d34b5 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "c9.ide.language.javascript.tern": "#b55d0069bb", "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#4b329741b1", - "c9.ide.language.codeintel": "#06ce7d393c", + "c9.ide.language.codeintel": "#56cf2d0032", "c9.ide.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", From a87a65a66e0736032c7fd62c672d69223f0b9c44 Mon Sep 17 00:00:00 2001 From: "Lennart C. L. Kats" Date: Fri, 18 Mar 2016 11:25:16 +0100 Subject: [PATCH 8/8] Add comment --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d9d34b5..a10fe075 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "c9.ide.language.javascript.tern": "#b55d0069bb", "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#4b329741b1", - "c9.ide.language.codeintel": "#56cf2d0032", + "c9.ide.language.codeintel": "#871d8e5e5d", "c9.ide.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f",