v10.3.1 patch (#342)

* fix upgrade order of (n)vim plugins

* treesitter should use the synchronous cmd

* add lazy pkg manager for neovim

* fix lazy cmd

* change calls

* add autocmd, remove ts and coc

* fix vimscript err invalid range

---------

Co-authored-by: Thomas Schönauer <37108907+DottoDev@users.noreply.github.com>

Cargo.lock

@@ -2049,7 +2049,7 @@ dependencies = [
 
 [[package]]
 name = "topgrade"
-version = "10.2.5"
+version = "10.3.1"
 dependencies = [
  "cfg-if",
  "chrono",

Cargo.toml

@@ -6,7 +6,7 @@ keywords = ["upgrade", "update"]
 license = "GPL-3.0"
 # license-file = "LICENSE"
 repository = "https://github.com/topgrade-rs/topgrade"
-version = "10.2.5"
+version = "10.3.1"
 authors = ["Roey Darwish Dror <roey.ghost@gmail.com>", "Thomas Schönauer <t.schoenauer@hgs-wt.at>"]
 exclude = ["doc/screenshot.gif"]
 edition = "2021"

README.md

@@ -80,8 +80,6 @@ Just fork the repository and start coding.
 
 - Check if your code passes `cargo fmt` and `cargo clippy`.
 - Check if your code is self explanatory, if not it should be documented by comments.
-- Make a pull request to the `dev` branch for new features or to the `bug-fixes` branch for bug fixes.
-
 ## Roadmap
 
 - [ ] Add a proper testing framework to the code base.

src/main.rs

@@ -86,7 +86,7 @@ fn run() -> Result<()> {
     debug!("Binary path: {:?}", std::env::current_exe());
     debug!("Self Update: {:?}", cfg!(feature = "self-update"));
 
-    if config.display_preamble() || !config.skip_notify() {
+    if config.display_preamble() && !config.skip_notify() {
         print_warning("Due to a design issue with notify-send it could be that topgrade hangs when it's finished.
 If this is the case on your system add the --skip-notify flag to the topgrade command or set skip_notify = true in the config file.
 If you don't want this message to appear any longer set display_preamble = false in the config file.
@@ -123,7 +123,7 @@ For more information about this issue see https://askubuntu.com/questions/110969
                         return result;
                     }
                 }
-                print_warning(format!("Self update error: {}", e));
+                print_warning(format!("Self update error: {e}"));
             }
         }
     }

src/self_update.rs

@@ -31,7 +31,7 @@ pub fn self_update() -> Result<()> {
     if let UpdateStatus::Updated(release) = &result {
         println!("\nTopgrade upgraded to {}:\n", release.version);
         if let Some(body) = &release.body {
-            println!("{}", body);
+            println!("{body}");
         }
     } else {
         println!("Topgrade is up-to-date");

src/steps/os/linux.rs

@@ -436,8 +436,9 @@ fn upgrade_solus(ctx: &ExecutionContext) -> Result<()> {
 }
 
 pub fn update_am(ctx: &ExecutionContext) -> Result<()> {
+    let am = require("am")?;
     if let Some(sudo) = ctx.sudo() {
-        ctx.run_type().execute(sudo).args(["am", "-u"]).status_checked()?;
+        ctx.run_type().execute(sudo).arg(am).arg("-u").status_checked()?;
     } else {
         print_warning("No sudo detected. Skipping AM Step");
     }

src/steps/upgrade.vim

@@ -35,27 +35,14 @@ endif
 
 if exists(":Lazy")
     echo "Lazy Update"
-    +Lazy! sync
+    autocmd User LazySync * quitall
+    Lazy sync
 endif
 
-function! UpdateCoCAndTS()
-    if exists(":CocUpdateSync")
-        echo "CocUpdateSync"
-        CocUpdateSync
-    endif
-
-    if exists(":TSUpdateSync")
-        echo "TreeSitter Update"
-        TSUpdate
-    endif
-
-    quitall
-endfunction
-
 if exists(':PackerSync')
     echo "Packer"
-    autocmd User PackerComplete * call UpdateCoCAndTS()
+    autocmd User PackerComplete quitall
     PackerSync
 else
-    call UpdateCoCAndTS()
+    quitall
 endif