Release/1.x

.travis.yml

@@ -1,8 +1,17 @@
 ---
 language: python
-python:
-  - "3.6"
-install: 
-  - pip install vim-vint
+
+cache:
+  yarn: true
+  directories:
+    - node_modules
+
+services:
+  - docker
+
+before_install: 
+  - docker pull mitermayer/vim-test-bed
+  - yarn install
+
 script: 
-  - vint .
+  - make lint test

Dockerfile

@@ -0,0 +1,59 @@
+FROM alpine:3.8 as builder
+
+WORKDIR /tmp
+
+RUN apk add --no-cache \
+  build-base \
+  ctags \
+  git \
+  libx11-dev \
+  libxpm-dev \
+  libxt-dev \
+  libxtst-dev \
+  make \
+  ncurses-dev \
+  python3 \
+  python3-dev \
+  perl-dev \
+  ruby-dev
+
+RUN git clone https://github.com/vim/vim && cd vim \
+  && ./configure \
+  --with-features=huge \
+  --with-x \
+  [email protected] \
+  && make install
+
+FROM testbed/vim:latest
+
+COPY --from=builder /usr/local/bin /usr/local/bin
+COPY --from=builder /usr/local/share/vim  /usr/local/share/vim
+
+# install pip
+ENV PACKAGES="\
+    bash \
+    git \
+    python \
+    py-pip \
+    nodejs \
+    npm \
+    libxt \
+    libx11 \
+"
+
+RUN apk --update add $PACKAGES && \
+    rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
+
+#  install supported vim8 and neovim
+RUN install_vim -tag v7.4.052 -name vim7 -build \
+                -tag v8.1.0519 -name vim8 -build \
+                -tag neovim:v0.3.5 -name neovim -build
+
+# upgrade node and yarn
+RUN npm install -g npm yarn
+
+# copy vimrc 
+ADD tests/vimrc /root/.vimrc
+
+# install vint
+RUN pip install typing>=4.6.2 pathlib==1.0.1 enum34>=1.0.4 vim-vint==0.3.19

Makefile

@@ -0,0 +1,53 @@
+NAME=vim-prettier
+
+VERSION=1.0.0-alpha
+
+build: 
+	docker build -t mitermayer/vim-test-bed .
+
+test:
+	echo "Running tests..."
+	docker run \
+		-t \
+		--rm \
+		-v ${PWD}:/testplugin \
+		-v ${PWD}/tests:/home \
+		"mitermayer/vim-test-bed" \
+		yarn --cwd testplugin test
+
+lint:
+	echo "Running linter..."
+	docker run \
+		-t \
+		--rm \
+		-v ${PWD}:/testplugin \
+		-v ${PWD}/tests:/home \
+		"mitermayer/vim-test-bed" \
+		yarn --cwd testplugin lint
+
+tag:
+	git tag $(VERSION)
+
+chroot:
+	docker run \
+		-it \
+		-v ${PWD}:/testplugin \
+		-v ${PWD}/tests:/home \
+		"mitermayer/vim-test-bed" \
+		bash
+
+run:
+	docker run \
+		-it \
+		-v ${PWD}:/testplugin \
+		-v ${PWD}/tests:/home \
+		"mitermayer/vim-test-bed" \
+		${VIM_VERSION} -u /home/vimrc
+
+changelog:
+	docker run -it --rm -v "${PWD}":/usr/local/src/your-app ferrarimarco/github-changelog-generator -u prettier -p vim-prettier -t ${GITHUB_REPO_READ_TOKEN}
+
+release:
+	git push --tags
+
+.PHONY: build test lint tag chroot run changelog release

README.md

