studio/storybook
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(lexer): add type system keywords

Browse Source 
Added four keywords for new type system:
- concept: Base type definition
- sub_concept: Enum/record sub-type definition
- concept_comparison: Compile-time enum mapping
- any: Universal type for dynamic contexts

Also added:
- CLAUDE.md with project instructions and commit guidelines
- Test coverage for new keywords
- Crate-level deny directives for unused variables and dead code

Fixed pre-existing clippy issues to pass pre-commit hooks.
This commit is contained in:
Sienna Meridian Satterwhite
2026-02-13 22:31:56 +00:00
parent 16deb5d237
commit f258a526e3
14 changed files with 151 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lsp/code_actions.rs
View File

@@ -659,11 +659,7 @@ fn add_missing_template_fields(
character: insert_position.1 as u32,
},
},
new_text: if character.fields.is_empty() {
format!("\n{}", field_text)
} else {
format!("\n{}", field_text)
},
new_text: format!("\n{}", field_text),
}],
);

23
src/lsp/completion.rs
View File

@@ -290,17 +290,12 @@ fn get_contextual_field_completions(doc: &Document, offset: usize) -> Option<Vec
| Declaration::Template(template) => {
// Check if cursor is inside this template block
if offset >= template.span.start && offset <= template.span.end {
let mut items = Vec::new();
// Add special keywords for templates
items.push(simple_item(
// Templates can suggest common field patterns
return Some(vec![simple_item(
"include",
"Include a template",
"include ${1:TemplateName}",
));
// Templates can suggest common field patterns
return Some(items);
)]);
}
},
| _ => {},
@@ -494,16 +489,18 @@ fn determine_context(text: &str, offset: usize) -> CompletionContext {
for (_offset, token, _end) in &tokens {
match token {
| Token::LBrace => nesting_level += 1,
| Token::LBrace => {
nesting_level += 1;
if seen_colon_without_brace {
// Opening brace after colon - we've entered the block
seen_colon_without_brace = false;
}
},
| Token::RBrace => nesting_level = nesting_level.saturating_sub(1),
| Token::Colon => {
// Mark that we've seen a colon
seen_colon_without_brace = true;
},
| Token::LBrace if seen_colon_without_brace => {
// Opening brace after colon - we've entered the block
seen_colon_without_brace = false;
},
| Token::Ident(keyword)
if matches!(
keyword.as_str(),

19
src/lsp/diagnostics.rs
View File

@@ -91,25 +91,6 @@ fn try_parse(text: &str) -> Result<(), Vec<Diagnostic>> {
}
}
fn byte_offset_to_line(text: &str, offset: usize) -> usize {
let mut line = 0;
let mut current_offset = 0;
for ch in text.chars() {
if current_offset >= offset {
break;
}
if ch == '\n' {
line += 1;
}
current_offset += ch.len_utf8();
}
line
}
/// Convert a byte offset to line/column position
/// This is a placeholder - will be replaced when we have proper Span tracking
pub fn byte_offset_to_position(text: &str, offset: usize) -> Position {

5
src/lsp/diagnostics_tests.rs
View File

@@ -172,9 +172,8 @@ invalid syntax here
#[test]
fn test_byte_offset_to_position_beyond_text() {
let text = "short";
let pos = diagnostics::byte_offset_to_position(text, 1000);
// Should not panic, returns position at end (line is always valid u32)
assert!(pos.line == 0 || pos.line > 0);
// Should not panic when offset is beyond text length
let _ = diagnostics::byte_offset_to_position(text, 1000);
}
#[test]

10
src/lsp/hover.rs
View File

@@ -39,13 +39,11 @@ pub fn get_hover_info(text: &str, line: usize, character: usize) -> Option<Hover
}
// Add the character offset (assuming UTF-8)
let mut char_count = 0;
for (byte_pos, _) in line_text.char_indices() {
for (char_count, (byte_pos, _)) in line_text.char_indices().enumerate() {
if char_count == character {
byte_offset += byte_pos;
break;
}
char_count += 1;
}
break;
}
@@ -123,13 +121,11 @@ pub fn get_semantic_hover_info(doc: &Document, line: usize, character: usize) ->
return None;
}
let mut char_count = 0;
for (byte_pos, _) in line_text.char_indices() {
for (char_count, (byte_pos, _)) in line_text.char_indices().enumerate() {
if char_count == character {
byte_offset += byte_pos;
break;
}
char_count += 1;
}
break;
}
@@ -156,7 +152,7 @@ pub fn get_semantic_hover_info(doc: &Document, line: usize, character: usize) ->
let word = target_ident?;
// Look up the symbol in the name table
let symbol_info = doc.name_table.lookup(&[word.clone()])?;
let symbol_info = doc.name_table.lookup(std::slice::from_ref(&word))?;
// Find the declaration in the AST
for decl in &ast.declarations {

5
src/lsp/rename.rs
View File

@@ -84,10 +84,7 @@ pub fn get_rename_edits(
new_text: params.new_name.clone(),
};
all_changes
.entry(url.clone())
.or_default()
.push(edit);
all_changes.entry(url.clone()).or_default().push(edit);
}
}
}

