From 3b6e4213b92a166f6bbf1eeb9d8af440e519a1d0 Mon Sep 17 00:00:00 2001
From: Matt Leong <mattleong91@gmail.com>
Date: Wed, 27 Oct 2021 14:32:02 -0700
Subject: [PATCH] feat: cleaner string formats

---
 init.lua                              | 2 +-
 lua/cosmic/config/editor.lua          | 2 ++
 lua/cosmic/config/init.lua            | 4 ++--
 lua/cosmic/init.lua                   | 2 +-
 lua/cosmic/lsp/providers/defaults.lua | 7 ++-----
 lua/cosmic/pluginsInit.lua            | 2 +-
 lua/cosmic/utils.lua                  | 4 ++--
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/init.lua b/init.lua
index 49d2e1b..aad6e2e 100644
--- a/init.lua
+++ b/init.lua
@@ -1,5 +1,5 @@
 local ok, err = pcall(require, 'cosmic')
 
 if not ok then
-  error(string.format('Error loading core...\n\n%s', err))
+  error(('Error loading core...\n\n%s'):format(err))
 end
diff --git a/lua/cosmic/config/editor.lua b/lua/cosmic/config/editor.lua
index d29cae8..c55bbb6 100644
--- a/lua/cosmic/config/editor.lua
+++ b/lua/cosmic/config/editor.lua
@@ -1,5 +1,6 @@
 -- Override Cosmic editor options
 --[[
+
 local opt = vim.opt
 local g = vim.g
 
@@ -8,4 +9,5 @@ g.mapleader = ','
 opt.tabstop = 4
 opt.softtabstop = 4
 opt.shiftwidth = 4
+
 ]]
diff --git a/lua/cosmic/config/init.lua b/lua/cosmic/config/init.lua
index cc56a3e..7d3b99f 100644
--- a/lua/cosmic/config/init.lua
+++ b/lua/cosmic/config/init.lua
@@ -2,7 +2,7 @@
 local ok, user_config = pcall(require, 'cosmic.config.config')
 
 if not ok then
-  error(string.format('Error loading user config...\n\n%s', user_config))
+  error(('Error loading user config...\n\n%s'):format(user_config))
   error('No user config, using default instead...')
 end
 
@@ -29,7 +29,7 @@ local default_config = {
         -- todo: icons for diagnostics?
         --[[ format = function(diagnostic)
         if diagnostic.severity == vim.diagnostic.severity.ERROR then
-          return string.format('E: %s', diagnostic.message)
+          return ('E: %s'):format(diagnostic.message)
         end
         return diagnostic.message
       end, ]]
diff --git a/lua/cosmic/init.lua b/lua/cosmic/init.lua
index 8a73fe5..8b3f3d8 100644
--- a/lua/cosmic/init.lua
+++ b/lua/cosmic/init.lua
@@ -12,6 +12,6 @@ local cosmic_modules = {
 for _, mod in ipairs(cosmic_modules) do
   local ok, err = pcall(require, mod)
   if not ok then
-    error(string.format('Error loading %s...\n\n%s', mod, err))
+    error(('Error loading %s...\n\n%s'):format(mod, err))
   end
 end
diff --git a/lua/cosmic/lsp/providers/defaults.lua b/lua/cosmic/lsp/providers/defaults.lua
index 2d807fc..c9bd325 100644
--- a/lua/cosmic/lsp/providers/defaults.lua
+++ b/lua/cosmic/lsp/providers/defaults.lua
@@ -25,15 +25,12 @@ function M.on_attach(client, bufnr)
       else
         format_filetypes = '*'
       end
-      vim.cmd(string.format(
-        [[
+      vim.cmd(([[
           augroup CosmicFormat
           autocmd!
           autocmd BufWritePre %s lua vim.lsp.buf.formatting_sync(nil, 200)
           augroup end
-        ]],
-        format_filetypes
-      ))
+        ]]):format(format_filetypes))
     end
   else
     client.resolved_capabilities.document_formatting = false
diff --git a/lua/cosmic/pluginsInit.lua b/lua/cosmic/pluginsInit.lua
index bd26b42..04aebb7 100644
--- a/lua/cosmic/pluginsInit.lua
+++ b/lua/cosmic/pluginsInit.lua
@@ -9,7 +9,7 @@ local use = packer.use
 
 local ok, user_plugins = pcall(require, 'cosmic.config.plugins')
 if not ok then
-  error(string.format('Error loading user custom plugins...\n\n%s', user_plugins))
+  error(('Error loading user custom plugins...\n\n%s'):format(user_plugins))
   return false
 end
 
diff --git a/lua/cosmic/utils.lua b/lua/cosmic/utils.lua
index 1b5ab6b..26aae31 100644
--- a/lua/cosmic/utils.lua
+++ b/lua/cosmic/utils.lua
@@ -34,9 +34,9 @@ end
 
 function M.highlight(group, bg, fg, gui)
   if gui ~= nil and gui ~= '' then
-    vim.api.nvim_command(string.format('hi %s guibg=%s guifg=%s gui=%s', group, bg, fg, gui))
+    vim.api.nvim_command(('hi %s guibg=%s guifg=%s gui=%s'):format(group, bg, fg, gui))
   else
-    vim.api.nvim_command(string.format('hi %s guibg=%s guifg=%s', group, bg, fg))
+    vim.api.nvim_command(('hi %s guibg=%s guifg=%s'):format(group, bg, fg))
   end
 end