Skip to content
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

Jump to bottom

PR: Move completion plugin files to manager plugin and create a completions.manager.api file #13403

Merged
merged 2 commits into from
Jul 29, 2020
Merged

PR: Move completion plugin files to manager plugin and create a completions.manager.api file #13403

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
566a979
Move completion manager plugin to separate folder
goanpeca Jul 28, 2020
a3ac6a2
Move LSP constants to completion manager so provider depend on manage…
goanpeca Jul 28, 2020
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
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@ def run(self):
spyder_plugins_entry_points = [
'appearance = spyder.plugins.appearance.plugin:Appearance',
'breakpoints = spyder.plugins.breakpoints.plugin:Breakpoints',
'code_completion = spyder.plugins.completion.plugin:CompletionManager',
('code_completion = spyder.plugins.completion.manager.plugin:'
'CompletionManager'),
'core = spyder.plugins.core.plugin:Core',
'editor = spyder.plugins.editor.plugin:Editor',
'explorer = spyder.plugins.explorer.plugin:Explorer',
Expand Down
193 changes: 0 additions & 193 deletions spyder/api/completion.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion spyder/app/mainwindow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,7 @@ def create_edit_action(text, tr_text, icon):

# Code completion client initialization
self.set_splash(_("Starting code completion manager..."))
from spyder.plugins.completion.plugin import CompletionManager
from spyder.plugins.completion.manager.plugin import CompletionManager
self.completions = CompletionManager(self)

# Outline explorer widget
Expand Down
4 changes: 2 additions & 2 deletions spyder/plugins/completion/fallback/actor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
from diff_match_patch import diff_match_patch

# Local imports
from spyder.plugins.completion.languageserver import CompletionItemKind
from spyder.plugins.completion.languageserver import LSPRequestTypes
from spyder.plugins.completion.manager.api import CompletionItemKind
from spyder.plugins.completion.manager.api import LSPRequestTypes
from spyder.plugins.completion.fallback.utils import (
get_keywords, get_words, is_prefix_valid)

Expand Down
2 changes: 1 addition & 1 deletion spyder/plugins/completion/fallback/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import logging

# Local imports
from spyder.api.completion import SpyderCompletionPlugin
from spyder.plugins.completion.manager.api import SpyderCompletionPlugin
from spyder.plugins.completion.fallback.actor import FallbackActor


Expand Down
2 changes: 1 addition & 1 deletion spyder/plugins/completion/fallback/tests/test_fallback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import pytest
from diff_match_patch import diff_match_patch
from spyder.plugins.completion.languageserver import LSPRequestTypes
from spyder.plugins.completion.manager.api import LSPRequestTypes
from spyder.plugins.completion.fallback.utils import get_words


Expand Down
2 changes: 1 addition & 1 deletion spyder/plugins/completion/kite/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

"""Kite client requests and constants."""

from spyder.plugins.completion.languageserver import LSPRequestTypes
from spyder.plugins.completion.manager.api import LSPRequestTypes


LOCALHOST = '127.0.0.1'
Expand Down
2 changes: 1 addition & 1 deletion spyder/plugins/completion/kite/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from spyder.config.base import _, running_under_pytest
from spyder.config.manager import CONF
from spyder.utils.programs import run_program
from spyder.api.completion import SpyderCompletionPlugin
from spyder.plugins.completion.manager.api import SpyderCompletionPlugin
from spyder.plugins.completion.kite.client import KiteClient
from spyder.plugins.completion.kite.utils.status import (
check_if_kite_running, check_if_kite_installed)
Expand Down
2 changes: 1 addition & 1 deletion spyder/plugins/completion/kite/providers/document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

from qtpy.QtCore import QMutexLocker
from spyder.plugins.completion.kite.decorators import send_request, handles
from spyder.plugins.completion.languageserver import (
from spyder.plugins.completion.manager.api import (
LSPRequestTypes, CompletionItemKind)


Expand Down
Loading