mirror of
https://github.com/SpaceVim/SpaceVim.git
synced 2025-02-02 22:40:06 +08:00
Fix java_formatter_jar layer option
close https://github.com/SpaceVim/SpaceVim/issues/4076
This commit is contained in:
parent
c5b6a1446f
commit
8bd0d20a54
@ -19,7 +19,7 @@
|
|||||||
"
|
"
|
||||||
" 1. `format_on_save`: Enable/disabled code formatting when saving current file.
|
" 1. `format_on_save`: Enable/disabled code formatting when saving current file.
|
||||||
" Disabled by default.
|
" 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.
|
" 3. `java_file_head`: The default file header for new java file.
|
||||||
" by default it is:
|
" by default it is:
|
||||||
" >
|
" >
|
||||||
@ -109,12 +109,12 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
if exists('s:java_fomatter_jar')
|
if exists('s:java_formatter_jar')
|
||||||
finish
|
finish
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
let s:java_fomatter_jar = ''
|
let s:java_formatter_jar = ''
|
||||||
let s:format_on_save = 0
|
let s:format_on_save = 0
|
||||||
let s:java_file_head = [
|
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_enabled_java = get(g:, 'neoformat_enabled_java', ['googlefmt'])
|
||||||
let g:neoformat_java_googlefmt = {
|
let g:neoformat_java_googlefmt = {
|
||||||
\ 'exe': 'java',
|
\ 'exe': 'java',
|
||||||
\ 'args': ['-jar', s:java_fomatter_jar, '-'],
|
\ 'args': ['-jar', s:java_formatter_jar, '-'],
|
||||||
\ 'stdin': 1,
|
\ 'stdin': 1,
|
||||||
\ }
|
\ }
|
||||||
try
|
try
|
||||||
@ -325,6 +325,9 @@ function! SpaceVim#layers#lang#java#set_variable(var) abort
|
|||||||
\ 'java_interpreter',
|
\ 'java_interpreter',
|
||||||
\ s:java_interpreter
|
\ s:java_interpreter
|
||||||
\ )
|
\ )
|
||||||
|
let s:java_formatter_jar = get(a:var,
|
||||||
|
\ 'java_formatter_jar',
|
||||||
|
\ s:java_formatter_jar)
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
" vim:set et sw=2 cc=80:
|
" vim:set et sw=2 cc=80:
|
||||||
|
@ -2404,7 +2404,7 @@ LAYER OPTIONS
|
|||||||
|
|
||||||
1. `format_on_save`: Enable/disabled code formatting when saving current
|
1. `format_on_save`: Enable/disabled code formatting when saving current
|
||||||
file. Disabled by default.
|
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
|
3. `java_file_head`: The default file header for new java file. by default
|
||||||
it is:
|
it is:
|
||||||
|
|
||||||
|
@ -177,7 +177,7 @@ path of this jar file in layer option.
|
|||||||
```toml
|
```toml
|
||||||
[[layers]]
|
[[layers]]
|
||||||
name = 'lang#java'
|
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)
|
![format-java](https://user-images.githubusercontent.com/13142418/46323426-ccadde80-c620-11e8-9726-d99025f3bf76.gif)
|
||||||
|
@ -52,11 +52,11 @@ lang: zh
|
|||||||
name = 'lang#java'
|
name = 'lang#java'
|
||||||
format_on_save = true
|
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
|
```toml
|
||||||
[[layers]]
|
[[layers]]
|
||||||
name = 'lang#java'
|
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 文件时自动加入。
|
- `java_file_head`: 默认的文件头,当新建 Java 文件时自动加入。
|
||||||
```toml
|
```toml
|
||||||
@ -106,12 +106,12 @@ lang: zh
|
|||||||
默认的代码格式化快捷键是 `SPC b f`,该快捷键由 `format` 模块定义,同时也可以通过 `g =` 来对齐整个文档。
|
默认的代码格式化快捷键是 `SPC b f`,该快捷键由 `format` 模块定义,同时也可以通过 `g =` 来对齐整个文档。
|
||||||
|
|
||||||
为了使 format 模块支持 Java 文件,需要安装 [google's formater jar](https://github.com/google/google-java-format)。
|
为了使 format 模块支持 Java 文件,需要安装 [google's formater jar](https://github.com/google/google-java-format)。
|
||||||
同时,需要设置模块选项`java_fomatter_jar`:
|
同时,需要设置模块选项`java_formatter_jar`:
|
||||||
|
|
||||||
```toml
|
```toml
|
||||||
[[layers]]
|
[[layers]]
|
||||||
name = 'lang#java'
|
name = 'lang#java'
|
||||||
java_fomatter_jar = 'path/to/google-java-format.jar'
|
java_formatter_jar = 'path/to/google-java-format.jar'
|
||||||
```
|
```
|
||||||
|
|
||||||
### Maven
|
### Maven
|
||||||
|
@ -54,11 +54,11 @@ To use this configuration layer, update custom configuration file with:
|
|||||||
name = 'lang#java'
|
name = 'lang#java'
|
||||||
format_on_save = true
|
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
|
```toml
|
||||||
[[layers]]
|
[[layers]]
|
||||||
name = 'lang#java'
|
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:
|
- `java_file_head`: The default file header for new java file. by default it is:
|
||||||
```toml
|
```toml
|
||||||
@ -106,7 +106,7 @@ To use this configuration layer, update custom configuration file with:
|
|||||||
### Code formatting
|
### Code formatting
|
||||||
|
|
||||||
The default formater of java language is [google's formater jar](https://github.com/google/google-java-format).
|
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`.
|
The default key bindings for format current buffer is `SPC b f`.
|
||||||
And this key binding is defined in [`format`](../layers/format/) layer.
|
And this key binding is defined in [`format`](../layers/format/) layer.
|
||||||
|
Loading…
Reference in New Issue
Block a user