Skip to content

Bugfix/get var stack #198

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 2 commits into
base: master
Choose a base branch
from
Open

Bugfix/get var stack #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5315f8a
test_def typo; should compare start and end lines
masonium Apr 18, 2021
ed950cb
fix get_var_stack that prevents beginning-of-line looks
masonium Apr 18, 2021
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
2 changes: 1 addition & 1 deletion fortls/objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ def get_var_stack(line):
"CALL self%method(this%foo" -> ["this", "foo"]
"""
if len(line) == 0:
return None
return ['']
final_var, sections = get_paren_level(line)
if final_var == '':
return ['']
Expand Down
6 changes: 4 additions & 2 deletions test/test_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ def test_def():
def check_return(result_array, checks):
assert result_array["uri"] == path_to_uri(checks[2])
assert result_array["range"]["start"]["line"] == checks[0]
assert result_array["range"]["start"]["line"] == checks[1]
assert result_array["range"]["end"]["line"] == checks[1]

def def_request(file_path, line, char):
return write_rpc_request(1, "textDocument/definition", {
Expand All @@ -378,6 +378,7 @@ def def_request(file_path, line, char):
string += def_request(file_path, 20, 7)
string += def_request(file_path, 21, 20)
string += def_request(file_path, 21, 42)
string += def_request(file_path, 23, 0)
string += def_request(file_path, 23, 26)
file_path = os.path.join(test_dir, "subdir", "test_submod.F90")
string += def_request(file_path, 30, 12)
Expand All @@ -401,6 +402,7 @@ def def_request(file_path, line, char):
[10, 10, os.path.join(test_dir, "test_prog.f08")],
[21, 21, free_path],
[14, 14, free_path],
[7, 7, os.path.join(test_dir, "test_prog.f08")],
[5, 5, free_path],
# subdir/test_submod.F90
[1, 1, os.path.join(test_dir, "subdir", "test_submod.F90")],
Expand Down Expand Up @@ -530,4 +532,4 @@ def hover_request(file_path, line, char):
test_def()
test_refs()
test_hover()
test_docs()
test_docs()