Commit: 81a17217b749fc4f3f66a462922427bfe442ec89 - vim (git)

Commit MetaInfo

• Revision: 81a17217b749fc4f3f66a462922427bfe442ec89 (tree)
• Time: 2023-04-26 18:30:02
• Author: badcoff33 <none@none>
• Commiter: badcoff33

Log Message

avoid error message in case no file exists

Change Summary

• modified: after/ftplugin/markdown_preview.vim
• modified: after/ftplugin/rst_preview.vim

Incremental Difference

--- a/after/ftplugin/markdown_preview.vim
+++ b/after/ftplugin/markdown_preview.vim
@@ -14,21 +14,26 @@ else
   let b:markdown_template_file = " --template=" .. b:markdown_template_file
 endif
 
-let b:markdown_command = "pandoc -f gfm -t html5 --toc --toc-depth=3"
-      \ .. b:markdown_css_file
-      \ .. b:markdown_template_file
-      \ .." --metadata title=\""..expand("%:t:r").."\""
-      \ .." -o "..getenv("TEMP")..g:slash..expand("%:t")..".html"
-      \ .." "..getenv("TEMP")..g:slash.."_"..expand("%:t")
 
 function! s:OpenHTML()
-    exe "terminal ++close ++hidden cmd /C start" getenv("TEMP")..g:slash..expand("%:t")..".html"
+    exe "terminal ++close ++hidden cmd /C start" getenv("TEMP") .. g:slash .. expand("%:t") .. ".html"
+endfunction
+
+function! s:ComputeCommand(file)
+    return "pandoc -f gfm -t html5 --toc --toc-depth=3"
+                \ .. b:markdown_css_file
+                \ .. b:markdown_template_file
+                \ .. " --metadata title=\"" .. expand("%:t:r") .. "\""
+                \ .. " -o " .. getenv("TEMP") .. g:slash .. expand("%:t") .. ".html"
+                \ .. " " .. getenv("TEMP") .. g:slash.."_" .. expand("%:t")
 endfunction
 
 function! s:MakeHTML(...)
-    if exists("b:markdown_command")
-        silent exe "write!" getenv("TEMP")..g:slash.."_"..expand("%:t")
-        silent exe "bwipeout!" getenv("TEMP")..g:slash.."_"..expand("%:t")
+    if filereadable(expand("%"))
+        let b:markdown_command = s:ComputeCommand(expand("%"))
+        let b:markdown_temp_file = getenv("TEMP") .. g:slash .. "_" .. expand("%:t")
+        silent exe "write!" b:markdown_temp_file
+        silent exe "bwipeout!" b:markdown_temp_file
         call run#RunStart(#{
                     \ cmd: b:markdown_command,
                     \ background: v:true,

--- a/after/ftplugin/rst_preview.vim
+++ b/after/ftplugin/rst_preview.vim
@@ -16,26 +16,30 @@ else
   let b:rst_template_file = " --template=" .. b:rst_template_file
 endif
 
-let b:rst_command = "pandoc -f rst -t html5 --toc --toc-depth=3"
-      \ .. b:rst_css_file
-      \ .. b:rst_template_file
-      \ .." --metadata title=\""..expand("%:t:r").."\""
-      \ .." -o "..getenv("TEMP")..g:slash..expand("%:t")..".html"
-      \ .." "..getenv("TEMP")..g:slash.."_"..expand("%:t")
-
 function! s:OpenHTML()
     exe "terminal ++close ++hidden cmd /C start" getenv("TEMP")..g:slash..expand("%:t")..".html"
 endfunction
 
+function! s:ComputeCommand(file)
+    return "pandoc -f rst -t html5 --toc --toc-depth=3"
+                \ .. b:rst_css_file
+                \ .. b:rst_template_file
+                \ .. " --metadata title=\"" .. expand("%:t:r") .. "\""
+                \ .. " -o " .. getenv("TEMP") .. g:slash .. expand("%:t") .. ".html"
+                \ .. " " .. getenv("TEMP") .. g:slash .. "_" .. expand("%:t")
+endfunction
+
 function! s:MakeHTML(...)
-    if exists("b:rst_command")
-        silent exe "write!" getenv("TEMP")..g:slash.."_"..expand("%:t")
-        silent exe "bwipeout!" getenv("TEMP")..g:slash.."_"..expand("%:t")
+    if filereadable(expand("%"))
+        let b:rst_command = s:ComputeCommand(expand("%"))
+        let b:rst_temp_file = getenv("TEMP") .. g:slash .. "_" .. expand("%:t")
+        silent exe "write!" b:rst_temp_file
+        silent exe "bwipeout!" b:rst_temp_file
         call run#RunStart(#{
                     \ cmd: b:rst_command,
                     \ background: v:true,
                     \ no_write: v:true
-        })
+                    \ })
     endif
 endfunction