Merge pull request #270 from julia-vscode/tidy

Tidy

Author: davidanthoff

src/references.jl

@@ -55,11 +55,11 @@ function resolve_ref(x::EXPR, scope::Scope, state::State)::Bool
         setref!(x, Binding(noname, nothing, nothing, []))
         return true
     end
-    x1, mn = nameof_expr_to_resolve(x)
-    mn == true && return true
+    mn = nameof_expr_to_resolve(x)
+    mn === nothing && return true
 
     if scopehasbinding(scope, mn)
-        setref!(x1, scope.names[mn])
+        setref!(x, scope.names[mn])
         resolved = true
     elseif scope.modules isa Dict && length(scope.modules) > 0
         for m in values(scope.modules)
@@ -107,11 +107,11 @@ function resolve_ref_from_module(x::EXPR, scope::Scope, state::State)::Bool
     hasref(x) && return true
     resolved = false
 
-    x1, mn = nameof_expr_to_resolve(x)
-    mn == true && return true
+    mn = nameof_expr_to_resolve(x)
+    mn === nothing && return true
 
     if scope_exports(scope, mn, state)
-        setref!(x1, scope.names[mn])
+        setref!(x, scope.names[mn])
         resolved = true
     end
     return resolved
@@ -144,10 +144,8 @@ function initial_pass_on_exports(x::EXPR, name, server)
     for a in x.args[3] # module block expressions
         if headof(a) === :export
             for i = 1:length(a.args)
-                if isidentifier(a.args[i]) && valof(a.args[i]) == name
-                    if !hasref(a.args[i])
-                        Delayed(scopeof(x), server)(a.args[i])
-                    end
+                if isidentifier(a.args[i]) && valof(a.args[i]) == name && !hasref(a.args[i])
+                    Delayed(scopeof(x), server)(a.args[i])
                 end
             end
         end
@@ -220,12 +218,11 @@ function resolve_getfield(x::EXPR, b::Binding, state::State)::Bool
 end
 
 function resolve_getfield(x::EXPR, parent_type, state::State)::Bool
-    hasref(x) && return true
-    return false
+    hasref(x)
 end
 
 function is_overloaded(val::SymbolServer.SymStore, scope::Scope)
-    (vr = val.name isa SymbolServer.FakeTypeName ? val.name.name : val.name)
+    vr = val.name isa SymbolServer.FakeTypeName ? val.name.name : val.name
     haskey(scope.overloaded, vr)
 end
 
@@ -257,15 +254,6 @@ function resolve_getfield(x::EXPR, m::SymbolServer.ModuleStore, state::State)::B
     return resolved
 end
 
-# function is_overloaded1(x, tls, val)
-#     vr = val.name isa SymbolServer.FakeTypeName ? val.name.name : val.name
-#     if haskey(tls.names, valof(x)) && tls.names[valof(x)] isa Binding && first(tls.names[valof(x)]) isa SymbolServer.FunctionStore
-
-#     end
-#     haskey(tls.overloaded, vr)
-    
-# end
-
 function resolve_getfield(x::EXPR, parent::SymbolServer.DataTypeStore, state::State)::Bool
     hasref(x) && return true
     resolved = false
@@ -282,33 +270,7 @@ end
 
 resolvable_macroname(x::EXPR) = isidentifier(x) && CSTParser.ismacroname(x) && refof(x) === nothing
 
-"""
-    module_safety_trip(scope::Scope,  visited_scopes)
-
-Checks whether the scope is a module and we've visited it before, 
-otherwise adds the module to the list.
-"""
-function module_safety_trip(scope::Scope,  visited_scopes)
-    if CSTParser.defines_module(scope.expr) && length(scope.expr.args) > 1 && isidentifier(scope.expr.args[2])
-        s_m_name = valofid(scope.expr.args[2])
-        if s_m_name in visited_scopes
-            return true
-        else
-            push!(visited_scopes, s_m_name)
-        end
-    end
-    return false
-end
-
-
-function nameof_expr_to_resolve(x)
-    if isidentifier(x)
-        mn = valofid(x)
-    else
-        return x, true
-    end
-    x, mn
-end
+nameof_expr_to_resolve(x) = isidentifier(x) ? valofid(x) : nothing
 
 """
     valofid(x)
@@ -324,4 +286,4 @@ new_within_struct(x::EXPR)
 Checks whether x is a reference to `new` within a datatype constructor. 
 """
 new_within_struct(x::EXPR) = isidentifier(x) && valofid(x) == "new" && is_in_fexpr(x, CSTParser.defines_struct)
-is_special_macro_term(x::EXPR) = isidentifier(x) && (valofid(x) == "__source__" || valofid(x) == "__module__") && is_in_fexpr(x, CSTParser.defines_macro)
+is_special_macro_term(x::EXPR) = isidentifier(x) && (valofid(x) == "__source__" || valofid(x) == "__module__") && is_in_fexpr(x, CSTParser.defines_macro)