Files that changed from the base of the PR and between f639c75 and 9d10f3b.

• crates/cli/src/config.rs (6 hunks)
• crates/cli/src/new.rs (4 hunks)
• crates/cli/src/verify/find_file.rs (1 hunks)

crates/cli/src/verify/find_file.rs (1)

95-98: LGTM! Clean refactor of configuration access.

The direct destructuring of test_configs from ProjectConfig simplifies the code while maintaining the same behavior through unwrap_or_default().

Let's verify the default behavior is consistent with the old implementation:

✅ Verification successful

Based on the search results, I can now generate the final response:

Verified: Configuration handling is consistent across the codebase

The direct destructuring and unwrap_or_default() approach aligns with the codebase's handling of test_configs:

• In new.rs, it's handled as an Option<Vec<TestConfig>> with explicit None checks
• In config.rs, it's defined as Option<Vec<TestConfig>> in the struct definition
• The migration from sg_config preserves the optional nature through take()

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify that the default behavior for test_configs matches the old implementation
# Test: Search for any custom default implementations or derives for ProjectConfig
ast-grep --pattern 'impl Default for ProjectConfig'

# Test: Check for any other places where test_configs is accessed to ensure consistent handling
rg 'test_configs' -A 3

Length of output: 2771

crates/cli/src/new.rs (5)

178-178: LGTM: Simplified config access

The change correctly reflects the ProjectConfig restructuring by directly accessing test_configs.

---

250-252: LGTM: Clean destructuring pattern

The destructuring correctly extracts the required fields from ProjectConfig using idiomatic Rust pattern matching.

---

255-261: LGTM: Simplified rule directory handling

The code maintains correct functionality while simplifying the configuration access pattern. It properly handles both single and multiple rule directory cases.

---

272-272: LGTM: Consistent test config usage

The change maintains consistency with the earlier test_configs access pattern modification.

---

331-334: LGTM: Consistent utility directory handling

The changes maintain consistency with the overall refactoring pattern while preserving proper error handling.

crates/cli/src/config.rs (5)

59-64: Refactoring ProjectConfig to include configuration fields

Integrating rule_dirs, test_configs, and util_dirs directly into ProjectConfig simplifies the configuration structure and reduces nested dependencies.

---

94-104: Ensure sg_config remains valid after field extraction

After extracting fields from sg_config to construct ProjectConfig, verify that sg_config still contains the necessary data for register_custom_language. Since fields like rule_dirs are drained and test_configs, util_dirs are taken, confirm that the remaining fields in sg_config are sufficient for proper operation.

---

133-136: Consistent use of util_dirs in functions

The updates to destructure util_dirs from ProjectConfig in find_util_rules and the subsequent use in build_util_walker improve clarity and consistency.

---

169-172: Destructuring rule_dirs from ProjectConfig

Using rule_dirs directly from ProjectConfig in read_directory_yaml aligns with the refactored structure and enhances code readability.

---

219-223: Simplified configuration path discovery

Removing the base parameter from find_config_path_with_default streamlines the configuration file discovery process. The function now starts searching from the current directory, which simplifies usage.