12
src/lsp/semantic_tokens.rs
View File

@@ -83,7 +83,6 @@ fn find_identifiers_in_span(
/// Recursively highlight behavior tree nodes
fn highlight_behavior_node(
builder: &mut SemanticTokensBuilder,
doc: &Document,
node: &crate::syntax::ast::BehaviorNode,
) {
use crate::syntax::ast::BehaviorNode;
@@ -91,19 +90,18 @@ fn highlight_behavior_node(
match node {
| BehaviorNode::Selector { children, .. } | BehaviorNode::Sequence { children, .. } => {
for child in children {
highlight_behavior_node(builder, doc, child);
highlight_behavior_node(builder, child);
}
},
| BehaviorNode::Action(action_name, params) => {
| BehaviorNode::Action(_action_name, params) => {
// Action names don't have spans, so we'd need to search for them
// For now, just highlight the parameters
for param in params {
highlight_field(builder, param);
}
let _ = action_name; // Suppress warning
},
| BehaviorNode::Decorator { child, .. } => {
highlight_behavior_node(builder, doc, child);
highlight_behavior_node(builder, child);
},
| BehaviorNode::SubTree(_path) => {
// SubTree references another behavior by path
@@ -161,7 +159,7 @@ pub fn get_semantic_tokens(doc: &Document) -> Option<SemanticTokensResult> {
&doc.text,
character.span.start,
character.span.end,
&[species.clone()],
std::slice::from_ref(species),
);
for (offset, species_name) in species_positions {
@@ -322,7 +320,7 @@ pub fn get_semantic_tokens(doc: &Document) -> Option<SemanticTokensResult> {
// TODO: Traverse behavior tree to highlight conditions and actions
// Would need recursive function to walk BehaviorNode tree
highlight_behavior_node(&mut builder, doc, &behavior.root);
highlight_behavior_node(&mut builder, &behavior.root);
},
| Declaration::Relationship(relationship) => {
// Highlight relationship name as METHOD

10
src/lsp/tests.rs
View File

@@ -481,14 +481,14 @@ mod definition_tests {
};
let uri = Url::parse("file:///test.sb").unwrap();
let result = definition::get_definition(&mut doc, &params, &uri);
let result = definition::get_definition(&doc, &params, &uri);
assert!(result.is_some());
}
#[test]
fn test_goto_definition_not_found() {
let mut doc = Document::new("character Alice {}".to_string());
let doc = Document::new("character Alice {}".to_string());
let params = GotoDefinitionParams {
text_document_position_params: TextDocumentPositionParams {
@@ -505,7 +505,7 @@ mod definition_tests {
};
let uri = Url::parse("file:///test.sb").unwrap();
let result = definition::get_definition(&mut doc, &params, &uri);
let result = definition::get_definition(&doc, &params, &uri);
assert!(result.is_none());
}
@@ -542,7 +542,7 @@ mod references_tests {
};
let uri = Url::parse("file:///test.sb").unwrap();
let result = references::find_references(&mut doc, &params, &uri);
let result = references::find_references(&doc, &params, &uri);
assert!(result.is_some());
let locations = result.unwrap();
@@ -576,7 +576,7 @@ mod references_tests {
};
let uri = Url::parse("file:///test.sb").unwrap();
let result = references::find_references(&mut doc, &params, &uri);
let result = references::find_references(&doc, &params, &uri);
let locations = result.unwrap();
// Should only find "Alice", not "Alicia"