From c7349d681738cb0ae56bb7ba918271b8cbabe1b5 Mon Sep 17 00:00:00 2001
From: jsbautista <js.bautista@uniandes.edu.co>
Date: Fri, 9 May 2025 01:12:21 -0500
Subject: [PATCH 1/3] Fix Inline Comments

---
 pylsp/plugins/symbols.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pylsp/plugins/symbols.py b/pylsp/plugins/symbols.py
index 4e1890c1..67efab1d 100644
--- a/pylsp/plugins/symbols.py
+++ b/pylsp/plugins/symbols.py
@@ -2,6 +2,7 @@
 # Copyright 2021- Python Language Server Contributors.
 
 import logging
+import re
 from pathlib import Path
 
 from pylsp import hookimpl
@@ -27,7 +28,11 @@ def pylsp_document_symbols(config, document):
         if not add_import_symbols:
             # Skip if there's an import in the code the symbol is defined.
             code = d.get_line_code()
-            if " import " in code or "import " in code:
+            pattern = (
+                re.compile
+                (r'^\s*(?!#)(from\s+\w+(\.\w+)*\s+import\s+[\w,\s*]+|import\s+[\w,\s]+)')
+                )
+            if pattern.match(code):
                 continue
 
             # Skip imported symbols comparing module names.

From b8f544e2cacb8cf677909b6af09cd302590bab49 Mon Sep 17 00:00:00 2001
From: jsbautista <js.bautista@uniandes.edu.co>
Date: Tue, 13 May 2025 11:53:55 -0500
Subject: [PATCH 2/3] apply code review

---
 pylsp/plugins/symbols.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pylsp/plugins/symbols.py b/pylsp/plugins/symbols.py
index 67efab1d..263513cd 100644
--- a/pylsp/plugins/symbols.py
+++ b/pylsp/plugins/symbols.py
@@ -20,6 +20,10 @@ def pylsp_document_symbols(config, document):
     symbols = []
     exclude = set({})
     redefinitions = {}
+    pattern_import = (
+        re.compile
+        (r'^\s*(?!#)\s*(from\s+[.\w]+(\.[\w]+)*\s+import\s+[\w\s,()*]+|import\s+[\w\s,.*]+)')
+        )
 
     while definitions != []:
         d = definitions.pop(0)
@@ -28,11 +32,8 @@ def pylsp_document_symbols(config, document):
         if not add_import_symbols:
             # Skip if there's an import in the code the symbol is defined.
             code = d.get_line_code()
-            pattern = (
-                re.compile
-                (r'^\s*(?!#)(from\s+\w+(\.\w+)*\s+import\s+[\w,\s*]+|import\s+[\w,\s]+)')
-                )
-            if pattern.match(code):
+            
+            if pattern_import.match(code):
                 continue
 
             # Skip imported symbols comparing module names.

From 2d307c529d240fbcf2f60ab9c9c5c369441ee620 Mon Sep 17 00:00:00 2001
From: jsbautista <js.bautista@uniandes.edu.co>
Date: Thu, 15 May 2025 14:56:18 -0500
Subject: [PATCH 3/3] add tests

---
 test/plugins/test_symbols.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/test/plugins/test_symbols.py b/test/plugins/test_symbols.py
index c00ab935..17b181be 100644
--- a/test/plugins/test_symbols.py
+++ b/test/plugins/test_symbols.py
@@ -30,6 +30,17 @@ def main(x):
 
 """
 
+DOC_IMPORTS = """from . import something
+from ..module import something
+from module import (a, b)
+
+def main():
+    # import ignored
+    print("from module import x")  # string with import
+    return something
+
+"""
+
 
 def helper_check_symbols_all_scope(symbols):
     # All eight symbols (import sys, a, B, __init__, x, y, main, y)
@@ -73,6 +84,22 @@ def sym(name):
     assert sym("main")["location"]["range"]["end"] == {"line": 12, "character": 0}
 
 
+def test_symbols_complex_imports(config, workspace):
+    doc = Document(DOC_URI, workspace, DOC_IMPORTS)
+    config.update({"plugins": {"jedi_symbols": {"all_scopes": False}}})
+    symbols = pylsp_document_symbols(config, doc)
+
+    import_symbols = [s for s in symbols if s["kind"] == SymbolKind.Module]
+
+    assert len(import_symbols) == 4
+
+    names = [s["name"] for s in import_symbols]
+    assert "something" in names
+    assert "a" in names or "b" in names
+
+    assert any(s["name"] == "main" and s["kind"] == SymbolKind.Function for s in symbols)
+
+
 def test_symbols_all_scopes(config, workspace) -> None:
     doc = Document(DOC_URI, workspace, DOC)
     symbols = pylsp_document_symbols(config, doc)