Revert "Merge branch 'c42f-c42f/fixed-world-age'"

This reverts commit 056c328, reversing
changes made to 1e17c65.

Author: Moelf

src/BracketInserter.jl

@@ -166,4 +166,5 @@ function insert_into_keymap!(D::Dict)
     end
 end
 
+insert_into_keymap!(OhMyREPL.Prompt.NEW_KEYBINDINGS)
 end # module

src/hooks.jl src/MarkdownHighlighter.jl

@@ -1,41 +1,13 @@
-import REPL
-import REPL.LineEdit
+
 using Crayons
 import Markdown
 
-function _refresh_line(s::REPL.LineEdit.BufferLike)
-    LineEdit.refresh_multi_line(s)
-    OhMyREPL.Prompt.rewrite_with_ANSI(s)
-end
-
-function _REPL_display(d::REPL.REPLDisplay, mime::MIME"text/plain", @nospecialize(x))
-    x = Ref{Any}(x)
-    REPL.with_repl_linfo(d.repl) do io
-        if isdefined(REPL, :active_module)
-            mod = REPL.active_module(d)::Module
-        else
-            mod = Main
-        end
-        io = IOContext(io, :limit => true, :module => mod)
-        if OUTPUT_PROMPT !== nothing
-            output_prompt = OUTPUT_PROMPT isa String ? OUTPUT_PROMPT : OUTPUT_PROMPT()
-            write(io, OUTPUT_PROMPT_PREFIX)
-            write(io, output_prompt, "\e[0m")
-        end
-        get(io, :color, false) && write(io, REPL.answer_color(d.repl))
-        if isdefined(d.repl, :options) && isdefined(d.repl.options, :iocontext)
-            # this can override the :limit property set initially
-            io = foldl(IOContext, d.repl.options.iocontext, init=io)
-        end
-        show(io, mime, x[])
-        println(io)
-    end
-    return nothing
-end
+import .OhMyREPL.Passes.SyntaxHighlighter.SYNTAX_HIGHLIGHTER_SETTINGS
+import .OhMyREPL.HIGHLIGHT_MARKDOWN
 
 split_lines(s::AbstractString) = isdefined(Markdown, :lines) ? Markdown.lines(s) : split(s, '\n')
 
-function _Markdown_term(io::IO, md::Markdown.Code, columns)
+function Markdown.term(io::IO, md::Markdown.Code, columns)
     code = md.code
     # Want to remove potential.
     lang = md.language == "" ? "" : first(split(md.language))
@@ -65,11 +37,11 @@ function _Markdown_term(io::IO, md::Markdown.Code, columns)
         push!(outputs, "")
     end
 
-    if do_syntax && OhMyREPL.HIGHLIGHT_MARKDOWN[]
+    if do_syntax && HIGHLIGHT_MARKDOWN[]
         for (i, (sourcecode, output)) in enumerate(zip(sourcecodes, outputs))
             tokens = collect(tokenize(sourcecode))
             crayons = fill(Crayon(), length(tokens))
-            OhMyREPL.Passes.SyntaxHighlighter.SYNTAX_HIGHLIGHTER_SETTINGS(crayons, tokens, 0, sourcecode)
+            SYNTAX_HIGHLIGHTER_SETTINGS(crayons, tokens, 0, sourcecode)
             buff = IOBuffer()
             if lang == "jldoctest" || lang == "julia-repl"
                 print(buff, Crayon(foreground = :red, bold = true), "julia> ", Crayon(reset = true))
@@ -100,18 +72,3 @@ function _Markdown_term(io::IO, md::Markdown.Code, columns)
         end
     end
 end
-
-_refresh_line_hook = _refresh_line
-
-function activate_hooks()
-    @eval begin
-        LineEdit.refresh_line(s::REPL.LineEdit.BufferLike) =
-            _refresh_line_hook(s)
-        Markdown.term(io::IO, md::Markdown.Code, columns) =
-            _Markdown_term(io, md, columns)
-    end
-    if !isdefined(REPL, :IPython)
-        @eval REPL.display(d::REPL.REPLDisplay, mime::MIME"text/plain", x) =
-            _REPL_display(d, mime, x)
-    end
-end

src/OhMyREPL.jl

@@ -17,26 +17,12 @@ export colorscheme!, colorschemes, enable_autocomplete_brackets, enable_highligh
 
 const SUPPORTS_256_COLORS = !(Sys.iswindows() && VERSION < v"1.5.3")
 
