Browse Source

protected call for formatter.nvim

christianchiarulli 4 years ago
parent
commit
359b6fd8e4
3 changed files with 8 additions and 5 deletions
  1. 0 1
      init.lua
  2. 5 1
      lua/core/formatter.lua
  3. 3 3
      lua/plugins.lua

+ 0 - 1
init.lua

@@ -8,7 +8,6 @@ require "plugins"
 vim.g.colors_name = O.colorscheme -- Colorscheme must get called after plugins are loaded or it will break new installs.
 require "settings"
 require "lv-utils"
-require "core.formatter"
 
 -- TODO: these guys need to be in language files
 -- require "lsp"

+ 5 - 1
lua/core/formatter.lua

@@ -48,8 +48,12 @@ end
 --     end
 --   end
 -- end
+local status_ok, formatter = pcall(require, "formatter")
+if not status_ok then
+  return
+end
 
-require("formatter").setup {}
+formatter.setup {}
 
 if not O.format_on_save then
   vim.cmd [[if exists('#autoformat#BufWritePost')

+ 3 - 3
lua/plugins.lua

@@ -82,9 +82,9 @@ return require("packer").startup(function(use)
   -- Formatter.nvim
   use {
     "mhartington/formatter.nvim",
-    -- config = function()
-    --   require "core.formatter"
-    -- end,
+    config = function()
+      require "core.formatter"
+    end,
   }
 
   -- NvimTree