sqlakit-lsp 0.3.1__tar.gz → 0.3.2__tar.gz

{sqlakit_lsp-0.3.1 → sqlakit_lsp-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlakit-lsp
-Version: 0.3.1
+Version: 0.3.2
 Summary: The language server for SQLAKit templates.
 Keywords: sqlalchemy,sqlakit,lsp,language-server,sql
 Author: Anton Ruhlov

{sqlakit_lsp-0.3.1 → sqlakit_lsp-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sqlakit-lsp"
-version = "0.3.1"
+version = "0.3.2"
 description = "The language server for SQLAKit templates."
 readme = "README.md"
 license = "MIT"

{sqlakit_lsp-0.3.1 → sqlakit_lsp-0.3.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "sqlakit-lsp"
-version = "0.3.1"
+version = "0.3.2"
 description = "The language server for SQLAKit templates."
 readme = "README.md"
 license = "MIT"

{sqlakit_lsp-0.3.1 → sqlakit_lsp-0.3.2}/sqlakit_lsp/_server.py

@@ -973,12 +973,24 @@ class _Assistant:
                 continue
             names = alone.parameters()
             given = _rendered(alone, dialect, dict.fromkeys(names, _Example()))
-            if names and given in (None, text.strip()):
+            if names and self._kept(given, call.name):
                 missing = _rendered(alone, dialect, dict.fromkeys(names))
-                if missing not in (None, text.strip()):
+                if not self._kept(missing, call.name):
                     found.update(names)
         return found
 
+    def _kept(self, sql: str | None, macro: str) -> bool:
+        """Whether a call rendered alone could not be made, and wrote itself.
+
+        It writes itself on one line, whatever lines it was written on.
+        """
+        if sql is None:
+            return True
+        namespace = re.escape(self.project.templates.namespace)
+        return bool(
+            re.match(rf"{namespace}\.{re.escape(macro)}\s*\(", sql, re.IGNORECASE)
+        )
+
     def holds_macros(self, path: Path) -> bool:
         """Whether a file defines macros: SQL macros, or the SQL of a file macro."""
         return self._reads_macros(path) or path.resolve() in self._macro_sql
@@ -1061,7 +1073,7 @@ class _Assistant:
         missing = _rendered(alone, dialect, dict.fromkeys(names))
         # A call that cannot be made writes itself, which says nothing new.
         given, missing = (
-            None if one == text.strip() else one for one in (given, missing)
+            None if self._kept(one, call.name) else one for one in (given, missing)
         )
         if not names or given == missing:
             one = given or missing