-# Wrap the function `f` so that it's always invoked in the given `world_age`
-function fix_world_age(f, world_age)
-    if world_age == typemax(UInt)
-        function (args...; kws...)
-            Base.invokelatest(f, args...; kws...)
-        end
-    else
-        function (args...; kws...)
-            Base.invoke_in_world(world_age, f, args...; kws...)
-        end
-    end
-end
-
 include("repl_pass.jl")
 include("repl.jl")
 include("passes/Passes.jl")
 
 include("BracketInserter.jl")
 include("prompt.jl")
-include("hooks.jl")
 
 import .BracketInserter.enable_autocomplete_brackets
 
@@ -105,47 +91,50 @@ const ENABLE_FZF = Ref(true)
 enable_fzf(v::Bool) = ENABLE_FZF[] = v
 
 using Pkg
-function reinsert_after_pkg(repl, world_age)
+function reinsert_after_pkg()
+    repl = Base.active_repl
     mirepl = isdefined(repl,:mi) ? repl.mi : repl
     main_mode = mirepl.interface.modes[1]
     m = first(methods(main_mode.keymap_dict[']']))
     if m.module == Pkg.REPLMode
-        Prompt.insert_keybindings(repl, world_age)
+        Prompt.insert_keybindings()
     end
 end
 
-function setup_repl(repl, world_age)
-    if !isdefined(repl, :interface)
-        repl.interface = REPL.setup_interface(repl)
-    end
-    Prompt.insert_keybindings(repl, world_age)
-    @async begin
-        sleep(0.25)
-        reinsert_after_pkg(repl, world_age)
-    end
-    update_interface(repl.interface)
-
-    global _refresh_line_hook = fix_world_age(_refresh_line, world_age)
-end
-
 function __init__()
     options = Base.JLOptions()
-    world_age = Base.get_world_counter()
     # command-line
     if (options.isinteractive != 1) && options.commands != C_NULL
         return
     end
 
     if isdefined(Base, :active_repl)
-        setup_repl(Base.active_repl, world_age)
+        if !isdefined(Base.active_repl, :interface)
+            Base.active_repl.interface = REPL.setup_interface(Base.active_repl)
+        end
+        Prompt.insert_keybindings()
+        @async begin
+            sleep(0.25)
+            reinsert_after_pkg()
+        end
     else
         atreplinit() do repl
-            setup_repl(Base.active_repl, world_age)
+            if !isdefined(repl, :interface)
+                repl.interface = REPL.setup_interface(repl)
+            end
+            Prompt.insert_keybindings()
+            @async begin
+                sleep(0.25)
+                reinsert_after_pkg()
+            end
+            update_interface(repl.interface)
         end
     end
 
     if ccall(:jl_generating_output, Cint, ()) == 0
-        activate_hooks()
+        include(joinpath(@__DIR__, "refresh_lines.jl"))
+        include(joinpath(@__DIR__, "output_prompt_overwrite.jl"))
+        include(joinpath(@__DIR__, "MarkdownHighlighter.jl"))
     end
 end
 

src/output_prompt_overwrite.jl

@@ -0,0 +1,28 @@
+import REPL
+
+if !isdefined(REPL, :IPython)
+function REPL.display(d::REPL.REPLDisplay, mime::MIME"text/plain", x)
+    x = Ref{Any}(x)
+    REPL.with_repl_linfo(d.repl) do io
+        if isdefined(REPL, :active_module)
+            mod = REPL.active_module(d)::Module
+        else
+            mod = Main
+        end
+        io = IOContext(io, :limit => true, :module => mod)
+        if OUTPUT_PROMPT !== nothing
+            output_prompt = OUTPUT_PROMPT isa String ? OUTPUT_PROMPT : OUTPUT_PROMPT()
+            write(io, OUTPUT_PROMPT_PREFIX)
+            write(io, output_prompt, "\e[0m")
+        end
+        get(io, :color, false) && write(io, REPL.answer_color(d.repl))
+        if isdefined(d.repl, :options) && isdefined(d.repl.options, :iocontext)
+            # this can override the :limit property set initially
+            io = foldl(IOContext, d.repl.options.iocontext, init=io)
+        end
+        show(io, mime, x[])
+        println(io)
+    end
+    return nothing
+end
+end

src/precompile.jl

