Merge branch 'master' of github.com:c9/newclient into testpanel

configs/client-default.js

@@ -656,6 +656,7 @@ module.exports = function(options) {
         {
             packagePath: "plugins/c9.ide.configuration/configure"
         },
+        "plugins/c9.ide.services/linked-services",
         "plugins/c9.ide.save/save",
         "plugins/c9.ide.recentfiles/recentfiles",
         {

configs/standalone.js

@@ -178,6 +178,7 @@ module.exports = function(config, optimist) {
             readonly: readonly
         },
         "./c9.vfs.server/vfs.server",
+        "./c9.error/logger.raygun_mock",
         "./c9.preview/preview.handler",
         "./c9.vfs.server/cache",
         "./c9.vfs.server/download",

node_modules/ace/lib/ace/ext/modelist.js

@@ -48,10 +48,10 @@ var supportedModes = {
     ADA:         ["ada|adb"],
     Apache_Conf: ["^htaccess|^htgroups|^htpasswd|^conf|htaccess|htgroups|htpasswd"],
     AsciiDoc:    ["asciidoc|adoc"],
-    Assembly_x86:["asm"],
+    Assembly_x86:["asm|a"],
     AutoHotKey:  ["ahk"],
     BatchFile:   ["bat|cmd"],
-    C_Cpp:       ["cpp|c|cc|cxx|h|hh|hpp"],
+    C_Cpp:       ["cpp|c|cc|cxx|h|hh|hpp|ino"],
     C9Search:    ["c9search_results"],
     Cirru:       ["cirru|cr"],
     Clojure:     ["clj|cljs"],
@@ -68,7 +68,7 @@ var supportedModes = {
     Dot:         ["dot"],
     Dummy:       ["dummy"],
     DummySyntax: ["dummy"],
-    Eiffel:      ["e"],
+    Eiffel:      ["e|ge"],
     EJS:         ["ejs"],
     Elixir:      ["ex|exs"],
     Elm:         ["elm"],
@@ -138,7 +138,7 @@ var supportedModes = {
     SASS:        ["sass"],
     SCAD:        ["scad"],
     Scala:       ["scala"],
-    Scheme:      ["scm|rkt"],
+    Scheme:      ["scm|sm|rkt|oak|scheme"],
     SCSS:        ["scss"],
     SH:          ["sh|bash|^.bashrc"],
     SJS:         ["sjs"],
@@ -155,7 +155,7 @@ var supportedModes = {
     Text:        ["txt"],
     Textile:     ["textile"],
     Toml:        ["toml"],
-    Twig:        ["twig"],
+    Twig:        ["twig|swig"],
     Typescript:  ["ts|typescript|str"],
     Vala:        ["vala"],
     VBScript:    ["vbs|vb"],

node_modules/ace/lib/ace/worker/worker.js

@@ -5,15 +5,16 @@ if (typeof window.window != "undefined" && window.document)
 if (window.require && window.define)
     return;
 
-window.console = function() {
+if (!window.console) {
-    var msgs = Array.prototype.slice.call(arguments, 0);
+    window.console = function() {
-    postMessage({type: "log", data: msgs});
+        var msgs = Array.prototype.slice.call(arguments, 0);
-};
+        postMessage({type: "log", data: msgs});
-window.console.error =
+    };
-window.console.warn = 
+    window.console.error =
-window.console.log =
+    window.console.warn = 
-window.console.trace = window.console;
+    window.console.log =
-
+    window.console.trace = window.console;
+}
 window.window = window;
 window.ace = window;
 

node_modules/vfs-http-adapter/restful.js

@@ -12,6 +12,7 @@ module.exports = function setup(mount, vfs, mountOptions) {
     var errorHandler = mountOptions.errorHandler || function (req, res, err, code) {
         console.error(err.stack || err);
         if (code) res.statusCode = code;
+        else if (typeof err.code == "number") res.statusCode = err.code;
         else if (err.code === "EBADREQUEST") res.statusCode = 400;
         else if (err.code === "EACCES") res.statusCode = 403;
         else if (err.code === "ENOENT") res.statusCode = 404;

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.0.2302",
+    "version": "3.0.2366",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -55,17 +55,17 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#c8a0de682c",
+        "c9.ide.language": "#9a817580cb",
         "c9.ide.language.css": "#ef8a28943e",
         "c9.ide.language.generic": "#77d43cfaf0",
-        "c9.ide.language.html": "#bbe81afed1",
+        "c9.ide.language.html": "#99efa2853f",
         "c9.ide.language.html.diff": "#24f3608d26",
         "c9.ide.language.javascript": "#8479d0a9c1",
         "c9.ide.language.javascript.immediate": "#0535804ada",
         "c9.ide.language.javascript.eslint": "#9b2721c3d0",
         "c9.ide.language.javascript.tern": "#3ef5101eec",
-        "c9.ide.language.javascript.infer": "#cfec494a3c",
+        "c9.ide.language.javascript.infer": "#4c9a4282ff",
-        "c9.ide.language.jsonalyzer": "#103e701afc",
+        "c9.ide.language.jsonalyzer": "#dcb9e546f8",
         "c9.ide.collab": "#b49eda3791",
         "c9.ide.local": "#a9703b630c",
         "c9.ide.find": "#5c18bbbcc1",
@@ -86,7 +86,7 @@
         "c9.ide.dialog.wizard": "#7667ec79a8",
         "c9.ide.fontawesome": "#781602c5d8",
         "c9.ide.format": "#b0bb91a623",
-        "c9.ide.help.support": "#9421afc950",
+        "c9.ide.help.support": "#e95f98f87c",
         "c9.ide.imgeditor": "#66a9733dc1",
         "c9.ide.immediate": "#6845a93705",
         "c9.ide.installer": "#be8d9aa07c",

plugins/c9.preview/preview.handler.js

@@ -6,6 +6,7 @@ define(function(require, exports, module) {
         "connect.render.ejs",
         "connect.redirect",
         "connect.static",
+        "error.logger",
         "metrics"
     ];
     main.provides = ["preview.handler"];
@@ -19,6 +20,7 @@ define(function(require, exports, module) {
         var metrics = imports.metrics;
         var parseUrl = require("url").parse;
         var debug = require("debug")("preview");
+        var logError = imports["error.logger"].warn;
         
         var staticPrefix = imports["connect.static"].getStaticPrefix();
         
@@ -306,8 +308,16 @@ define(function(require, exports, module) {
                         if (data)
                             buffer += data;
                         
-                        if (shouldInject)
+                        if (shouldInject) {
-                            buffer = generateInstrumentedHTML(buffer) || "";
+                            try {
+                                buffer = generateInstrumentedHTML(buffer) || "";
+                            } catch(e) {
+                                // don't intrument if it fails
+                                logError(new Error("HTML instrumentation failed"), {
+                                    exception: e
+                                });
+                            }
+                        }
                         data = new Buffer(buffer);
                         res.writeHead(200, {
                             "content-length": data.length + inject.length,