fixing comments

Author: benfdking

sqlmesh/core/linter/rules/builtin.py

@@ -16,7 +16,7 @@
 from sqlmesh.core.linter.rule import Rule, RuleViolation, Range, Fix, TextEdit
 from sqlmesh.core.linter.definition import RuleSet
 from sqlmesh.core.model import Model, SqlModel, ExternalModel
-from sqlmesh.utils.lineage import extract_references_from_query, LSPExternalModelReference
+from sqlmesh.utils.lineage import extract_references_from_query, ExternalModelReference
 
 
 class NoSelectStar(Rule):
@@ -167,10 +167,10 @@ def check_model(
                 dialect=model.dialect,
             ): ref
             for ref in references
-            if isinstance(ref, LSPExternalModelReference) and ref.path is None
+            if isinstance(ref, ExternalModelReference) and ref.path is None
         }
 
-        # Ensure that depends_on are a subset of the external references. If not, return generic violation.
+        # Ensure that depends_on and external references match.
         if not_registered_external_models != set(external_references.keys()):
             return self._standard_error_message(
                 model_name=model.fqn,

sqlmesh/lsp/main.py

@@ -60,15 +60,15 @@
 from sqlmesh.lsp.helpers import to_lsp_range, to_sqlmesh_position
 from sqlmesh.lsp.hints import get_hints
 from sqlmesh.lsp.reference import (
-    LSPCteReference,
-    LSPModelReference,
+    CTEReference,
+    ModelReference,
     get_references,
     get_all_references,
 )
 from sqlmesh.lsp.rename import prepare_rename, rename_symbol, get_document_highlights
 from sqlmesh.lsp.uri import URI
 from sqlmesh.utils.errors import ConfigError
-from sqlmesh.utils.lineage import LSPExternalModelReference
+from sqlmesh.utils.lineage import ExternalModelReference
 from web.server.api.endpoints.lineage import column_lineage, model_lineage
 from web.server.api.endpoints.models import get_models
 from typing import Union
@@ -479,7 +479,7 @@ def hover(ls: LanguageServer, params: types.HoverParams) -> t.Optional[types.Hov
                 if not references:
                     return None
                 reference = references[0]
-                if isinstance(reference, LSPCteReference) or not reference.markdown_description:
+                if isinstance(reference, CTEReference) or not reference.markdown_description:
                     return None
                 return types.Hover(
                     contents=types.MarkupContent(
@@ -525,7 +525,7 @@ def goto_definition(
                 location_links = []
                 for reference in references:
                     # Use target_range if available (CTEs, Macros, and external models in YAML)
-                    if isinstance(reference, LSPModelReference):
+                    if isinstance(reference, ModelReference):
                         # Regular SQL models - default to start of file
                         target_range = types.Range(
                             start=types.Position(line=0, character=0),
@@ -535,7 +535,7 @@ def goto_definition(
                             start=types.Position(line=0, character=0),
                             end=types.Position(line=0, character=0),
                         )
-                    elif isinstance(reference, LSPExternalModelReference):
+                    elif isinstance(reference, ExternalModelReference):
                         # External models may have target_range set for YAML files
                         target_range = types.Range(
                             start=types.Position(line=0, character=0),

sqlmesh/lsp/reference.py

@@ -12,10 +12,10 @@
 
 from sqlmesh.lsp.uri import URI
 from sqlmesh.utils.lineage import (
-    LSPMacroReference,
-    LSPCteReference,
+    MacroReference,
+    CTEReference,
     Reference,
-    LSPModelReference,
+    ModelReference,
     extract_references_from_query,
 )
 import ast
@@ -268,7 +268,7 @@ def get_macro_reference(
 
         # Create a reference to the macro definition
 
-        return LSPMacroReference(
+        return MacroReference(
             path=path,
             range=macro_range,
             target_range=Range(
@@ -301,7 +301,7 @@ def get_built_in_macro_reference(macro_name: str, macro_range: Range) -> t.Optio
     # Calculate the end line number by counting the number of source lines
     end_line_number = line_number + len(source_lines) - 1
 
-    return LSPMacroReference(
+    return MacroReference(
         path=Path(filename),
         range=macro_range,
         target_range=Range(
@@ -314,7 +314,7 @@ def get_built_in_macro_reference(macro_name: str, macro_range: Range) -> t.Optio
 
 def get_model_find_all_references(
     lint_context: LSPContext, document_uri: URI, position: Position
-) -> t.List[LSPModelReference]:
+) -> t.List[ModelReference]:
     """
     Get all references to a model across the entire project.
 
@@ -332,7 +332,7 @@ def get_model_find_all_references(
     # Find the model reference at the cursor position
     model_at_position = next(
         filter(
-            lambda ref: isinstance(ref, LSPModelReference)
+            lambda ref: isinstance(ref, ModelReference)
             and _position_within_range(position, ref.range),
             get_model_definitions_for_a_path(lint_context, document_uri),
         ),
@@ -342,13 +342,13 @@ def get_model_find_all_references(
     if not model_at_position:
         return []
 
-    assert isinstance(model_at_position, LSPModelReference)  # for mypy
+    assert isinstance(model_at_position, ModelReference)  # for mypy
 
     target_model_path = model_at_position.path
 
     # Start with the model definition
-    all_references: t.List[LSPModelReference] = [
-        LSPModelReference(
+    all_references: t.List[ModelReference] = [
+        ModelReference(
             path=model_at_position.path,
             range=Range(
                 start=Position(line=0, character=0),
@@ -360,15 +360,15 @@ def get_model_find_all_references(
 
     # Then add references from the current file
     current_file_refs = filter(
-        lambda ref: isinstance(ref, LSPModelReference) and ref.path == target_model_path,
+        lambda ref: isinstance(ref, ModelReference) and ref.path == target_model_path,
         get_model_definitions_for_a_path(lint_context, document_uri),
     )
 
     for ref in current_file_refs:
-        assert isinstance(ref, LSPModelReference)  # for mypy
+        assert isinstance(ref, ModelReference)  # for mypy
 
         all_references.append(
-            LSPModelReference(
+            ModelReference(
                 path=document_uri.to_path(),
                 range=ref.range,
                 markdown_description=ref.markdown_description,
@@ -385,15 +385,15 @@ def get_model_find_all_references(
 
         # Get model references that point to the target model
         matching_refs = filter(
-            lambda ref: isinstance(ref, LSPModelReference) and ref.path == target_model_path,
+            lambda ref: isinstance(ref, ModelReference) and ref.path == target_model_path,
             get_model_definitions_for_a_path(lint_context, file_uri),
         )
 
         for ref in matching_refs:
-            assert isinstance(ref, LSPModelReference)  # for mypy
+            assert isinstance(ref, ModelReference)  # for mypy
 
             all_references.append(
-                LSPModelReference(
+                ModelReference(
                     path=path,
                     range=ref.range,
                     markdown_description=ref.markdown_description,
@@ -405,7 +405,7 @@ def get_model_find_all_references(
 
 def get_cte_references(
     lint_context: LSPContext, document_uri: URI, position: Position
-) -> t.List[LSPCteReference]:
+) -> t.List[CTEReference]:
     """
     Get all references to a CTE at a specific position in a document.
 
@@ -421,10 +421,10 @@ def get_cte_references(
     """
 
     # Filter to get the CTE references
-    cte_references: t.List[LSPCteReference] = [
+    cte_references: t.List[CTEReference] = [
         ref
         for ref in get_model_definitions_for_a_path(lint_context, document_uri)
-        if isinstance(ref, LSPCteReference)
+        if isinstance(ref, CTEReference)
     ]
 
     if not cte_references:
@@ -446,7 +446,7 @@ def get_cte_references(
 
     # Add the CTE definition
     matching_references = [
-        LSPCteReference(
+        CTEReference(
             path=document_uri.to_path(),
             range=target_cte_definition_range,
             target_range=target_cte_definition_range,
@@ -457,7 +457,7 @@ def get_cte_references(
     for ref in cte_references:
         if ref.target_range == target_cte_definition_range:
             matching_references.append(
-                LSPCteReference(
+                CTEReference(
                     path=document_uri.to_path(),
                     range=ref.range,
                     target_range=ref.target_range,
@@ -469,7 +469,7 @@ def get_cte_references(
 
 def get_macro_find_all_references(
     lsp_context: LSPContext, document_uri: URI, position: Position
-) -> t.List[LSPMacroReference]:
+) -> t.List[MacroReference]:
     """
     Get all references to a macro at a specific position in a document.
 
@@ -486,7 +486,7 @@ def get_macro_find_all_references(
     # Find the macro reference at the cursor position
     macro_at_position = next(
         filter(
-            lambda ref: isinstance(ref, LSPMacroReference)
+            lambda ref: isinstance(ref, MacroReference)
             and _position_within_range(position, ref.range),
             get_macro_definitions_for_a_path(lsp_context, document_uri),
         ),
@@ -496,14 +496,14 @@ def get_macro_find_all_references(
     if not macro_at_position:
         return []
 
-    assert isinstance(macro_at_position, LSPMacroReference)  # for mypy
+    assert isinstance(macro_at_position, MacroReference)  # for mypy
 
     target_macro_path = macro_at_position.path
     target_macro_target_range = macro_at_position.target_range
 
     # Start with the macro definition
-    all_references: t.List[LSPMacroReference] = [
-        LSPMacroReference(
+    all_references: t.List[MacroReference] = [
+        MacroReference(
             path=target_macro_path,
             range=target_macro_target_range,
             target_range=target_macro_target_range,
@@ -517,16 +517,16 @@ def get_macro_find_all_references(
 
         # Get macro references that point to the same macro definition
         matching_refs = filter(
-            lambda ref: isinstance(ref, LSPMacroReference)
+            lambda ref: isinstance(ref, MacroReference)
             and ref.path == target_macro_path
             and ref.target_range == target_macro_target_range,
             get_macro_definitions_for_a_path(lsp_context, file_uri),
         )
 
         for ref in matching_refs:
-            assert isinstance(ref, LSPMacroReference)  # for mypy
+            assert isinstance(ref, MacroReference)  # for mypy
             all_references.append(
-                LSPMacroReference(
+                MacroReference(
                     path=path,
                     range=ref.range,
                     target_range=ref.target_range,

sqlmesh/lsp/rename.py

@@ -13,7 +13,7 @@
 from sqlmesh.lsp.reference import (
     _position_within_range,
     get_cte_references,
-    LSPCteReference,
+    CTEReference,
 )
 from sqlmesh.lsp.uri import URI
 
@@ -82,7 +82,7 @@ def rename_symbol(
     return None
 
 
-def _rename_cte(cte_references: t.List[LSPCteReference], new_name: str) -> WorkspaceEdit:
+def _rename_cte(cte_references: t.List[CTEReference], new_name: str) -> WorkspaceEdit:
     """
     Create a WorkspaceEdit for renaming a CTE.