From 834d0aee9fbe9626fde8db5cc1a71b0da7aa54c4 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 17 Apr 2013 16:28:59 +0400 Subject: [PATCH] update tests --- demo/kitchen-sink/doclist.js | 8 +++--- .../docs/{batch_file.bat => batchfile.bat} | 0 demo/kitchen-sink/docs/dart.dart | 4 +-- .../docs/{tinymush.mc => mushcode.mc} | 0 lib/ace/mode/_test/tokens_actionscript.json | 27 +++++++------------ lib/ace/mode/_test/tokens_erlang.json | 9 +++---- lib/ace/mode/_test/tokens_haskell.json | 18 +++++-------- lib/ace/mode/_test/tokens_pascal.json | 6 ++--- 8 files changed, 27 insertions(+), 45 deletions(-) rename demo/kitchen-sink/docs/{batch_file.bat => batchfile.bat} (100%) rename demo/kitchen-sink/docs/{tinymush.mc => mushcode.mc} (100%) diff --git a/demo/kitchen-sink/doclist.js b/demo/kitchen-sink/doclist.js index 2f634549..93d5a321 100644 --- a/demo/kitchen-sink/doclist.js +++ b/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", diff --git a/demo/kitchen-sink/docs/batch_file.bat b/demo/kitchen-sink/docs/batchfile.bat similarity index 100% rename from demo/kitchen-sink/docs/batch_file.bat rename to demo/kitchen-sink/docs/batchfile.bat diff --git a/demo/kitchen-sink/docs/dart.dart b/demo/kitchen-sink/docs/dart.dart index 8700c8cd..cdb43c38 100644 --- a/demo/kitchen-sink/docs/dart.dart +++ b/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 diff --git a/demo/kitchen-sink/docs/tinymush.mc b/demo/kitchen-sink/docs/mushcode.mc similarity index 100% rename from demo/kitchen-sink/docs/tinymush.mc rename to demo/kitchen-sink/docs/mushcode.mc diff --git a/lib/ace/mode/_test/tokens_actionscript.json b/lib/ace/mode/_test/tokens_actionscript.json index 00223583..e3fad38f 100644 --- a/lib/ace/mode/_test/tokens_actionscript.json +++ b/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"], diff --git a/lib/ace/mode/_test/tokens_erlang.json b/lib/ace/mode/_test/tokens_erlang.json index 5a1fa366..8a828976 100644 --- a/lib/ace/mode/_test/tokens_erlang.json +++ b/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"," "], diff --git a/lib/ace/mode/_test/tokens_haskell.json b/lib/ace/mode/_test/tokens_haskell.json index 2d2d3b6e..8f9a2b38 100644 --- a/lib/ace/mode/_test/tokens_haskell.json +++ b/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 "], diff --git a/lib/ace/mode/_test/tokens_pascal.json b/lib/ace/mode/_test/tokens_pascal.json index 85f47a64..22c1f0c4 100644 --- a/lib/ace/mode/_test/tokens_pascal.json +++ b/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",