Skip to content

Commit

Permalink
[WIP] widen instance count columns
Browse files Browse the repository at this point in the history
  • Loading branch information
@JamieMason
JamieMason committed Oct 27, 2024
1 parent 943f74c commit 3b94a45
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 48 deletions.
4 changes: 2 additions & 2 deletions src/effects/lint.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ pub fn run(ctx: Context) -> Context {
let ui = Ui {
ctx: &ctx,
show_ignored: true,
show_instances: false,
show_instances: true,
show_local_hint: true,
show_status_codes: true,
show_packages: false,
show_packages: true,
// @TODO: show_valid: false,
// @TODO: sort_by: "name" | "state" | "count",
};
Expand Down
96 changes: 50 additions & 46 deletions src/effects/ui.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,37 +295,37 @@ impl<'a> Ui<'a> {
match variant {
ValidInstance::IsIgnored => {
let icon = self.unknown_icon();
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
ValidInstance::IsLocalAndValid => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
ValidInstance::IsIdenticalToLocal => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
ValidInstance::SatisfiesLocal => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
ValidInstance::IsHighestOrLowestSemver => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
ValidInstance::SatisfiesHighestOrLowestSemver => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
ValidInstance::IsNonSemverButIdentical => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
ValidInstance::IsIdenticalToPin => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
ValidInstance::SatisfiesSameRangeGroup => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
ValidInstance::IsIdenticalToSnapTarget => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
ValidInstance::SatisfiesSnapTarget => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
}
}
Expand All @@ -335,66 +335,66 @@ impl<'a> Ui<'a> {
match variant {
InvalidInstance::Fixable(variant) => match variant {
FixableInstance::IsBanned => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
FixableInstance::DiffersToLocal => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
FixableInstance::DiffersToHighestOrLowestSemver => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
FixableInstance::DiffersToSnapTarget => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
FixableInstance::DiffersToPin => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
FixableInstance::SemverRangeMismatch => {
let arrow = self.dim_right_arrow();
let expected = instance.get_specifier_with_preferred_semver_range();
let expected = expected.unwrap().unwrap();
let expected = expected.green();
info!(" {icon} {actual} {arrow} {expected} {location} {state_link}");
info!(" {icon} {actual} {arrow} {expected} {location} {state_link}");
}
FixableInstance::PinOverridesSemverRange => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
FixableInstance::PinOverridesSemverRangeMismatch => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
},
InvalidInstance::Unfixable(variant) => match variant {
UnfixableInstance::DependsOnInvalidLocalPackage => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
UnfixableInstance::NonSemverMismatch => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
UnfixableInstance::SameRangeMismatch => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
UnfixableInstance::DependsOnMissingSnapTarget => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
},
InvalidInstance::Conflict(variant) => match variant {
SemverGroupAndVersionConflict::MatchConflictsWithHighestOrLowestSemver => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
SemverGroupAndVersionConflict::MismatchConflictsWithHighestOrLowestSemver => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
SemverGroupAndVersionConflict::MatchConflictsWithSnapTarget => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
SemverGroupAndVersionConflict::MismatchConflictsWithSnapTarget => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
SemverGroupAndVersionConflict::MatchConflictsWithLocal => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
SemverGroupAndVersionConflict::MismatchConflictsWithLocal => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
},
}
Expand All @@ -403,16 +403,16 @@ impl<'a> Ui<'a> {
let icon = self.warn_icon();
match variant {
SuspectInstance::RefuseToBanLocal => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
SuspectInstance::RefuseToPinLocal => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
SuspectInstance::RefuseToSnapLocal => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
SuspectInstance::InvalidLocalVersion => {
info!(" {icon} {actual} {location} {state_link}");
info!(" {icon} {actual} {location} {state_link}");
}
}
}
Expand Down Expand Up @@ -445,7 +445,7 @@ impl<'a> Ui<'a> {
/// Return a right-aligned column of a count of instances
/// Example " 38x"
pub fn count_column(&self, count: usize) -> ColoredString {
format!("{: >4}x", count).dimmed()
format!("{: >8}x", count).dimmed()
}

/// Return a location hint for an instance
Expand Down Expand Up @@ -485,9 +485,12 @@ impl<'a> Ui<'a> {
let status = "Valid".green();
info!("{count} {icon} {status}");
if self.show_packages {
packages.iter().for_each(|package| {
self.print_formatted_package(&package.borrow());
});
packages
.iter()
.sorted_by_key(|package| package.borrow().get_name_unsafe())
.for_each(|package| {
self.print_formatted_package(&package.borrow());
});
}
}
}
Expand All @@ -496,8 +499,8 @@ impl<'a> Ui<'a> {
fn print_formatted_package(&self, package: &PackageJson) {
if package.formatting_mismatches.borrow().is_empty() {
let icon = "-".dimmed();
let file_link = self.package_json_link(package);
info!(" {icon} {file_link}");
let file_link = self.package_json_link(package).dimmed();
info!(" {icon} {file_link}");
}
}

Expand All @@ -511,15 +514,13 @@ impl<'a> Ui<'a> {
if self.show_packages {
mismatches
.iter()
.sorted_by(|a, b| a.package.borrow().get_name_unsafe().cmp(&b.package.borrow().get_name_unsafe()))
.sorted_by_key(|mismatch| mismatch.package.borrow().get_name_unsafe())
.for_each(|mismatch| {
let icon = "-".dimmed();
let package = mismatch.package.borrow();
let property_path = self.format_path(&mismatch.property_path).dimmed();
let property_path = self.format_path(&mismatch.property_path);
let file_link = self.package_json_link(&package);
let in_ = "in".dimmed();
let at = "at".dimmed();
let msg = format!(" {icon} {in_} {file_link} {at} {property_path}");
let msg = format!(" {icon} {property_path} of {file_link}").red();
info!("{msg}");
});
}
Expand Down Expand Up @@ -554,7 +555,10 @@ impl<'a> Ui<'a> {

/// Convert eg. "/dependencies/react" to ".dependencies.react"
fn format_path(&self, path: &str) -> ColoredString {
let path = path.replace("/", ".");
path.normal()
if path == "/" {
"root".normal()
} else {
path.replace("/", ".").normal()
}
}
}

0 comments on commit 3b94a45

Please sign in to comment.