From cf72234acc6d146247304e9858dd69eaa665106d Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Fri, 18 Mar 2016 12:52:37 +0100 Subject: [PATCH 1/8] Add setting for codeintel include dirs --- configs/client-default.js | 3 +++ package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configs/client-default.js b/configs/client-default.js index 7d3fe52d..0cc65505 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -910,6 +910,9 @@ module.exports = function(options) { plugins.push({ packagePath: "plugins/c9.ide.language.codeintel/codeintel", preinstalled: hosted && !options.ssh, + paths: { + php: "/home/ubuntu/workspace:/home/ubuntu/workspace/vendor", + }, }); } diff --git a/package.json b/package.json index 1d9d34b5..35782717 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": "#5b2da4538c", "c9.ide.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", From 0adedc61c9d32acc8b684e2346edc9d2246b49d5 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Fri, 18 Mar 2016 12:56:12 +0100 Subject: [PATCH 2/8] Increase initial timeout codeintel still appears to be scanning the workspace during completion rather than during the scanning phase --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 35782717..567b28f3 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": "#5b2da4538c", + "c9.ide.language.codeintel": "#84122055ba", "c9.ide.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", From 071e3307dabdb226dbcecd2e2855ecea64f9f756 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 6 Apr 2016 10:55:20 +0000 Subject: [PATCH 3/8] Add settings to enable/disable completion --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 567b28f3..06a45c97 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": "#84122055ba", + "c9.ide.language.codeintel": "#c6741dc41e", "c9.ide.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", @@ -91,7 +91,7 @@ "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#19758abe08", "c9.ide.installer": "#0fde9f0067", - "c9.ide.language.python": "#330b80e3b2", + "c9.ide.language.python": "#a001e72a4b", "c9.ide.language.go": "#6ce1c7a7ef", "c9.ide.mount": "#4c39359b87", "c9.ide.navigate": "#1fbb7cd53b", From 7aa6db901c0e59084569b4248c6f093e3cbcea5f Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 6 Apr 2016 11:40:53 +0000 Subject: [PATCH 4/8] Add extra labels --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 06a45c97..013a3419 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#8d02f86043", + "c9.ide.language": "#b392f03a6c", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#92210f5a48", "c9.ide.language.html": "#22fdc74869", @@ -63,10 +63,10 @@ "c9.ide.language.javascript": "#d1a479805c", "c9.ide.language.javascript.immediate": "#c8b1e5767a", "c9.ide.language.javascript.eslint": "#3c57ed1720", - "c9.ide.language.javascript.tern": "#b55d0069bb", + "c9.ide.language.javascript.tern": "#64ab01f271", "c9.ide.language.javascript.infer": "#18acb93a3a", "c9.ide.language.jsonalyzer": "#4b329741b1", - "c9.ide.language.codeintel": "#c6741dc41e", + "c9.ide.language.codeintel": "#72157892e4", "c9.ide.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", @@ -91,7 +91,7 @@ "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#19758abe08", "c9.ide.installer": "#0fde9f0067", - "c9.ide.language.python": "#a001e72a4b", + "c9.ide.language.python": "#701bd2630a", "c9.ide.language.go": "#6ce1c7a7ef", "c9.ide.mount": "#4c39359b87", "c9.ide.navigate": "#1fbb7cd53b", From be12aad1bd121022017995cd097006508863729c Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Thu, 7 Apr 2016 12:38:02 +0200 Subject: [PATCH 5/8] Fix tests --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0d6efb58..8f94b865 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#e058ff301f", + "c9.ide.language": "#742877e271", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#3949510863", "c9.ide.language.html": "#22fdc74869", From 9ca28e82f699c57a5f9c5ce1a3f2e5c820423298 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Fri, 8 Apr 2016 09:10:05 +0000 Subject: [PATCH 6/8] Don't immediately show completer when there's an exact match --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 567b28f3..77146e62 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#8d02f86043", + "c9.ide.language": "#e146862568", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#92210f5a48", "c9.ide.language.html": "#22fdc74869", From af2f458e9b9fc4355cbb7a5a4ec23f0a31528782 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Fri, 8 Apr 2016 09:20:27 +0000 Subject: [PATCH 7/8] Allow relative paths for PHP imports --- 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 0cc65505..75baa7a2 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -911,7 +911,7 @@ module.exports = function(options) { packagePath: "plugins/c9.ide.language.codeintel/codeintel", preinstalled: hosted && !options.ssh, paths: { - php: "/home/ubuntu/workspace:/home/ubuntu/workspace/vendor", + php: ".:./vendor", }, }); } diff --git a/package.json b/package.json index 77146e62..d9bbdc1f 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": "#84122055ba", + "c9.ide.language.codeintel": "#93d04e9eef", "c9.ide.collab": "#11a0d3c5ce", "c9.ide.local": "#10eb45842a", "c9.ide.find": "#e33fbaed2f", From 4c458d0c10bc7c87f8b37599289426366f3d3bd6 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 11 May 2016 10:49:26 +0200 Subject: [PATCH 8/8] Revert "Don't immediately show completer when there's an exact match" This reverts commit 9ca28e82f699c57a5f9c5ce1a3f2e5c820423298. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 776c0566..8ffdf4c2 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "c9" ], "c9plugins": { - "c9.ide.language": "#07583f1706", + "c9.ide.language": "#79bcb2fe06", "c9.ide.language.css": "#be07d72209", "c9.ide.language.generic": "#3949510863", "c9.ide.language.html": "#22fdc74869",