@@ -5,8 +5,3 @@ precompile(Tuple{OhMyREPL.Passes.SyntaxHighlighter.SyntaxHighlighterSettings, Ar
 precompile(Tuple{OhMyREPL.Passes.BracketHighlighter.BracketHighlighterSettings, Array{Crayons.Crayon, 1}, Array{JuliaSyntax.Token, 1}, Int64, String})
 precompile(Tuple{OhMyREPL.Passes.RainbowBrackets.RainbowBracketsSettings, Array{Crayons.Crayon, 1}, Array{JuliaSyntax.Token, 1}, Int64, String})
 precompile(Tuple{typeof(OhMyREPL.untokenize_with_ANSI), Base.IOContext{Base.GenericIOBuffer{Array{UInt8, 1}}}, OhMyREPL.PassHandler, Array{JuliaSyntax.Token, 1}, String, Int64})
-precompile(_refresh_line, (REPL.LineEdit.ModeState,))
-precompile(_refresh_line, (REPL.LineEdit.MIState,))
-precompile(_refresh_line, (REPL.LineEdit.IOBuffer,))
-precompile(_REPL_display, (REPL.REPLDisplay, MIME"text/plain", String))
-precompile(_Markdown_term, (IO, Markdown.Code, Int))

src/refresh_lines.jl

@@ -0,0 +1,6 @@
+import REPL.LineEdit
+
+function LineEdit.refresh_line(s::REPL.LineEdit.BufferLike)
+    LineEdit.refresh_multi_line(s)
+    OhMyREPL.Prompt.rewrite_with_ANSI(s)
+end

src/repl.jl

@@ -17,7 +17,7 @@ import REPL.Terminals: raw!, width, height, cmove, getX, TerminalBuffer,
                   getY, clear_line, beep, disable_bracketed_paste, enable_bracketed_paste
 
 using OhMyREPL
-import OhMyREPL: untokenize_with_ANSI, apply_passes!, PASS_HANDLER, fix_world_age
+import OhMyREPL: untokenize_with_ANSI, apply_passes!, PASS_HANDLER
 
 if VERSION > v"1.3"
 import JLFzf
@@ -89,7 +89,8 @@ function rewrite_with_ANSI(s, cursormove::Bool = false)
     end
 end
 
-function create_keybindings(prefix_hist_prompt, world_age)
+
+function create_keybindings()
     D = Dict{Any, Any}()
     D['\b']   = (s, data, c) -> if LineEdit.edit_backspace(s, true)
         rewrite_with_ANSI(s)
@@ -288,33 +289,29 @@ function create_keybindings(prefix_hist_prompt, world_age)
             LineEdit.enter_search(s, p, true)
         end
     end
-
-    # Up Arrow
-    D["\e[A"] = (s,o...)-> begin
-        LineEdit.edit_move_up(buffer(s)) || LineEdit.enter_prefix_search(s, prefix_hist_prompt, true)
-        Prompt.rewrite_with_ANSI(s)
-    end
-    # Down Arrow
-    D["\e[B"] = (s,o...)-> begin
-        LineEdit.edit_move_down(buffer(s)) || LineEdit.enter_prefix_search(s, prefix_hist_prompt, false)
-        Prompt.rewrite_with_ANSI(s)
-    end
-
-    OhMyREPL.BracketInserter.insert_into_keymap!(D)
-
-    return Dict(k=>fix_world_age(f, world_age) for (k,f) in D)
+    return D
 end
+NEW_KEYBINDINGS = create_keybindings()
 
-function insert_keybindings(repl, world_age)
+function insert_keybindings(repl = Base.active_repl)
     mirepl = (isdefined(repl,:mistate) && !isnothing(repl.mistate)) ? repl.mistate : repl
     interface_modes = mirepl.interface.modes
     main_mode = interface_modes[1]
     php_idx = findfirst(Base.Fix2(isa, LineEdit.PrefixHistoryPrompt), interface_modes)
     p = interface_modes[php_idx]
 
-    keybinds = create_keybindings(p, world_age)
+    # Up Arrow
+    NEW_KEYBINDINGS["\e[A"] = (s,o...)-> begin
+        LineEdit.edit_move_up(buffer(s)) || LineEdit.enter_prefix_search(s, p, true)
+        Prompt.rewrite_with_ANSI(s)
+    end
+    # Down Arrow
+    NEW_KEYBINDINGS["\e[B"] = (s,o...)-> begin
+        LineEdit.edit_move_down(buffer(s)) || LineEdit.enter_prefix_search(s, p, false)
+        Prompt.rewrite_with_ANSI(s)
+    end
 
-    main_mode.keymap_dict = LineEdit.keymap(Dict{Any, Any}[keybinds, main_mode.keymap_dict])
+    main_mode.keymap_dict = LineEdit.keymap(Dict{Any, Any}[NEW_KEYBINDINGS, main_mode.keymap_dict])
 end
 
 function _commit_line(s, data, c)