node

diff --git a/etc/vim/source/functions.vim b/etc/vim/source/functions.vim
index 526cd40fbd68911e310b010cabb845eb60a145a8..60371aea3b7f25b0b9b67448bd92eac495f3570f 100644 (file)
--- a/etc/vim/source/functions.vim
+++ b/etc/vim/source/functions.vim
@@ -80,7 +80,7 @@ func! FileInit(...)
        if (g:File['type'] == 'vim') || (g:File['type'] == 'vimrc')
                let g:File['c'] = '"'
 
-       elseif (g:File['type'] == 'javascript' || g:File['type'] == 'c')
+       elseif (g:File['type'] == 'javascript' || g:File['type'] == 'c' || g:File['ext'] == 'json')
                let g:File['c'] = '//'
 
        elseif (g:File['type'] == 'php')
@@ -121,8 +121,11 @@ func! FileInit(...)
        elseif (g:File['type'] == 'xml')
                let g:File['check'] = 'xmllint --noout'
 
-       elseif (g:File['type'] == 'javascript')
-               let g:File['check'] = "perl -MJSON -e 'JSON::from_json(join(qq||,<>))'"
+       elseif (g:File['type'] == 'javascript' || g:File['ext'] == 'json')
+               let g:File['check'] = "ruby -rjson -e 'puts JSON.parse(File.read(ARGV[0]))'"
+        if (filereadable('/usr/local/bin/node'))
+            let g:File['check'] = "/usr/local/bin/node --check"
+        end
 
        elseif (g:File['ext'] == 'erb')
                let g:File['check'] = 'sh -c "cat | erb -x - | ruby -c" <'
@@ -134,7 +137,7 @@ func! FileInit(...)
                let g:File['check'] = "perl -e 'system qq/puppet parser validate $ARGV[0] && puppet-lint --no-selector_inside_resource-check --no-autoloader_layout-check --no-hard_tabs-check --no-80chars-check $ARGV[0]/'"
 
        elseif (g:File['type'] == 'yaml')
-               let g:File['check'] = "perl -MYAML -e 'YAML::LoadFile($ARGV[0])'"
+               let g:File['check'] = "ruby -ryaml -e 'puts YAML.load_file(ARGV[0])'"
 
        elseif (g:File['type'] == 'sh')
                let g:File['check'] = 'bash -n'