From a1a7a1b5106b101a1a0f5ee9e0e90cbe6050bfd1 Mon Sep 17 00:00:00 2001
From: mitermayer <mitermayer.reis@gmail.com>
Date: Tue, 5 Sep 2017 20:37:17 -0700
Subject: Adding support for prettier configuration

---
 README.md             | 3 +++
 autoload/prettier.vim | 2 ++
 doc/prettier.txt      | 3 +++
 plugin/prettier.vim   | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/README.md b/README.md
index 92c3c06..db89d1f 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,9 @@ g:prettier#config#trailing_comma = 'all'
 
 " flow|babylon|typescript|postcss|json|graphql
 g:prettier#config#parser = 'flow'
+
+" cli-override|file-override|prefer-file
+g:prettier#config#config_precedence = 'prefer-file'
 ```
 
 ### REQUIREMENT(S)
diff --git a/autoload/prettier.vim b/autoload/prettier.vim
index 8982911..7d6eb08 100644
--- a/autoload/prettier.vim
+++ b/autoload/prettier.vim
@@ -190,6 +190,8 @@ function! s:Get_Prettier_Exec_Args(config) abort
           \ get(a:config, 'trailingComma', g:prettier#config#trailing_comma) .
           \ ' --parser ' .
           \ get(a:config, 'parser', g:prettier#config#parser) .
+          \ ' --config-precedence ' .
+          \ get(a:config, 'configPrecedence', g:prettier#config#config_precedence) .
           \ ' --stdin '
   return cmd
 endfunction
diff --git a/doc/prettier.txt b/doc/prettier.txt
index 9a0f209..dd81f0c 100644
--- a/doc/prettier.txt
+++ b/doc/prettier.txt
@@ -123,6 +123,9 @@ However they can be configured by:
 
   " flow|babylon|typescript|postcss|json|graphql
   g:prettier#config#parser = 'flow'
+
+  " cli-override|file-override|prefer-file
+  g:prettier#config#config_precedence = 'prefer-file'
 <
 ==============================================================================
 REQUIREMENT(S)                                      *vim-prettier-requirements*
diff --git a/plugin/prettier.vim b/plugin/prettier.vim
index f6cb7c8..7888309 100644
--- a/plugin/prettier.vim
+++ b/plugin/prettier.vim
@@ -54,6 +54,9 @@ let g:prettier#config#trailing_comma = get(g:,'prettier#config#trailing_comma',
 " flow|babylon|typescript|postcss|json|graphql
 let g:prettier#config#parser = get(g:,'prettier#config#parser', 'flow')
 
+" cli-override|file-override|prefer-file
+let g:prettier#config#config_precedence = get(g:, 'prettier#config#config_precedence', 'prefer-file')
+
 " synchronous by default
 command! -nargs=? -range=% Prettier call prettier#Prettier(g:prettier#exec_cmd_async, <line1>, <line2>)
 
-- 
cgit v1.3