From 8bd0d20a54778f59bc68d871b3057d95141d1351 Mon Sep 17 00:00:00 2001
From: Shidong Wang <wsdjeg@outlook.com>
Date: Tue, 9 Feb 2021 12:24:19 +0800
Subject: [PATCH] Fix java_formatter_jar layer option

close https://github.com/SpaceVim/SpaceVim/issues/4076
---
 autoload/SpaceVim/layers/lang/java.vim          | 11 +++++++----
 doc/SpaceVim.txt                                |  2 +-
 docs/_posts/2017-02-11-use-vim-as-a-java-ide.md |  2 +-
 docs/cn/layers/lang/java.md                     |  8 ++++----
 docs/layers/lang/java.md                        |  6 +++---
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/autoload/SpaceVim/layers/lang/java.vim b/autoload/SpaceVim/layers/lang/java.vim
index 1a936a97c..c9703e46d 100644
--- a/autoload/SpaceVim/layers/lang/java.vim
+++ b/autoload/SpaceVim/layers/lang/java.vim
@@ -19,7 +19,7 @@
 "
 " 1. `format_on_save`: Enable/disabled code formatting when saving current file.
 "   Disabled by default.
-" 2. `java_fomatter_jar`: Set the full path of google's java formatter jar.
+" 2. `java_formatter_jar`: Set the full path of google's java formatter jar.
 " 3. `java_file_head`: The default file header for new java file.
 "   by default it is: 
 " >
@@ -109,12 +109,12 @@
 
 
 
-if exists('s:java_fomatter_jar')
+if exists('s:java_formatter_jar')
   finish
 endif
 
 
-let s:java_fomatter_jar = ''
+let s:java_formatter_jar = ''
 let s:format_on_save = 0
 let s:java_file_head = [
       \ '/**',
@@ -157,7 +157,7 @@ function! SpaceVim#layers#lang#java#config() abort
   let g:neoformat_enabled_java = get(g:, 'neoformat_enabled_java', ['googlefmt'])
   let g:neoformat_java_googlefmt = {
         \ 'exe': 'java',
-        \ 'args': ['-jar', s:java_fomatter_jar, '-'],
+        \ 'args': ['-jar', s:java_formatter_jar, '-'],
         \ 'stdin': 1,
         \ }
   try
@@ -325,6 +325,9 @@ function! SpaceVim#layers#lang#java#set_variable(var) abort
         \ 'java_interpreter',
         \ s:java_interpreter
         \ )
+  let s:java_formatter_jar = get(a:var,
+        \ 'java_formatter_jar',
+        \ s:java_formatter_jar)
 endfunction
 
 " vim:set et sw=2 cc=80:
diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt
index 54124fc96..fc5f04a01 100644
--- a/doc/SpaceVim.txt
+++ b/doc/SpaceVim.txt
@@ -2404,7 +2404,7 @@ LAYER OPTIONS
 
   1. `format_on_save`: Enable/disabled code formatting when saving current
     file. Disabled by default.
-  2. `java_fomatter_jar`: Set the full path of google's java formatter jar.
+  2. `java_formatter_jar`: Set the full path of google's java formatter jar.
   3. `java_file_head`: The default file header for new java file. by default
     it is:
 
diff --git a/docs/_posts/2017-02-11-use-vim-as-a-java-ide.md b/docs/_posts/2017-02-11-use-vim-as-a-java-ide.md
index 2834984fa..980c4f556 100644
--- a/docs/_posts/2017-02-11-use-vim-as-a-java-ide.md
+++ b/docs/_posts/2017-02-11-use-vim-as-a-java-ide.md
@@ -177,7 +177,7 @@ path of this jar file in layer option.
 ```toml
 [[layers]]
   name = 'lang#java'
-  java_fomatter_jar = 'path/to/google-java-format.jar'
+  java_formatter_jar = 'path/to/google-java-format.jar'
 ```
 
 ![format-java](https://user-images.githubusercontent.com/13142418/46323426-ccadde80-c620-11e8-9726-d99025f3bf76.gif)
diff --git a/docs/cn/layers/lang/java.md b/docs/cn/layers/lang/java.md
index 3c1431322..072f3c71d 100644
--- a/docs/cn/layers/lang/java.md
+++ b/docs/cn/layers/lang/java.md
@@ -52,11 +52,11 @@ lang: zh
     name = 'lang#java'
     format_on_save = true
   ```
-- `java_fomatter_jar`: 设置 [谷歌格式化工具](https://github.com/google/google-java-format) 的具体路径。
+- `java_formatter_jar`: 设置 [谷歌格式化工具](https://github.com/google/google-java-format) 的具体路径。
   ```toml
   [[layers]]
     name = 'lang#java'
-    java_fomatter_jar = 'path/to/google-java-format.jar'
+    java_formatter_jar = 'path/to/google-java-format.jar'
   ```
 - `java_file_head`: 默认的文件头，当新建 Java 文件时自动加入。
   ```toml
@@ -106,12 +106,12 @@ lang: zh
 默认的代码格式化快捷键是 `SPC b f`，该快捷键由 `format` 模块定义，同时也可以通过 `g =` 来对齐整个文档。
 
 为了使 format 模块支持 Java 文件，需要安装  [google's formater jar](https://github.com/google/google-java-format)。
-同时，需要设置模块选项`java_fomatter_jar`：
+同时，需要设置模块选项`java_formatter_jar`：
 
 ```toml
 [[layers]]
   name = 'lang#java'
-  java_fomatter_jar = 'path/to/google-java-format.jar'
+  java_formatter_jar = 'path/to/google-java-format.jar'
 ```
 
 ### Maven
diff --git a/docs/layers/lang/java.md b/docs/layers/lang/java.md
index d96d3b538..dd7516d4a 100644
--- a/docs/layers/lang/java.md
+++ b/docs/layers/lang/java.md
@@ -54,11 +54,11 @@ To use this configuration layer, update custom configuration file with:
     name = 'lang#java'
     format_on_save = true
   ```
-- `java_fomatter_jar`: Set the full path of [google's formater jar](https://github.com/google/google-java-format).
+- `java_formatter_jar`: Set the full path of [google's formater jar](https://github.com/google/google-java-format).
   ```toml
   [[layers]]
     name = 'lang#java'
-    java_fomatter_jar = 'path/to/google-java-format.jar'
+    java_formatter_jar = 'path/to/google-java-format.jar'
   ```
 - `java_file_head`: The default file header for new java file. by default it is:
   ```toml
@@ -106,7 +106,7 @@ To use this configuration layer, update custom configuration file with:
 ### Code formatting
 
 The default formater of java language is [google's formater jar](https://github.com/google/google-java-format).
-You need to download the jar and set the `java_fomatter_jar` layer option.
+You need to download the jar and set the `java_formatter_jar` layer option.
 
 The default key bindings for format current buffer is `SPC b f`.
 And this key binding is defined in [`format`](../layers/format/) layer.