clean up test

Author: niilohlin

pylsp/hookspecs.py

@@ -69,7 +69,7 @@ def pylsp_execute_command(config, workspace, command, arguments):
 
 
 @hookspec
-def pylsp_workspace_symbol(config, workspace, query):
+def pylsp_workspace_symbol(workspace, query):
     pass
 
 

pylsp/plugins/workspace_symbol.py

@@ -2,7 +2,6 @@
 # Copyright 2021- Python Language Server Contributors.
 
 import logging
-from pathlib import Path
 
 from pylsp import hookimpl
 from pylsp.lsp import SymbolKind
@@ -11,11 +10,14 @@
 
 
 @hookimpl
-def pylsp_workspace_symbol(config, workspace, query):
+def pylsp_workspace_symbol(workspace, query):
     if not query or not workspace:
         return []
 
-    return [_jedi_name_to_symbol(jedi_name) for jedi_name in workspace.search(query)]
+    return [
+        _jedi_name_to_symbol(jedi_name)
+        for jedi_name in workspace.complete_search(query)
+    ]
 
 
 def _jedi_name_to_symbol(jedi_name):
@@ -33,18 +35,8 @@ def _jedi_name_to_symbol(jedi_name):
 
 
 def _jedi_type_to_symbol_kind(jedi_type):
-    if jedi_type == "module":
-        return SymbolKind.Module
-    if jedi_type == "class":
-        return SymbolKind.Class
-    if jedi_type == "function":
-        return SymbolKind.Function
-    if jedi_type == "instance":
-        return SymbolKind.Variable
-    if jedi_type == "statement":
-        return SymbolKind.Variable
-    if jedi_type == "param":
-        return SymbolKind.Variable
-    if jedi_type == "path":
-        return SymbolKind.File
-    return SymbolKind.Variable
+    return {
+        "module": SymbolKind.Module,
+        "class": SymbolKind.Class,
+        "function": SymbolKind.Function,
+    }.get(jedi_type, SymbolKind.Variable)

pylsp/workspace.py

@@ -100,7 +100,7 @@ def root_path(self):
     def root_uri(self):
         return self._root_uri
 
-    def search(self, query):
+    def complete_search(self, query):
         project = self.jedi_project()
         return project.complete_search(query)
 

test/plugins/test_workspace_symbols.py

@@ -7,70 +7,49 @@
 import pytest
 
 from pylsp import uris
-from pylsp.lsp import SymbolKind
 from pylsp.plugins.workspace_symbol import pylsp_workspace_symbol
-from pylsp.workspace import Workspace
 
 PY2 = sys.version[0] == "2"
 LINUX = sys.platform.startswith("linux")
 CI = os.environ.get("CI")
 DOC_URI = uris.from_fs_path(__file__)
-DOC = """import sys
 
-a = 'hello'
 
-class B:
-    def __init__(self):
-        x = 2
-        self.y = x
-
-def main(x):
-    y = 2 * x
-    return y
+DOC1_NAME = "file1.py"
+DOC2_NAME = "file2.py"
 
+DOC1 = """class Test1():
+    pass
 """
 
+DOC2 = """from file1 import Test1
 
-def test_symbols_empty_query(config, workspace):
-    config.update({"plugins": {"jedi_workspace_symbols": {"enabled": True}}})
-    symbols = pylsp_workspace_symbol(config, workspace, "")
+try:
+    Test1()
+except UnicodeError:
+    pass
+"""
 
-    assert len(symbols) == 0
 
+@pytest.fixture
+def tmp_workspace(temp_workspace_factory):
+    return temp_workspace_factory(
+        {
+            DOC1_NAME: DOC1,
+            DOC2_NAME: DOC2,
+        }
+    )
 
-def test_symbols_nonempty_query(config, workspace):
-    config.update({"plugins": {"jedi_workspace_symbols": {"enabled": True}}})
-    symbols = pylsp_workspace_symbol(config, workspace, "main")
+
+def test_symbols_empty_query(tmp_workspace):
+    symbols = pylsp_workspace_symbol(tmp_workspace, "")
 
     assert len(symbols) == 0
 
 
-#
-# def test_symbols_all_scopes(config, workspace):
-#     doc = Document(DOC_URI, workspace, DOC)
-#     symbols = pylsp_document_symbols(config, doc)
-#     helper_check_symbols_all_scope(symbols)
-#
-#
-# def test_symbols_non_existing_file(config, workspace, tmpdir):
-#     path = tmpdir.join("foo.py")
-#     # Check pre-condition: file must not exist
-#     assert not path.check(exists=1)
-#
-#     doc = Document(uris.from_fs_path(str(path)), workspace, DOC)
-#     symbols = pylsp_document_symbols(config, doc)
-#     helper_check_symbols_all_scope(symbols)
-#
-#
-# @pytest.mark.skipif(
-#     PY2 or not LINUX or not CI, reason="tested on linux and python 3 only"
-# )
-# def test_symbols_all_scopes_with_jedi_environment(workspace):
-#     doc = Document(DOC_URI, workspace, DOC)
-#
-#     # Update config extra environment
-#     env_path = "/tmp/pyenv/bin/python"
-#     settings = {"pylsp": {"plugins": {"jedi": {"environment": env_path}}}}
-#     doc.update_config(settings)
-#     symbols = pylsp_document_symbols(doc._config, doc)
-#     helper_check_symbols_all_scope(symbols)
+def test_symbols_nonempty_query(tmp_workspace):
+    symbols = pylsp_workspace_symbol(tmp_workspace, "Test")
+
+    assert len(symbols) == 1
+    assert symbols[0]["name"] == "Test1"
+    assert symbols[0]["kind"] == 5  # Class