From d98d29a66aba5a3814ae12660280b83f3c965bef Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sat, 10 Nov 2012 13:15:21 +0400
Subject: [PATCH] fix makefile mode detection in demo

---
 demo/kitchen-sink/modelist.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/demo/kitchen-sink/modelist.js b/demo/kitchen-sink/modelist.js
index c50fffe8..ae46813f 100644
--- a/demo/kitchen-sink/modelist.js
+++ b/demo/kitchen-sink/modelist.js
@@ -5,8 +5,9 @@ define(function(require, exports, module) {
 var modes = [];
 function getModeFromPath(path) {
     var mode = modesByName.text;
+    var fileName = path.split(/[\/\\]/).pop();
     for (var i = 0; i < modes.length; i++) {
-        if (modes[i].supportsFile(path)) {
+        if (modes[i].supportsFile(fileName)) {
             mode = modes[i];
             break;
         }
@@ -18,7 +19,15 @@ var Mode = function(name, desc, extensions) {
     this.name = name;
     this.desc = desc;
     this.mode = "ace/mode/" + name;
-    this.extRe = new RegExp("^.*\\.(" + extensions + ")$", "g");
+    if (/\^/.test(extensions)) {
+        var re = extensions.replace(/\|(\^)?/g, function(a, b){
+            return "$|" + (b ? "^" : "^.*\\.");
+        }) + "$";
+    } else {
+        var re = "^.*\\.(" + extensions + ")$";
+    }   
+
+    this.extRe = new RegExp(re, "g");
 };
 
 Mode.prototype.supportsFile = function(filename) {
@@ -28,7 +37,7 @@ Mode.prototype.supportsFile = function(filename) {
 var modesByName = {
     asciidoc:   ["AsciiDoc"     , "asciidoc"],
     c9search:   ["C9Search"     , "c9search_results"],
-    coffee:     ["CoffeeScript" , "coffee|^Cakefile"],
+    coffee:     ["CoffeeScript" , "^Cakefile|coffee|cf"],
     coldfusion: ["ColdFusion"   , "cfm"],
     csharp:     ["C#"           , "cs"],
     css:        ["CSS"          , "css"],
@@ -42,7 +51,7 @@ var modesByName = {
     clojure:    ["Clojure"      , "clj"],
     jade:       ["Jade"         , "jade"],
     java:       ["Java"         , "java"],
-    jsp:        ["JSP"                , "jsp"],
+    jsp:        ["JSP"          , "jsp"],
     javascript: ["JavaScript"   , "js"],
     json:       ["JSON"         , "json"],
     jsx:        ["JSX"          , "jsx"],
@@ -51,7 +60,7 @@ var modesByName = {
     liquid:     ["Liquid"       , "liquid"],
     lua:        ["Lua"          , "lua"],
     luapage:    ["LuaPage"      , "lp"], // http://keplerproject.github.com/cgilua/manual.html#templates
-    makefile:   ["Makefile"     , "GNUmakefile|makefile|Makefile|OCamlMakefile|make"],
+    makefile:   ["Makefile"     , "^GNUmakefile|^makefile|^Makefile|^OCamlMakefile|make"],
     markdown:   ["Markdown"     , "md|markdown"],
     ocaml:      ["OCaml"        , "ml|mli"],
     perl:       ["Perl"         , "pl|pm"],