chore(fmt/psl): Clean up usage of identifiers, names, spans, attributes

prisma-fmt/src/code_actions.rs

@@ -14,7 +14,7 @@ use psl::{
         walkers::{ModelWalker, RefinedRelationWalker, ScalarFieldWalker},
         SourceFile,
     },
-    schema_ast::ast::{self, Attribute, IndentationType, NewlineType, WithSpan},
+    schema_ast::ast::{self, Attribute, IndentationType, NewlineType, WithAttributes, WithSpan},
     PreviewFeature,
 };
 use std::collections::HashMap;
@@ -181,7 +181,7 @@ fn create_missing_attribute<'a>(
             &attribute,
             model.indentation(),
             model.newline(),
-            &model.ast_model().attributes,
+            model.ast_model().attributes(),
         );
 
         let range = range_after_span(model.ast_model().span(), schema);

prisma-fmt/src/code_actions/field.rs

@@ -51,7 +51,7 @@ pub(super) fn add_missing_opposite_relation(
 
     let name_arg = field
         .ast_field()
-        .attributes
+        .attributes()
         .iter()
         .find(|attr| attr.name() == "relation")
         .and_then(|attr| attr.arguments.arguments.iter().find(|arg| arg.value.is_string()));

prisma-fmt/src/code_actions/multi_schema.rs

@@ -2,7 +2,7 @@ use lsp_types::{CodeAction, CodeActionKind, CodeActionOrCommand};
 use psl::{
     diagnostics::Span,
     parser_database::walkers::{EnumWalker, ModelWalker},
-    schema_ast::ast::WithSpan,
+    schema_ast::ast::{WithAttributes, WithSpan},
 };
 
 use super::CodeActionsContext;
@@ -42,7 +42,7 @@ pub(super) fn add_schema_block_attribute_model(
         "schema()",
         model.indentation(),
         model.newline(),
-        &model.ast_model().attributes,
+        model.ast_model().attributes(),
     );
 
     let Ok(edit) = super::create_text_edit(

prisma-fmt/src/code_actions/relation_mode.rs

@@ -1,7 +1,7 @@
 use lsp_types::{CodeAction, CodeActionKind, CodeActionOrCommand};
 use psl::{
     parser_database::walkers::CompleteInlineRelationWalker,
-    schema_ast::ast::{SourceConfig, WithIdentifier, WithName},
+    schema_ast::ast::{SourceConfig, WithIdentifier, WithName, WithSpan},
 };
 
 use super::CodeActionsContext;
@@ -24,7 +24,7 @@ pub(crate) fn edit_referential_integrity(
         context.initiating_file_source(),
         "relationMode".to_owned(),
         false,
-        prop.identifier().span,
+        prop.identifier().span(),
     ) else {
         return;
     };

prisma-fmt/src/code_actions/relations.rs

@@ -1,7 +1,10 @@
 use lsp_types::{CodeAction, CodeActionKind, CodeActionOrCommand, TextEdit, WorkspaceEdit};
-use psl::parser_database::{
-    ast::WithSpan,
-    walkers::{CompleteInlineRelationWalker, InlineRelationWalker, RelationFieldWalker},
+use psl::{
+    parser_database::{
+        ast::WithSpan,
+        walkers::{CompleteInlineRelationWalker, InlineRelationWalker, RelationFieldWalker},
+    },
+    schema_ast::ast::WithAttributes,
 };
 use std::collections::HashMap;
 
@@ -471,7 +474,7 @@ pub(super) fn add_index_for_relation_fields(
         &attribute,
         relation.model().indentation(),
         relation.model().newline(),
-        &relation.model().ast_model().attributes,
+        relation.model().ast_model().attributes(),
     );
 
     let range = super::range_after_span(relation.model().ast_model().span(), context.initiating_file_source());

prisma-fmt/src/references.rs

@@ -267,7 +267,7 @@ fn find_where_used_for_native_type<'ast>(
         Box::new(fields.filter_map(move |field| {
             field
                 .1
-                .attributes
+                .attributes()
                 .iter()
                 .find(|attr| extract_ds_from_native_type(attr.name()) == Some(name))
                 .map(|attr| attr.identifier().span())
@@ -289,7 +289,7 @@ fn find_where_used_as_field_type<'ast>(
     fn get_relevent_identifiers<'a>(fields: impl Iterator<Item = (FieldId, &'a Field)>, name: &str) -> Vec<Span> {
         fields
             .filter_map(|(_id, field)| match &field.field_type {
-                FieldType::Supported(id) if id.name == name => Some(id.span()),
+                FieldType::Supported(id) if id.name() == name => Some(id.span()),
                 _ => None,
             })
             .collect()

prisma-fmt/tests/text_document_completion/scenarios/referential_actions_with_trailing_comma/schema.prisma

@@ -10,10 +10,9 @@ model TestB {
 }
 
 model Test {
-  id      Int   @id
+  id      Int @id
   bId     Int
   // The user started typing Casc
   b       TestB @relation(fields: [testBId], references: [id], onDelete: <|>,)
   testBId Int
 }
-

psl/parser-database/src/attributes.rs

@@ -568,7 +568,7 @@ fn model_unique(data: &mut ModelAttributes, model_id: crate::ModelId, ctx: &mut
         };
 
         if let Some(name) = name {
-            validate_client_name(current_attribute.span, ast_model.name(), name, "@@unique", ctx);
+            validate_client_name(current_attribute.span(), ast_model.name(), name, "@@unique", ctx);
         }
 
         mapped_name
@@ -595,7 +595,7 @@ fn common_index_validations(
         }
     };
 
-    match resolve_field_array_with_args(fields, current_attribute.span, model_id, resolving, ctx) {
+    match resolve_field_array_with_args(fields, current_attribute.span(), model_id, resolving, ctx) {
         Ok(fields) => {
             index_data.fields = fields;
         }
@@ -625,7 +625,7 @@ fn common_index_validations(
                         fields.join(", "),
                     );
                     let model_name = ctx.asts[model_id].name();
-                    DatamodelError::new_model_validation_error(message, "model", model_name, current_attribute.span)
+                    DatamodelError::new_model_validation_error(message, "model", model_name, current_attribute.span())
                 });
             }
 
@@ -668,7 +668,7 @@ fn common_index_validations(
                     ),
                     "model",
                     ctx.asts[model_id].name(),
-                    current_attribute.span,
+                    current_attribute.span(),
                 ));
             }
         }
