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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

`FIX` now configurations are loaded properly in NeoVim in cases when no extra LSP configuration parameters are provided

`CHG` extended humanization of small constant table types

# 0.3.3

`NEW` Add Develop Guide
Expand Down
44 changes: 42 additions & 2 deletions crates/code_analysis/src/db_index/type/humanize_type.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{
DbIndex, GenericTpl, LuaExistFieldType, LuaExtendedType, LuaFunctionType, LuaGenericType,
LuaInstanceType, LuaIntersectionType, LuaMemberKey, LuaMultiReturn, LuaObjectType,
LuaInstanceType, LuaIntersectionType, LuaMemberKey, LuaMemberOwner, LuaMultiReturn, LuaObjectType,
LuaSignatureId, LuaStringTplType, LuaTupleType, LuaType, LuaTypeDeclId, LuaUnionType,
};

Expand All @@ -18,7 +18,10 @@ pub fn humanize_type(db: &DbIndex, ty: &LuaType) -> String {
LuaType::Userdata => "userdata".to_string(),
LuaType::IntegerConst(i) => i.to_string(),
LuaType::FloatConst(f) => f.to_string(),
LuaType::TableConst(_) => "table".to_string(),
LuaType::TableConst(v) => {
let member_owner = LuaMemberOwner::Element(v.clone());
humanize_table_const_type(db, member_owner)
},
LuaType::Global => "global".to_string(),
LuaType::Def(id) => humanize_def_type(db, id),
LuaType::Union(union) => humanize_union_type(db, union),
Expand Down Expand Up @@ -245,6 +248,43 @@ fn humanize_generic_type(db: &DbIndex, generic: &LuaGenericType) -> String {
format!("{}<{}>", simple_name, generic_params)
}

fn humanize_table_const_type_extended(db: &DbIndex, member_owned: LuaMemberOwner) -> Option<String> {
let member_index = db.get_member_index();
let member_map = member_index.get_member_map(member_owned)?;

let members_string = member_map.into_iter().fold(Some("".to_string()), |acc, member| {
let prev_member_string = acc?;
let (member_key, member_id) = member;
let member_value = member_index.get_member(member_id)?;
let member_value_string = humanize_type(db, member_value.get_decl_type());

let member_string = match member_key {
LuaMemberKey::Name(name) => format!("{} = {}", name, member_value_string),
LuaMemberKey::Integer(i) => format!("[{}] = {}", i, member_value_string),
LuaMemberKey::None => format!("{}", member_value_string)
};

let prev_member_string_len = prev_member_string.chars().count();

// Maximum typename length is 36 symbols.
if prev_member_string_len + member_string.chars().count() <= 32 {
if prev_member_string_len > 0 {
Some(format!("{}, {}", prev_member_string, member_string))
} else {
Some(format!("{}", member_string))
}
} else {
None
}
})?;

Some(format!("{{ {} }}", members_string))
}

fn humanize_table_const_type(db: &DbIndex, member_owned: LuaMemberOwner) -> String {
humanize_table_const_type_extended(db, member_owned).unwrap_or("table".to_string())
}

fn humanize_table_generic_type(db: &DbIndex, table_generic_params: &Vec<LuaType>) -> String {
let generic_params = table_generic_params
.iter()
Expand Down