Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cf05d533a4 | |||
| 72792615e7 | |||
| 5cca07970c | |||
| 705ad1e0dd | |||
| 7ad424ea42 | |||
| 69318e74c8 |
@@ -64,20 +64,24 @@ jobs:
|
|||||||
opt: [
|
opt: [
|
||||||
# "vint",
|
# "vint",
|
||||||
|
|
||||||
"-n vim_7.3.429",
|
"-n vim_7.4.2367",
|
||||||
"-n vim_8.1.0519",
|
"-n vim_8.2.5172",
|
||||||
|
"-n vim_9.0.2190",
|
||||||
|
"-n vim_9.1.0786",
|
||||||
|
|
||||||
# TODO add me when test works on Vim, 9.0
|
# TODO add me when test works on Vim, 9.0
|
||||||
# -- Currently I experienced some surprised due to defaults
|
# -- Currently I experienced some surprised due to defaults
|
||||||
# -- tinmarino 2023-03-10
|
# -- tinmarino 2023-03-10
|
||||||
# "-n v9.0.1396",
|
# "-n v9.0.1396",
|
||||||
|
|
||||||
"-n nvim_0.3.8",
|
# This build isn't currently working with vim-testbed:
|
||||||
|
# "-n nvim_0.10.2",
|
||||||
|
|
||||||
# Cannot quote as it is expanded from $OPT after quote removal
|
# Cannot quote as it is expanded from $OPT after quote removal
|
||||||
# So I decided to escape the *
|
# So I decided to escape the *
|
||||||
"-n vim_7.4.1099 -f '[a-k]*.vader'",
|
# "-n vim_7.4.1099 -f '[a-k]*.vader'",
|
||||||
"-n vim_7.4.1546 -f 'l*.vader'",
|
# "-n vim_7.4.1546 -f 'l*.vader'",
|
||||||
"-n vim_8.0.0027 -f '[m-z]*.vader'",
|
# "-n vim_8.0.0027 -f '[m-z]*.vader'",
|
||||||
]
|
]
|
||||||
steps:
|
steps:
|
||||||
# This action is required to fetch the code to test
|
# This action is required to fetch the code to test
|
||||||
|
|||||||
+8
-7
@@ -17,10 +17,11 @@ RUN git checkout de8a976f1eae2c2b680604205c3e8b5c8882493c
|
|||||||
# Build vim and neovim versions we want to test
|
# Build vim and neovim versions we want to test
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
|
|
||||||
RUN install_vim -tag v7.3.429 -name vim_7.3.429 -build
|
RUN install_vim -tag v7.4.2367 -name vim_7.4.2367 -build
|
||||||
RUN install_vim -tag v7.4.1099 -name vim_7.4.1099 -build
|
RUN install_vim -tag v8.2.5172 -name vim_8.2.5172 -build
|
||||||
RUN install_vim -tag v7.4.1546 -name vim_7.4.1546 -build
|
RUN install_vim -tag v9.0.2190 -name v9.0.2190 -build
|
||||||
RUN install_vim -tag v8.0.0027 -name vim_8.0.0027 -build
|
RUN install_vim -tag v9.1.0786 -name v9.1.0786 -build
|
||||||
RUN install_vim -tag v8.1.0519 -name vim_8.1.0519 -build
|
|
||||||
RUN install_vim -tag v9.0.1396 -name v9.0.1396 -build
|
# TODO: This one doesn't build - vim-testbed seems way out of date:
|
||||||
RUN install_vim -tag neovim:v0.3.8 -name nvim_0.3.8 -build
|
# TODO: tag neovim:v0.10.2, name nvim_0.10.2
|
||||||
|
# (Format as install_vim instances above.)
|
||||||
|
|||||||
@@ -262,11 +262,20 @@ function! vimwiki#base#resolve_link(link_text, ...) abort
|
|||||||
\ vimwiki#vars#get_wikilocal('ext', link_infos.index)
|
\ vimwiki#vars#get_wikilocal('ext', link_infos.index)
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
" append extension iff one not already present or it's not the targeted
|
" append extension if one not already present or it's not the targeted
|
||||||
" wiki extension - https://github.com/vimwiki/vimwiki/issues/950
|
" wiki extension - https://github.com/vimwiki/vimwiki/issues/950
|
||||||
let ext = fnamemodify(link_text, ':e')
|
let ext = fnamemodify(link_text, ':e')
|
||||||
let ext_with_dot = '.' . ext
|
let ext_with_dot = '.' . ext
|
||||||
if ext ==? '' || ext_with_dot !=? vimwiki#vars#get_wikilocal('ext', link_infos.index)
|
|
||||||
|
" Check if a .md must be added
|
||||||
|
" See #1271 to modify files with a "."
|
||||||
|
let do_add_ext = ext ==? ''
|
||||||
|
if vimwiki#vars#get_syntaxlocal('open_link_add_ext')
|
||||||
|
let do_add_ext = do_add_ext || ext_with_dot !=? vimwiki#vars#get_wikilocal('ext', link_infos.index)
|
||||||
|
endif
|
||||||
|
|
||||||
|
" Add the dot
|
||||||
|
if do_add_ext
|
||||||
let link_infos.filename .= vimwiki#vars#get_wikilocal('ext', link_infos.index)
|
let link_infos.filename .= vimwiki#vars#get_wikilocal('ext', link_infos.index)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -100,7 +100,8 @@ function! s:normalize_link_syntax_n() abort
|
|||||||
let sub = vimwiki#base#normalize_link_in_diary(lnk)
|
let sub = vimwiki#base#normalize_link_in_diary(lnk)
|
||||||
else
|
else
|
||||||
let sub = vimwiki#base#normalize_link_helper(lnk,
|
let sub = vimwiki#base#normalize_link_helper(lnk,
|
||||||
\ vimwiki#vars#get_global('rxWord'), '',
|
\ vimwiki#vars#get_global('rxWord'),
|
||||||
|
\ vimwiki#vars#get_global('rxWord'),
|
||||||
\ vimwiki#vars#get_syntaxlocal('Link1'))
|
\ vimwiki#vars#get_syntaxlocal('Link1'))
|
||||||
endif
|
endif
|
||||||
call vimwiki#base#replacestr_at_cursor('\V'.lnk, sub)
|
call vimwiki#base#replacestr_at_cursor('\V'.lnk, sub)
|
||||||
|
|||||||
@@ -851,6 +851,10 @@ function! s:get_common_syntaxlocal() abort
|
|||||||
" HTML comment
|
" HTML comment
|
||||||
let res.comment_regex = {'type': type(''), 'default': '\%(^\s*%%.*$\|<!--\%([^>]\|\n\)*-->\)'}
|
let res.comment_regex = {'type': type(''), 'default': '\%(^\s*%%.*$\|<!--\%([^>]\|\n\)*-->\)'}
|
||||||
|
|
||||||
|
" Opening link with dot in the ref, see #1271 and ref and Brennen comment:
|
||||||
|
" -- https://github.com/vimwiki/vimwiki/issues/1271#issuecomment-1482207680
|
||||||
|
let res.open_link_add_ext = {'type': type(1), 'default': 1}
|
||||||
|
|
||||||
return res
|
return res
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -1521,7 +1521,7 @@ In this case, <mathjax_folder> would be "../mathjax" (without quotes).
|
|||||||
2. Loading MathJax from a CDN-server (needs internet connection).
|
2. Loading MathJax from a CDN-server (needs internet connection).
|
||||||
Add to your HTML template the following lines:
|
Add to your HTML template the following lines:
|
||||||
|
|
||||||
<script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
|
<script src="https://cdnjs.cloudflare.com/polyfill/v3/polyfill.min.js?features=es6"></script>
|
||||||
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
|
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
|
||||||
|
|
||||||
|
|
||||||
@@ -3282,7 +3282,7 @@ cannot otherwise convert the link. A customized handler might look like this: >
|
|||||||
let str = a:value
|
let str = a:value
|
||||||
|
|
||||||
" complete URL
|
" complete URL
|
||||||
let url_0 = matchstr(str, g:vimwiki_rxWikiInclMatchUrl)
|
let url_0 = matchstr(str, g:vimwiki_global_vars.rxWikiInclMatchUrl)
|
||||||
" URL parts
|
" URL parts
|
||||||
let link_infos = vimwiki#base#resolve_link(url_0)
|
let link_infos = vimwiki#base#resolve_link(url_0)
|
||||||
let arg1 = matchstr(str, VimwikiWikiInclMatchArg(1))
|
let arg1 = matchstr(str, VimwikiWikiInclMatchArg(1))
|
||||||
|
|||||||
+1
-1
@@ -257,7 +257,7 @@ Expect (Correctly formatted tags file):
|
|||||||
!_TAG_PROGRAM_AUTHOR Vimwiki
|
!_TAG_PROGRAM_AUTHOR Vimwiki
|
||||||
!_TAG_PROGRAM_NAME Vimwiki Tags
|
!_TAG_PROGRAM_NAME Vimwiki Tags
|
||||||
!_TAG_PROGRAM_URL https://github.com/vimwiki/vimwiki
|
!_TAG_PROGRAM_URL https://github.com/vimwiki/vimwiki
|
||||||
!_TAG_PROGRAM_VERSION 2023.05.12
|
!_TAG_PROGRAM_VERSION 2024.01.24
|
||||||
second-tag Test-Tag.md 13;" vimwiki:Test-Tag\tTest-Tag#second-tag\tTest-Tag#second-tag
|
second-tag Test-Tag.md 13;" vimwiki:Test-Tag\tTest-Tag#second-tag\tTest-Tag#second-tag
|
||||||
test-tag Test-Tag.md 5;" vimwiki:Test-Tag\tTest-Tag#a-header\tA header
|
test-tag Test-Tag.md 5;" vimwiki:Test-Tag\tTest-Tag#a-header\tA header
|
||||||
top-tag Test-Tag.md 1;" vimwiki:Test-Tag\tTest-Tag\tTest-Tag
|
top-tag Test-Tag.md 1;" vimwiki:Test-Tag\tTest-Tag\tTest-Tag
|
||||||
|
|||||||
Reference in New Issue
Block a user