@@ -681,7 +681,7 @@ fn visit_relation(model_id: crate::ModelId, relation_field_id: RelationFieldId,
     ctx.types[relation_field_id].relation_attribute = Some(ctx.current_attribute_id().1);
 
     if let Some(fields) = ctx.visit_optional_arg("fields") {
-        let fields = match resolve_field_array_without_args(fields, attr.span, model_id, ctx) {
+        let fields = match resolve_field_array_without_args(fields, attr.span(), model_id, ctx) {
             Ok(fields) => fields,
             Err(FieldResolutionError::AlreadyDealtWith) => Vec::new(),
             Err(FieldResolutionError::ProblematicFields {
@@ -722,7 +722,7 @@ fn visit_relation(model_id: crate::ModelId, relation_field_id: RelationFieldId,
     if let Some(references) = ctx.visit_optional_arg("references") {
         let references = match resolve_field_array_without_args(
             references,
-            attr.span,
+            attr.span(),
             ctx.types[relation_field_id].referenced_model,
             ctx,
         ) {
@@ -745,7 +745,7 @@ fn visit_relation(model_id: crate::ModelId, relation_field_id: RelationFieldId,
                         "The argument `references` must refer only to existing fields in the related model `{model_name}`. The following fields do not exist in the related model: {field_names}",
                     );
 
-                    ctx.push_error(DatamodelError::new_validation_error(&msg, attr.span));
+                    ctx.push_error(DatamodelError::new_validation_error(&msg, attr.span()));
                 }
 
                 if !relation_fields.is_empty() {
@@ -754,7 +754,7 @@ fn visit_relation(model_id: crate::ModelId, relation_field_id: RelationFieldId,
                         ctx.asts[ctx.types[relation_field_id].referenced_model].name(),
                         relation_fields.iter().map(|(f, _)| f.name()).collect::<Vec<_>>().join(", "),
                     );
-                    ctx.push_error(DatamodelError::new_validation_error(&msg, attr.span));
+                    ctx.push_error(DatamodelError::new_validation_error(&msg, attr.span()));
                 }
 
                 Vec::new()

psl/parser-database/src/attributes/default.rs

@@ -1,3 +1,5 @@
+use schema_ast::ast::WithSpan;
+
 use crate::{
     ast::{self, WithName},
     coerce,
@@ -336,7 +338,7 @@ fn validate_default_value_on_composite_type(
         "Defaults on fields of type composite are not supported. Please remove the `@default` attribute.",
         ct_name,
         ast_field.name(),
-        attr.span,
+        attr.span(),
     ));
 }
 

psl/parser-database/src/attributes/id.rs

@@ -19,7 +19,7 @@ pub(super) fn model(model_data: &mut ModelAttributes, model_id: crate::ModelId,
 
     let resolving = FieldResolvingSetup::OnlyTopLevel;
 
-    let resolved_fields = match resolve_field_array_with_args(fields, attr.span, model_id, resolving, ctx) {
+    let resolved_fields = match resolve_field_array_with_args(fields, attr.span(), model_id, resolving, ctx) {
         Ok(fields) => fields,
         Err(FieldResolutionError::AlreadyDealtWith) => return,
         Err(FieldResolutionError::ProblematicFields {
@@ -61,7 +61,7 @@ pub(super) fn model(model_data: &mut ModelAttributes, model_id: crate::ModelId,
                     &msg,
                     "model",
                     ctx.asts[model_id].name(),
-                    attr.span,
+                    attr.span(),
                 ));
             }
 
@@ -105,7 +105,7 @@ pub(super) fn model(model_data: &mut ModelAttributes, model_id: crate::ModelId,
             ),
             "model",
             ast_model.name(),
-            attr.span,
+            attr.span(),
         ))
     }
 
@@ -222,7 +222,7 @@ pub(super) fn validate_id_field_arities(
         ctx.push_error(DatamodelError::new_attribute_validation_error(
             "Fields that are marked as id must be required.",
             "@id",
-            ctx.asts[pk.source_attribute].span,
+            ctx.asts[pk.source_attribute].span(),
         ))
     }
 }

psl/parser-database/src/attributes/native_types.rs

@@ -1,3 +1,5 @@
+use schema_ast::ast::WithSpan;
+
 use crate::{ast, context::Context, ScalarFieldId, StringId};
 
 pub(super) fn visit_model_field_native_type_attribute(
@@ -10,7 +12,7 @@ pub(super) fn visit_model_field_native_type_attribute(
     let args = &attr.arguments;
     let args: Vec<String> = args.arguments.iter().map(|arg| arg.value.to_string()).collect();
 
-    ctx.types[id].native_type = Some((datasource_name, type_name, args, attr.span))
+    ctx.types[id].native_type = Some((datasource_name, type_name, args, attr.span()))
 }
 
 pub(super) fn visit_composite_type_field_native_type_attribute(
@@ -24,6 +26,6 @@ pub(super) fn visit_composite_type_field_native_type_attribute(
     let args: Vec<String> = args.arguments.iter().map(|arg| arg.value.to_string()).collect();
 
     if let Some(composite_type_field) = ctx.types.composite_type_fields.get_mut(&id) {
-        composite_type_field.native_type = Some((datasource_name, type_name, args, attr.span))
+        composite_type_field.native_type = Some((datasource_name, type_name, args, attr.span()))
     }
 }