update tests

demo/kitchen-sink/doclist.js

@@ -65,8 +65,8 @@ function makeHuge(txt) {
 }
 
 var docs = {
-    "docs/AsciiDoc.asciidoc": "AsciiDoc",
     "docs/javascript.js": "JavaScript",
+    "docs/AsciiDoc.asciidoc": "AsciiDoc",
     "docs/clojure.clj": "Clojure",
     "docs/coffeescript.coffee": "CoffeeScript",
     "docs/coldfusion.cfm": "ColdFusion",
@@ -102,7 +102,7 @@ var docs = {
     "docs/luapage.lp": "LuaPage",
     "docs/Makefile": "Makefile",
     "docs/markdown.md": {name: "Markdown", wrapped: true},
-    "docs/tinymush.mc": {name: "TinyMUSH", wrapped: true},
+    "docs/mushcode.mc": {name: "MUSHCode", wrapped: true},
     "docs/objectivec.m": {name: "Objective-C"},
     "docs/ocaml.ml": "OCaml",
     "docs/OpenSCAD.scad": "OpenSCAD",
@@ -129,7 +129,7 @@ var docs = {
     "docs/tcl.tcl": "Tcl",
     "docs/tex.tex": "Tex",
     "docs/textile.textile": {name: "Textile", wrapped: true},
-    "docs/tmSnippet.tmSnippet": "tmSnippet",
+    "docs/snippets.snippets": "snippets",
     "docs/toml.toml": "TOML",
     "docs/typescript.ts": "Typescript",
     "docs/vbscript.vbs": "VBScript",
@@ -141,7 +141,7 @@ var docs = {
     
     "docs/actionscript.as": "ActionScript",
     "docs/autohotkey.ahk": "AutoHotKey",
-    "docs/batch_file.bat": "BatchFile",
+    "docs/batchfile.bat": "BatchFile",
     "docs/erlang/erl": "Erlang",
     "docs/forth.frt": "Forth",
     "docs/haskell.hs": "Haskell",

demo/kitchen-sink/docs/batchfile.bat

@@ -0,0 +1,15 @@
+:: batch file highlighting in Ace!
+@echo off
+
+CALL set var1=%cd%
+echo unhide everything in %var1%!
+
+:: FOR loop in bat is super strange!
+FOR /f "tokens=*" %%G IN ('dir /A:D /b') DO (
+echo %var1%%%G
+attrib -r -a -h -s "%var1%%%G" /D /S
+)
+
+pause
+
+REM that's all

demo/kitchen-sink/docs/dart.dart

@@ -14,8 +14,8 @@ asdad
 77
 .86
 
-#import("http://dartwatch.com/myOtherLibrary.dart");
-#import("myOtherLibrary.dart", prefix:"lib1");
+import("http://dartwatch.com/myOtherLibrary.dart");
+import("myOtherLibrary.dart", prefix:"lib1");
 
 """asdasdads
 asdadsadsasd

demo/kitchen-sink/docs/mushcode.mc

@@ -0,0 +1,8 @@
+@create phone
+&pickup phone=$pick up:@ifelse [u(is,u(mode),ICC)]={@pemit %#=You pick up the [fullname(me)].[set(me,PHONER:%#)][set(me,MODE:CIP)][set([u(INCOMING)],CONNECTED:[num(me)])][set(me,CONNECTED:[u(INCOMING)])]%r[showpicture(PICPICKUP)]%rUse '[color(green,black,psay <message>)]' (or '[color(green,black,p <message>)]') to talk into the phone.;@oemit %#=%N picks up the [fullname(me)].},{@pemit %#=You pick up the phone but no one is there. You hear a dialtone and then hang up. [play(u(DIALTONE))];@oemit %#=%N picks up the phone, but no one is on the other end.}
+&ringfun phone=[ifelse(eq(comp([u(%0/ringtone)],off),0),[color(black,cyan,INCOMING CALL FROM %1)],[play([switch([u(%0/ringtone)],1,[u(%0/ringtone1)],2,[u(%0/ringtone2)],3,[u(%0/ringtone3)],4,[u(%0/ringtone4)],5,[u(%0/ringtone5)],6,[u(%0/ringtone6)],7,[u(%0/ringtone7)],8,[u(%0/ringtone8)],9,[u(%0/ringtone9)],custom,[u(%0/customtone)],vibrate,[u(%0/vibrate)])])]
+&ringloop phone=@switch [u(ringstate)]=1,{@emit [setq(q,[u(connecting)])][set(%qq,rangs:0)][set(%qq,mode:WFC)][set(%qq,INCOMING:)];@ifelse [u(%qq/HASVMB)]={@tr me/ROUTEVMB=[u(connecting)];},{@pemit %#=[u(MSGCNC)];}},2,{@pemit %#=The call is connected.[setq(q,[u(CONNECTING)])][set(me,CONNECTED:%qq)][set(%qq,CONNECTED:[num(me)])][set(%qq,MODE:CIP)];@tr me/ciploop;@tr %qq/ciploop;},3,{@emit On [fullname(me)]'s earpiece you hear a ringing sound.[play(u(LINETONE))];@tr me/ringhere;@increment [u(connecting)]/RANGS;@wait 5={@tr me/ringloop};},4,{}
+&ringstate phone=[setq(q,u(connecting))][setq(1,[gt(u(%qq/rangs),sub(u(%qq/rings),1))])][setq(2,[and(u(is,u(%qq/MODE),CIP),u(is,u(%qq/INCOMING),[num(me)]))][setq(3,[u(is,u(%qq/MODE),ICC)])][ifelse(%q1,1,ifelse(%q2,2,ifelse(%q3,3,4)))]
+;comment
+@@(comment)
+say [time()]

lib/ace/mode/_test/tokens_actionscript.json

@@ -45,13 +45,11 @@
 ],[
    "start",
   ["text","\t\t"],
-  ["punctuation.definition.comment.actionscript.2","//"],
-  ["comment.line.double-slash.actionscript.2","*************************"]
+  ["punctuation.definition.comment.actionscript.2","//*************************"]
 ],[
    "start",
   ["text","\t\t"],
-  ["punctuation.definition.comment.actionscript.2","//"],
-  ["comment.line.double-slash.actionscript.2"," Properties:"]
+  ["punctuation.definition.comment.actionscript.2","// Properties:"]
 ],[
    "start",
   ["text","\t\t"]
@@ -71,8 +69,7 @@
 ],[
    "start",
   ["text","\t\t"],
-  ["punctuation.definition.comment.actionscript.2","//"],
-  ["comment.line.double-slash.actionscript.2"," Color offsets"]
+  ["punctuation.definition.comment.actionscript.2","// Color offsets"]
 ],[
    "start",
   ["text","\t\t"],
@@ -87,21 +84,18 @@
   ["text"," "],
   ["constant.numeric.actionscript.2","0"],
   ["text",";\t"],
-  ["punctuation.definition.comment.actionscript.2","//"],
-  ["comment.line.double-slash.actionscript.2"," R"]
+  ["punctuation.definition.comment.actionscript.2","// R"]
 ],[
    "start",
   ["text","\t\t"]
 ],[
    "start",
   ["text","\t\t"],
-  ["punctuation.definition.comment.actionscript.2","//"],
-  ["comment.line.double-slash.actionscript.2","*************************"]
+  ["punctuation.definition.comment.actionscript.2","//*************************"]
 ],[
    "start",
   ["text","\t\t"],
-  ["punctuation.definition.comment.actionscript.2","//"],
-  ["comment.line.double-slash.actionscript.2"," Constructor:"]
+  ["punctuation.definition.comment.actionscript.2","// Constructor:"]
 ],[
    "start",
   ["text","\t\t"]
@@ -121,8 +115,7 @@
 ],[
    "start",
   ["text","\t\t\t"],
-  ["punctuation.definition.comment.actionscript.2","//"],
-  ["comment.line.double-slash.actionscript.2"," Respond to mouse events"]
+  ["punctuation.definition.comment.actionscript.2","// Respond to mouse events"]
 ],[
    "start",
   ["text","\t\t\tswatch1_btn."],
@@ -145,8 +138,7 @@
 ],[
    "start",
   ["text","\t\t\t"],
-  ["punctuation.definition.comment.actionscript.2","//"],
-  ["comment.line.double-slash.actionscript.2"," Respond to drag events"]
+  ["punctuation.definition.comment.actionscript.2","// Respond to drag events"]
 ],[
    "start",
   ["text","\t\t\tred_slider."],
@@ -158,8 +150,7 @@
 ],[
    "start",
   ["text","\t\t\t"],
-  ["punctuation.definition.comment.actionscript.2","//"],
-  ["comment.line.double-slash.actionscript.2"," Draw a frame later"]
+  ["punctuation.definition.comment.actionscript.2","// Draw a frame later"]
 ],[
    "start",
   ["text","\t\t\t"],

lib/ace/mode/_test/tokens_erlang.json

@@ -1,13 +1,11 @@
 [[
    "start",
   ["text","  "],
-  ["punctuation.definition.comment.erlang","%"],
-  ["comment.line.percentage.erlang","% A process whose only job is to keep a counter."]
+  ["punctuation.definition.comment.erlang","%% A process whose only job is to keep a counter."]
 ],[
    "start",
   ["text","  "],
-  ["punctuation.definition.comment.erlang","%"],
-  ["comment.line.percentage.erlang","% First version"]
+  ["punctuation.definition.comment.erlang","%% First version"]
 ],[
    "start",
   ["meta.directive.module.erlang","  "],
@@ -141,8 +139,7 @@
 ],[
    ["keyword.control.receive.erlang","text6","text6","meta.function.erlang"],
   ["meta.expression.receive.erlang","          "],
-  ["punctuation.definition.comment.erlang","%"],
-  ["comment.line.percentage.erlang"," Force the use of 'codeswitch/1' from the latest MODULE version"]
+  ["punctuation.definition.comment.erlang","% Force the use of 'codeswitch/1' from the latest MODULE version"]
 ],[
    "start",
   ["meta.expression.receive.erlang","    "],

lib/ace/mode/_test/tokens_haskell.json

@@ -1,7 +1,6 @@
 [[
    "start",
-  ["punctuation.definition.comment.haskell","--"],
-  ["comment.line.double-dash.haskell"," Type annotation (optional)"]
+  ["punctuation.definition.comment.haskell","-- Type annotation (optional)"]
 ],[
    "start",
   ["entity.name.function.haskell","fib"],
@@ -18,8 +17,7 @@
   ["text"," "]
 ],[
    "start",
-  ["punctuation.definition.comment.haskell","--"],
-  ["comment.line.double-dash.haskell"," With self-referencing data"]
+  ["punctuation.definition.comment.haskell","-- With self-referencing data"]
 ],[
    "start",
   ["text","fib n "],
@@ -47,15 +45,13 @@
 ],[
    "start",
   ["text","        "],
-  ["punctuation.definition.comment.haskell","--"],
-  ["comment.line.double-dash.haskell"," 0,1,1,2,3,5,..."]
+  ["punctuation.definition.comment.haskell","-- 0,1,1,2,3,5,..."]
 ],[
    "start",
   ["text"," "]
 ],[
    "start",
-  ["punctuation.definition.comment.haskell","--"],
-  ["comment.line.double-dash.haskell"," Same, coded directly"]
+  ["punctuation.definition.comment.haskell","-- Same, coded directly"]
 ],[
    "start",
   ["text","fib n "],
@@ -96,8 +92,7 @@
   ["text"," "]
 ],[
    "start",
-  ["punctuation.definition.comment.haskell","--"],
-  ["comment.line.double-dash.haskell"," Similar idea, using zipWith"]
+  ["punctuation.definition.comment.haskell","-- Similar idea, using zipWith"]
 ],[
    "start",
   ["text","fib n "],
@@ -131,8 +126,7 @@
   ["text"," "]
 ],[
    "start",
-  ["punctuation.definition.comment.haskell","--"],
-  ["comment.line.double-dash.haskell"," Using a generator function"]
+  ["punctuation.definition.comment.haskell","-- Using a generator function"]
 ],[
    "start",
   ["text","fib n "],

lib/ace/mode/_test/tokens_pascal.json

@@ -1,12 +1,12 @@
 [[
-   "punctuation.definition.comment.pascal1",
+   "punctuation.definition.comment.pascal",
   ["punctuation.definition.comment.pascal","(*"],
   ["comment.block.pascal.one","****************************************************************************"]
 ],[
-   "punctuation.definition.comment.pascal1",
+   "punctuation.definition.comment.pascal",
   ["comment.block.pascal.one"," * A simple bubble sort program.  Reads integers, one per line, and prints   *"]
 ],[
-   "punctuation.definition.comment.pascal1",
+   "punctuation.definition.comment.pascal",
   ["comment.block.pascal.one"," * them out in sorted order.  Blows up if there are more than 49.            *"]
 ],[
    "start",