fix(expand): try to use "Self" in function calls

tooling/nargo_cli/build.rs

@@ -126,7 +126,7 @@
     // There's no "src/main.nr" here so it's trickier to make this work
     "overlapping_dep_and_mod",
     // bug
     "poseidonsponge_x5_254",
     // bug
     "regression_5045",
     // bug
@@ -143,14 +143,12 @@
 /// These tests are ignored because of existing bugs in `nargo expand`.
 /// As the bugs are fixed these tests should be removed from this list.
 /// (some are ignored on purpose for the same reason as `IGNORED_NARGO_EXPAND_EXECUTION_TESTS`)
-const IGNORED_NARGO_EXPAND_COMPILE_SUCCESS_EMPTY_TESTS: [&str; 15] = [
+const IGNORED_NARGO_EXPAND_COMPILE_SUCCESS_EMPTY_TESTS: [&str; 14] = [
     // There's no "src/main.nr" here so it's trickier to make this work
     "overlapping_dep_and_mod",
     // bug
     "reexports",
     // bug
-    "regression_4436",
-    // bug
     "regression_7038",
     // bug
     "regression_7038_2",
@@ -676,7 +674,7 @@
     writeln!(test_file, "}}").unwrap();
 }
 
 /// Here we check, for every program in `test_programs/exeuction_success`, that:
 /// 1. `nargo expand` works on it
 /// 2. That the output of the original program is the same as the output of the expanded program
 ///    (that is, we run `nargo execute` on the original program and the expanded program and compare the output)

tooling/nargo_cli/src/cli/expand_cmd/printer/hir.rs

@@ -49,14 +49,14 @@
         }
     }
 
     fn show_hir_expression_id_maybe_inside_curlies(&mut self, expr_id: ExprId) {
         let hir_expr = self.interner.expression(&expr_id);
         let curlies = hir_expression_needs_parentheses(&hir_expr);
         if curlies {
             self.push('{');
         }
         self.show_hir_expression(hir_expr);
         if curlies {
             self.push('}');
         }
     }
@@ -254,7 +254,7 @@
             self.show_type(&hir_lambda.return_type);
             self.push_str(" ");
         }
         self.show_hir_expression_id_maybe_inside_curlies(hir_lambda.body);
     }
 
     fn show_hir_match(&mut self, hir_match: HirMatch) {
@@ -694,8 +694,19 @@
         let definition = self.interner.definition(ident.id);
         match definition.kind {
             DefinitionKind::Function(func_id) => {
-                let use_import = true;
-                self.show_reference_to_module_def_id(ModuleDefId::FunctionId(func_id), use_import);
+                let func_meta = self.interner.function_meta(&func_id);
+                if func_meta.self_type.is_some() && func_meta.self_type == self.self_type {
+                    // No need to fully-qualify the function name if its self type is the current self type
+                    let name = self.interner.function_name(&func_id);
+                    self.push_str("Self::");
+                    self.push_str(name);
+                } else {
+                    let use_import = true;
+                    self.show_reference_to_module_def_id(
+                        ModuleDefId::FunctionId(func_id),
+                        use_import,
+                    );
+                }
             }
             DefinitionKind::Global(global_id) => {
                 let global_info = self.interner.get_global(global_id);