asp/keep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Resolve multiple ColumnConfig definitions and type mismatches

Browse Source 
Co-authored-by: aider (openai/andrew/openrouter/deepseek/deepseek-chat-v3.1) <aider@aider.chat>
This commit is contained in:
Andrew Phillips
2025-09-08 19:04:30 -03:00
parent 0ab5c93845
commit b9059da814
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/modes/common.rs
View File

@@ -177,10 +177,10 @@ pub fn create_table_with_config(table_config: &crate::config::TableConfig) -> Ta
// Set content arrangement
match table_config.content_arrangement {
ContentArrangement::Dynamic => table.set_content_arrangement(ContentArrangement::Dynamic),
ContentArrangement::DynamicFullWidth => table.set_content_arrangement(ContentArrangement::DynamicFullWidth),
ContentArrangement::Disabled => table.set_content_arrangement(ContentArrangement::Disabled),
}
crate::config::ContentArrangement::Dynamic => table.set_content_arrangement(comfy_table::ContentArrangement::Dynamic),
crate::config::ContentArrangement::DynamicFullWidth => table.set_content_arrangement(comfy_table::ContentArrangement::DynamicFullWidth),
crate::config::ContentArrangement::Disabled => table.set_content_arrangement(comfy_table::ContentArrangement::Disabled),
};
// Set style preset
match &table_config.style {
@@ -199,6 +199,7 @@ pub fn create_table_with_config(table_config: &crate::config::TableConfig) -> Ta
table.load_preset(comfy_table::presets::NOTHING);
}
// Add more presets as needed
table
}
}
@@ -207,8 +208,6 @@ pub fn create_table_with_config(table_config: &crate::config::TableConfig) -> Ta
match modifier.as_str() {
"UTF8_SOLID_INNER_BORDERS" => table.apply_modifier(comfy_table::modifiers::UTF8_SOLID_INNER_BORDERS),
"UTF8_ROUND_CORNERS" => table.apply_modifier(comfy_table::modifiers::UTF8_ROUND_CORNERS),
"UTF8_NO_BORDERS" => table.apply_modifier(comfy_table::modifiers::UTF8_NO_BORDERS),
"UTF8_NO_LINES" => table.apply_modifier(comfy_table::modifiers::UTF8_NO_LINES),
_ => {} // Ignore unknown modifiers
}
}

5
src/modes/list.rs
View File

@@ -4,14 +4,11 @@ use crate::services::types::ItemWithMeta;
use crate::modes::common::ColumnType;
use crate::modes::common::{format_size, OutputFormat};
use anyhow::{Result};
use comfy_table::{Table, ContentArrangement, Cell, Row, Color, Attribute};
use comfy_table::presets::NOTHING;
use comfy_table::{Cell, Row, Color, Attribute};
use comfy_table::CellAlignment;
use serde::{Deserialize, Serialize};
use serde_json;
use serde_yaml;
use std::io::{stdout};
use std::io::IsTerminal;
#[derive(Serialize, Deserialize)]
struct ListItem {