5 files changed, 42 insertions, 0 deletions
diff --git a/autoload/ale/fix/registry.vim b/autoload/ale/fix/registry.vim
index 76cce87f..98f52232 100644
--- a/autoload/ale/fix/registry.vim
+++ b/autoload/ale/fix/registry.vim
@@ -250,6 +250,11 @@ let s:default_registry = {
 \       'suggested_filetypes': ['c', 'cpp', 'cs', 'objc', 'objcpp', 'd', 'java', 'p', 'vala' ],
 \       'description': 'Fix C, C++, C#, ObjectiveC, ObjectiveC++, D, Java, Pawn, and VALA files with uncrustify.',
 \   },
+\   'terraform': {
+\       'function': 'ale#fixers#terraform#Fix',
+\       'suggested_filetypes': ['hcl', 'terraform'],
+\       'description': 'Fix tf and hcl files with terraform fmt.',
+\   },
 \}
 
 " Reset the function registry to the default entries.
diff --git a/autoload/ale/fixers/terraform.vim b/autoload/ale/fixers/terraform.vim
new file mode 100644
index 00000000..bc05380a
--- /dev/null
+++ b/autoload/ale/fixers/terraform.vim
@@ -0,0 +1,17 @@
+" Author: dsifford <dereksifford@gmail.com>
+" Description: Fixer for terraform and .hcl files
+
+call ale#Set('terraform_fmt_executable', 'terraform')
+call ale#Set('terraform_fmt_options', '')
+
+function! ale#fixers#terraform#Fix(buffer) abort
+    let l:executable = ale#Var(a:buffer, 'terraform_fmt_executable')
+    let l:options = ale#Var(a:buffer, 'terraform_fmt_options')
+
+    return {
+    \   'command': ale#Escape(l:executable)
+    \       . ' fmt'
+    \       . (empty(l:options) ? '' : ' ' . l:options)
+    \       . ' -'
+    \}
+endfunction
diff --git a/autoload/ale/linter.vim b/autoload/ale/linter.vim
index 06bc5e80..0279c0b1 100644
--- a/autoload/ale/linter.vim
+++ b/autoload/ale/linter.vim
@@ -255,6 +255,14 @@ function! ale#linter#PreProcess(filetype, linter) abort
         elseif has_key(a:linter, 'initialization_options')
             let l:obj.initialization_options = a:linter.initialization_options
         endif
+
+        if has_key(a:linter, 'lsp_config')
+            if type(a:linter.lsp_config) isnot v:t_dict
+                throw '`lsp_config` must be a Dictionary'
+            endif
+
+            let l:obj.lsp_config = a:linter.lsp_config
+        endif
     endif
 
     let l:obj.output_stream = get(a:linter, 'output_stream', 'stdout')
diff --git a/autoload/ale/lsp/message.vim b/autoload/ale/lsp/message.vim
index 9e05156d..9ed41ac4 100644
--- a/autoload/ale/lsp/message.vim
+++ b/autoload/ale/lsp/message.vim
@@ -138,3 +138,9 @@ function! ale#lsp#message#Hover(buffer, line, column) abort
     \   'position': {'line': a:line - 1, 'character': a:column},
     \}]
 endfunction
+
+function! ale#lsp#message#DidChangeConfiguration(buffer, config) abort
+    return [0, 'workspace/didChangeConfiguration', {
+    \   'settings': a:config,
+    \}]
+endfunction
diff --git a/autoload/ale/lsp_linter.vim b/autoload/ale/lsp_linter.vim
index a11c76bc..55190483 100644
--- a/autoload/ale/lsp_linter.vim
+++ b/autoload/ale/lsp_linter.vim
@@ -190,6 +190,12 @@ function! ale#lsp_linter#StartLSP(buffer, linter) abort
 
     let l:language_id = ale#util#GetFunction(a:linter.language_callback)(a:buffer)
 
+    if !empty(get(a:linter, 'lsp_config'))
+        " set LSP configuration options (workspace/didChangeConfiguration)
+        let l:config_message = ale#lsp#message#DidChangeConfiguration(a:buffer, a:linter.lsp_config)
+        call ale#lsp#Send(l:conn_id, l:config_message)
+    endif
+
     let l:details = {
     \   'buffer': a:buffer,
     \   'connection_id': l:conn_id,