Merge pull request #1715 from ajaxorg/velocity_snippets

Support loading snippets for mixed modes

lib/ace/ext/language_tools.js

@@ -46,10 +46,9 @@ var keyWordCompleter = {
 
 var snippetCompleter = {
     getCompletions: function(editor, session, pos, prefix, callback) {
-        var scope = snippetManager.$getScope(editor);
         var snippetMap = snippetManager.snippetMap;
         var completions = [];
-        [scope, "_"].forEach(function(scope) {
+        snippetManager.getActiveScopes(editor).forEach(function(scope) {
             var snippets = snippetMap[scope] || [];
             for (var i = snippets.length; i--;) {
                 var s = snippets[i];
@@ -80,22 +79,39 @@ var expandSnippet = {
             editor.execCommand("indent");
     },
     bindKey: "tab"
-}
+};
 
 var onChangeMode = function(e, editor) {
-    var mode = editor.session.$mode;
-    var id = mode.$id
-    if (!snippetManager.files) snippetManager.files = {};
-    if (id && !snippetManager.files[id]) {
-        var snippetFilePath = id.replace("mode", "snippets");
-        config.loadModule(snippetFilePath, function(m) {
-            if (m) {
-                snippetManager.files[id] = m;
-                m.snippets = snippetManager.parseSnippetFile(m.snippetText);
-                snippetManager.register(m.snippets, m.scope);
+    loadSnippetsForMode(editor.session.$mode);
+};
+
+var loadSnippetsForMode = function(mode) {
+    var id = mode.$id;
+    if (!snippetManager.files)
+        snippetManager.files = {};
+    loadSnippetFile(id);
+    if (mode.modes)
+        mode.modes.forEach(loadSnippetsForMode);
+};
+
+var loadSnippetFile = function(id) {
+    if (!id || snippetManager.files[id])
+        return;
+    var snippetFilePath = id.replace("mode", "snippets");
+    snippetManager.files[id] = {};
+    config.loadModule(snippetFilePath, function(m) {
+        if (m) {
+            snippetManager.files[id] = m;
+            m.snippets = snippetManager.parseSnippetFile(m.snippetText);
+            snippetManager.register(m.snippets, m.scope);
+            if (m.includeScopes) {
+                snippetManager.snippetMap[m.scope].includeScopes = m.includeScopes;
+                m.includeScopes.forEach(function(x) {
+                    loadSnippetFile("ace/mode/" + x);
+                });
             }
-        });
-    }
+        }
+    });
 };
 
 var Editor = require("../editor").Editor;
@@ -103,7 +119,7 @@ require("../config").defineOptions(Editor.prototype, "editor", {
     enableBasicAutocompletion: {
         set: function(val) {
             if (val) {
-                this.completers = completers
+                this.completers = completers;
                 this.commands.addCommand(Autocomplete.startCommand);
             } else {
                 this.commands.removeCommand(Autocomplete.startCommand);
@@ -116,7 +132,7 @@ require("../config").defineOptions(Editor.prototype, "editor", {
             if (val) {
                 this.commands.addCommand(expandSnippet);
                 this.on("changeMode", onChangeMode);
-                onChangeMode(null, this)
+                onChangeMode(null, this);
             } else {
                 this.commands.removeCommand(expandSnippet);
                 this.off("changeMode", onChangeMode);

lib/ace/mode/abap.js

@@ -70,6 +70,7 @@ oop.inherits(Mode, TextMode);
         }
     };
     
+    this.$id = "ace/mode/abap";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/actionscript.js

@@ -56,6 +56,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "//";
     this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/actionscript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/ada.js

@@ -46,6 +46,7 @@ oop.inherits(Mode, TextMode);
 
     this.lineCommentStart = "--";
 
+    this.$id = "ace/mode/ada";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/asciidoc.js

@@ -58,6 +58,7 @@ oop.inherits(Mode, TextMode);
             return this.$getIndent(line);
         }
     };
+    this.$id = "ace/mode/asciidoc";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/assembly_x86.js

@@ -50,6 +50,7 @@ oop.inherits(Mode, TextMode);
 
 (function() {
     this.lineCommentStart = ";";
+    this.$id = "ace/mode/assembly_x86";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/autohotkey.js

@@ -56,6 +56,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "/\\*";
     this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/autohotkey";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/batchfile.js

@@ -55,6 +55,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "::";
     this.blockComment = "";
+    this.$id = "ace/mode/batchfile";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/c9search.js

@@ -60,6 +60,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/c9search";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/c_cpp.js

@@ -95,6 +95,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/c_cpp";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/clojure.js

@@ -80,6 +80,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/clojure";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/cobol.js

@@ -46,6 +46,7 @@ oop.inherits(Mode, TextMode);
 
     this.lineCommentStart = "*";
 
+    this.$id = "ace/mode/cobol";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/coffee.js

@@ -107,6 +107,7 @@ oop.inherits(Mode, TextMode);
         return worker;
     };
 
+    this.$id = "ace/mode/coffee";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/coldfusion.js

@@ -56,6 +56,7 @@ oop.inherits(Mode, XmlMode);
         return this.$getIndent(line);
     };
 
+    this.$id = "ace/mode/coldfusion";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/csharp.js

@@ -55,6 +55,7 @@ oop.inherits(Mode, TextMode);
         return null;
     };
 
+    this.$id = "ace/mode/csharp";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/css.js

@@ -93,6 +93,7 @@ oop.inherits(Mode, TextMode);
         return worker;
     };
 
+    this.$id = "ace/mode/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/curly.js

@@ -57,6 +57,7 @@ var Mode = function() {
 oop.inherits(Mode, HtmlMode);
 
 (function() {
+    this.$id = "ace/mode/curly";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/d.js

@@ -50,6 +50,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "/\\+";
     this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/d";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/dart.js

@@ -56,6 +56,7 @@ oop.inherits(Mode, CMode);
 (function() { 
     this.lineCommentStart = "//";
     this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/dart";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/diff.js

@@ -45,6 +45,7 @@ oop.inherits(Mode, TextMode);
 
 (function() {
 
+    this.$id = "ace/mode/diff";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/dot.js

@@ -49,6 +49,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/dot";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/ejs.js

@@ -103,6 +103,7 @@ oop.inherits(Mode, HtmlMode);
 
 (function() {
 
+    this.$id = "ace/mode/ejs";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/erlang.js

@@ -51,6 +51,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "%";
     this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/erlang";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/forth.js

@@ -56,6 +56,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "(?<=^|\\s)\\.?\\( [^)]*\\)";
     this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/forth";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/ftl.js

@@ -43,6 +43,7 @@ oop.inherits(Mode, TextMode);
 
 (function() {
 
+    this.$id = "ace/mode/ftl";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/golang.js

@@ -49,6 +49,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/golang";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/groovy.js

@@ -18,6 +18,7 @@ oop.inherits(Mode, JavaScriptMode);
         return null;
     };
 
+    this.$id = "ace/mode/groovy";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/haml.js

@@ -55,6 +55,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = ["//", "#"];
     
+    this.$id = "ace/mode/haml";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/handlebars.js

@@ -23,6 +23,7 @@ oop.inherits(Mode, HtmlMode);
 
 (function() {
     
+    this.$id = "ace/mode/handlebars";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/haskell.js

@@ -56,6 +56,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "--";
     this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/haskell";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/haxe.js

@@ -50,6 +50,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/haxe";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/html.js

@@ -71,6 +71,7 @@ oop.inherits(Mode, TextMode);
         return this.$completer.getCompletions(state, session, pos, prefix);
     };
 
+    this.$id = "ace/mode/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/html_ruby.js

@@ -53,6 +53,7 @@ oop.inherits(Mode, HtmlMode);
 
 (function() {
 
+    this.$id = "ace/mode/html_ruby";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/ini.js

@@ -47,6 +47,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = ";";
     this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/ini";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/jack.js

@@ -73,6 +73,7 @@ oop.inherits(Mode, TextMode);
     };
 
 
+    this.$id = "ace/mode/jack";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/jade.js

@@ -51,6 +51,7 @@ oop.inherits(Mode, TextMode);
 
 (function() { 
 	this.lineCommentStart = "//";
+    this.$id = "ace/mode/jade";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/java.js

@@ -18,6 +18,7 @@ oop.inherits(Mode, JavaScriptMode);
         return null;
     };
 
+    this.$id = "ace/mode/java";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/javascript.js

@@ -110,6 +110,7 @@ oop.inherits(Mode, TextMode);
         return worker;
     };
 
+    this.$id = "ace/mode/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/json.js

@@ -87,6 +87,7 @@ oop.inherits(Mode, TextMode);
     };
 
 
+    this.$id = "ace/mode/json";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/jsoniq.js

@@ -100,6 +100,7 @@ oop.inherits(Mode, TextMode);
             doc.replace(range, outdent ? line.match(re)[1] : "(:" + line + ":)");
         }
     };
+    this.$id = "ace/mode/jsoniq";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/jsp.js

@@ -49,6 +49,7 @@ oop.inherits(Mode, TextMode);
 
 (function() {
 
+    this.$id = "ace/mode/jsp";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/jsx.js

@@ -50,6 +50,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/jsx";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/julia.js

@@ -56,6 +56,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "#";
     this.blockComment = "";
+    this.$id = "ace/mode/julia";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/latex.js

@@ -17,6 +17,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "%";
 
+    this.$id = "ace/mode/latex";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/less.js

@@ -77,6 +77,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/less";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/liquid.js

@@ -76,6 +76,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/liquid";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/lisp.js

@@ -50,6 +50,7 @@ oop.inherits(Mode, TextMode);
        
     this.lineCommentStart = ";";
     
+    this.$id = "ace/mode/lisp";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/logiql.js

@@ -133,6 +133,7 @@ oop.inherits(Mode, TextMode);
         var row = it.getCurrentTokenRow();
         return new Range(row, col, row, col + tok.value.length);
     };
+    this.$id = "ace/mode/logiql";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/lsl.js

@@ -86,6 +86,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/lsl";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/lua.js

@@ -160,6 +160,7 @@ oop.inherits(Mode, TextMode);
         return worker;
     };
 
+    this.$id = "ace/mode/lua";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/makefile.js

@@ -57,6 +57,7 @@ oop.inherits(Mode, TextMode);
     this.lineCommentStart = "#";    
     this.$indentWithTabs = true;
     
+    this.$id = "ace/mode/makefile";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/markdown.js

@@ -70,6 +70,7 @@ oop.inherits(Mode, TextMode);
             return this.$getIndent(line);
         }
     };
+    this.$id = "ace/mode/markdown";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/matlab.js

@@ -47,6 +47,7 @@ oop.inherits(Mode, TextMode);
     this.lineCommentStart = "%";
     this.blockComment = {start: "%{", end: "%}"};
 
+    this.$id = "ace/mode/matlab";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/mushcode.js

@@ -107,6 +107,7 @@ oop.inherits(Mode, TextMode);
             doc.remove(new Range(row, indent.length-tab.length, row, indent.length));
     };
 
+    this.$id = "ace/mode/mushcode";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/mysql.js

@@ -45,6 +45,7 @@ oop.inherits(Mode, TextMode);
     this.lineCommentStart = ["--", "#"]; // todo space
     this.blockComment = {start: "/*", end: "*/"};
 
+    this.$id = "ace/mode/mysql";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/nix.js

@@ -56,6 +56,7 @@ oop.inherits(Mode, CMode);
 (function() { 
     this.lineCommentStart = "#";
     this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/nix";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/objectivec.js

@@ -55,6 +55,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "//";
     this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/objectivec";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/ocaml.js

@@ -90,6 +90,7 @@ var indenter = /(?:[({[=:]|[-=]>|\b(?:else|try|with))\s*$/;
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/ocaml";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/pascal.js

@@ -61,6 +61,7 @@ oop.inherits(Mode, TextMode);
         {start: "{", end: "}"}
     ];
     
+    this.$id = "ace/mode/pascal";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/perl.js

@@ -84,6 +84,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/perl";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/pgsql.js

@@ -53,6 +53,7 @@ oop.inherits(Mode, TextMode);
         }
     }
 
+    this.$id = "ace/mode/pgsql";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/php.js

@@ -129,6 +129,7 @@ oop.inherits(Mode, TextMode);
         return worker;
     };
 
+    this.$id = "ace/mode/php";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/plain_text.js

@@ -49,6 +49,7 @@ oop.inherits(Mode, TextMode);
     this.getNextLineIndent = function(state, line, tab) {
         return '';
     };
+    this.$id = "ace/mode/plain_text";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/powershell.js

@@ -55,6 +55,7 @@ oop.inherits(Mode, TextMode);
         return null;
     };
 
+    this.$id = "ace/mode/powershell";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/prolog.js

@@ -56,6 +56,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "%";
     this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/prolog";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/protobuf.js

@@ -60,6 +60,7 @@ oop.inherits(Mode, CMode);
     // Extra logic goes here.
     this.lineCommentStart = "//";
     this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/protobuf";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/python.js

@@ -107,6 +107,7 @@ oop.inherits(Mode, TextMode);
             doc.remove(new Range(row, indent.length-tab.length, row, indent.length));
     };
 
+    this.$id = "ace/mode/python";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/r.js

@@ -149,6 +149,7 @@ define(function(require, exports, module) {
          }
          return false;
       };*/
+       this.$id = "ace/mode/r";
    }).call(Mode.prototype);
    exports.Mode = Mode;
 });

lib/ace/mode/rdoc.js

@@ -55,6 +55,7 @@ oop.inherits(Mode, TextMode);
     this.getNextLineIndent = function(state, line, tab) {
         return this.$getIndent(line);
     };
+    this.$id = "ace/mode/rdoc";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/rhtml.js

@@ -80,6 +80,7 @@ oop.inherits(Mode, HtmlMode);
       return this.codeModel.getNextLineIndent(row, line, state, tab, tabSize);
    }; */
 
+    this.$id = "ace/mode/rhtml";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/ruby.js

@@ -85,6 +85,7 @@ oop.inherits(Mode, TextMode);
             doc.remove(new Range(row, indent.length-tab.length, row, indent.length));
     };
 
+    this.$id = "ace/mode/ruby";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/rust.js

@@ -56,6 +56,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "/\\*";
     this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/rust";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/sass.js

@@ -45,6 +45,7 @@ oop.inherits(Mode, TextMode);
 
 (function() {   
     this.lineCommentStart = "//";
+    this.$id = "ace/mode/sass";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/scad.js

@@ -93,6 +93,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/scad";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/scala.js

@@ -19,6 +19,7 @@ oop.inherits(Mode, JavaScriptMode);
         return null;
     };
 
+    this.$id = "ace/mode/scala";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/scheme.js

@@ -50,6 +50,7 @@ oop.inherits(Mode, TextMode);
        
     this.lineCommentStart = ";";
     
+    this.$id = "ace/mode/scheme";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/scss.js

@@ -77,6 +77,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/scss";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/sh.js

@@ -108,6 +108,7 @@ oop.inherits(Mode, TextMode);
             doc.remove(new Range(row, indent.length-tab.length, row, indent.length));
     };
 
+    this.$id = "ace/mode/sh";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/sjs.js

@@ -53,6 +53,7 @@ oop.inherits(Mode, JSMode);
     this.createWorker = function(session) {
         return null;
     }
+    this.$id = "ace/mode/sjs";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/snippets.js

@@ -105,6 +105,7 @@ oop.inherits(Mode, TextMode);
 
 (function() {
     this.$indentWithTabs = true;
+    this.$id = "ace/mode/snippets";
 }).call(Mode.prototype);
 exports.Mode = Mode;
 

lib/ace/mode/soy_template.js

@@ -54,6 +54,7 @@ oop.inherits(Mode, HtmlMode);
 (function() {
     this.lineCommentStart = "//";
     this.blockComment = {start: "/*", end: "*/"};
+    this.$id = "ace/mode/soy_template";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/space.js

@@ -16,6 +16,7 @@ var Mode = function() {
 oop.inherits(Mode, TextMode);
 (function() {
     
+    this.$id = "ace/mode/space";
 }).call(Mode.prototype);
 exports.Mode = Mode;
 });

lib/ace/mode/sql.js

@@ -46,6 +46,7 @@ oop.inherits(Mode, TextMode);
 
     this.lineCommentStart = "--";
 
+    this.$id = "ace/mode/sql";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/stylus.js

@@ -53,6 +53,7 @@ var Mode = function() {
 oop.inherits(Mode, TextMode);
 
 (function() { 
+    this.$id = "ace/mode/stylus";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/svg.js

@@ -63,6 +63,7 @@ oop.inherits(Mode, XmlMode);
     };
     
 
+    this.$id = "ace/mode/svg";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/tcl.js

@@ -78,6 +78,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
+    this.$id = "ace/mode/tcl";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/tex.js

@@ -62,6 +62,7 @@ oop.inherits(Mode, TextMode);
    this.allowAutoInsert = function() {
       return false;
    };
+    this.$id = "ace/mode/tex";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/text.js

@@ -378,6 +378,7 @@ var Mode = function() {
         });
     };
 
+    this.$id = "ace/mode/text";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/textile.js

@@ -59,6 +59,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
     
+    this.$id = "ace/mode/textile";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/toml.js

@@ -50,6 +50,7 @@ oop.inherits(Mode, TextMode);
 
 (function() {
     this.lineCommentStart = "#";
+    this.$id = "ace/mode/toml";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/twig.js

@@ -86,6 +86,7 @@ oop.inherits(Mode, TextMode);
     this.autoOutdent = function(state, doc, row) {
         this.$outdent.autoOutdent(doc, row);
     };
+    this.$id = "ace/mode/twig";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/typescript.js

@@ -56,6 +56,7 @@ oop.inherits(Mode, jsMode);
     this.createWorker = function(session) {
         return null;
     };
+    this.$id = "ace/mode/typescript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/vbscript.js

@@ -54,6 +54,7 @@ oop.inherits(Mode, TextMode);
        
     this.lineCommentStart = ["'", "REM"];
     
+    this.$id = "ace/mode/vbscript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/velocity.js

@@ -53,6 +53,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "##";
     this.blockComment = {start: "#*", end: "*#"};
+    this.$id = "ace/mode/velocity";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/verilog.js

@@ -47,6 +47,7 @@ oop.inherits(Mode, TextMode);
     this.lineCommentStart = "//";
     this.blockComment = {start: "/*", end: "*/"};
 
+    this.$id = "ace/mode/verilog";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/vhdl.js

@@ -45,6 +45,7 @@ oop.inherits(Mode, TextMode);
 
     this.lineCommentStart = "--";
 
+    this.$id = "ace/mode/vhdl";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/xml.js

@@ -50,6 +50,7 @@ oop.inherits(Mode, TextMode);
     
     this.blockComment = {start: "<!--", end: "-->"};
 
+    this.$id = "ace/mode/xml";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/xquery.js

@@ -133,6 +133,7 @@ oop.inherits(Mode, TextMode);
         return worker;
     };
     
+    this.$id = "ace/mode/xquery";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/mode/yaml.js

@@ -71,6 +71,7 @@ oop.inherits(Mode, TextMode);
     };
 
 
+    this.$id = "ace/mode/yaml";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

lib/ace/snippets.js

@@ -396,16 +396,26 @@ var SnippetManager = function() {
         return scope;
     };
 
+    this.getActiveScopes = function(editor) {
+        var scope = this.$getScope(editor);
+        var scopes = [scope];
+        var snippetMap = this.snippetMap;
+        if (snippetMap[scope] && snippetMap[scope].includeScopes) {
+            scopes.push.apply(scopes, snippetMap[scope].includeScopes);
+        }
+        scopes.push("_");
+        return scopes;
+    };
+
     this.expandWithTab = function(editor) {
         var cursor = editor.getCursorPosition();
         var line = editor.session.getLine(cursor.row);
         var before = line.substring(0, cursor.column);
         var after = line.substr(cursor.column);
 
-        var scope = this.$getScope(editor);
         var snippetMap = this.snippetMap;
         var snippet;
-        [scope, "_"].some(function(scope) {
+        this.getActiveScopes(editor).some(function(scope) {
             var snippets = snippetMap[scope];
             if (snippets)
                 snippet = this.findMatchingSnippet(snippets, before, after);
@@ -562,10 +572,9 @@ var SnippetManager = function() {
         return list;
     };
     this.getSnippetByName = function(name, editor) {
-        var scope = editor && this.$getScope(editor);
         var snippetMap = this.snippetNameMap;
         var snippet;
-        [scope, "_"].some(function(scope) {
+        this.getActiveScopes(editor).some(function(scope) {
             var snippets = snippetMap[scope];
             if (snippets)
                 snippet = snippets[name];
@@ -800,6 +809,10 @@ var TabstopManager = function(editor) {
     this.keyboardHandler = new HashHandler();
     this.keyboardHandler.bindKeys({
         "Tab": function(ed) {
+            if (exports.snippetManager && exports.snippetManager.expandWithTab(ed)) {
+                return;
+            }
+
             ed.tabstopManager.tabNext(1);
         },
         "Shift-Tab": function(ed) {