refactoring

Author: ponyii

crates/ide-db/src/path_transform.rs

@@ -160,12 +160,8 @@ impl<'a> PathTransform<'a> {
                 }
                 (Either::Left(k), None) => {
                     if let Some(default) = k.default(db) {
-                        eprintln!("\ndefault = {:?}", default);
                         let default = ast::make::expr_const_value(&default);
-                        fn get_syntax<T: AstNode>(node: T) -> SyntaxNode {
-                            node.syntax().clone_for_update()
-                        }
-                        const_substs.insert(k, default.either(get_syntax, get_syntax));
+                        const_substs.insert(k, default.syntax().clone_for_update());
                         // FIXME: transform the default value
                     }
                 }

crates/syntax/src/ast/make.rs

@@ -9,7 +9,6 @@
 //! API should require to assemble every node piecewise. The trick of
 //! `parse(format!())` we use internally is an implementation detail -- long
 //! term, it will be replaced with direct tree manipulation.
-use either::Either;
 use itertools::Itertools;
 use stdx::{format_to, never};
 
@@ -508,9 +507,8 @@ pub fn expr_literal(text: &str) -> ast::Literal {
     ast_from_text(&format!("fn f() {{ let _ = {text}; }}"))
 }
 
-// FIXME: support `ast::BLOCK_EXPR` too
-pub fn expr_const_value(text: &str) -> Either<ast::Literal, ast::PathExpr> {
-    ast_from_text(&format!("fn f() {{ let _ = {text}; }}"))
+pub fn expr_const_value(text: &str) -> ast::Expr {
+    ast_from_text(&format!("trait Foo<const N: usize = {text}> {{}}"))
 }
 
 pub fn expr_empty_block() -> ast::Expr {