temp

Author: benfdking

examples/sushi/config.py

@@ -41,7 +41,7 @@
     default_gateway="duckdb",
     model_defaults=model_defaults,
     linter=LinterConfig(
-        enabled=False,
+        enabled=True,
         rules=[
             "ambiguousorinvalidcolumn",
             "invalidselectstarexpansion",

sqlmesh/lsp/main.py

@@ -317,7 +317,8 @@ def _diagnostic_to_lsp_diagnostic(
 
         # Get rule definition location for diagnostics link
         rule_location = diagnostic.rule.get_definition_location()
-        rule_uri = f"file://{rule_location.file_path}#L{rule_location.start_line}"
+        rule_uri_wihout_extension = URI.from_path(rule_location.file_path)
+        rule_uri = f"{rule_uri_wihout_extension.value}#L{rule_location.start_line}"
 
         # Use URI format to create a link for "related information"
         return types.Diagnostic(
@@ -346,11 +347,9 @@ def _diagnostics_to_lsp_diagnostics(
         return lsp_diagnostics
 
     @staticmethod
-    def _uri_to_path(uri: str) -> str:
+    def _uri_to_path(uri: str) -> Path:
         """Convert a URI to a path."""
-        if uri.startswith("file://"):
-            return Path(uri[7:]).resolve().as_posix()
-        return Path(uri).resolve().as_posix()
+        return URI(uri).to_path()
 
     def start(self) -> None:
         """Start the server with I/O transport."""

sqlmesh/lsp/reference.py

@@ -162,7 +162,7 @@ def get_model_definitions_for_a_path(
         # Check whether the path exists
         if not referenced_model_path.is_file():
             continue
-        referenced_model_uri = f"file://{referenced_model_path}"
+        referenced_model_uri = URI.from_path(referenced_model_path)
 
         # Extract metadata for positioning
         table_meta = TokenPositionDetails.from_meta(table.this.meta)
@@ -179,7 +179,7 @@ def get_model_definitions_for_a_path(
 
         references.append(
             Reference(
-                uri=referenced_model_uri,
+                uri=referenced_model_uri.value,
                 range=Range(start=start_pos, end=end_pos),
                 description=referenced_model.description,
             )

sqlmesh/lsp/uri.py

@@ -18,10 +18,7 @@ def __eq__(self, other: object) -> bool:
         if not isinstance(other, URI):
             return False
         # Normalize paths for comparison to handle Windows paths
-        return (
-            Path(self.value.removeprefix("file://")).as_posix()
-            == Path(other.value.removeprefix("file://")).as_posix()
-        )
+        return self.to_path() == other.to_path()
 
     def __repr__(self) -> str:
         return f"URI({self.value})"

tests/lsp/test_completions.py

@@ -37,9 +37,7 @@ def test_get_sql_completions_with_context_and_file_uri():
     lsp_context = LSPContext(context)
 
     file_uri = next(
-        key
-        for key in lsp_context.map.keys()
-        if str(key.to_path()).endswith("models/active_customers.sql")
+        key for key in lsp_context.map.keys() if str(key.to_path()).endswith("active_customers.sql")
     )
     completions = get_sql_completions(lsp_context, file_uri)
     assert len(completions.keywords) > len(TOKENIZER_KEYWORDS)

tests/lsp/test_context.py

@@ -14,9 +14,7 @@ def test_lsp_context():
 
     # find one model in the map
     active_customers_key = next(
-        key
-        for key in lsp_context.map.keys()
-        if str(key.to_path()).endswith("models/active_customers.sql")
+        key for key in lsp_context.map.keys() if str(key.to_path()).endswith("active_customers.sql")
     )
 
     # Check that the value is a ModelInfo with the expected model name