@@ -9,37 +9,13 @@ settings.
 
 If you have feature request and/or suggestions please comment on issue [1.0 release](https://github.com/prettier/vim-prettier/issues/126)
 
-If you want to try out the `release/1.x` branch feel free to add this to your `.vimrc`
-
-```vim
-Plug 'prettier/vim-prettier', {
-  \ 'do': 'yarn install',
-  \ 'branch': 'release/1.x',
-  \ 'for': [
-    \ 'javascript',
-    \ 'typescript',
-    \ 'css',
-    \ 'less',
-    \ 'scss',
-    \ 'json',
-    \ 'graphql',
-    \ 'markdown',
-    \ 'vue',
-    \ 'lua',
-    \ 'php',
-    \ 'python',
-    \ 'ruby',
-    \ 'html',
-    \ 'swift' ] }
-```
-
 ---
 
 By default it will auto format **javascript**, **typescript**, **less**,
 **scss**, **css**, **json**, **graphql** and **markdown** files if they
 have/support the "@format" pragma annotation in the header of the file.
 
-![vim-prettier](/media/vim-prettier.gif?raw=true 'vim-prettier')
+![vim-prettier](/media/vim-prettier.gif?raw=true "vim-prettier")
 
 ### INSTALL
 
@@ -56,7 +32,7 @@ Plug 'prettier/vim-prettier', {
 or simply enable for all formats by:
 
 ```vim
-" post install (yarn install | npm install)
+" post install (yarn install | npm install) then load plugin only for editing supported files
 Plug 'prettier/vim-prettier', { 'do': 'yarn install' }
 ```
 
@@ -103,6 +79,22 @@ If your are on vim 8+ you can also trigger async formatting by:
 :PrettierAsync
 ```
 
+You can send to prettier your entire buffer but ensure that it formats only your selection.
+
+**note: ** differs from `:PrettierFragment` by sending the entire buffer to prettier, allowing identation level to be preserved, but it requires the whole file to be valid.
+
+```vim
+:PrettierPartial
+```
+
+You can send to prettier your current selection as a fragment of same type as the file being edited.
+
+**note: ** differs from `:PrettierFragment` by sending only the current selection to prettier, this allows for faster formatting but wont preserve indentation.
+
+```vim
+:PrettierFragment
+```
+
 You can check what is the `vim-prettier` plugin version by:
 
 ```vim
@@ -135,10 +127,22 @@ Change the mapping to run from the default of `<Leader>p`
 nmap <Leader>py <Plug>(Prettier)
 ```
 
-Disable auto formatting of files that have "@format" tag
+Enable auto formatting of files that have "@format" or "@prettier" tag
+
+```vim
+let g:prettier#autoformat = 1
+```
+
+Toggle the `g:prettier#autoformat` setting based on whether a config file can be found in the current directory or any parent directory.  Note that this will override the `g:prettier#autoformat` setting!
 
 ```vim
-let g:prettier#autoformat = 0
+let g:prettier#autoformat_config_present = 1
+```
+
+A list containing all config file names to search for when using the `g:prettier#autoformat_config_present` option.
+
+```vim
+let g:prettier#autoformat_config_files = [...]
 ```
 
 Set the prettier CLI executable path
@@ -159,26 +163,31 @@ By default parsing errors will open the quickfix but can also be disabled
 let g:prettier#quickfix_enabled = 0
 ```
 
+By default selection formatting will be running `:PrettierFragment` but we can set
+`:PrettierPartial` as the default selection formatting by:
+
+```vim
+let g:prettier#partial_format=1
+```
+
 By default we auto focus on the quickfix when there are errors but can also be disabled
 
 ```vim
 let g:prettier#quickfix_auto_focus = 0
 ```
 
-To enable vim-prettier to run in files without requiring the "@format" doc tag.
-First disable the default autoformat, then update to your own custom behaviour
+To enable vim-prettier to auto run in files without requiring the "@format" or "@prettier" doc tag.
+First ensure that `g:prettier#autoformat` is not enabled on your `vimrc` (it should be disabled by default), then update to your own custom behaviour
 
 Running before saving sync:
 
 ```vim
-let g:prettier#autoformat = 0
 autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml,*.html Prettier
 ```
 
 Running before saving async (vim 8+):
 
 ```vim
-let g:prettier#autoformat = 0
 autocmd BufWritePre *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml,*.html PrettierAsync
 ```
 
@@ -188,7 +197,6 @@ Running before saving, changing text or leaving insert mode:
 " when running at every change you may want to disable quickfix
 let g:prettier#quickfix_enabled = 0
 
-let g:prettier#autoformat = 0
 autocmd BufWritePre,TextChanged,InsertLeave *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.less,*.scss,*.json,*.graphql,*.md,*.vue,*.yaml,*.html PrettierAsync
 ```
 
@@ -198,54 +206,40 @@ autocmd BufWritePre,TextChanged,InsertLeave *.js,*.jsx,*.mjs,*.ts,*.tsx,*.css,*.
 However they can be configured by:
 
 ```vim
-" max line length that prettier will wrap on
-" Prettier default: 80
-let g:prettier#config#print_width = 80
-
-" number of spaces per indentation level
-" Prettier default: 2
-let g:prettier#config#tab_width = 2
-
-" use tabs over spaces
-" Prettier default: false
-let g:prettier#config#use_tabs = 'false'
-
-" print semicolons
-" Prettier default: true
-let g:prettier#config#semi = 'true'
+" Max line length that prettier will wrap on: a number or 'auto' (use
+" textwidth).
+" default: 'auto'
+let g:prettier#config#print_width = 'auto'
 
-" single quotes over double quotes
-" Prettier default: false
-let g:prettier#config#single_quote = 'true'
+" number of spaces per indentation level: a number or 'auto' (use
+" softtabstop)
+" default: 'auto'
+let g:prettier#config#tab_width = 'auto'
 
-" print spaces between brackets
-" Prettier default: true
-let g:prettier#config#bracket_spacing = 'false'
+" use tabs instead of spaces: true, false, or auto (use the expandtab setting).
+" default: 'auto'
+let g:prettier#config#use_tabs = 'auto'
 
-" put > on the last line instead of new line
-" Prettier default: false
-let g:prettier#config#jsx_bracket_same_line = 'true'
-
-" avoid|always
-" Prettier default: avoid
-let g:prettier#config#arrow_parens = 'always'
-
-" none|es5|all
-" Prettier default: none
-let g:prettier#config#trailing_comma = 'all'
-
-" flow|babylon|typescript|css|less|scss|json|graphql|markdown
-" Prettier default: babylon
-let g:prettier#config#parser = 'flow'
+" flow|babylon|typescript|css|less|scss|json|graphql|markdown or empty string
+" (let prettier choose).
+" default: ''
+let g:prettier#config#parser = ''
 
 " cli-override|file-override|prefer-file
-let g:prettier#config#config_precedence = 'prefer-file'
+" default: 'file-override'
+let g:prettier#config#config_precedence = 'file-override'
 
 " always|never|preserve
+" default: 'preserve'
 let g:prettier#config#prose_wrap = 'preserve'
 
 " css|strict|ignore
+" default: 'css'
 let g:prettier#config#html_whitespace_sensitivity = 'css'
+
+" false|true
+" default: 'false'
+let g:prettier#config#require_pragma = 'false'
 ```
 
 ### REQUIREMENT(S)