Skip to content

Commit f779a49

Browse files
authored
Format files using DocumentFormat
1 parent 8652378 commit f779a49

15 files changed

+263
-265
lines changed

docs/make.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ makedocs(;
77
repo="https://github.com/julia-vscode/StaticLint.jl/blob/{commit}{path}#L{line}",
88
sitename="StaticLint.jl",
99
format=Documenter.HTML(;
10-
prettyurls=prettyurls = get(ENV, "CI", nothing) == "true",
10+
prettyurls=prettyurls = get(ENV, "CI", nothing) == "true"
1111
# canonical="https://www.julia-vscode.org/StaticLint.jl",
1212
# assets=String[],
1313
),
1414
pages=[
1515
"Home" => "index.md",
1616
"Syntax Reference" => "syntax.md",
17-
],
17+
]
1818
)
1919

2020
deploydocs(;
21-
repo="github.com/julia-vscode/StaticLint.jl",
21+
repo="github.com/julia-vscode/StaticLint.jl"
2222
)

src/StaticLint.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ Meta() = Meta(nothing, nothing, nothing, nothing)
2727

2828
function Base.show(io::IO, m::Meta)
2929
m.binding !== nothing && show(io, m.binding)
30-
m.ref !== nothing && printstyled(io, " * ", color = :red)
31-
m.scope !== nothing && printstyled(io, " new scope", color = :green)
32-
m.error !== nothing && printstyled(io, " lint ", color = :red)
30+
m.ref !== nothing && printstyled(io, " * ", color=:red)
31+
m.scope !== nothing && printstyled(io, " new scope", color=:green)
32+
m.error !== nothing && printstyled(io, " lint ", color=:red)
3333
end
3434
hasmeta(x::EXPR) = x.meta isa Meta
3535
hasbinding(m::Meta) = m.binding isa Binding
@@ -166,7 +166,7 @@ end
166166
167167
Performs a semantic pass across a project from the entry point `file`. A first pass traverses the top-level scope after which secondary passes handle delayed scopes (e.g. functions). These secondary passes can be, optionally, very light and only seek to resovle references (e.g. link symbols to bindings). This can be done by supplying a list of expressions on which the full secondary pass should be made (`modified_expr`), all others will receive the light-touch version.
168168
"""
169-
function semantic_pass(file, modified_expr = nothing)
169+
function semantic_pass(file, modified_expr=nothing)
170170
server = file.server
171171
env = getenv(file, server)
172172
setscope!(getcst(file), Scope(nothing, getcst(file), Dict(), Dict{Symbol,Any}(:Base => env.symbols[:Base], :Core => env.symbols[:Core]), nothing))

src/bindings.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ function mark_binding!(x::EXPR, val=x)
139139
return x
140140
end
141141

142-
function mark_parameters(sig::EXPR, params = String[])
142+
function mark_parameters(sig::EXPR, params=String[])
143143
if CSTParser.issubtypedecl(sig)
144144
mark_parameters(sig.args[1], params)
145145
elseif iswhere(sig)
@@ -365,7 +365,7 @@ function add_binding(x, state, scope=state.scope)
365365
end
366366

367367
function enforce_hard_scope(x::EXPR, scope)
368-
scope.expr.head === :for && is_in_fexpr(x, x-> x == scope.expr.args[1])
368+
scope.expr.head === :for && is_in_fexpr(x, x -> x == scope.expr.args[1])
369369
end
370370

371371
name_is_getfield(x) = parentof(x) isa EXPR && parentof(parentof(x)) isa EXPR && CSTParser.is_getfield_w_quotenode(parentof(parentof(x)))

src/coretypes.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ isva(x::SymbolServer.FakeUnionAll) = isva(x.body)
3939
@static if Core.Vararg isa Core.Type
4040
function isva(x)
4141
return (x isa SymbolServer.FakeTypeName && x.name.name == :Vararg &&
42-
x.name.parent isa SymbolServer.VarRef && x.name.parent.name == :Core)
42+
x.name.parent isa SymbolServer.VarRef && x.name.parent.name == :Core)
4343
end
4444
else
4545
isva(x) = x isa SymbolServer.FakeTypeofVararg

src/exception_types.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ end
44

55
function Base.showerror(io::IO, ex::SLInvalidPath)
66
print(io, ex.msg)
7-
end
7+
end

src/imports.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ end
8686

8787
function has_workspace_package(server, name)
8888
haskey(server.workspacepackages, name) &&
89-
hasscope(getcst(server.workspacepackages[name])) &&
90-
haskey(scopeof(getcst(server.workspacepackages[name])).names, name) &&
91-
scopeof(getcst(server.workspacepackages[name])).names[name] isa Binding &&
92-
scopeof(getcst(server.workspacepackages[name])).names[name].val isa EXPR &&
93-
CSTParser.defines_module(scopeof(getcst(server.workspacepackages[name])).names[name].val)
89+
hasscope(getcst(server.workspacepackages[name])) &&
90+
haskey(scopeof(getcst(server.workspacepackages[name])).names, name) &&
91+
scopeof(getcst(server.workspacepackages[name])).names[name] isa Binding &&
92+
scopeof(getcst(server.workspacepackages[name])).names[name].val isa EXPR &&
93+
CSTParser.defines_module(scopeof(getcst(server.workspacepackages[name])).names[name].val)
9494
end
9595

9696
function add_to_imported_modules(scope::Scope, name::Symbol, val)
@@ -121,8 +121,8 @@ function _get_field(par, arg, state)
121121
if par isa SymbolServer.EnvStore
122122
if (arg_scope = retrieve_scope(arg)) !== nothing && (tlm = get_named_toplevel_module(arg_scope, arg_str_rep)) !== nothing && hasbinding(tlm)
123123
return bindingof(tlm)
124-
# elseif has_workspace_package(state.server, arg_str_rep)
125-
# return scopeof(getcst(state.server.workspacepackages[arg_str_rep])).names[arg_str_rep]
124+
# elseif has_workspace_package(state.server, arg_str_rep)
125+
# return scopeof(getcst(state.server.workspacepackages[arg_str_rep])).names[arg_str_rep]
126126
elseif haskey(par, Symbol(arg_str_rep))
127127
if isempty(state.env.project_deps) || Symbol(arg_str_rep) in state.env.project_deps
128128
return par[Symbol(arg_str_rep)]

src/interface.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
function setup_server(env = dirname(SymbolServer.Pkg.Types.Context().env.project_file), depot = first(SymbolServer.Pkg.depots()), cache = joinpath(dirname(pathof(SymbolServer)), "..", "store"))
1+
function setup_server(env=dirname(SymbolServer.Pkg.Types.Context().env.project_file), depot=first(SymbolServer.Pkg.depots()), cache=joinpath(dirname(pathof(SymbolServer)), "..", "store"))
22
server = StaticLint.FileServer()
33
ssi = SymbolServerInstance(depot, cache)
44
_, server.symbolserver = SymbolServer.getstore(ssi, env)
5-
server.symbol_extends = SymbolServer.collect_extended_methods(server.symbolserver)
5+
server.symbol_extends = SymbolServer.collect_extended_methods(server.symbolserver)
66
server
77
end
88

@@ -13,7 +13,7 @@ Parse a string and run a semantic pass over it. This will mark scopes, bindings,
1313
references, and lint hints. An annotated `EXPR` is returned or, if `gethints = true`,
1414
it is paired with a collected list of errors/hints.
1515
"""
16-
function lint_string(s::String, server = setup_server(); gethints = false)
16+
function lint_string(s::String, server=setup_server(); gethints=false)
1717
empty!(server.files)
1818
f = File("", s, CSTParser.parse(s, true), nothing, server)
1919
env = getenv(f, server)
@@ -37,7 +37,7 @@ in the project will be loaded automatically (calls to `include` with complicated
3737
are not handled, see `followinclude` for details). A `FileServer` will be returned
3838
containing the `File`s of the package.
3939
"""
40-
function lint_file(rootpath, server = setup_server(); gethints = false)
40+
function lint_file(rootpath, server=setup_server(); gethints=false)
4141
empty!(server.files)
4242
root = loadfile(server, rootpath)
4343
semantic_pass(root)
@@ -46,7 +46,7 @@ function lint_file(rootpath, server = setup_server(); gethints = false)
4646
end
4747
if gethints
4848
hints = []
49-
for (p,f) in server.files
49+
for (p, f) in server.files
5050
append!(hints, [(x, string(haserror(x) ? LintCodeDescriptions[x.meta.error] : "Missing reference", " at offset ", offset, " of ", p)) for (offset, x) in collect_hints(f.cst, getenv(f, server))])
5151
end
5252
return root, hints

src/linting/checks.jl

Lines changed: 41 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
@enum(
2-
LintCodes,
3-
4-
MissingRef,
2+
LintCodes, MissingRef,
53
IncorrectCallArgs,
64
IncorrectIterSpec,
75
NothingEquality,
@@ -177,9 +175,9 @@ function func_nargs(x::EXPR)
177175
maxargs !== typemax(Int) && (maxargs += 1)
178176
end
179177
elseif issplat(arg) ||
180-
(isdeclaration(arg) &&
181-
((isidentifier(arg.args[2]) && valofid(arg.args[2]) == "Vararg") ||
182-
(iscurly(arg.args[2]) && isidentifier(arg.args[2].args[1]) && valofid(arg.args[2].args[1]) == "Vararg")))
178+
(isdeclaration(arg) &&
179+
((isidentifier(arg.args[2]) && valofid(arg.args[2]) == "Vararg") ||
180+
(iscurly(arg.args[2]) && isidentifier(arg.args[2].args[1]) && valofid(arg.args[2].args[1]) == "Vararg")))
183181
maxargs = typemax(Int)
184182
else
185183
minargs += 1
@@ -243,9 +241,9 @@ end
243241
# compare_f_call(m_counts, call_counts) = true # fallback method
244242

245243
function compare_f_call(
246-
(ref_minargs, ref_maxargs, ref_kws, kwsplat),
247-
(act_minargs, act_maxargs, act_kws),
248-
)
244+
(ref_minargs, ref_maxargs, ref_kws, kwsplat),
245+
(act_minargs, act_maxargs, act_kws),
246+
)
249247
# check matching on positional arguments
250248
if act_maxargs == typemax(Int)
251249
act_minargs <= act_maxargs < ref_minargs && return false
@@ -265,10 +263,10 @@ end
265263

266264
function is_something_with_methods(x::Binding)
267265
(CoreTypes.isfunction(x.type) && x.val isa EXPR) ||
268-
(CoreTypes.isdatatype(x.type) && x.val isa EXPR && CSTParser.defines_struct(x.val)) ||
269-
(x.val isa SymbolServer.FunctionStore || x.val isa SymbolServer.DataTypeStore)
266+
(CoreTypes.isdatatype(x.type) && x.val isa EXPR && CSTParser.defines_struct(x.val)) ||
267+
(x.val isa SymbolServer.FunctionStore || x.val isa SymbolServer.DataTypeStore)
270268
end
271-
is_something_with_methods(x::T) where T <: Union{SymbolServer.FunctionStore,SymbolServer.DataTypeStore} = true
269+
is_something_with_methods(x::T) where T<:Union{SymbolServer.FunctionStore,SymbolServer.DataTypeStore} = true
272270
is_something_with_methods(x) = false
273271

274272
function check_call(x, env::ExternalEnv)
@@ -372,13 +370,13 @@ function check_incorrect_iter_spec(x, body, env)
372370
if headof(rng) === :FLOAT || headof(rng) === :INTEGER || (iscall(rng) && refof(rng.args[1]) === getsymbols(env)[:Base][:length])
373371
seterror!(x, IncorrectIterSpec)
374372
elseif iscall(rng) && valof(rng.args[1]) == ":" &&
375-
length(rng.args) === 3 &&
376-
headof(rng.args[2]) === :INTEGER &&
377-
iscall(rng.args[3]) &&
378-
length(rng.args[3].args) > 1 && (
379-
refof(rng.args[3].args[1]) === getsymbols(env)[:Base][:length] ||
380-
refof(rng.args[3].args[1]) === getsymbols(env)[:Base][:size]
381-
)
373+
length(rng.args) === 3 &&
374+
headof(rng.args[2]) === :INTEGER &&
375+
iscall(rng.args[3]) &&
376+
length(rng.args[3].args) > 1 && (
377+
refof(rng.args[3].args[1]) === getsymbols(env)[:Base][:length] ||
378+
refof(rng.args[3].args[1]) === getsymbols(env)[:Base][:size]
379+
)
382380
if length(x.args) >= 1
383381
lhs = x.args[1]
384382
arr = rng.args[3].args[2]
@@ -421,14 +419,14 @@ end
421419
function check_nothing_equality(x::EXPR, env::ExternalEnv)
422420
if isbinarycall(x) && length(x.args) == 3
423421
if valof(x.args[1]) == "==" && (
424-
(valof(x.args[2]) == "nothing" && refof(x.args[2]) === getsymbols(env)[:Core][:nothing]) ||
425-
(valof(x.args[3]) == "nothing" && refof(x.args[3]) === getsymbols(env)[:Core][:nothing])
426-
)
422+
(valof(x.args[2]) == "nothing" && refof(x.args[2]) === getsymbols(env)[:Core][:nothing]) ||
423+
(valof(x.args[3]) == "nothing" && refof(x.args[3]) === getsymbols(env)[:Core][:nothing])
424+
)
427425
seterror!(x.args[1], NothingEquality)
428426
elseif valof(x.args[1]) == "!=" && (
429-
(valof(x.args[2]) == "nothing" && refof(x.args[2]) === getsymbols(env)[:Core][:nothing]) ||
430-
(valof(x.args[3]) == "nothing" && refof(x.args[3]) === getsymbols(env)[:Core][:nothing])
431-
)
427+
(valof(x.args[2]) == "nothing" && refof(x.args[2]) === getsymbols(env)[:Core][:nothing]) ||
428+
(valof(x.args[3]) == "nothing" && refof(x.args[3]) === getsymbols(env)[:Core][:nothing])
429+
)
432430
seterror!(x.args[1], NothingNotEq)
433431
end
434432
end
@@ -520,9 +518,9 @@ end
520518

521519
function check_modulename(x::EXPR)
522520
if CSTParser.defines_module(x) && # x is a module
523-
scopeof(x) isa Scope && parentof(scopeof(x)) isa Scope && # it has a scope and a parent scope
524-
CSTParser.defines_module(parentof(scopeof(x)).expr) && # the parent scope is a module
525-
valof(CSTParser.get_name(x)) == valof(CSTParser.get_name(parentof(scopeof(x)).expr)) # their names match
521+
scopeof(x) isa Scope && parentof(scopeof(x)) isa Scope && # it has a scope and a parent scope
522+
CSTParser.defines_module(parentof(scopeof(x)).expr) && # the parent scope is a module
523+
valof(CSTParser.get_name(x)) == valof(CSTParser.get_name(parentof(scopeof(x)).expr)) # their names match
526524
seterror!(CSTParser.get_name(x), InvalidModuleName)
527525
end
528526
end
@@ -532,7 +530,7 @@ function check_farg_unused(x::EXPR)
532530
if CSTParser.defines_function(x)
533531
sig = CSTParser.rem_wheres_decls(CSTParser.get_sig(x))
534532
if (headof(x) === :function && length(x.args) == 2 && x.args[2] isa EXPR && length(x.args[2].args) == 1 && CSTParser.isliteral(x.args[2].args[1])) ||
535-
(length(x.args) > 1 && headof(x.args[2]) === :block && length(x.args[2].args) == 1 && CSTParser.isliteral(x.args[2].args[1]))
533+
(length(x.args) > 1 && headof(x.args[2]) === :block && length(x.args[2].args) == 1 && CSTParser.isliteral(x.args[2].args[1]))
536534
return # Allow functions that return constants
537535
end
538536
if iscall(sig)
@@ -566,12 +564,12 @@ function check_farg_unused_(arg, arg_names)
566564
valof(b.name) isa String && all_underscore(valof(b.name)) && return false
567565

568566
if b === nothing ||
569-
# no refs:
567+
# no refs:
570568
isempty(b.refs) ||
571-
# only self ref:
569+
# only self ref:
572570
(length(b.refs) == 1 && first(b.refs) == b.name) ||
573-
# first usage has binding:
574-
(length(b.refs) > 1 && b.refs[2] isa EXPR && hasbinding(b.refs[2]))
571+
# first usage has binding:
572+
(length(b.refs) > 1 && b.refs[2] isa EXPR && hasbinding(b.refs[2]))
575573
seterror!(arg, UnusedFunctionArgument)
576574
end
577575

@@ -591,8 +589,8 @@ end
591589

592590
function is_nospecialize_call(x)
593591
CSTParser.ismacrocall(x) &&
594-
CSTParser.ismacroname(x.args[1]) &&
595-
is_nospecialize(x.args[1])
592+
CSTParser.ismacroname(x.args[1]) &&
593+
is_nospecialize(x.args[1])
596594
end
597595

598596
"""
@@ -612,8 +610,8 @@ function collect_hints(x::EXPR, env, missingrefs=:all, isquoted=false, errs=Tupl
612610
push!(errs, (pos, x))
613611
elseif !isquoted
614612
if missingrefs != :none && isidentifier(x) && !hasref(x) &&
615-
!(valof(x) == "var" && parentof(x) isa EXPR && isnonstdid(parentof(x))) &&
616-
!((valof(x) == "stdcall" || valof(x) == "cdecl" || valof(x) == "fastcall" || valof(x) == "thiscall" || valof(x) == "llvmcall") && is_in_fexpr(x, x -> iscall(x) && isidentifier(x.args[1]) && valof(x.args[1]) == "ccall"))
613+
!(valof(x) == "var" && parentof(x) isa EXPR && isnonstdid(parentof(x))) &&
614+
!((valof(x) == "stdcall" || valof(x) == "cdecl" || valof(x) == "fastcall" || valof(x) == "thiscall" || valof(x) == "llvmcall") && is_in_fexpr(x, x -> iscall(x) && isidentifier(x.args[1]) && valof(x.args[1]) == "ccall"))
617615

618616
push!(errs, (pos, x))
619617
elseif haserror(x) && errorof(x) isa StaticLint.LintCodes
@@ -642,7 +640,7 @@ end
642640

643641
function should_mark_missing_getfield_ref(x, env)
644642
if isidentifier(x) && !hasref(x) && # x has no ref
645-
parentof(x) isa EXPR && headof(parentof(x)) === :quotenode && parentof(parentof(x)) isa EXPR && is_getfield(parentof(parentof(x))) # x is the rhs of a getproperty
643+
parentof(x) isa EXPR && headof(parentof(x)) === :quotenode && parentof(parentof(x)) isa EXPR && is_getfield(parentof(parentof(x))) # x is the rhs of a getproperty
646644
lhsref = refof_maybe_getfield(parentof(parentof(x)).args[1])
647645
hasref(x) && return false # We've resolved
648646
if lhsref isa SymbolServer.ModuleStore || (lhsref isa Binding && lhsref.val isa SymbolServer.ModuleStore)
@@ -711,14 +709,14 @@ function is_type_of_call_to_getproperty(x::EXPR)
711709
if iscall(x)
712710
func_name = x.args[1]
713711
return (isidentifier(func_name) && valof(func_name) == "getproperty") || # getproperty()
714-
(is_getfield_w_quotenode(func_name) && isidentifier(func_name.args[2].args[1]) && valof(func_name.args[2].args[1]) == "getproperty") # Base.getproperty()
712+
(is_getfield_w_quotenode(func_name) && isidentifier(func_name.args[2].args[1]) && valof(func_name.args[2].args[1]) == "getproperty") # Base.getproperty()
715713
end
716714
return false
717715
end
718716

719717
return parentof(x) isa EXPR && parentof(parentof(x)) isa EXPR &&
720-
((isdeclaration(parentof(x)) && x === parentof(x).args[2] && is_call_to_getproperty(parentof(parentof(x)))) ||
721-
(iscurly(parentof(x)) && x === parentof(x).args[1] && isdeclaration(parentof(parentof(x))) && parentof(parentof(parentof(x))) isa EXPR && is_call_to_getproperty(parentof(parentof(parentof(x))))))
718+
((isdeclaration(parentof(x)) && x === parentof(x).args[2] && is_call_to_getproperty(parentof(parentof(x)))) ||
719+
(iscurly(parentof(x)) && x === parentof(x).args[1] && isdeclaration(parentof(parentof(x))) && parentof(parentof(parentof(x))) isa EXPR && is_call_to_getproperty(parentof(parentof(parentof(x))))))
722720
end
723721

724722
isunionfaketype(t::SymbolServer.FakeTypeName) = t.name.name === :Union && t.name.parent isa SymbolServer.VarRef && t.name.parent.name === :Core
@@ -951,8 +949,8 @@ function check_unused_binding(b::Binding, scope::Scope)
951949
if headof(scope.expr) !== :struct && headof(scope.expr) !== :tuple && !all_underscore(valof(b.name))
952950
refs = loose_refs(b)
953951
if (isempty(refs) || length(refs) == 1 && refs[1] == b.name) &&
954-
!is_sig_arg(b.name) && !is_overwritten_in_loop(b.name) &&
955-
!is_overwritten_subsequently(b, scope) && !is_kw_of_macrocall(b)
952+
!is_sig_arg(b.name) && !is_overwritten_in_loop(b.name) &&
953+
!is_overwritten_subsequently(b, scope) && !is_kw_of_macrocall(b)
956954
seterror!(b.name, UnusedBinding)
957955
end
958956
end

0 commit comments

Comments
 (0)