fixup

Author: KristofferC

Project.toml

@@ -9,7 +9,6 @@ version = "1.11.0"
 Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
-Example = "7876af07-990d-54b4-ab0e-23690620f79a"
 FileWatching = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
 LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
@@ -39,4 +38,4 @@ Preferences = "21216c6a-2e73-6563-6e65-726566657250"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "Preferences", "HistoricalStdlibVersions"]
+test = ["REPL", "Test", "Preferences", "HistoricalStdlibVersions"]

ext/REPLExt/REPLExt.jl

@@ -6,10 +6,10 @@ import REPL
 import .REPL: LineEdit, REPLCompletions, TerminalMenus
 
 import Pkg
-import .Pkg: linewrap, pathrepr, compat, can_fancyprint, printpkgstyle
+import .Pkg: linewrap, pathrepr, compat, can_fancyprint, printpkgstyle, PKGMODE_PROJECT
 using .Pkg: Types, Operations, API, Registry, Resolve, REPLMode
 
-using .REPLMode: Statement, CommandSpec, Command, prepare_cmd
+using .REPLMode: Statement, CommandSpec, Command, prepare_cmd, tokenize, core_parse, SPECS, api_options, parse_option, api_options, is_opt, wrap_option
 
 using .Types: Context, PkgError, pkgerror, EnvCache
 
@@ -177,6 +177,7 @@ function repl_init(repl::REPL.AbstractREPL)
     return
 end
 
+const REG_WARNED = Ref{Bool}(false)
 
 function try_prompt_pkg_add(pkgs::Vector{Symbol})
     ctx = try
@@ -216,12 +217,12 @@ function try_prompt_pkg_add(pkgs::Vector{Symbol})
         printstyled(ctx.io, " │ "; color=:green)
         println(ctx.io, "Install package$(plural4)?")
         msg2 = string("add ", join(available_pkgs, ' '))
-        for (i, line) in pairs(linewrap(msg2; io = ctx.io, padding = length(string(" |   ", REPLMode.promptf()))))
+        for (i, line) in pairs(linewrap(msg2; io = ctx.io, padding = length(string(" |   ", promptf()))))
             printstyled(ctx.io, " │   "; color=:green)
             if i == 1
-                printstyled(ctx.io, REPLMode.promptf(); color=:blue)
+                printstyled(ctx.io, promptf(); color=:blue)
             else
-                print(ctx.io, " "^length(REPLMode.promptf()))
+                print(ctx.io, " "^length(promptf()))
             end
             println(ctx.io, line)
         end

ext/REPLExt/completions.jl

