Merge pull request #118 from tyru/devel

v1.1

appveyor.yml → .appveyor.yml

@@ -3,7 +3,6 @@ clone_depth: 10
 
 environment:
   matrix:
-    - VIM_URL: http://vim-jp.org/redirects/koron/vim-kaoriya/vim74/oldest/win64/
     - VIM_URL: http://vim-jp.org/redirects/koron/vim-kaoriya/vim80/oldest/win64/
     - VIM_URL: http://vim-jp.org/redirects/koron/vim-kaoriya/latest/win64/
     # To test with latest official Vim binary, uncomment below line.
@@ -18,16 +17,18 @@ install:
       [Reflection.Assembly]::LoadWithPartialName('System.IO.Compression.FileSystem') > $null
       [System.IO.Compression.ZipFile]::ExtractToDirectory($zip, $vim)
       $Env:THEMIS_VIM = $vim + (Get-ChildItem $vim).Name + '\vim.exe'
-  # themis
-  - 'git -c advice.detachedHead=false clone https://github.com/thinca/vim-themis --quiet --branch v1.5.1 --single-branch --depth 1 %TEMP%\vim-themis'
-  # vmock
-  - 'git -c advice.detachedHead=false clone https://github.com/kannokanno/vmock --quiet --single-branch --depth 1 %TEMP%\vmock'
+  # test dependencies
+  - 'git -c advice.detachedHead=false clone https://github.com/MaxMEllon/vim-jsx-pretty --quiet --single-branch --depth 1 %TEMP%\vim-jsx-pretty'
+  - 'git -c advice.detachedHead=false --git-dir=%TEMP%\vim-jsx-pretty\.git checkout 05f9953fcaccc18a8f5c1ee9db06ac2b26662347'
+  - 'git -c advice.detachedHead=false clone https://github.com/Shougo/context_filetype.vim --quiet --single-branch --depth 1 %TEMP%\context_filetype'
+  - 'git -c advice.detachedHead=false --git-dir=%TEMP%\context_filetype\.git checkout f200fe69939089da9e61bd9a3ff75b4ef7adc708'
+  - 'git -c advice.detachedHead=false clone https://github.com/thinca/vim-themis --quiet --branch v1.5.4 --single-branch --depth 1 %TEMP%\vim-themis'
   # https://groups.google.com/forum/#!msg/vim_dev/3AkHqiD1NLE/vFw52yh_AAAJ
   - 'reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7-32 /s /reg:32'
   - 'reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7-32 /s /reg:64'
 build: off
 test_script:
   - ps: |
       & $Env:THEMIS_VIM --version
-      & $Env:TEMP\vim-themis\bin\themis.bat -r --runtimepath $Env:TEMP\vmock --reporter dot
+      & $Env:TEMP\vim-themis\bin\themis.bat -r --runtimepath $Env:TEMP\vim-jsx-pretty --runtimepath $Env:TEMP\context_filetype --reporter dot
 deploy: off

.travis.yml

@@ -5,14 +5,10 @@ git:
 
 matrix:
   include:
-    - os: linux
-      env:
-        - VIM_VERSION=v7.4
-        - RUN_VINT=true
     - os: linux
       env:
         - VIM_VERSION=v8.0.0000
-        - RUN_VINT=true
+        - RUN_VINT=false
     - os: linux
       env:
         - VIM_VERSION=master
@@ -27,10 +23,11 @@ matrix:
         - brew cleanup
 
 before_script:
-  - git clone --depth 1 --single-branch https://github.com/syngan/vim-vimlint /tmp/vim-vimlint
-  - git clone --depth 1 --single-branch https://github.com/ynkdir/vim-vimlparser /tmp/vim-vimlparser
-  - git clone --depth 1 --single-branch https://github.com/kannokanno/vmock /tmp/vmock
-  - git clone --depth 1 --single-branch --branch v1.5.2.1 https://github.com/thinca/vim-themis /tmp/vim-themis
+  - git -c advice.detachedHead=false clone https://github.com/MaxMEllon/vim-jsx-pretty --quiet --single-branch --depth 1 /tmp/vim-jsx-pretty
+  - git -c advice.detachedHead=false --git-dir=/tmp/vim-jsx-pretty/.git checkout 05f9953fcaccc18a8f5c1ee9db06ac2b26662347
+  - git -c advice.detachedHead=false clone https://github.com/Shougo/context_filetype.vim --quiet --single-branch --depth 1 /tmp/context_filetype
+  - git -c advice.detachedHead=false --git-dir=/tmp/context_filetype/.git checkout f200fe69939089da9e61bd9a3ff75b4ef7adc708
+  - git -c advice.detachedHead=false clone https://github.com/thinca/vim-themis --quiet --branch v1.5.4 --single-branch --depth 1 /tmp/vim-themis
 
 addons:
   homebrew:
