mv query to ast_pretty

kclvm/Cargo.toml

@@ -48,6 +48,7 @@ lto = true
 members = [
     "capi",
     "ast",
+    "ast_pretty",
     "compiler",
     "config",
     "error",

kclvm/ast/src/lib.rs

@@ -4,7 +4,6 @@ use crate::ast::*;
 pub mod ast;
 pub mod config;
 pub mod path;
-pub mod printer;
 pub mod token;
 pub mod token_stream;
 pub mod walker;

kclvm/ast_pretty/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "kclvm-ast-pretty"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+kclvm-parser = {path = "../parser", version = "0.1.0"}
+kclvm-error = {path = "../error", version = "0.1.0"}
+kclvm-ast = {path = "../ast", version = "0.1.0"}
+indexmap = "1.0"
+fancy-regex = "0.7.1"

kclvm/ast/src/printer/mod.rs → kclvm/ast_pretty/src/lib.rs

@@ -1,8 +1,11 @@
 use indexmap::IndexMap;
+use kclvm_ast::{
+    ast::{self, Module},
+    token::TokenKind,
+    walker::MutSelfTypedResultWalker,
+};
 use std::collections::VecDeque;
 
-use crate::{ast, token::TokenKind, walker::MutSelfTypedResultWalker};
-
 mod node;
 
 #[cfg(test)]
@@ -244,7 +247,7 @@ impl<'p> Printer<'p> {
 }
 
 /// Print AST to string
-pub fn print_ast_module(module: &ast::Module) -> String {
+pub fn print_ast_module(module: &Module) -> String {
     let mut printer = Printer::default();
     printer.write_module(module);
     printer.out

kclvm/ast/src/printer/node.rs → kclvm/ast_pretty/src/node.rs

@@ -1,12 +1,11 @@
 use std::collections::HashSet;
 
-use kclvm_error::bug;
-
-use crate::{
+use kclvm_ast::{
     ast::{self, CallExpr},
     token::{DelimToken, TokenKind},
     walker::MutSelfTypedResultWalker,
 };
+use kclvm_error::bug;
 
 use super::{Indentation, Printer};
 

kclvm/ast/src/printer/tests.rs → kclvm/ast_pretty/src/tests.rs

@@ -1,6 +1,8 @@
-use super::*;
+use std::path::PathBuf;
+
 use kclvm_parser::parse_file;
-use pretty_assertions::assert_eq;
+
+use super::print_ast_module;
 
 const FILE_INPUT_SUFFIX: &str = ".input";
 const FILE_OUTPUT_SUFFIX: &str = ".output";
@@ -23,18 +25,19 @@ const TEST_CASES: &[&'static str; 15] = &[
 ];
 
 fn read_data(data_name: &str) -> (String, String) {
-    let module = parse_file(
-        &format!("./src/printer/test_data/{}{}", data_name, FILE_INPUT_SUFFIX),
-        None,
-    );
+    let mut filename = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    filename.push(&format!("src/test_data/{}{}", data_name, FILE_INPUT_SUFFIX));
+
+    let module = parse_file(filename.to_str().unwrap(), None);
 
+    let mut filename_expect = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    filename_expect.push(&format!(
+        "src/test_data/{}{}",
+        data_name, FILE_OUTPUT_SUFFIX
+    ));
     (
         print_ast_module(&module.unwrap()),
-        std::fs::read_to_string(&format!(
-            "./src/printer/test_data/{}{}",
-            data_name, FILE_OUTPUT_SUFFIX
-        ))
-        .unwrap(),
+        std::fs::read_to_string(filename_expect.to_str().unwrap()).unwrap(),
     )
 }
 

kclvm/parser/src/lib.rs

@@ -70,6 +70,7 @@ pub fn parse_file(filename: &str, code: Option<String>) -> Result<ast::Module, S
         let src = if let Some(s) = code {
             s
         } else {
+            println!("{:?}", filename);
             std::fs::read_to_string(filename).unwrap()
         };
 

kclvm/tools/Cargo.toml

@@ -16,6 +16,8 @@ kclvm-error = {path = "../error", version = "0.1.0"}
 kclvm-parser = {path = "../parser", version = "0.1.0"}
 kclvm-sema = {path = "../sema", version = "0.1.0"}
 kclvm-config = {path = "../config", version = "0.1.0"}
+kclvm-ast-pretty = {path = "../ast_pretty", version = "0.1.0"}
+
 serde_json = "1.0.85"
 serde_yaml = "0.9.13"
 

kclvm/tools/src/format/mod.rs

@@ -6,10 +6,10 @@
 //! AST Module, and then use the AST printer [kclvm_tools::printer::print_ast_module]
 //! to print it as source code string.
 use anyhow::{anyhow, Result};
+use kclvm_ast_pretty::print_ast_module;
 use std::path::Path;
 
 use crate::util::get_kcl_files;
-use kclvm_ast::printer::print_ast_module;
 use kclvm_parser::parse_file;
 
 #[cfg(test)]

kclvm/tools/src/query/mod.rs

@@ -11,12 +11,12 @@ mod util;
 
 use anyhow::{anyhow, Result};
 use kclvm_ast::ast;
+use kclvm_ast_pretty::print_ast_module;
 use kclvm_parser::parse_file;
 
 pub use r#override::{apply_override_on_module, apply_overrides};
 
 use self::r#override::parse_override_spec;
-use kclvm_ast::printer::print_ast_module;
 
 /// Override and rewrite a file with override specifications. Please note that this is an external user API,
 /// and it can directly modify the KCL file in place.

kclvm/tools/src/query/override.rs

@@ -4,9 +4,9 @@ use anyhow::{anyhow, Result};
 
 use kclvm_ast::config::try_get_config_expr_mut;
 use kclvm_ast::path::{get_attr_paths_from_config_expr, get_key_path};
-use kclvm_ast::printer::print_ast_module;
 use kclvm_ast::walker::MutSelfMutWalker;
 use kclvm_ast::{ast, walk_if_mut};
+use kclvm_ast_pretty::print_ast_module;
 use kclvm_parser::parse_expr;
 use kclvm_sema::pre_process::{fix_config_expr_nest_attr, transform_multi_assign};