From b264baf656e723fff0cd6bfce5e8e8f8dbde4c01 Mon Sep 17 00:00:00 2001 From: Janych Date: Tue, 12 Nov 2019 19:50:37 +0300 Subject: [PATCH 1/5] fix for old version jedi --- gedi.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gedi.py b/gedi.py index dbae712..a130e5f 100644 --- a/gedi.py +++ b/gedi.py @@ -94,10 +94,14 @@ def do_populate(self, context): for completion in Jedi.get_script(document).completions(): complete = completion.name + if jedi.__version__ <= (0,7,0): + doc=completion.doc + else: + doc=completion.docstring() proposals.append(GtkSource.CompletionItem.new(completion.name, completion.name, self.get_icon_for_type(completion.type), - completion.docstring())) + doc)) context.add_proposals(self, proposals, True) From fcc3b8f9a57551529b5f73a77fc977a75d018b09 Mon Sep 17 00:00:00 2001 From: Janych Date: Tue, 12 Nov 2019 19:52:24 +0300 Subject: [PATCH 2/5] fix for gedit versions lower 3.14 --- gedi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gedi.py b/gedi.py index a130e5f..58d8359 100644 --- a/gedi.py +++ b/gedi.py @@ -44,7 +44,7 @@ def do_activate(self): def do_deactivate(self): print("Gedi is deactivated.") - def on_document_load(self, document): + def on_document_load(self, document, p3=None, p4=None, p5=0, p6=0): if document.get_uri_for_display().endswith(self.py_extension): if self.completion_provider is None: self.completion_provider = GediCompletionProvider() From b3b73a186b5e0968ef249f24a69caaa7e74a9abf Mon Sep 17 00:00:00 2001 From: Janych Date: Tue, 12 Nov 2019 20:07:59 +0300 Subject: [PATCH 3/5] fix activating gedi Load is not call when empty noname document opened at gedit startup replace by python document --- gedi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gedi.py b/gedi.py index 58d8359..428fc39 100644 --- a/gedi.py +++ b/gedi.py @@ -35,7 +35,7 @@ def __init__(self): def do_activate(self): print("Gedi is activated.") document = self.view.get_buffer() - document.connect("load", self.on_document_load) + document.connect("loaded", self.on_document_load) if document.get_uri_for_display().endswith(self.py_extension): self.completion_provider = GediCompletionProvider() From 11b992452f44a5af3cd7640a617edac2c8ab1972 Mon Sep 17 00:00:00 2001 From: Janych Date: Tue, 12 Nov 2019 20:12:11 +0300 Subject: [PATCH 4/5] add check for strings and comments --- gedi.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gedi.py b/gedi.py index 428fc39..77fef27 100644 --- a/gedi.py +++ b/gedi.py @@ -71,9 +71,11 @@ def get_iter_correctly(self, context): return context.get_iter() def do_match(self, context): - #FIXME: check for strings and comments iter = self.get_iter_correctly(context) iter.backward_char() + buffer=iter.get_buffer() + if buffer.get_context_classes_at_iter(iter) != ['no-spell-check']: + return False ch = iter.get_char() if not (ch in ('_', '.') or ch.isalnum()): return False From 48c065942e24bce18d32607467b966cc3010f611 Mon Sep 17 00:00:00 2001 From: Janych Date: Tue, 12 Nov 2019 22:35:41 +0300 Subject: [PATCH 5/5] update README.md python-jedi contains only files for python 2.7 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bfbd331..c444bae 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ A python code completion plugin for gedit. Built with the Jedi auto completion l - Some refactoring tools ## Using -- Firstly, you need to install jedi. You can install it from your distro's package manager(search for python-jedi) or you can install it with pip: +- Firstly, you need to install jedi. You can install it from your distro's package manager(search for python3-jedi) or you can install it with pip: ``` pip install jedi ```