Skip to content

Commit 57fbc50

Browse files
mjbvzmjbvz
authored
Pick up latest marked release (microsoft#159629)
1 parent ec12178 commit 57fbc50

File tree

3 files changed

+129
-104
lines changed

3 files changed

+129
-104
lines changed

‎src/vs/base/common/marked/cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"git": {
77
"name": "marked",
88
"repositoryUrl": "https://github.com/markedjs/marked",
9-
"commitHash": "2002557d004139ca2208c910d9ca999829b65406"
9+
"commitHash": "7e2ef307846427650114591f9257b5545868e928"
1010
}
1111
},
1212
"license": "MIT",
13-
"version": "4.0.16"
13+
"version": "4.1.0"
1414
}
1515
],
1616
"version": 1

‎src/vs/base/common/marked/marked.d.ts

Lines changed: 57 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
// Sarun Intaralawan <https://github.com/sarunint>
1111
// Tony Brix <https://github.com/UziTech>
1212
// Anatolii Titov <https://github.com/Toliak>
13+
// Jean-Francois Cere <https://github.com/jfcere>
14+
// Mykhaylo Stolyarchuk <https://github.com/MykSto>
1315
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
1416

1517
/**
@@ -75,11 +77,7 @@ export namespace marked {
7577
* @param callback Function called when the markdownString has been fully parsed when using async highlighting
7678
* @return String of compiled HTML
7779
*/
78-
function parse(
79-
src: string,
80-
options?: MarkedOptions,
81-
callback?: (error: any, parseResult: string) => void,
82-
): string;
80+
function parse(src: string, options?: MarkedOptions, callback?: (error: any, parseResult: string) => void): string;
8381

