From 03874530f5476f8859a17f55bf3fcbd9233642b7 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Mon, 11 Jan 2016 11:14:25 +0000
Subject: [PATCH 1/3] Use jsonm for transferring jsonalyzer messages

---
 package.json                     | 2 +-
 plugins/c9.ide.server/plugins.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 11a7acec..89ebd7df 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
         "c9.ide.language.javascript.eslint": "#a234af16c0",
         "c9.ide.language.javascript.tern": "#f9ba3813d7",
         "c9.ide.language.javascript.infer": "#9cf94f77be",
-        "c9.ide.language.jsonalyzer": "#f0bb823c6f",
+        "c9.ide.language.jsonalyzer": "#0a130ac606",
         "c9.ide.collab": "#10c224f9b8",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#e33fbaed2f",
diff --git a/plugins/c9.ide.server/plugins.js b/plugins/c9.ide.server/plugins.js
index 5922d825..64c2fe89 100644
--- a/plugins/c9.ide.server/plugins.js
+++ b/plugins/c9.ide.server/plugins.js
@@ -35,6 +35,7 @@ define(function(require, exports, module) {
                 ace_tree: "lib/ace_tree/lib/ace_tree",
                 treehugger: "lib/treehugger/lib/treehugger",
                 acorn: "lib/treehugger/lib/acorn",
+                jsonm: "lib/jsonm",
                 tern: "lib/tern",
                 tern_from_ts: "lib/tern_from_ts",
                 ui: "lib/ui",
@@ -60,6 +61,7 @@ define(function(require, exports, module) {
                     "tern",
                     "tern_from_ts",
                     "treehugger",
+                    "jsonm",
                     "pivottable",
                     "architect",
                     "source-map",

From d175ff123bdccede0bac565159bd686dae224fb3 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Mon, 11 Jan 2016 14:48:30 +0000
Subject: [PATCH 2/3] Fix test

---
 test/setup_paths.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/setup_paths.js b/test/setup_paths.js
index a2446317..058f29a3 100644
--- a/test/setup_paths.js
+++ b/test/setup_paths.js
@@ -12,7 +12,8 @@ modules._resolveFilename = function(request, parent) {
     // Ensure client extensions can be loaded
     request = request.replace(/^ext\//, "ext.")
             .replace(/^core\//, "cloud9.core/www/core/")
-            .replace(/^lib\/chai\//, "chai/");
+            .replace(/^lib\/chai\//, "chai/")
+            .replace(/^lib\/jsonm\//, "jsonm/");
     // Add the extra paths
     extraPaths.forEach(function(p) {
         if (parent.paths.indexOf(p) === -1)

From 684aaab959bae776399f395c69a9a383b3ae34cf Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Mon, 11 Jan 2016 23:13:55 +0000
Subject: [PATCH 3/3] Remove broken size information

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 89ebd7df..70636e49 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#af265e3604",
+        "c9.ide.language": "#f4933e1b47",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#2b5cc6275e",
         "c9.ide.language.html": "#9be847c0ce",
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#41dd524599",
+        "c9.ide.language.python": "#ea98fce541",
         "c9.ide.mount": "#915b3d20be",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",