Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions crates/sem-cli/src/formatters/terminal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,21 @@ pub fn format_terminal(result: &DiffResult, verbose: bool) -> String {
};

let type_label = format!("{:<10}", change.entity_type);
let name_display = if let Some(ref old_name) = change.old_entity_name {
let base_name = if let Some(ref old_name) = change.old_entity_name {
format!("{old_name} -> {}", change.entity_name)
} else {
change.entity_name.clone()
};
let name_label = format!("{:<25}", name_display);
let display_name = match &change.parent_name {
Some(p) => format!("{p}::{base_name}"),
None => base_name,
};
let truncated = if display_name.len() > 25 {
format!("{}…", display_name.char_indices().nth(24).map(|(i, _)| &display_name[..i]).unwrap_or(&display_name))
} else {
display_name
};
let name_label = format!("{:<25}", truncated);

lines.push(format!(
"{} {} {} {} {}",
Expand Down
2 changes: 2 additions & 0 deletions crates/sem-core/src/model/change.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ pub struct SemanticChange {
pub entity_name: String,
#[serde(default)]
pub entity_line: usize,
#[serde(skip_serializing_if = "Option::is_none")]
pub parent_name: Option<String>,
pub file_path: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub old_entity_name: Option<String>,
Expand Down
7 changes: 7 additions & 0 deletions crates/sem-core/src/model/identity.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ use std::collections::{HashMap, HashSet};
use super::change::{ChangeType, SemanticChange};
use super::entity::SemanticEntity;

/// Extracts the leaf name from a parent_id string (last "::" segment).
fn parent_name(entity: &SemanticEntity) -> Option<String> {
let pid = entity.parent_id.as_ref()?;
pid.rsplit("::").next().map(String::from)
}

pub struct MatchResult {
pub changes: Vec<SemanticChange>,
}
Expand Down Expand Up @@ -43,6 +49,7 @@ fn make_change(
entity_type: primary.entity_type.clone(),
entity_name: primary.name.clone(),
entity_line: primary.start_line,
parent_name: parent_name(primary),
file_path: primary.file_path.clone(),
old_entity_name: before_entity.and_then(|b| {
(b.name != after_entity.name).then(|| b.name.clone())
Expand Down
1 change: 1 addition & 0 deletions crates/sem-core/src/parser/differ.rs
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ fn detect_orphan_changes(
entity_type: "orphan".to_string(),
entity_name: "module-level".to_string(),
entity_line: 0,
parent_name: None,
file_path: file.file_path.clone(),
old_entity_name: None,
old_file_path: None,
Expand Down
Loading