Merge branch 'ScottPJones-spj/editdef'

Author: StefanKarpinski

base/LineEdit.jl

@@ -1326,6 +1326,26 @@ function commit_line(s)
     state(s, mode(s)).ias = InputAreaState(0, 0)
 end
 
+"""
+`Base.LineEdit.tabwidth` controls the presumed tab width of code pasted into the REPL.
+
+You can modify it by doing `eval(Base.LineEdit, :(tabwidth = 4))`, for example.
+
+Must satisfy `0 < tabwidth <= 16`.
+"""
+global tabwidth = 8
+
+function bracketed_paste(s)
+    ps = state(s, mode(s))
+    input = readuntil(ps.terminal, "\e[201~")[1:(end-6)]
+    input = replace(input, '\r', '\n')
+    if position(buffer(s)) == 0
+        indent = Base.indentation(input; tabwidth=tabwidth)[1]
+        input = Base.unindent(input[(indent+1):end], indent; tabwidth=tabwidth)
+    end
+    input
+end
+
 const default_keymap =
 AnyDict(
     # Tab
@@ -1429,13 +1449,7 @@ AnyDict(
     "\e[3~" => (s,o...)->edit_delete(s),
     # Bracketed Paste Mode
     "\e[200~" => (s,o...)->begin
-        ps = state(s, mode(s))
-        input = readuntil(ps.terminal, "\e[201~")[1:(end-6)]
-        input = replace(input, '\r', '\n')
-        if position(buffer(s)) == 0
-            indent = Base.indentation(input; tabwidth=4)[1]
-            input = Base.unindent(input[(indent+1):end], indent; tabwidth=4)
-        end
+        input = bracketed_paste(s)
         edit_insert(s, input)
     end,
     "^T" => (s,o...)->edit_transpose(s)

base/REPL.jl

@@ -784,15 +784,9 @@ function setup_interface(repl::LineEditREPL; hascolor = repl.hascolor, extra_rep
 
         # Bracketed Paste Mode
         "\e[200~" => (s,o...)->begin
-            ps = LineEdit.state(s, LineEdit.mode(s))
-            input = readuntil(ps.terminal, "\e[201~")[1:(end-6)]
-            input = replace(input, '\r', '\n')
-            if position(LineEdit.buffer(s)) == 0
-                indent = Base.indentation(input; tabwidth=4)[1]
-                input = Base.unindent(lstrip(input), indent; tabwidth=4)
-            end
+            input = LineEdit.bracketed_paste(s)
             buf = copy(LineEdit.buffer(s))
-            edit_insert(buf,input)
+            edit_insert(buf, input)
             string = takebuf_string(buf)
             curspos = position(LineEdit.buffer(s))
             pos = 0