Merge master

demo/kitchen-sink/doclist.js

@@ -90,6 +90,7 @@ var docs = {
     "docs/latex.tex": {name: "LaTeX", wrapped: true},
     "docs/less.less": "LESS",
     "docs/lisp.lisp": "Lisp",
+    "docs/scheme.scm": "Scheme",
     "docs/liquid.liquid": "Liquid",
     "docs/lua.lua": "Lua",
     "docs/lucene.lucene": "Lucene",
@@ -119,6 +120,7 @@ var docs = {
     "docs/tcl.tcl": "Tcl",
     "docs/tex.tex": "Tex",
     "docs/textile.textile": {name: "Textile", wrapped: true},
+    "docs/tmSnippet.tmSnippet": "tmSnippet",
     "docs/typescript.ts": "Typescript",
     "docs/vbscript.vbs": "VBScript",
     "docs/xml.xml": "XML",

demo/kitchen-sink/docs/ruby.rb

@@ -20,4 +20,16 @@ class Range
   end
 end
 
-{:id => 34, :sdfasdfasdf => "asdasdads"}
+{:id => 34, :key => "value"}
+
+
+    herDocs = [<<'FOO', <<BAR, <<-BAZ, <<-`EXEC`] #comment
+  FOO #{literal}
+FOO
+  BAR #{fact(10)}
+BAR
+  BAZ indented
+    BAZ
+        echo hi
+    EXEC
+puts herDocs

demo/kitchen-sink/docs/scheme.scm

@@ -0,0 +1,21 @@
+(define (prompt-for-cd)
+   "Prompts
+    for CD"
+   (prompt-read "Title" 1.53 1 2/4 1.7 1.7e0 2.9E-4 +42 -7 #b001 #b001/100 #o777 #O777 #xabc55 #c(0 -5.6))
+   (prompt-read "Artist")
+   (or (parse-integer (prompt-read "Rating") #:junk-allowed #t) 0)
+  (if x (format #t "yes") (format #f "no") ;and here comment
+  ) 
+  ;; second line comment
+  '(+ 1 2)
+  (position-if-not char-set:whitespace line #:start beg))
+  (quote (privet 1 2 3))
+  '(hello world)
+  (* 5 7)
+  (1 2 34 5)
+  (#:use "aaaa")
+  (let ((x 10) (y 20))
+    (display (+ x y))
+  ) 
+
+  "asdad\0eqweqe"

demo/kitchen-sink/docs/tmSnippet.tmSnippet

@@ -0,0 +1,19 @@
+$$------------------------------------
+tabTrigger: t
+name: Heading 3
+scope: language
+content: -----------------------------
+\begin{${1:documnet}}
+    ${2:$TM_SELECTED_TEXT:some latex}
+    ${3:$TM_SELECTED_TEXT/a/b/c}
+    ${4:${TM_SELECTED_TEXT/(.)/\\u$1/g:7}}
+\end{$1}
+$0\\$$
+$$------------------------------------
+tabTrigger: ^3
+name: Heading 3
+scope: language
+content: -----------------------------
+
+${TM_CURRENT_LINE/./^/g}
+$$------------------------------------

demo/kitchen-sink/modelist.js

@@ -62,7 +62,8 @@ var modesByName = {
     jsx:        ["JSX"          , "jsx"],
     latex:      ["LaTeX"        , "latex|tex|ltx|bib"],
     less:       ["LESS"         , "less"],
-    lisp:       ["Lisp"         , "lisp|scm|rkt"],
+    lisp:       ["Lisp"         , "lisp"],
+    scheme:     ["Scheme"       , "scm|rkt"],
     liquid:     ["Liquid"       , "liquid"],
     lua:        ["Lua"          , "lua"],
     luapage:    ["LuaPage"      , "lp"], // http://keplerproject.github.com/cgilua/manual.html#templates
@@ -91,6 +92,7 @@ var modesByName = {
     tex:        ["Tex"          , "tex"],
     text:       ["Text"         , "txt"],
     textile:    ["Textile"      , "textile"],
+    tm_snippet: ["tmSnippet"    , "tmSnippet"],
     typescript: ["Typescript"   , "typescript|ts|str"],
     vbscript:   ["VBScript"     , "vbs"],
     xml:        ["XML"          , "xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl"],