Merge remote-tracking branch 'origin/master'

coderj001 · coderj001 · commit cf73acac9bc5 · 2024-01-15T16:56:50.000+05:30
diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
@@ -35,13 +35,11 @@ require("lazy").setup({
     { import = "plugins.colorschemes." .. color_scheme },
     -- StatusLine Select One
     -- { import = "plugins.extras.statusline.lualine" },
-    { import = "plugins.extras.statusline.luafancy" },
-    -- { import = "plugins.extras.statusline.galaxyline" },
+    -- { import = "plugins.extras.statusline.luafancy" },
+    { import = "plugins.extras.statusline.galaxyline" },
     -- Added required configs
     -- { import = "plugins.extras.lsp" },
-    { import = "plugins.extras.dashboard.bufferline" },
     { import = "plugins.extras.wilder" },
-    { import = "plugins.extras.figlet" },
     { import = "plugins.extras.tmux" },
     { import = "plugins.extras.scalpel" },
     { import = "plugins.extras.harpoon" },
diff --git a/lua/config/options.lua b/lua/config/options.lua
@@ -60,7 +60,7 @@ opt.fillchars      = {
   diff = "╱",
   eob = " ",
 }
-opt.list           = true
+opt.list           = false
 opt.listchars      = {
   tab = ">>>",
   trail = "·",
diff --git a/lua/utils/cmp.lua b/lua/utils/cmp.lua
@@ -1,13 +1,13 @@
 local M = {}
 
-local status_cmp, cmp = pcall(require, "cmp")
-if (not status_cmp) then
+local cmp_status_ok, cmp = pcall(require, "cmp")
+if (not cmp_status_ok) then
   vim.notify("error loading cmp")
   return
 end
 
-local status_luasnip, luasnip = pcall(require, "luasnip")
-if (not status_luasnip) then
+local snip_status_ok, luasnip = pcall(require, "luasnip")
+if (not snip_status_ok) then
   vim.notify("error loading luasnip")
   return
 end
@@ -184,7 +184,13 @@ function M.setup()
         },
       }
     },
-    preselect = cmp.PreselectMode.Item,
+    -- preselect = cmp.PreselectMode.Item,
+    preselect = cmp.PreselectMode.None,
+    snippet = {
+      expand = function(args)
+        luasnip.lsp_expand(args.body)                 -- For `luasnip` users.
+      end,
+    },
     sorting = {
       priority_weight = 2,
       comparators = {
diff --git a/snippets/go.lua b/snippets/go.lua
@@ -108,5 +108,40 @@ cs(
   )
 )
 
+cs("readfile",
+  fmt([[
+  file, err := os.Open({})
+	if err != nil {{
+		fmt.Printf("Error Opening The File: %v\n", err)
+	}}
+	defer file.Close()
+
+  // import "bufio"
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {{
+		fmt.Println(scanner.Text())
+	}}
+
+	if err = scanner.Err(); err != nil {{
+		fmt.Printf("Error Reading File: %v\n", err)
+	}}
+  ]], {
+    i(1, "filename")
+  })
+)
+
+cs("jsonread",
+  fmt([[
+    // import "encoding/json"
+    err := json.Unmarshal([]byte({}), &{}); if err != nil {{
+      {}
+    }}
+  ]], {
+    i(1, "json"),
+    i(2, "object"),
+    i(3, "panic()"),
+  })
+)
+
 
 return snippets, autosnippets

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ opt.fillchars = {`
`60`	`60`	`diff = "╱",`
`61`	`61`	`eob = " ",`
`62`	`62`	`}`
`63`		`-opt.list = true`
	`63`	`+opt.list = false`
`64`	`64`	`opt.listchars = {`
`65`	`65`	`tab = ">>>",`
`66`	`66`	`trail = "·",`