From 8c64176e93409165fb347876b2ab55ede83a0b31 Mon Sep 17 00:00:00 2001 From: Boris Yankov Date: Sat, 25 May 2013 18:38:50 +0300 Subject: [PATCH] Fix marked definitions and tests --- marked/marked-tests.ts | 22 ++++++++-------------- marked/marked.d.ts | 5 +++-- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/marked/marked-tests.ts b/marked/marked-tests.ts index 458c0c616..184223024 100644 --- a/marked/marked-tests.ts +++ b/marked/marked-tests.ts @@ -3,23 +3,17 @@ import marked = module('marked'); marked.setOptions({ - gfm: true, - tables: true, - breaks: false, - pedantic: false, - sanitize: true, - highlight: function(code, lang) { - if (lang === 'js') { - return highlighter.javascript(code); + gfm: true, + tables: true, + breaks: false, + pedantic: false, + sanitize: true, + highlight: function (code, lang) { } - return code; - } }); console.log(marked('i am using __markdown__.')); +var text = 'something', + options = {}; var tokens = marked.lexer(text, options); console.log(marked.parser(tokens)); - -var lexer = new marked.Lexer(options); -var tokens2 = lexer.lex(text); -console.log(lexer.rules); \ No newline at end of file diff --git a/marked/marked.d.ts b/marked/marked.d.ts index 8b20b273a..044bd890b 100644 --- a/marked/marked.d.ts +++ b/marked/marked.d.ts @@ -3,10 +3,11 @@ // Definitions by: William Orr // Definitions: https://github.com/borisyankov/DefinitelyTyped + declare module "marked" { export function (src: string, opt?: Options): string; - export function lexer(src: string, opt?: Options): Array; - export function parser(src: string, opt?: Options): string; + export function lexer(src: string, opt?: Options): any[]; + export function parser(src: any[], opt?: Options): string; export function parse(src: string, opt?: Options): string; export function setOptions(opt: Options): void; }