Skip to content

Commit d734e1a

Browse files
committed
run v fmt -w .
1 parent 6e034e8 commit d734e1a

File tree

3 files changed

+29
-20
lines changed

3 files changed

+29
-20
lines changed

src/html.v

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ fn write_data_cb(txt &char, size u32, mut sb strings.Builder) {
1919

2020
pub fn to_html(input string) string {
2121
mut wr := strings.new_builder(200)
22-
C.md_html(voidptr(input.str), input.len, write_data_cb, &wr, C.MD_DIALECT_GITHUB, 0)
22+
C.md_html(voidptr(input.str), input.len, write_data_cb, &wr, C.MD_DIALECT_GITHUB,
23+
0)
2324
return wr.str().trim_space()
2425
}

src/html_experimental.v

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ mut:
9292
content_writer strings.Builder = strings.new_builder(200)
9393
writer strings.Builder = strings.new_builder(200)
9494
image_nesting_level int
95-
last_htag_open_pos int
95+
last_htag_open_pos int
9696
}
9797

9898
fn (mut ht HtmlRenderer) str() string {
@@ -255,15 +255,16 @@ fn (mut ht HtmlRenderer) enter_block(typ MD_BLOCKTYPE, detail voidptr) ? {
255255
}
256256

257257
fn title_to_id(title string) string {
258-
no_amps1 := title.replace('&', '&')
259-
no_amps2 := no_amps1.replace('&', 'and')
260-
no_spaces := no_amps2.replace(' ', '-')
261-
lower := no_spaces.to_lower()
262-
a := lower.bytes()
263-
allowed := a.filter(it == `-` || it.is_alnum())
264-
res := allowed.bytestr()
265-
return res
258+
no_amps1 := title.replace('&', '&')
259+
no_amps2 := no_amps1.replace('&', 'and')
260+
no_spaces := no_amps2.replace(' ', '-')
261+
lower := no_spaces.to_lower()
262+
a := lower.bytes()
263+
allowed := a.filter(it == `-` || it.is_alnum())
264+
res := allowed.bytestr()
265+
return res
266266
}
267+
267268
fn (mut ht HtmlRenderer) leave_block(typ MD_BLOCKTYPE, detail voidptr) ? {
268269
ht.render_content()
269270
ht.parent_stack.pop() or {}

src/html_experimental_test.v

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,54 +33,61 @@ fn test_render_ul() {
3333
assert markdown.to_html_experimental('
3434
- test
3535
- abcd
36-
'.trim_space()).replace('\n','') == '<ul><li>test</li><li>abcd</li></ul>'
36+
'.trim_space()).replace('\n',
37+
'') == '<ul><li>test</li><li>abcd</li></ul>'
3738
}
3839

3940
fn test_render_ul_checkbox() {
4041
assert markdown.to_html_experimental('
4142
- [x] test
4243
- [X] abcd
4344
- [ ] defg
44-
'.trim_space()).replace('\n', '') == '<ul>${item_checked}test</li>${item_checked}abcd</li>${item_unchecked}defg</li></ul>'
45+
'.trim_space()).replace('\n',
46+
'') == '<ul>${item_checked}test</li>${item_checked}abcd</li>${item_unchecked}defg</li></ul>'
4547
}
4648

4749
fn test_render_ul_mixed() {
4850
assert markdown.to_html_experimental('
4951
- [x] test
5052
- abcd
5153
- [ ] defg
52-
'.trim_space()).replace('\n', '') == '<ul>${item_checked}test</li><li>abcd</li>${item_unchecked}defg</li></ul>'
54+
'.trim_space()).replace('\n',
55+
'') == '<ul>${item_checked}test</li><li>abcd</li>${item_unchecked}defg</li></ul>'
5356
}
5457

5558
fn test_render_ol() {
5659
assert markdown.to_html_experimental('
5760
1. test
5861
2. abcd
59-
'.trim_space()).replace('\n', '') == '<ol><li>test</li><li>abcd</li></ol>'
62+
'.trim_space()).replace('\n',
63+
'') == '<ol><li>test</li><li>abcd</li></ol>'
6064
}
6165

6266
fn test_render_ol_diff_start() {
6367
assert markdown.to_html_experimental('
6468
4. test
6569
7. abcd
66-
'.trim_space()).replace('\n', '') == '<ol start="4"><li>test</li><li>abcd</li></ol>'
70+
'.trim_space()).replace('\n',
71+
'') == '<ol start="4"><li>test</li><li>abcd</li></ol>'
6772
}
6873

6974
fn test_render_ol_checkbox() {
7075
res := markdown.to_html_experimental('
7176
1. [x] test
7277
2. [X] abcd
7378
3. [ ] defg
74-
'.trim_space()).replace('\n', '')
75-
assert res == '<ol>${item_checked}test</li>${item_checked}abcd</li>${item_unchecked}defg</li></ol>'
79+
'.trim_space()).replace('\n',
80+
'')
81+
assert res == '<ol>${item_checked}test</li>${item_checked}abcd</li>${item_unchecked}defg</li></ol>'
7682
}
7783

7884
fn test_render_ol_mixed() {
7985
assert markdown.to_html_experimental('
8086
1. [x] test
8187
2. abcd
8288
3. [ ] defg
83-
'.trim_space()).replace('\n', '') == '<ol>${item_checked}test</li><li>abcd</li>${item_unchecked}defg</li></ol>'
89+
'.trim_space()).replace('\n',
90+
'') == '<ol>${item_checked}test</li><li>abcd</li>${item_unchecked}defg</li></ol>'
8491
}
8592

8693
fn test_render_ul_ol_mixed() {
@@ -96,7 +103,7 @@ fn test_render_ul_ol_mixed() {
96103
1. Ordered 1
97104
2. Ordered 2
98105
'.trim_space())
99-
assert res.replace('\n', '') == [
106+
assert res.replace('\n', '') == [
100107
'<ol><li>Things to do<ul>${item_checked}Task 1</li>${item_unchecked}Task 2</li></ul></li>',
101108
'<li>Notes<ul><li>Note 1</li><li>Note 2</li></ul></li></ol>',
102109
'<ul><li>Hey<ol><li>Ordered 1</li><li>Ordered 2</li></ol></li></ul>',
@@ -141,7 +148,7 @@ fn test_render_table() {
141148
|Item 1| Item 2 |
142149
'.trim_space()
143150
res := markdown.to_html_experimental(input)
144-
assert res.replace('\n','') == '<table><thead><tr><th>Column 1</th><th>Column 2</th></tr></thead><tbody><tr><td>Item 1</td><td>Item 2</td></tr></tbody></table>'
151+
assert res.replace('\n', '') == '<table><thead><tr><th>Column 1</th><th>Column 2</th></tr></thead><tbody><tr><td>Item 1</td><td>Item 2</td></tr></tbody></table>'
145152
}
146153

147154
fn test_img() {

0 commit comments

Comments
 (0)