From 784f9ff081177495f7c1d94f8fe5ea2dba732bc0 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Thu, 23 Apr 2020 10:10:58 +0200 Subject: [PATCH] Actually fix #1556, forgot to add this in 94d374c9ceeb16ea1c6fe49b8e039d415c7dbe5a --- conftest.py | 2 +- jedi/api/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conftest.py b/conftest.py index 4c6abf25..08c5e81a 100644 --- a/conftest.py +++ b/conftest.py @@ -13,7 +13,7 @@ from test.helpers import test_dir collect_ignore = [ 'setup.py', - '__main__.py', + 'jedi/__main__.py', 'jedi/inference/compiled/subprocess/__main__.py', 'build/', 'test/examples', diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py index 591dd19e..47e046e4 100644 --- a/jedi/api/__init__.py +++ b/jedi/api/__init__.py @@ -472,7 +472,7 @@ class Script(object): if definitions: return definitions leaf = self._module_node.get_leaf_for_position((line, column)) - if leaf.type in ('keyword', 'operator', 'error_leaf'): + if leaf is not None and leaf.type in ('keyword', 'operator', 'error_leaf'): reserved = self._inference_state.grammar._pgen_grammar.reserved_syntax_strings.keys() if leaf.value in reserved: name = KeywordName(self._inference_state, leaf.value)