@@ -187,7 +187,7 @@ function complete_argument(spec::CommandSpec, options::Vector{String},
         e isa PkgError && return String[]
         rethrow()
     end
-    return applicable(spec.completions, opts, partial, offset, index)
+    return spec.completions(opts, partial, offset, index)
 end
 
 function _completions(input, final, offset, index)

src/REPLMode/REPLMode.jl

@@ -497,6 +497,5 @@ Some commands have an alias, indicated below.
 end
 
 const help = gen_help()
-const REG_WARNED = Ref{Bool}(false)
 
 end #module

src/Registry/Registry.jl

@@ -211,7 +211,7 @@ function download_registries(io::IO, regs::Vector{RegistrySpec}, depot::String=d
                     printpkgstyle(io, :Symlinked, "registry `$(Base.contractuser(registry.name))` to `$(Base.contractuser(regpath))`")
                     return
                 elseif reg.url !== nothing && reg.linked == true
-                    pkgerror("""
+                    Pkg.Types.pkgerror("""
                     A symlinked registry was requested but `path` was not set and `url` was set to `$url`.
                     Set only `path` and `linked = true` to use registry symlinking.
                     """)
@@ -382,7 +382,7 @@ function update(regs::Vector{RegistrySpec} = RegistrySpec[]; io::IO=stderr_f(),
         for reg in unique(r -> r.uuid, find_installed_registries(io, depot_regs; depots=[depot]); seen=Set{UUID}())
             prev_update = get(registry_update_log, string(reg.uuid), nothing)::Union{Nothing, DateTime}
             if prev_update !== nothing
-                diff = now() - prev_update            
+                diff = now() - prev_update
                 if diff < update_cooldown
                     @debug "Skipping updating registry $(reg.name) since it is on cooldown: $(Dates.canonicalize(Millisecond(update_cooldown) - diff)) left"
                     continue

src/Types.jl

@@ -1009,7 +1009,7 @@ function ensure_resolved(ctx::Context, manifest::Manifest,
                     join(io, what, ", ", " or ")
                     print(io, ")")
                     all_names = available_names(ctx; manifest, include_registries = registry)
-                    all_names_ranked, any_score_gt_zero = FuzzySort.fuzzysort(name, all_names)
+                    all_names_ranked, any_score_gt_zero = fuzzysort(name, all_names)
                     if any_score_gt_zero
                         println(io)
                         prefix = "   Suggestions:"
@@ -1032,7 +1032,11 @@ function ensure_resolved(ctx::Context, manifest::Manifest,
     pkgerror(msg)
 end
 
-
+# copied from REPL to efficiently expose if any score is >0
+function fuzzysort(search::String, candidates::Vector{String})
+    scores = map(cand -> (FuzzySorting.fuzzyscore(search, cand), -Float64(FuzzySorting.levenshtein(search, cand))), candidates)
+    candidates[sortperm(scores)] |> reverse, any(s -> s[1] > 0, scores)
+end
 
 function available_names(ctx::Context = Context(); manifest::Manifest = ctx.env.manifest, include_registries::Bool = true)
     all_names = String[]

test/repl.jl

@@ -10,6 +10,8 @@ using UUIDs
 using Test
 using TOML
 import LibGit2
+import REPL
+const REPLExt = Base.get_extension(Pkg, :REPLExt)
 
 using ..Utils
 
@@ -288,7 +290,7 @@ temp_pkg_dir() do depot
     end
 end
 
-test_complete(s) = Pkg.REPLMode.completions(s, lastindex(s))
+test_complete(s) = REPLExt.completions(s, lastindex(s))
 apply_completion(str) = begin
     c, r, s = test_complete(str)
     str[1:prevind(str, first(r))]*first(c)
@@ -596,32 +598,32 @@ end
     end
 
     with_temp_env("SomeEnv") do
-        @test Pkg.REPLMode.promptf() == "(SomeEnv) pkg> "
+        @test REPLExt.promptf() == "(SomeEnv) pkg> "
     end
 
     with_temp_env("this_is_a_test_for_truncating_long_folder_names_in_the_prompt") do
-        @test Pkg.REPLMode.promptf() == "(this_is_a_test_for_truncati...) pkg> "
+        @test REPLExt.promptf() == "(this_is_a_test_for_truncati...) pkg> "
     end
 
     env_name = "Test2"
     with_temp_env(env_name) do env_path
         projfile_path = joinpath(env_path, "Project.toml")
-        @test Pkg.REPLMode.promptf() == "($env_name) pkg> "
+        @test REPLExt.promptf() == "($env_name) pkg> "
 
         newname = "NewName"
         set_name(projfile_path, newname)
-        @test Pkg.REPLMode.promptf() == "($newname) pkg> "
+        @test REPLExt.promptf() == "($newname) pkg> "
         cd(env_path) do
-            @test Pkg.REPLMode.promptf() == "($newname) pkg> "
+            @test REPLExt.promptf() == "($newname) pkg> "
         end
-        @test Pkg.REPLMode.promptf() == "($newname) pkg> "
+        @test REPLExt.promptf() == "($newname) pkg> "
 
         newname = "NewNameII"
         set_name(projfile_path, newname)
         cd(env_path) do
-            @test Pkg.REPLMode.promptf() == "($newname) pkg> "
+            @test REPLExt.promptf() == "($newname) pkg> "
         end
-        @test Pkg.REPLMode.promptf() == "($newname) pkg> "
+        @test REPLExt.promptf() == "($newname) pkg> "
     end
 end
 
@@ -711,16 +713,16 @@ end
 
 @testset "REPL missing package install hook" begin
     isolate(loaded_depot=true) do
-        @test Pkg.REPLMode.try_prompt_pkg_add(Symbol[:notapackage]) == false
+        @test REPLExt.try_prompt_pkg_add(Symbol[:notapackage]) == false
 
         # don't offer to install the dummy "julia" entry that's in General
-        @test Pkg.REPLMode.try_prompt_pkg_add(Symbol[:julia]) == false
+        @test REPLExt.try_prompt_pkg_add(Symbol[:julia]) == false
 
         withreply("n") do
-            @test Pkg.REPLMode.try_prompt_pkg_add(Symbol[:Example]) == false
+            @test REPLExt.try_prompt_pkg_add(Symbol[:Example]) == false
         end
         withreply("y") do
-            @test Pkg.REPLMode.try_prompt_pkg_add(Symbol[:Example]) == true
+            @test REPLExt.try_prompt_pkg_add(Symbol[:Example]) == true
         end
     end
 end