Merge pull request #201 from JunoLab/avi/misc

misc:

Author: pfitzseb

src/debugger/repl.jl

@@ -4,7 +4,7 @@ using REPL.REPLCompletions
 using JuliaInterpreter: moduleof, locals, eval_code
 import ..Atom: @msg
 
-const normal_prefix = Sys.iswindows() ? "\e[33m" : "\e[38;5;166m"
+const normal_prefix = @static Sys.iswindows() ? "\e[33m" : "\e[38;5;166m"
 const compiled_prefix = "\e[96m"
 
 function debugprompt()

src/eval.jl

@@ -159,8 +159,14 @@ handle("evalall") do data
 end
 
 handle("docs") do data
-  @destruct [mod || "Main", word] = data
+  @destruct [
+    word,
+    mod || "Main"
+  ] = data
+  docs(word, mod)
+end
 
+function docs(word, mod = "Main")
   docstring = @errs getdocs(mod, word)
   docstring isa EvalError && return Dict(:error => true)
 

src/outline.jl

@@ -276,7 +276,7 @@ function byteoffset(text, line, col)
             c === '\n' && break
         end
         current_char == col && break
-        byteoffset += VERSION >= v"1.1" ? ncodeunits(c) : ncodeunits(string(c))
+        byteoffset += @static VERSION >= v"1.1" ? ncodeunits(c) : ncodeunits(string(c))
         c === '\n' && (current_line += 1)
     end
     byteoffset

src/path_matching.jl

@@ -1,10 +1,10 @@
-const uri_regex = if Sys.iswindows()
+const uri_regex = @static if Sys.iswindows()
   r"((?:(?:[a-zA-Z]:|\.\.?|\~)|(?:[^\0<>\?\|\/\s!$`&*()\[\]+'\":;])+)?(?:(?:\\|\/)(?:[^\0<>\?\|\/\s!$`&*()\[\]+'\":;])+)+)(?:\:(\d+))?"
 else
   r"((?:(?:\.\.?|\~)|(?:[^\0\s!$`&*()\[\]+'\":;\\])+)?(?:\/(?:[^\0\s!$`&*()\[\]+'\":;\\])+)+)(?:\:(\d+))?"
 end
 
-const buildbot_regex = if Sys.iswindows()
+const buildbot_regex = @static if Sys.iswindows()
   r"C:\\cygwin\home\\Admininstrator\\buildbot\\.*?(\\julia\\stdlib\\.*?\.jl)"
 else
   r"\/buildworker\/worker\/.*?(\/julia\/stdlib\/.*?\.jl)"

test/eval.jl

@@ -1,22 +1,16 @@
 @testset "toggle docs" begin
-    cb = 0  # callback count
-    handle(type, word, mod = "Main") =
-        Atom.handlemsg(Dict("type"     => type,
-                            "callback" => (cb += 1)),
-                       Dict("word"     => word,
-                            "mod"      => mod))
-
-    ## toggle docs
-
     # basic
-    handle("docs", "push!")
-    @test !readmsg()[3]["error"]
+    let doc = Atom.docs("push!")
+        @test !doc[:error]
+    end
 
     # context module
-    handle("docs", "handlemsg", "Atom")
-    @test !readmsg()[3]["error"]
+    let doc = Atom.docs("handle", "Atom")
+        @test !doc[:error]
+    end
 
     # keyword
-    handle("docs", "begin", "Atom")
-    @test !readmsg()[3]["error"]
+    let doc = Atom.docs("begin", "Atom")
+        @test !doc[:error]
+    end
 end