Merge remote-tracking branch 'origin/rolling'

4 files changed, 13 insertions, 7 deletions

diff --git a/utils/installer/config.example.lua b/utils/installer/config.example.lua
index 4ea98fbe..409235a5 100644
--- a/utils/installer/config.example.lua
+++ b/utils/installer/config.example.lua
@@ -46,10 +46,10 @@ lvim.keys.normal_mode["<C-s>"] = ":w<cr>"
 --   name = "+Trouble",
 --   r = { "<cmd>Trouble lsp_references<cr>", "References" },
 --   f = { "<cmd>Trouble lsp_definitions<cr>", "Definitions" },
---   d = { "<cmd>Trouble lsp_document_diagnostics<cr>", "Diagnostics" },
+--   d = { "<cmd>Trouble document_diagnostics<cr>", "Diagnostics" },
 --   q = { "<cmd>Trouble quickfix<cr>", "QuickFix" },
 --   l = { "<cmd>Trouble loclist<cr>", "LocationList" },
---   w = { "<cmd>Trouble lsp_workspace_diagnostics<cr>", "Diagnostics" },
+--   w = { "<cmd>Trouble workspace_diagnostics<cr>", "Wordspace Diagnostics" },
 -- }
 
 -- TODO: User Config for predefined plugins
diff --git a/utils/installer/config_win.example.lua b/utils/installer/config_win.example.lua
index 9c9888a8..ecfbd1e4 100644
--- a/utils/installer/config_win.example.lua
+++ b/utils/installer/config_win.example.lua
@@ -63,10 +63,10 @@ lvim.keys.normal_mode["<C-s>"] = ":w<cr>"
 --   name = "+Trouble",
 --   r = { "<cmd>Trouble lsp_references<cr>", "References" },
 --   f = { "<cmd>Trouble lsp_definitions<cr>", "Definitions" },
---   d = { "<cmd>Trouble lsp_document_diagnostics<cr>", "Diagnostics" },
+--   d = { "<cmd>Trouble document_diagnostics<cr>", "Diagnostics" },
 --   q = { "<cmd>Trouble quickfix<cr>", "QuickFix" },
 --   l = { "<cmd>Trouble loclist<cr>", "LocationList" },
---   w = { "<cmd>Trouble lsp_workspace_diagnostics<cr>", "Diagnostics" },
+--   w = { "<cmd>Trouble workspace_diagnostics<cr>", "Workspace Diagnostics" },
 -- }
 
 -- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile
diff --git a/utils/installer/install.ps1 b/utils/installer/install.ps1
index bef15ac2..182e7bac 100644
--- a/utils/installer/install.ps1
+++ b/utils/installer/install.ps1
@@ -267,7 +267,7 @@ function create_alias {
         return
     }
 
-    Add-Content -Path $PROFILE -Value $("Set-Alias lvim $lvim_bin")
+    Add-Content -Path $PROFILE -Value $("`r`nSet-Alias lvim $lvim_bin")
 
     Write-Host 'To use the new alias in this window reload your profile with: `. $PROFILE`' -ForegroundColor Green
 }
diff --git a/utils/installer/uninstall.ps1 b/utils/installer/uninstall.ps1
index 4d6ffa5d..2de21037 100644
--- a/utils/installer/uninstall.ps1
+++ b/utils/installer/uninstall.ps1
@@ -49,9 +49,15 @@ function remove_lvim_dirs($force) {
         if (Test-Path $dir) {

             Remove-Item -Force -Recurse $dir

         }

-        if ($force -eq $true -and (Test-Path "$dir.bak" -or Test-Path "$dir.old")) {

-            Remove-Item -Force -Recurse "$dir.{bak,old}"

+        if ($force -eq $true) {

+            if (Test-Path "$dir.bak") {

+                Remove-Item -Force -Recurse "$dir.bak"

+            }

+            if (Test-Path "$dir.old") {

+                Remove-Item -Force -Recurse "$dir.old"

+            }

         }

     }

 }

 

+main($args)
\ No newline at end of file