8482
/**
8583
* @param src Tokenized source as array of tokens
@@ -126,74 +124,79 @@ export namespace marked {
126124
class Tokenizer<T = never> {
127125
constructor(options?: MarkedOptions);
128126
options: MarkedOptions;
129-
space(this: TokenizerThis, src: string): Tokens.Space | T;
130-
code(this: TokenizerThis, src: string): Tokens.Code | T;
131-
fences(this: TokenizerThis, src: string): Tokens.Code | T;
132-
heading(this: TokenizerThis, src: string): Tokens.Heading | T;
133-
hr(this: TokenizerThis, src: string): Tokens.Hr | T;
134-
blockquote(this: TokenizerThis, src: string): Tokens.Blockquote | T;
135-
list(this: TokenizerThis, src: string): Tokens.List | T;
136-
html(this: TokenizerThis, src: string): Tokens.HTML | T;
137-
def(this: TokenizerThis, src: string): Tokens.Def | T;
138-
table(this: TokenizerThis, src: string): Tokens.Table | T;
139-
lheading(this: TokenizerThis, src: string): Tokens.Heading | T;
140-
paragraph(this: TokenizerThis, src: string): Tokens.Paragraph | T;
141-
text(this: TokenizerThis, src: string): Tokens.Text | T;
142-
escape(this: TokenizerThis, src: string): Tokens.Escape | T;
143-
tag(this: TokenizerThis, src: string): Tokens.Tag | T;
144-
link(this: TokenizerThis, src: string): Tokens.Image | Tokens.Link | T;
127+
space(this: Tokenizer & TokenizerThis, src: string): Tokens.Space | T;
128+
code(this: Tokenizer & TokenizerThis, src: string): Tokens.Code | T;
129+
fences(this: Tokenizer & TokenizerThis, src: string): Tokens.Code | T;
130+
heading(this: Tokenizer & TokenizerThis, src: string): Tokens.Heading | T;
131+
hr(this: Tokenizer & TokenizerThis, src: string): Tokens.Hr | T;
132+
blockquote(this: Tokenizer & TokenizerThis, src: string): Tokens.Blockquote | T;
133+
list(this: Tokenizer & TokenizerThis, src: string): Tokens.List | T;
134+
html(this: Tokenizer & TokenizerThis, src: string): Tokens.HTML | T;
135+
def(this: Tokenizer & TokenizerThis, src: string): Tokens.Def | T;
136+
table(this: Tokenizer & TokenizerThis, src: string): Tokens.Table | T;
137+
lheading(this: Tokenizer & TokenizerThis, src: string): Tokens.Heading | T;
138+
paragraph(this: Tokenizer & TokenizerThis, src: string): Tokens.Paragraph | T;
139+
text(this: Tokenizer & TokenizerThis, src: string): Tokens.Text | T;
140+
escape(this: Tokenizer & TokenizerThis, src: string): Tokens.Escape | T;
141+
tag(this: Tokenizer & TokenizerThis, src: string): Tokens.Tag | T;
142+
link(this: Tokenizer & TokenizerThis, src: string): Tokens.Image | Tokens.Link | T;
145143
reflink(
146-
this: TokenizerThis,
144+
this: Tokenizer & TokenizerThis,
147145
src: string,
148146
links: Tokens.Link[] | Tokens.Image[],
149147
): Tokens.Link | Tokens.Image | Tokens.Text | T;
150-
emStrong(this: TokenizerThis, src: string, maskedSrc: string, prevChar: string): Tokens.Em | Tokens.Strong | T;
151-
codespan(this: TokenizerThis, src: string): Tokens.Codespan | T;
152-
br(this: TokenizerThis, src: string): Tokens.Br | T;
153-
del(this: TokenizerThis, src: string): Tokens.Del | T;
154-
autolink(this: TokenizerThis, src: string, mangle: (cap: string) => string): Tokens.Link | T;
155-
url(this: TokenizerThis, src: string, mangle: (cap: string) => string): Tokens.Link | T;
156-
inlineText(this: TokenizerThis, src: string, smartypants: (cap: string) => string): Tokens.Text | T;
148+
emStrong(
149+
this: Tokenizer & TokenizerThis,
150+
src: string,
151+
maskedSrc: string,
152+
prevChar: string,
153+
): Tokens.Em | Tokens.Strong | T;
154+
codespan(this: Tokenizer & TokenizerThis, src: string): Tokens.Codespan | T;
155+
br(this: Tokenizer & TokenizerThis, src: string): Tokens.Br | T;
156+
del(this: Tokenizer & TokenizerThis, src: string): Tokens.Del | T;
157+
autolink(this: Tokenizer & TokenizerThis, src: string, mangle: (cap: string) => string): Tokens.Link | T;
158+
url(this: Tokenizer & TokenizerThis, src: string, mangle: (cap: string) => string): Tokens.Link | T;
159+
inlineText(this: Tokenizer & TokenizerThis, src: string, smartypants: (cap: string) => string): Tokens.Text | T;
157160
}
158161

159162
type TokenizerObject = Partial<Omit<Tokenizer<false>, 'constructor' | 'options'>>;
160163

161164
class Renderer<T = never> {
162165
constructor(options?: MarkedOptions);
163166
options: MarkedOptions;
164-
code(this: RendererThis, code: string, language: string | undefined, isEscaped: boolean): string | T;
165-
blockquote(this: RendererThis, quote: string): string | T;
166-
html(this: RendererThis, html: string): string | T;
167+
code(this: Renderer | RendererThis, code: string, language: string | undefined, isEscaped: boolean): string | T;
168+
blockquote(this: Renderer | RendererThis, quote: string): string | T;
169+
html(this: Renderer | RendererThis, html: string): string | T;
167170
heading(
168-
this: RendererThis,
171+
this: Renderer | RendererThis,
169172
text: string,
170173
level: 1 | 2 | 3 | 4 | 5 | 6,
171174
raw: string,
172175
slugger: Slugger,
173176
): string | T;
174-
hr(this: RendererThis): string | T;
175-
list(this: RendererThis, body: string, ordered: boolean, start: number): string | T;
176-
listitem(this: RendererThis, text: string, task: boolean, checked: boolean): string | T;
177-
checkbox(this: RendererThis, checked: boolean): string | T;
178-
paragraph(this: RendererThis, text: string): string | T;
179-
table(this: RendererThis, header: string, body: string): string | T;
180-
tablerow(this: RendererThis, content: string): string | T;
177+
hr(this: Renderer | RendererThis): string | T;
178+
list(this: Renderer | RendererThis, body: string, ordered: boolean, start: number): string | T;
179+
listitem(this: Renderer | RendererThis, text: string, task: boolean, checked: boolean): string | T;
180+
checkbox(this: Renderer | RendererThis, checked: boolean): string | T;
181+
paragraph(this: Renderer | RendererThis, text: string): string | T;
182+
table(this: Renderer | RendererThis, header: string, body: string): string | T;
183+
tablerow(this: Renderer | RendererThis, content: string): string | T;
181184
tablecell(
182-
this: RendererThis,
185+
this: Renderer | RendererThis,
183186
content: string,
184187
flags: {
185188
header: boolean;
186189
align: 'center' | 'left' | 'right' | null;
187190
},
188191
): string | T;
189-
strong(this: RendererThis, text: string): string | T;
190-
em(this: RendererThis, text: string): string | T;
191-
codespan(this: RendererThis, code: string): string | T;
192-
br(this: RendererThis): string | T;
193-
del(this: RendererThis, text: string): string | T;
194-
link(this: RendererThis, href: string | null, title: string | null, text: string): string | T;
195-
image(this: RendererThis, href: string | null, title: string | null, text: string): string | T;
196-
text(this: RendererThis, text: string): string | T;
192+
strong(this: Renderer | RendererThis, text: string): string | T;
193+
em(this: Renderer | RendererThis, text: string): string | T;
194+
codespan(this: Renderer | RendererThis, code: string): string | T;
195+
br(this: Renderer | RendererThis): string | T;
196+
del(this: Renderer | RendererThis, text: string): string | T;
197+
link(this: Renderer | RendererThis, href: string | null, title: string | null, text: string): string | T;
198+
image(this: Renderer | RendererThis, href: string | null, title: string | null, text: string): string | T;
199+
text(this: Renderer | RendererThis, text: string): string | T;
197200
}
198201

199202
type RendererObject = Partial<Omit<Renderer<false>, 'constructor' | 'options'>>;
@@ -221,7 +224,7 @@ export namespace marked {
221224
static parse(src: Token[] | TokensList, options?: MarkedOptions): string;
222225
static parseInline(src: Token[], options?: MarkedOptions): string;
223226
parse(src: Token[] | TokensList): string;
224-
parseInline(src: Token[], renderer: Renderer): string;
227+
parseInline(src: Token[], renderer?: Renderer): string;
225228
next(): Token;
226229
}
227230

@@ -236,8 +239,8 @@ export namespace marked {
236239
lex(src: string): TokensList;
237240
blockTokens(src: string, tokens: Token[]): Token[];
238241
blockTokens(src: string, tokens: TokensList): TokensList;
239-
inline(src: string, tokens: Token[]): void;
240-
inlineTokens(src: string, tokens: Token[]): Token[];
242+
inline(src: string, tokens?: Token[]): Token[];
243+
inlineTokens(src: string, tokens?: Token[]): Token[];
241244
state: {
242245
inLink: boolean;
243246
inRawBlock: boolean;
@@ -461,7 +464,7 @@ export namespace marked {
461464
interface TokenizerExtension {
462465
name: string;
463466
level: 'block' | 'inline';
464-
start?: ((this: TokenizerThis, src: string) => number) | undefined;
467+
start?: ((this: TokenizerThis, src: string) => number | void) | undefined;
465468
tokenizer: (this: TokenizerThis, src: string, tokens: Token[] | TokensList) => Tokens.Generic | void;
466469
childTokens?: string[] | undefined;
467470
}
@@ -514,11 +517,7 @@ export namespace marked {
514517
* with an error if any occurred during highlighting and a string
515518
* if highlighting was successful)
516519
*/
517-
highlight?(
518-
code: string,
519-
lang: string,
520-
callback?: (error: any, code?: string) => void,
521-
): string | void;
520+
highlight?(code: string, lang: string, callback?: (error: any, code?: string) => void): string | void;
522521

523522
/**
524523
* Set the prefix for code block classes.

0 commit comments

Comments
 (0)