vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

tools: fix more strange edge cases for markdown links in `v check-md` (#10486) 

* fix support for numbers in urls

* fix valid github link id creation
pull/10493/head
Andreas Heissenberger 2021-06-17 11:53:25 +02:00 committed by GitHub
parent c58b04bcbf
commit 0918c130ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cmd/tools/vcheck-md.v
View File

@ -266,7 +266,7 @@ mut:
} }
fn (mut ad AnchorData) add_links(line_number int, line string) { fn (mut ad AnchorData) add_links(line_number int, line string) {
query := r'\[(?P<lable>[^\]]+)\]\(\s*#(?P<link>[a-z0-9\-]+)\)' query := r'\[(?P<lable>[^\]]+)\]\(\s*#(?P<link>[a-z0-9\-\_\x7f-\uffff]+)\)'
mut re := regex.regex_opt(query) or { panic(err) } mut re := regex.regex_opt(query) or { panic(err) }
res := re.find_all_str(line) res := re.find_all_str(line)
@ -292,7 +292,7 @@ fn (mut ad AnchorData) add_link_targets(line_number int, line string) {
} }
} }
} else { } else {
query := r'<a\s*id=["\'](?P<link>[a-z0-9\-]+)["\']\s*/>' query := r'<a\s*id=["\'](?P<link>[a-z0-9\-\_\x7f-\uffff]+)["\']\s*/>'
mut re := regex.regex_opt(query) or { panic(err) } mut re := regex.regex_opt(query) or { panic(err) }
res := re.find_all_str(line) res := re.find_all_str(line)
@ -351,10 +351,30 @@ fn (mut ad AnchorData) check_link_target_match(fpath string, mut res CheckResult
} }
} }
// based on a reference sample md doc
// https://github.com/aheissenberger/vlang-markdown-module/blob/master/test.md
fn create_ref_link(s string) string { fn create_ref_link(s string) string {
query_remove := r'[^a-z0-9 \-]' mut result := ''
mut re := regex.regex_opt(query_remove) or { panic(err) } for c in s.trim_space() {
return re.replace_simple(s.to_lower(), '').replace(' ', '-') result += match c {
`a`...`z`, `0`...`9` {
c.ascii_str()
}
`A`...`Z` {
c.ascii_str().to_lower()
}
` `, `-` {
'-'
}
`_` {
'_'
}
else {
if c > 127 { c.ascii_str() } else { '' }
}
}
}
return result
} }
fn (mut f MDFile) debug() { fn (mut f MDFile) debug() {