Merge pull request #7 from ubaldot/pandoc_check_tests

Pandoc check tests

Author: ubaldot

ftplugin/markdown.vim

@@ -19,6 +19,7 @@ nnoremap <buffer> <backspace> <ScriptCmd>funcs.GoToPrevVisitedBuffer()<cr>
 
 
 # -------------- prettier ------------------------
+#
 if markdown_extras.use_prettier
   if exists('g:markdown_extras_config') != 0
       && has_key(g:markdown_extras_config, 'formatprg')
@@ -41,11 +42,6 @@ endif
 # --------------End prettier ------------------------
 
 # -------------------- pandoc -----------------------
-if exists('g:markdown_extras_config') != 0
-    && has_key(g:markdown_extras_config, 'use_pandoc')
-  use_pandoc = g:markdown_extras_config['use_pandoc']
-endif
-
 if markdown_extras.use_pandoc
   # All the coreography happening inside here relies on the compiler
   # pandoc.
@@ -66,6 +62,8 @@ if markdown_extras.use_pandoc
     # TIP2: redraw! is used to avoid the "PRESS ENTER" thing
     echo cmd->matchstr('.*\ze2>&1') | redraw!
 
+    # TODO: pandoc compiler returns v:shell_error = 0 even if there are
+    # errors. Add a condition on v:shell_error once pandoc compiler is fixed.
     if exists(':Open') != 0
       exe $'Open {output_file}'
     endif

plugin/markdown_extras.vim

@@ -16,11 +16,9 @@ elseif !has('patch-9.1.1071')
   finish
 endif
 
-
 if exists('g:markdown_extras_loaded')
   finish
 endif
-g:markdown_extras_loaded = true
 
 augroup MARKDOWN_EXTRAS_VISITED_BUFFERS
     autocmd!
@@ -29,53 +27,52 @@ augroup MARKDOWN_EXTRAS_VISITED_BUFFERS
           \ funcs.RemoveVisitedBuffer(bufnr())
 augroup END
 
-# Check if prettier can/shall be used or not
+# Check prettier executable
 export var use_prettier = true
 
 if exists('g:markdown_extras_config') != 0
     && has_key(g:markdown_extras_config, 'use_prettier')
   use_prettier = g:markdown_extras_config['use_prettier']
 endif
 
-if use_prettier
-  def PrettierInstalledCheck()
-    if !executable('prettier')
-      utils.Echowarn("'prettier' not installed!'")
-      use_prettier = false
-    endif
-  enddef
-
-  augroup MARKDOWN_EXTRAS_PRETTIER_CHECK
-    autocmd!
-    # TODO: Changing BufReadPre with FileType markdown won't work because
-    # FileType markdown autocmd is executed after ftplugin/markdown.vim is sourced,
-    # and therefore ftplugin/markdown.vim would see use_prettier = true all
-    # the time. Hence, the hack is to use BufReadPre and to specify all the
-    # possible file extensions.
-    autocmd BufReadPre *.md,*.markdown,*.mdown,*.mkd ++once
-          \ PrettierInstalledCheck()
-  augroup END
+# If user wants to use prettier but it is not available...
+if use_prettier && !executable('prettier')
+  use_prettier = false
+  # If vim is called with args, like vim README.md
+  if &filetype == 'markdown'
+    utils.Echowarn("'prettier' not installed!'")
+  else
+    # As soon as we open a markdown file, the error is displayed
+    augroup MARKDOWN_EXTRAS_PRETTIER_ERROR
+      autocmd!
+      autocmd FileType markdown ++once {
+          utils.Echowarn("'prettier' not installed!'")
+      }
+    augroup END
+  endif
 endif
 
-# Check if pandoc can/shall be used or not
+# Check pandoc executable
 export var use_pandoc = true
 
 if exists('g:markdown_extras_config') != 0
     && has_key(g:markdown_extras_config, 'use_pandoc')
   use_pandoc = g:markdown_extras_config['use_pandoc']
 endif
 
-if use_pandoc
-  def PandocInstalledCheck()
-    if !executable('pandoc')
-      utils.Echowarn("'pandoc' not installed!'")
-      use_pandoc = false
-    endif
-  enddef
-
-  augroup MARKDOWN_EXTRAS_PANDOC_CHECK
-    autocmd!
-    autocmd BufReadPre *.md,*.markdown,*.mdown,*.mkd ++once
-          \ PandocInstalledCheck()
-  augroup END
+# If user wants to use pandoc but it is not available...
+if use_pandoc && !executable('pandoc')
+  use_pandoc = false
+  if &filetype == 'markdown'
+    utils.Echowarn("'pandoc' not installed!'")
+  else
+    augroup MARKDOWN_EXTRAS_PANDOC_ERROR
+      autocmd!
+      autocmd FileType markdown ++once {
+          utils.Echowarn("'pandoc' not installed!'")
+      }
+    augroup END
+  endif
 endif
+
+g:markdown_extras_loaded = true