Merge branch 'master' of github.com:ChristianChiarulli/LunarVim into stable

1 files changed, 13 insertions, 24 deletions

diff --git a/ftplugin/c.lua b/ftplugin/c.lua
index a2324986..7443cabe 100644
--- a/ftplugin/c.lua
+++ b/ftplugin/c.lua
@@ -1,31 +1,20 @@
-local clangd_flags = {"--background-index"};
+local clangd_flags = { "--background-index" }
 
 if O.lang.clang.cross_file_rename then
-   table.insert(clangd_flags, "--cross-file-rename")
+  table.insert(clangd_flags, "--cross-file-rename")
 end
 
 table.insert(clangd_flags, "--header-insertion=" .. O.lang.clang.header_insertion)
 
-require'lspconfig'.clangd.setup {
-    cmd = {DATA_PATH .. "/lspinstall/cpp/clangd/bin/clangd",  unpack(clangd_flags)},
-    on_attach = require'lsp'.common_on_attach,
-    handlers = {
-        ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
-            virtual_text = O.lang.clang.diagnostics.virtual_text,
-            signs = O.lang.clang.diagnostics.signs,
-            underline = O.lang.clang.diagnostics.underline,
-            update_in_insert = true
-
-        })
-    }
+require("lspconfig").clangd.setup {
+  cmd = { DATA_PATH .. "/lspinstall/cpp/clangd/bin/clangd", unpack(clangd_flags) },
+  on_attach = require("lsp").common_on_attach,
+  handlers = {
+    ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
+      virtual_text = O.lang.clang.diagnostics.virtual_text,
+      signs = O.lang.clang.diagnostics.signs,
+      underline = O.lang.clang.diagnostics.underline,
+      update_in_insert = true,
+    }),
+  },
 }
-
-if O.lang.clang.autoformat then
-    require('lv-utils').define_augroups({
-      _clang_autoformat = {
-         {'BufWritePre *.c lua vim.lsp.buf.formatting_sync(nil,1000)'},
-         {'BufWritePre *.h lua vim.lsp.buf.formatting_sync(nil,1000)'},
-         {'BufWritePre *.cpp lua vim.lsp.buf.formatting_sync(nil,1000)'},
-         {'BufWritePre *.hpp lua vim.lsp.buf.formatting_sync(nil,1000)'},
-    }})
-end