fix parsing of multiple packages with modifiers on some of them (#4325)

Author: KristofferC

src/REPLMode/argument_parsers.jl

@@ -366,14 +366,16 @@ function parse_package_args(args::Vector{PackageToken}; add_or_dev = false)::Vec
         parsed_rev = false
         while !isempty(args)
             modifier = popfirst!(args)
-            if modifier isa Subdir
+            if modifier isa PackageIdentifier
+                pushfirst!(args, modifier)
+                return
+            elseif modifier isa Subdir
                 if parsed_subdir
                     pkgerror("Multiple subdir specifiers `$args` found.")
                 end
                 pkg.subdir = modifier.dir
-                (isempty(args) || args[1] isa PackageIdentifier) && return
-                modifier = popfirst!(args)
                 parsed_subdir = true
+                (isempty(args) || args[1] isa PackageIdentifier) && return
             elseif modifier isa VersionToken
                 if parsed_version
                     pkgerror("Multiple version specifiers `$args` found.")

test/new.jl

@@ -1184,6 +1184,14 @@ end
         @test api == Pkg.add
         @test args == [Pkg.PackageSpec(; name = "Example", version = "0.5.0")]
         @test isempty(opts)
+        # Add multiple packages with version specifier
+        api, args, opts = first(Pkg.pkg"add [email protected] Test")
+        @test api == Pkg.add
+        @test length(args) == 2
+        @test args[1].name == "Example"
+        @test args[1].version == "0.5.5"
+        @test args[2].name == "Test"
+        @test isempty(opts)
         # Add as a weakdep.
         api, args, opts = first(Pkg.pkg"add --weak Example")
         @test api == Pkg.add