From 7756b34fd5dfb1dc8491688a491a6cb66b8fabcc Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sun, 3 Jan 2016 14:02:15 +0100
Subject: [PATCH 1/4] Backport 'console' completion fix from
 language-library-ui branch

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d9bd9e03..fe583b1d 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
         "c9.ide.language.javascript": "#1a0b1584c2",
         "c9.ide.language.javascript.immediate": "#c8b1e5767a",
         "c9.ide.language.javascript.eslint": "#586becb51d",
-        "c9.ide.language.javascript.tern": "#b03b4dc50b",
+        "c9.ide.language.javascript.tern": "#f9ba3813d7",
         "c9.ide.language.javascript.infer": "#001fe08ecb",
         "c9.ide.language.jsonalyzer": "#1454bd1ed7",
         "c9.ide.collab": "#10c224f9b8",

From 034d78aeb8da7bbe33e671ba692e0404ce4cd322 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sun, 3 Jan 2016 14:04:46 +0100
Subject: [PATCH 2/4] Fix uncontextual early predictions

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fe583b1d..98f766d7 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#9374163ea5",
+        "c9.ide.language": "#baff0204f2",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#2b5cc6275e",
         "c9.ide.language.html": "#9be847c0ce",

From 5f9de12c30f40070193975e87a91a3349b228556 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sun, 3 Jan 2016 13:57:00 +0100
Subject: [PATCH 3/4] Fix --helpWithSudo

---
 server.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server.js b/server.js
index 2ecaed27..a64ebe82 100755
--- a/server.js
+++ b/server.js
@@ -84,6 +84,7 @@ function main(argv, config, onLoaded) {
         .describe("domains", "Primary and any secondary top-level domains to use (e.g, c9.io,c9.dev)")
         .describe("exclude", "Exclude specified service")
         .describe("include", "Include only specified service")
+        .describe("helpWithSudo", "Ask for sudo password on startup")
         .default("domains", inContainer && process.env.C9_HOSTNAME || process.env.C9_DOMAINS)
         .boolean("help")
         .describe("help", "Show command line options.");
@@ -107,7 +108,7 @@ function main(argv, config, onLoaded) {
     var delayed = expanded.filter(function(c) { return delayLoadConfigs.indexOf(c) !== -1 });
     var notDelayed = expanded.filter(function(c) { return delayLoadConfigs.indexOf(c) === -1 });
     
-    if (options.helpWithSudo)
+    if (options.argv.helpWithSudo)
         return child_process.execFile("sudo", ["echo -n"], main.bind(null, argv.filter(function(a) {
             return a !== "--helpWithSudo";
         }), config, onLoaded));

From 33cd4df8a3f489e9caf64b0ba8deba924505a197 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sun, 3 Jan 2016 14:06:06 +0100
Subject: [PATCH 4/4] Fix preferred completion handling w/caching

Conflicts, added tests removed for now:
	plugins/c9.ide.language/language_test.js
---
 package.json | 2 +-
 server.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 98f766d7..bfb8fc53 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#baff0204f2",
+        "c9.ide.language": "#630462418b",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#2b5cc6275e",
         "c9.ide.language.html": "#9be847c0ce",
diff --git a/server.js b/server.js
index a64ebe82..f04bc837 100755
--- a/server.js
+++ b/server.js
@@ -205,4 +205,4 @@ function start(configName, options, callback) {
                 plugin.name = name; 
         });
     });
-}
\ No newline at end of file
+}