REPL: move Options to improve inference (part of #37081)

Moving this earlier in the load sequence allows one to annotate the
return type of some methods.

stdlib/REPL/src/LineEdit.jl

@@ -3,7 +3,7 @@
 module LineEdit
 
 import ..REPL
-using REPL: AbstractREPL
+using REPL: AbstractREPL, Options
 
 using ..Terminals
 import ..Terminals: raw!, width, height, cmove, getX,
@@ -91,9 +91,9 @@ options(s::PromptState) =
     if isdefined(s.p, :repl) && isdefined(s.p.repl, :options)
         # we can't test isa(s.p.repl, LineEditREPL) as LineEditREPL is defined
         # in the REPL module
-        s.p.repl.options
+        s.p.repl.options::Options
     else
-        REPL.GlobalOptions
+        REPL.GlobalOptions::Options
     end
 
 function setmark(s::MIState, guess_region_active::Bool=true)

stdlib/REPL/src/REPL.jl

@@ -38,6 +38,8 @@ using .Terminals
 
 abstract type AbstractREPL end
 
+include("options.jl")
+
 include("LineEdit.jl")
 using .LineEdit
 import ..LineEdit:
@@ -374,64 +376,6 @@ function run_frontend(repl::BasicREPL, backend::REPLBackendRef)
     nothing
 end
 
-## User Options
-
-mutable struct Options
-    hascolor::Bool
-    extra_keymap::Union{Dict,Vector{<:Dict}}
-    # controls the presumed tab width of code pasted into the REPL.
-    # Must satisfy `0 < tabwidth <= 16`.
-    tabwidth::Int
-    # Maximum number of entries in the kill ring queue.
-    # Beyond this number, oldest entries are discarded first.
-    kill_ring_max::Int
-    region_animation_duration::Float64
-    beep_duration::Float64
-    beep_blink::Float64
-    beep_maxduration::Float64
-    beep_colors::Vector{String}
-    beep_use_current::Bool
-    backspace_align::Bool
-    backspace_adjust::Bool
-    confirm_exit::Bool # ^D must be repeated to confirm exit
-    auto_indent::Bool # indent a newline like line above
-    auto_indent_tmp_off::Bool # switch auto_indent temporarily off if copy&paste
-    auto_indent_bracketed_paste::Bool # set to true if terminal knows paste mode
-    # cancel auto-indent when next character is entered within this time frame :
-    auto_indent_time_threshold::Float64
-    # default IOContext settings at the REPL
-    iocontext::Dict{Symbol,Any}
-end
-
-Options(;
-        hascolor = true,
-        extra_keymap = AnyDict[],
-        tabwidth = 8,
-        kill_ring_max = 100,
-        region_animation_duration = 0.2,
-        beep_duration = 0.2, beep_blink = 0.2, beep_maxduration = 1.0,
-        beep_colors = ["\e[90m"], # gray (text_colors not yet available)
-        beep_use_current = true,
-        backspace_align = true, backspace_adjust = backspace_align,
-        confirm_exit = false,
-        auto_indent = true,
-        auto_indent_tmp_off = false,
-        auto_indent_bracketed_paste = false,
-        auto_indent_time_threshold = 0.005,
-        iocontext = Dict{Symbol,Any}()) =
-            Options(hascolor, extra_keymap, tabwidth,
-                    kill_ring_max, region_animation_duration,
-                    beep_duration, beep_blink, beep_maxduration,
-                    beep_colors, beep_use_current,
-                    backspace_align, backspace_adjust, confirm_exit,
-                    auto_indent, auto_indent_tmp_off, auto_indent_bracketed_paste,
-                    auto_indent_time_threshold,
-                    iocontext)
-
-# for use by REPLs not having an options field
-const GlobalOptions = Options()
-
-
 ## LineEditREPL ##
 
 mutable struct LineEditREPL <: AbstractREPL

stdlib/REPL/src/options.jl

@@ -0,0 +1,56 @@
+## User Options
+
+mutable struct Options
+    hascolor::Bool
+    extra_keymap::Union{Dict,Vector{<:Dict}}
+    # controls the presumed tab width of code pasted into the REPL.
+    # Must satisfy `0 < tabwidth <= 16`.
+    tabwidth::Int
+    # Maximum number of entries in the kill ring queue.
+    # Beyond this number, oldest entries are discarded first.
+    kill_ring_max::Int
+    region_animation_duration::Float64
+    beep_duration::Float64
+    beep_blink::Float64
+    beep_maxduration::Float64
+    beep_colors::Vector{String}
+    beep_use_current::Bool
+    backspace_align::Bool
+    backspace_adjust::Bool
+    confirm_exit::Bool # ^D must be repeated to confirm exit
+    auto_indent::Bool # indent a newline like line above
+    auto_indent_tmp_off::Bool # switch auto_indent temporarily off if copy&paste
+    auto_indent_bracketed_paste::Bool # set to true if terminal knows paste mode
+    # cancel auto-indent when next character is entered within this time frame :
+    auto_indent_time_threshold::Float64
+    # default IOContext settings at the REPL
+    iocontext::Dict{Symbol,Any}
+end
+
+Options(;
+        hascolor = true,
+        extra_keymap = AnyDict[],
+        tabwidth = 8,
+        kill_ring_max = 100,
+        region_animation_duration = 0.2,
+        beep_duration = 0.2, beep_blink = 0.2, beep_maxduration = 1.0,
+        beep_colors = ["\e[90m"], # gray (text_colors not yet available)
+        beep_use_current = true,
+        backspace_align = true, backspace_adjust = backspace_align,
+        confirm_exit = false,
+        auto_indent = true,
+        auto_indent_tmp_off = false,
+        auto_indent_bracketed_paste = false,
+        auto_indent_time_threshold = 0.005,
+        iocontext = Dict{Symbol,Any}()) =
+            Options(hascolor, extra_keymap, tabwidth,
+                    kill_ring_max, region_animation_duration,
+                    beep_duration, beep_blink, beep_maxduration,
+                    beep_colors, beep_use_current,
+                    backspace_align, backspace_adjust, confirm_exit,
+                    auto_indent, auto_indent_tmp_off, auto_indent_bracketed_paste,
+                    auto_indent_time_threshold,
+                    iocontext)
+
+# for use by REPLs not having an options field
+const GlobalOptions = Options()