Skip to content

Commit

Permalink
Merge pull request python-lsp#2 from bnavigator/jedi18
Browse files Browse the repository at this point in the history
bump jedi compatibility: compare to Path-like object
  • Loading branch information
krassowski authored Feb 21, 2021
2 parents a91a257 + e442467 commit 5ed736a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
10 changes: 8 additions & 2 deletions pyls/plugins/symbols.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,14 @@ def pyls_document_symbols(config, document):
if (not sym_full_name.startswith(module_name) and
not sym_full_name.startswith('__main__')):
continue

if _include_def(d) and document.path == d.module_path:
try:
docismodule = os.path.samefile(document.path, d.module_path)
except AttributeError:
# Python 2 on Windows has no .samefile, but then these are
# strings for sure
docismodule = document.path == d.module_path

if _include_def(d) and docismodule:
tuple_range = _tuple_range(d)
if tuple_range in exclude:
continue
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'configparser; python_version<"3.0"',
'future>=0.14.0; python_version<"3"',
'backports.functools_lru_cache; python_version<"3.2"',
'jedi>=0.17.2,<0.18.0',
'jedi>=0.17.2,<0.19.0',
'python-jsonrpc-server>=0.4.0',
'pluggy',
'ujson<=2.0.3 ; platform_system!="Windows" and python_version<"3.0"',
Expand Down

0 comments on commit 5ed736a

Please sign in to comment.