fix snippet loader

node_modules/ace/lib/ace/snippets.js

@@ -545,7 +545,10 @@ var SnippetManager = function() {
                     s.guard = "\\b";
                 s.trigger = lang.escapeRegExp(s.tabTrigger);
             }
-
+            
+            if (!s.trigger && !s.guard && !s.endTrigger && !s.endGuard)
+                return;
+            
             s.startRe = guardedRegexp(s.trigger, s.guard, true);
             s.triggerRe = new RegExp(s.trigger, "", true);
 

node_modules/architect-build/module-deps.js

@@ -369,21 +369,21 @@ function wrapUMD(module) {
     
     
     module.source = 'define(function(require, exports, module) {\n' 
-        + 'var _ = {require: require, exports: exports, module: module};\n'
+        + 'var $build_deps$ = {require: require, exports: exports, module: module};\n'
         + 'exports = undefined; module = undefined;\n'
         + 'function define(name, deps, m) {\n'
         + '    if (typeof name == "function") {\n'
-        + '        m = name; deps = ["require", "exports", "module"]; name = _.module.id\n'
+        + '        m = name; deps = ["require", "exports", "module"]; name = $build_deps$.module.id\n'
         + '    }\n'
         + '    if (typeof name !== "string") {\n'
-        + '        m = deps; deps = name; name = _.module.id\n'
+        + '        m = deps; deps = name; name = $build_deps$.module.id\n'
         + '    }\n'
         + '    if (!m) {\n'
         + '        m = deps; deps = [];\n'
         + '    }\n'
         + '   var ret = typeof m == "function" ?\n'
-        + '       m.apply(_.module, deps.map(function(n){return _[n] || require(n)})) : m\n'
-        + '   if (ret != undefined) _.module.exports = ret;\n'
+        + '       m.apply($build_deps$.module, deps.map(function(n){return $build_deps$[n] || require(n)})) : m\n'
+        + '   if (ret != undefined) $build_deps$.module.exports = ret;\n'
         + '}\n'
         + 'define.amd = true;'
         +  module.source

package.json

@@ -56,9 +56,9 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#2755277da0",
+        "c9.ide.language": "#7be4170efe",
         "c9.ide.language.css": "#ef8a28943e",
-        "c9.ide.language.generic": "#32986699ac",
+        "c9.ide.language.generic": "#7505e7902e",
         "c9.ide.language.html": "#bbe81afed1",
         "c9.ide.language.html.diff": "#24f3608d26",
         "c9.ide.language.javascript": "#8479d0a9c1",

plugins/c9.ide.plugins/debug.js

@@ -44,7 +44,8 @@ define(function(require, exports, module) {
         var HASSDK = c9.location.indexOf("sdk=0") === -1;
         
         var reParts = /^(builders|keymaps|modes|outline|runners|snippets|themes)\/(.*)/;
-        var reModule = /(?:_highlight_rules|_test|_worker|_fold|_behaviou?r).js$/;
+        var reModule = /(?:_highlight_rules|_test|_worker|_fold|_behaviou?r)\.js$/;
+        var jsExtRe = /\.js$/;
         
         var loaded = false;
         function load() {
@@ -272,9 +273,20 @@ define(function(require, exports, module) {
                 var filename = RegExp.$2;
                 if (filename.indexOf("/") > -1) return;
                 
-                if (type == "modes" && (reModule.test(filename) || !/\.js$/.test(filename)))
+                if (type == "modes" && (reModule.test(filename) || !jsExtRe.test(filename)))
                     return;
                 
+                if (type == "snippets") {
+                    if (jsExtRe.test(filename)) {
+                        var snippetPath = join("plugins", basename(path), type, filename).replace(jsExtRe, "");
+                        require([snippetPath], function(m) {
+                            architect.services["language.complete"].addSnippet(m, plugin);
+                        });
+                    }
+                    if (!/\.snippets$/.test(filename))
+                        return;
+                }
+                
                 parallel.push(function(next){
                     fs.readFile(join(path, type, filename), function(err, data){
                         if (err) {