bugfix: fix schema attr position in sema type (#674)

kcl-lang · Aug 21, 2023 · a19eb7b · a19eb7b
1 parent 1a00ca9
commit a19eb7b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/kclvm/sema/src/resolver/config.rs b/kclvm/sema/src/resolver/config.rs
@@ -84,8 +84,8 @@ impl<'ctx> Resolver<'ctx> {
                                     Some(attr_ty_obj) => Some(self.new_config_expr_context_item(
                                         key_name,
                                         attr_ty_obj.ty.clone(),
-                                        attr_ty_obj.pos.clone(),
-                                        attr_ty_obj.pos.clone(),
+                                        attr_ty_obj.range.0.clone(),
+                                        attr_ty_obj.range.1.clone(),
                                     )),
                                     None => match &schema_ty.index_signature {
                                         Some(index_signature) => {

diff --git a/kclvm/sema/src/resolver/global.rs b/kclvm/sema/src/resolver/global.rs
@@ -578,25 +578,26 @@ impl<'ctx> Resolver<'ctx> {
         };
         // Schema attributes
         let mut attr_obj_map: IndexMap<String, SchemaAttr> = IndexMap::default();
+        let settings_dummy_pos = Position {
+            filename: self.ctx.filename.clone(),
+            line: pos.line,
+            column: pos.column,
+        };
         attr_obj_map.insert(
             kclvm_runtime::SCHEMA_SETTINGS_ATTR_NAME.to_string(),
             SchemaAttr {
                 is_optional: true,
                 has_default: false,
                 default: None,
                 ty: Type::dict_ref(self.str_ty(), self.any_ty()),
-                pos: Position {
-                    filename: self.ctx.filename.clone(),
-                    line: pos.line,
-                    column: pos.column,
-                },
+                range: (settings_dummy_pos.clone(), settings_dummy_pos),
                 doc: None,
                 decorators: vec![],
             },
         );
         let parsed_doc = parse_doc_string(&schema_stmt.doc);
         for stmt in &schema_stmt.body {
-            let (name, ty, is_optional, default, decorators) = match &stmt.node {
+            let (name, ty, is_optional, default, decorators, range) = match &stmt.node {
                 ast::Stmt::Unification(unification_stmt) => {
                     let name = unification_stmt.value.node.name.node.get_name();
                     let ty = self.parse_ty_str_with_scope(&name, stmt.get_span_pos());
@@ -608,6 +609,7 @@ impl<'ctx> Resolver<'ctx> {
                         is_optional,
                         Some(default),
                         vec![],
+                        stmt.get_span_pos(),
                     )
                 }
                 ast::Stmt::SchemaAttr(schema_attr) => {
@@ -627,7 +629,14 @@ impl<'ctx> Resolver<'ctx> {
                         DecoratorTarget::Attribute,
                         &name,
                     );
-                    (name, ty, is_optional, default, decorators)
+                    (
+                        name,
+                        ty,
+                        is_optional,
+                        default,
+                        decorators,
+                        stmt.get_span_pos(),
+                    )
                 }
                 _ => continue,
             };
@@ -651,7 +660,7 @@ impl<'ctx> Resolver<'ctx> {
                         has_default: default.is_some(),
                         default,
                         ty: ty.clone(),
-                        pos: pos.clone(),
+                        range: range.clone(),
                         doc: doc_str,
                         decorators,
                     },

diff --git a/kclvm/sema/src/ty/mod.rs b/kclvm/sema/src/ty/mod.rs
@@ -14,6 +14,7 @@ pub use context::{TypeContext, TypeInferMethods};
 use indexmap::IndexMap;
 use kclvm_ast::ast;
 use kclvm_ast::MAIN_PKG;
+use kclvm_error::diagnostic::Range;
 use kclvm_error::Position;
 pub use unify::*;
 pub use walker::walk_type;
@@ -218,7 +219,7 @@ impl SchemaType {
                     has_default: false,
                     default: None,
                     ty,
-                    pos: Position::dummy_pos(),
+                    range: (Position::dummy_pos(), Position::dummy_pos()),
                     doc: None,
                     decorators: vec![],
                 };
@@ -269,7 +270,7 @@ pub struct SchemaAttr {
     /// is [None].
     pub default: Option<String>,
     pub ty: Rc<Type>,
-    pub pos: Position,
+    pub range: Range,
     pub doc: Option<String>,
     pub decorators: Vec<Decorator>,
 }