From 3d2c57cfc3c5e5a4328fd5163869fc7e2c2135df Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Fri, 9 Dec 2022 12:15:33 -0800 Subject: [PATCH 1/2] Fix jedi SAFE mode --- py/server/deephaven_internal/auto_completer/_completer.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/py/server/deephaven_internal/auto_completer/_completer.py b/py/server/deephaven_internal/auto_completer/_completer.py index 32d1f5304c2..7009e1b7030 100644 --- a/py/server/deephaven_internal/auto_completer/_completer.py +++ b/py/server/deephaven_internal/auto_completer/_completer.py @@ -79,11 +79,13 @@ def do_completion( # run jedi txt = self.get_doc(uri) - # The Script completer is static analysis only, so we should actually be feeding it a whole document at once. - completer = Script if self.__mode == Mode.SAFE else Interpreter + # The Script completer is static analysis only, so we should actually be feeding it a whole document at once. + if jedi_settings.mode == Mode.SAFE: + completions = Script(txt).complete(line, col) + else: + completions = Interpreter(txt, [self.__scope]).complete(line, col) - completions = completer(txt, [self.__scope]).complete(line, col) # for now, a simple sorting based on number of preceding _ # we may want to apply additional sorting to each list before combining results: list = [] From dee670109cc44d8cbad49bac2a3504544cb4fd94 Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Mon, 12 Dec 2022 09:06:54 -0800 Subject: [PATCH 2/2] Keep completer, Colin suggestion. move comment closer to script. black fmt --- .../deephaven_internal/auto_completer/_completer.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/py/server/deephaven_internal/auto_completer/_completer.py b/py/server/deephaven_internal/auto_completer/_completer.py index 7009e1b7030..485be4233e5 100644 --- a/py/server/deephaven_internal/auto_completer/_completer.py +++ b/py/server/deephaven_internal/auto_completer/_completer.py @@ -80,11 +80,13 @@ def do_completion( # run jedi txt = self.get_doc(uri) - # The Script completer is static analysis only, so we should actually be feeding it a whole document at once. - if jedi_settings.mode == Mode.SAFE: - completions = Script(txt).complete(line, col) - else: - completions = Interpreter(txt, [self.__scope]).complete(line, col) + completer = ( + # The Script completer is static analysis only, so we should actually be feeding it a whole document at once. + Script(txt) + if self.__mode == Mode.SAFE + else Interpreter(txt, [self.__scope]) + ) + completions = completer.complete(line, col) # for now, a simple sorting based on number of preceding _ # we may want to apply additional sorting to each list before combining