@@ -51,7 +48,7 @@ script:
   - git clean -f
   - if [ "$RUN_VINT" ]; then python --version; fi
   - if [ "$RUN_VINT" ]; then vint autoload plugin macros after; fi
-  - /tmp/vim-themis/bin/themis -r --runtimepath /tmp/vmock --reporter dot
+  - /tmp/vim-themis/bin/themis -r --runtimepath /tmp/vim-jsx-pretty --runtimepath /tmp/context_filetype --reporter dot
   # check if both macros/generate-ftplugins.vim and after/ftplugin/ are updated
   - git clean -f
   - rm -rf after/ftplugin/

after/ftplugin/aap/caw.vim

@@ -1,19 +1,15 @@
 " vim:foldmethod=marker:fen:
 scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
 
 let b:caw_oneline_comment = '#'
 let b:caw_wrap_oneline_comment = ['/*', '*/']
 
 if !exists('b:did_caw_ftplugin')
-    if exists('b:undo_ftplugin')
-        let b:undo_ftplugin .= ' | '
-    else
-        let b:undo_ftplugin = ''
-    endif
-    let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
-    let b:did_caw_ftplugin = 1
+  if exists('b:undo_ftplugin')
+    let b:undo_ftplugin .= ' | '
+  else
+    let b:undo_ftplugin = ''
+  endif
+  let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
+  let b:did_caw_ftplugin = 1
 endif
-
-let &cpo = s:save_cpo

after/ftplugin/abc/caw.vim

@@ -1,18 +1,14 @@
 " vim:foldmethod=marker:fen:
 scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
 
 let b:caw_oneline_comment = '%'
 
 if !exists('b:did_caw_ftplugin')
-    if exists('b:undo_ftplugin')
-        let b:undo_ftplugin .= ' | '
-    else
-        let b:undo_ftplugin = ''
-    endif
-    let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
-    let b:did_caw_ftplugin = 1
+  if exists('b:undo_ftplugin')
+    let b:undo_ftplugin .= ' | '
+  else
+    let b:undo_ftplugin = ''
+  endif
+  let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
+  let b:did_caw_ftplugin = 1
 endif
-
-let &cpo = s:save_cpo

after/ftplugin/acedb/caw.vim

@@ -1,18 +1,14 @@
 " vim:foldmethod=marker:fen:
 scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
 
 let b:caw_oneline_comment = '//'
 
 if !exists('b:did_caw_ftplugin')
-    if exists('b:undo_ftplugin')
-        let b:undo_ftplugin .= ' | '
-    else
-        let b:undo_ftplugin = ''
-    endif
-    let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
-    let b:did_caw_ftplugin = 1
+  if exists('b:undo_ftplugin')
+    let b:undo_ftplugin .= ' | '
+  else
+    let b:undo_ftplugin = ''
+  endif
+  let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
+  let b:did_caw_ftplugin = 1
 endif
-
-let &cpo = s:save_cpo

after/ftplugin/actionscript/caw.vim

@@ -1,19 +1,15 @@
 " vim:foldmethod=marker:fen:
 scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
 
 let b:caw_oneline_comment = '//'
 let b:caw_wrap_oneline_comment = ['/*', '*/']
 
 if !exists('b:did_caw_ftplugin')
-    if exists('b:undo_ftplugin')
-        let b:undo_ftplugin .= ' | '
-    else
-        let b:undo_ftplugin = ''
-    endif
-    let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
-    let b:did_caw_ftplugin = 1
+  if exists('b:undo_ftplugin')
+    let b:undo_ftplugin .= ' | '
+  else
+    let b:undo_ftplugin = ''
+  endif
+  let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
+  let b:did_caw_ftplugin = 1
 endif
-
-let &cpo = s:save_cpo

after/ftplugin/ada/caw.vim

@@ -1,18 +1,14 @@
 " vim:foldmethod=marker:fen:
 scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
 
 let b:caw_oneline_comment = '--'
 
 if !exists('b:did_caw_ftplugin')
-    if exists('b:undo_ftplugin')
-        let b:undo_ftplugin .= ' | '
-    else
-        let b:undo_ftplugin = ''
-    endif
-    let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
-    let b:did_caw_ftplugin = 1
+  if exists('b:undo_ftplugin')
+    let b:undo_ftplugin .= ' | '
+  else
+    let b:undo_ftplugin = ''
+  endif
+  let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
+  let b:did_caw_ftplugin = 1
 endif
-
-let &cpo = s:save_cpo

after/ftplugin/ahdl/caw.vim

@@ -1,18 +1,14 @@
 " vim:foldmethod=marker:fen:
 scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
 
 let b:caw_oneline_comment = '--'
 
 if !exists('b:did_caw_ftplugin')
-    if exists('b:undo_ftplugin')
-        let b:undo_ftplugin .= ' | '
-    else
-        let b:undo_ftplugin = ''
-    endif
-    let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
-    let b:did_caw_ftplugin = 1
+  if exists('b:undo_ftplugin')
+    let b:undo_ftplugin .= ' | '
+  else
+    let b:undo_ftplugin = ''
+  endif
+  let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
+  let b:did_caw_ftplugin = 1
 endif
