Skip to content

Fieldnameinfer #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Fieldnameinfer #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f2aa7b6
wip
ZacLN Apr 19, 2020
62be0ff
Merge branch 'master' into fieldnameinfer
ZacLN Apr 20, 2020
e7413da
Merge branch 'master' into fieldnameinfer
ZacLN Apr 25, 2020
b0ee7ac
Merge branch 'master' into fieldnameinfer
ZacLN Apr 26, 2020
6e16fd4
Merge branch 'master' into fieldnameinfer
ZacLN Apr 26, 2020
a9ea008
Merge branch 'master' into fieldnameinfer
ZacLN Apr 29, 2020
33e2e44
Merge branch 'master' into fieldnameinfer
ZacLN May 2, 2020
c632736
Merge branch 'master' into fieldnameinfer
ZacLN May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/languageserverinstance.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ mutable struct LanguageServerInstance
symbol_results_channel::Channel{Any}
symbol_store::Dict{Symbol,SymbolServer.ModuleStore}
symbol_extends::Dict{SymbolServer.VarRef,Vector{SymbolServer.VarRef}}
symbol_fieldtypemap::Dict{Symbol, Vector{SymbolServer.VarRef}}
symbol_store_ready::Bool

format_options::DocumentFormat.FormatOptions
Expand Down Expand Up @@ -69,6 +70,7 @@ mutable struct LanguageServerInstance
Channel(Inf),
deepcopy(SymbolServer.stdlibs),
SymbolServer.collect_extended_methods(SymbolServer.stdlibs),
StaticLint.fieldname_type_map(SymbolServer.stdlibs),
false,
DocumentFormat.FormatOptions(),
true,
Expand Down Expand Up @@ -163,7 +165,7 @@ function trigger_symbolstore_reload(server::LanguageServerInstance)
server.err_handler
)
server.symbol_extends = SymbolServer.collect_extended_methods(server.symbol_store)

server.symbol_fieldtypemap = StaticLint.fieldname_type_map(server.symbol_store)
server.number_of_outstanding_symserver_requests -= 1

if server.number_of_outstanding_symserver_requests==0
Expand Down
3 changes: 2 additions & 1 deletion src/staticlint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import StaticLint: hasfile, canloadfile, loadfile, setfile, getfile, getsymbolserver, getsymbolextendeds
import StaticLint: hasfile, canloadfile, loadfile, setfile, getfile, getsymbolserver, getsymbolextendeds, getsymbolfieldtypemap
import StaticLint: getpath, getroot, setroot, getcst, setcst, scopepass, getserver, setserver
hasfile(server::LanguageServerInstance, path::String) = hasdocument(server, URI2(filepath2uri(path)))
function canloadfile(server::LanguageServerInstance, path::String)
Expand Down Expand Up @@ -33,6 +33,7 @@ end
getfile(server::LanguageServerInstance, path::String) = getdocument(server, URI2(filepath2uri(path)))
getsymbolserver(server::LanguageServerInstance) = server.symbol_store
getsymbolextendeds(server::LanguageServerInstance) = server.symbol_extends
getsymbolfieldtypemap(server::LanguageServerInstance) = server.symbol_fieldtypemap

getpath(d::Document) = d.path
function setpath(d::Document, path::String)
Expand Down