simpler returns

Author: aviatesk

src/docs.jl

@@ -32,7 +32,7 @@ function renderitem(x)
 
   mod = getmodule(x.mod)
   name = Symbol(x.name)
-  r[:typ], r[:icon], r[:nativetype] = if (name !== :ans || mod === Base) && name ∈ keys(Docs.keywords)
+  r[:typ], r[:icon], r[:nativetype] = if (name !== :ans || mod === Base) && iskeyword(name)
     "keyword", "k", x.typ
   else
     val = getfield′(mod, name)

src/refactor.jl

@@ -20,22 +20,25 @@ function renamerefactor(
   column = 1, row = 1, startrow = 0, context = "",
   mod = "Main",
 )
+  # catch keyword renaming
+  iskeyword(old) && return Dict(:warning => "Keywords can't be renamed: `$old`")
+
   mod = getmodule(mod)
   head = first(split(full, '.'))
   headval = getfield′(mod, head)
 
   # catch field renaming
-  if head ≠ old && !isa(headval, Module)
-    return Dict(:warning => "Rename refactoring on a field isn't available: `$obj.$old`")
-  end
+  head ≠ old && !isa(headval, Module) && return Dict(
+    :warning => "Rename refactoring on a field isn't available: `$obj.$old`"
+  )
 
   expr = CSTParser.parse(context)
   items = toplevelitems(expr, context)
   ind = findfirst(item -> item isa ToplevelBinding, items)
   bind = ind === nothing ? nothing : items[ind].bind
 
   # local rename refactor if `old` isn't a toplevel binding
-  if bind === nothing || old ≠ bind.name
+  if islocalrefactor(bind, old)
     try
       refactored = localrefactor(old, new, path, column, row, startrow, context, expr)
       isempty(refactored) || return Dict(
@@ -51,15 +54,8 @@ function renamerefactor(
   try
     val = getfield′(mod, full)
 
-    # catch keyword renaming
-    if val isa Undefined && Symbol(old) in keys(Docs.keywords)
-      return Dict(:warning => "Keywords can't be renamed: `$old`")
-    end
-
     # catch global refactoring not on definition, e.g.: on a call site
-    if bind === nothing || old ≠ bind.name
-      return Dict(:info => contextdescription(old, mod, context))
-    end
+    islocalrefactor(bind, old) && return Dict(:info => contextdescription(old, mod, context))
 
     kind, desc = globalrefactor(old, new, mod, expr)
 
@@ -83,6 +79,8 @@ function renamerefactor(
   return Dict(:error => "Rename refactoring `$old` ⟹ `$new` failed")
 end
 
+islocalrefactor(bind, name) = bind === nothing || name ≠ bind.name
+
 # local refactor
 # --------------
 

src/utils.jl

@@ -177,7 +177,7 @@ Retrieves docs for `mod.word` with [`@doc`](@ref) macro. If `@doc` is not availa
     You may want to run [`cangetdocs`](@ref) in advance.
 """
 getdocs(mod::Module, word::AbstractString, fallbackmod::Module = Main) = begin
-  md = if Symbol(word) in keys(Docs.keywords)
+  md = if iskeyword(word)
     Core.eval(Main, :(@doc($(Symbol(word)))))
   else
     docsym = Symbol("@doc")
@@ -209,6 +209,12 @@ cangetdocs(mod::Module, word::Symbol) =
 cangetdocs(mod::Module, word::AbstractString) = cangetdocs(mod, Symbol(word))
 cangetdocs(mod::AbstractString, word::Union{Symbol, AbstractString}) = cangetdocs(getmodule(mod), word)
 
+# is utilities
+# ------------
+
+iskeyword(word::Symbol) = word in keys(Docs.keywords)
+iskeyword(word::AbstractString) = iskeyword(Symbol(word))
+
 # uri utilties
 # ------------