-
-let &cpo = s:save_cpo

after/ftplugin/ahk/caw.vim

@@ -1,19 +1,15 @@
 " vim:foldmethod=marker:fen:
 scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
 
 let b:caw_oneline_comment = ';'
 let b:caw_wrap_oneline_comment = ['/*', '*/']
 
 if !exists('b:did_caw_ftplugin')
-    if exists('b:undo_ftplugin')
-        let b:undo_ftplugin .= ' | '
-    else
-        let b:undo_ftplugin = ''
-    endif
-    let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
-    let b:did_caw_ftplugin = 1
+  if exists('b:undo_ftplugin')
+    let b:undo_ftplugin .= ' | '
+  else
+    let b:undo_ftplugin = ''
+  endif
+  let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
+  let b:did_caw_ftplugin = 1
 endif
-
-let &cpo = s:save_cpo

after/ftplugin/amiga/caw.vim

@@ -1,18 +1,14 @@
 " vim:foldmethod=marker:fen:
 scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
 
 let b:caw_oneline_comment = ';'
 
 if !exists('b:did_caw_ftplugin')
-    if exists('b:undo_ftplugin')
-        let b:undo_ftplugin .= ' | '
-    else
-        let b:undo_ftplugin = ''
-    endif
-    let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
-    let b:did_caw_ftplugin = 1
+  if exists('b:undo_ftplugin')
+    let b:undo_ftplugin .= ' | '
+  else
+    let b:undo_ftplugin = ''
+  endif
+  let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
+  let b:did_caw_ftplugin = 1
 endif
-
-let &cpo = s:save_cpo

after/ftplugin/aml/caw.vim

@@ -1,18 +1,14 @@
 " vim:foldmethod=marker:fen:
 scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
 
 let b:caw_oneline_comment = '/*'
 
 if !exists('b:did_caw_ftplugin')
-    if exists('b:undo_ftplugin')
-        let b:undo_ftplugin .= ' | '
-    else
-        let b:undo_ftplugin = ''
-    endif
-    let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
-    let b:did_caw_ftplugin = 1
+  if exists('b:undo_ftplugin')
+    let b:undo_ftplugin .= ' | '
+  else
+    let b:undo_ftplugin = ''
+  endif
+  let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
+  let b:did_caw_ftplugin = 1
 endif
-
-let &cpo = s:save_cpo

after/ftplugin/ampl/caw.vim

@@ -1,18 +1,14 @@
 " vim:foldmethod=marker:fen:
 scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
 
 let b:caw_oneline_comment = '#'
 
 if !exists('b:did_caw_ftplugin')
-    if exists('b:undo_ftplugin')
-        let b:undo_ftplugin .= ' | '
-    else
-        let b:undo_ftplugin = ''
-    endif
-    let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
-    let b:did_caw_ftplugin = 1
+  if exists('b:undo_ftplugin')
+    let b:undo_ftplugin .= ' | '
+  else
+    let b:undo_ftplugin = ''
+  endif
+  let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
+  let b:did_caw_ftplugin = 1
 endif
-
-let &cpo = s:save_cpo

after/ftplugin/apache/caw.vim

@@ -1,18 +1,14 @@
 " vim:foldmethod=marker:fen:
 scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
 
 let b:caw_oneline_comment = '#'
 
 if !exists('b:did_caw_ftplugin')
-    if exists('b:undo_ftplugin')
-        let b:undo_ftplugin .= ' | '
-    else
-        let b:undo_ftplugin = ''
-    endif
-    let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
-    let b:did_caw_ftplugin = 1
+  if exists('b:undo_ftplugin')
+    let b:undo_ftplugin .= ' | '
+  else
+    let b:undo_ftplugin = ''
+  endif
+  let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
+  let b:did_caw_ftplugin = 1
 endif
-
-let &cpo = s:save_cpo

after/ftplugin/apachestyle/caw.vim

@@ -1,18 +1,14 @@
 " vim:foldmethod=marker:fen:
 scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
 
 let b:caw_oneline_comment = '#'
 
 if !exists('b:did_caw_ftplugin')
-    if exists('b:undo_ftplugin')
-        let b:undo_ftplugin .= ' | '
-    else
-        let b:undo_ftplugin = ''
-    endif
-    let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
-    let b:did_caw_ftplugin = 1
+  if exists('b:undo_ftplugin')
+    let b:undo_ftplugin .= ' | '
+  else
+    let b:undo_ftplugin = ''
+  endif
+  let b:undo_ftplugin .= 'unlet! b:caw_oneline_comment b:caw_wrap_oneline_comment b:caw_wrap_multiline_comment b:did_caw_ftplugin'
+  let b:did_caw_ftplugin = 1
 endif
-
-let &cpo = s:save_cpo