Refactor

README.md

@@ -224,7 +224,7 @@ These are the default keybindings, which you can override in your configuration.
 It's possible to lazy load the plugin using Lazy.nvim, this will load the plugins only when it is needed, to enable lazy loading, add this plugin spec to your config.
 
 ```lua
-cmd = { 'Pioinit', 'Piorun', 'Piocmdh', 'Piocmdf', 'Piolib', 'Piomon', 'Piodebug', 'Piodb' },
+cmd = { 'Pioinit', 'PioLSP', 'Piorun', 'Piocmdh', 'Piocmdf', 'Piolib', 'Piomon', 'Piolsserial', 'Piodebug', 'PioTermList' },
 ```
 
 

lua/platformio/piocmd.lua

@@ -1,4 +1,5 @@
 local utils = require('platformio.utils')
+local terminal = require('platformio.terminal')
 local M = {}
 
 function M.piocmd(cmd_table, direction)
@@ -7,13 +8,13 @@ function M.piocmd(cmd_table, direction)
   end
 
   if cmd_table[1] == '' then
-    utils.ToggleTerminal('', direction, nil, utils.get_platformioRootDir())
+    terminal.ToggleTerminal('', direction, nil, utils.get_platformioRootDir())
   else
     local cmd = 'pio '
     for _, v in pairs(cmd_table) do
       cmd = cmd .. ' ' .. v
     end
-    utils.ToggleTerminal(cmd, direction, nil, utils.get_platformioRootDir())
+    terminal.ToggleTerminal(cmd, direction, nil, utils.get_platformioRootDir())
   end
 end
 

lua/platformio/piodebug.lua

@@ -1,4 +1,5 @@
 local utils = require('platformio.utils')
+local terminal = require('platformio.terminal')
 local M = {}
 
 function M.piodebug(args_table)
@@ -8,7 +9,7 @@ function M.piodebug(args_table)
 
   local command = 'pio debug --interface=gdb -- -x .pioinit'
   -- local command = string.format('pio debug --interface=gdb -- -x .pioinit %s', utils.extra)
-  utils.ToggleTerminal(command, 'float', nil, utils.get_platformioRootDir())
+  terminal.ToggleTerminal(command, 'float', nil, utils.get_platformioRootDir())
 end
 
 return M

lua/platformio/pioinit.lua

@@ -1,6 +1,7 @@
 local M = {}
 
 local utils = require('platformio.utils')
+local terminal = require('platformio.terminal')
 local picker = require('platformio.pickers')
 local boilerplate_gen = require('platformio.boilerplate').boilerplate_gen
 
@@ -12,7 +13,7 @@ local function init_project(board_details, selected_framework)
   local board_id = utils.sanitize_shell_arg(board_details.id)
   local framework_arg = utils.sanitize_shell_arg(framework)
   local command = 'pio project init --board ' .. board_id .. ' --project-option "framework=' .. framework_arg .. '"'
-  utils.ToggleTerminal(command, 'float', function()
+  terminal.ToggleTerminal(command, 'float', function()
     vim.cmd(':PioLSP')
     boilerplate_gen(framework)
   end)

lua/platformio/piolib.lua

@@ -2,6 +2,7 @@ local M = {}
 
 local curl = require('plenary.curl')
 local utils = require('platformio.utils')
+local terminal = require('platformio.terminal')
 local picker = require('platformio.pickers')
 
 function M.piolib(lib_arg_list)
@@ -40,7 +41,7 @@ function M.piolib(lib_arg_list)
       end
       local pkg_name = owner .. '/' .. name
       local command = 'pio pkg install --library "' .. pkg_name .. '"'
-      utils.ToggleTerminal(command, 'float', function()
+      terminal.ToggleTerminal(command, 'float', function()
         vim.cmd(':PioLSP')
       end, utils.get_platformioRootDir())
     end)

lua/platformio/piolsserial.lua

@@ -7,6 +7,9 @@ function M.parse_tty(lines)
   for k in pairs(M.tty_list) do
     M.tty_list[k] = nil
   end
+  if not lines[1] then
+    return
+  end
   local json_data = vim.json.decode(lines[1])
   for key, value in pairs(json_data) do
     if value['description'] ~= 'n/a' then

lua/platformio/piomon.lua

@@ -1,4 +1,5 @@
 local utils = require('platformio.utils')
+local terminal = require('platformio.terminal')
 local M = {}
 
 function M.piomon(args_table)
@@ -21,7 +22,7 @@ function M.piomon(args_table)
   if command == nil then
     vim.notify('Usage: Piomon <baud> <port>', vim.log.levels.ERROR)
   else
-    utils.ToggleTerminal(command, 'horizontal', nil, utils.get_platformioRootDir())
+    terminal.ToggleTerminal(command, 'horizontal', nil, utils.get_platformioRootDir())
   end
 end
 

lua/platformio/piorun.lua

@@ -1,25 +1,26 @@
 local M = {}
 
 local utils = require('platformio.utils')
+local terminal = require('platformio.terminal')
 
 function M.piobuild()
   local command = 'pio run' -- .. utils.extra
-  utils.ToggleTerminal(command, 'float', nil, utils.get_platformioRootDir())
+  terminal.ToggleTerminal(command, 'float', nil, utils.get_platformioRootDir())
 end
 
 function M.pioupload()
   local command = 'pio run --target upload' -- .. utils.extra
-  utils.ToggleTerminal(command, 'float', nil, utils.get_platformioRootDir())
+  terminal.ToggleTerminal(command, 'float', nil, utils.get_platformioRootDir())
 end
 
 function M.piouploadfs()
   local command = 'pio run --target uploadfs' -- .. utils.extra
-  utils.ToggleTerminal(command, 'float', nil, utils.get_platformioRootDir())
+  terminal.ToggleTerminal(command, 'float', nil, utils.get_platformioRootDir())
 end
 
 function M.pioclean()
   local command = 'pio run --target clean' -- .. utils.extra
-  utils.ToggleTerminal(command, 'float', nil, utils.get_platformioRootDir())
+  terminal.ToggleTerminal(command, 'float', nil, utils.get_platformioRootDir())
 end
 
 function M.piorun(arg_table)