Skip to content

feat: Import host association #240

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

Merged
merged 8 commits into from
Dec 4, 2022
Merged

feat: Import host association #240

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1d403a1
feat: start of import host association
gnikit Nov 20, 2022
09fd229
test: add example for all cases for host import
gnikit Nov 20, 2022
605ec78
refactor: rename USE_line, should inherit UseInfo
gnikit Nov 20, 2022
b4fa690
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 20, 2022
4d3effe
feat: adds full support for import host assoc
gnikit Dec 3, 2022
202b496
refactor: restructure USE tree descent
gnikit Dec 3, 2022
7e898c4
Merge branch 'master' into feat/import-host-assoc
gnikit Dec 3, 2022
917fc29
refactor: swap rename and add typings
gnikit Dec 4, 2022
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
3 changes: 2 additions & 1 deletion fortls/intrinsics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
Module,
Subroutine,
Type,
Use,
Variable,
)

Expand Down Expand Up @@ -119,7 +120,7 @@ def create_object(json_obj: dict, enc_obj=None):
if json_obj["type"] == 0: # module, match "type": in JSON files
mod_tmp = Module(intrinsic_ast, 0, name)
if "use" in json_obj:
mod_tmp.add_use(json_obj["use"], 0)
mod_tmp.add_use(Use(json_obj["use"], line_number=0))
return mod_tmp
elif json_obj["type"] == 1: # subroutine, match "type": in JSON files
return Subroutine(intrinsic_ast, 0, name, args=args)
Expand Down
82 changes: 52 additions & 30 deletions fortls/langserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
from fortls.jsonrpc import JSONRPC2Connection, path_from_uri, path_to_uri
from fortls.objects import (
FortranAST,
Import,
Scope,
Use,
Variable,
climb_type_tree,
find_in_scope,
Expand Down Expand Up @@ -386,7 +389,10 @@ def get_candidates(
):
#
def child_candidates(
scope, only_list: list = None, filter_public=True, req_abstract=False
scope: Scope,
only_list: list = None,
filter_public=True,
req_abstract=False,
):
if only_list is None:
only_list = []
Expand All @@ -411,7 +417,7 @@ def child_candidates(
return tmp_list

var_list = []
use_dict = {}
use_dict: dict[str, Use | Import] = {}
for scope in scope_list:
var_list += child_candidates(
scope, filter_public=public_only, req_abstract=abstract_only
Expand All @@ -421,48 +427,64 @@ def child_candidates(
use_dict = get_use_tree(scope, use_dict, self.obj_tree)
# Look in found use modules
rename_list = [None for _ in var_list]
import_var_list = []
for use_mod, use_info in use_dict.items():
scope = self.obj_tree[use_mod][0]
only_list = use_info.only_list
if len(use_info.rename_map) > 0:
only_list = [
use_info.rename_map.get(only_name, only_name)
for only_name in only_list
]
tmp_list = child_candidates(
scope, only_list, req_abstract=abstract_only
)
# Setup renaming
if len(use_info.rename_map) > 0:
rename_reversed = {
value: key for (key, value) in use_info.rename_map.items()
}
for tmp_obj in tmp_list:
var_list.append(tmp_obj)
rename_list.append(
rename_reversed.get(tmp_obj.name.lower(), None)
)
else:
var_list += tmp_list
rename_list += [None for _ in tmp_list]
if type(use_info) is Use:
scope = self.obj_tree[use_mod][0]
only_list = use_info.only_list
if use_info.rename_map:
only_list = [
use_info.rename_map.get(only_name, only_name)
for only_name in only_list
]
# TODO: replace only_name -> with use_info.rename()
tmp_list = child_candidates(
scope, only_list, req_abstract=abstract_only
)
# Setup renaming
if use_info.rename_map:
rename_reversed = {
value: key for (key, value) in use_info.rename_map.items()
}
for tmp_obj in tmp_list:
var_list.append(tmp_obj)
rename_list.append(
rename_reversed.get(tmp_obj.name.lower(), None)
)
else:
var_list += tmp_list
rename_list += [None for _ in tmp_list]
elif type(use_info) is Import:
scope = use_info.scope
# Add import candidates
import_var_list += child_candidates(
scope,
only_list=use_info.only_list,
req_abstract=abstract_only,
)
# We do not have renames so ignore

# Add globals
if inc_globals:
tmp_list = [obj[0] for (_, obj) in self.obj_tree.items()]
var_list += tmp_list + self.intrinsic_funs
rename_list += [None for _ in tmp_list + self.intrinsic_funs]
if import_var_list:
var_list = import_var_list
rename_list = [None for _ in import_var_list]
# Filter by prefix if necessary
if var_prefix == "":
return var_list, rename_list
else:
tmp_list = []
tmp_rename = []
for (i, var) in enumerate(var_list):
var_name = rename_list[i]
for (var, rename) in zip(var_list, rename_list):
var_name = rename
if var_name is None:
var_name = var.name
if var_name.lower().startswith(var_prefix):
tmp_list.append(var)
tmp_rename.append(rename_list[i])
tmp_rename.append(rename)
return tmp_list, tmp_rename

def build_comp(
Expand Down Expand Up @@ -651,15 +673,15 @@ def build_comp(
candidate_list, rename_list = get_candidates(
scope_list, var_prefix, include_globals, public_only, abstract_only, no_use
)
for (i, candidate) in enumerate(candidate_list):
for (candidate, rename) in zip(candidate_list, rename_list):
# Skip module names (only valid in USE)
candidate_type = candidate.get_type()
if type_mask[candidate_type]:
continue
if req_callable and (not candidate.is_callable()):
continue
#
name_replace = rename_list[i]
name_replace = rename
if candidate_type == INTERFACE_TYPE_ID and not line_context == "mod_mems":
tmp_list = []
if name_replace is None:
Expand Down
Loading