Skip to content

i thought i fixed that (2) #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tascord merged 1 commit into from
Mar 11, 2026
Merged

i thought i fixed that (2) #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 71 additions & 4 deletions src/lsp/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1190,7 +1190,12 @@ impl LoftLanguageServer {
lines,
);
}
Stmt::For { body, iterable, .. } => {
Stmt::For {
var,
body,
iterable,
..
} => {
Self::check_expr_with_imports(
iterable,
symbols,
Expand All @@ -1199,9 +1204,27 @@ impl LoftLanguageServer {
diagnostics,
lines,
);

// Create a temporary scope including the loop variable
let mut extended_symbols = symbols.to_vec();
extended_symbols.push(SymbolInfo {
name: var.clone(),
kind: SymbolKind::Variable {
var_type: None,
mutable: false,
},
detail: Some(format!("loop variable {}", var)),
documentation: None,
scope_level: 0, // Scope level not strictly used here for existence check
range: None,
selection_range: None,
source_uri: None,
is_exported: false,
});

Self::check_stmt_with_imports(
body,
symbols,
&extended_symbols,
used_vars,
used_imports,
diagnostics,
Expand Down Expand Up @@ -1263,9 +1286,27 @@ impl LoftLanguageServer {
Self::check_expr(condition, symbols, used_vars, diagnostics, lines);
Self::check_stmt(body, symbols, used_vars, diagnostics, lines);
}
Stmt::For { body, iterable, .. } => {
Stmt::For { var, body, iterable } => {
Self::check_expr(iterable, symbols, used_vars, diagnostics, lines);
Self::check_stmt(body, symbols, used_vars, diagnostics, lines);

// Create a temporary scope including the loop variable
let mut extended_symbols = symbols.to_vec();
extended_symbols.push(SymbolInfo {
name: var.clone(),
kind: SymbolKind::Variable {
var_type: None,
mutable: false,
},
detail: Some(format!("loop variable {}", var)),
documentation: None,
scope_level: 0,
range: None,
selection_range: None,
source_uri: None,
is_exported: false,
});

Self::check_stmt(body, &extended_symbols, used_vars, diagnostics, lines);
}
Stmt::Block(stmts) => {
Self::check_stmt_list(stmts, symbols, used_vars, diagnostics, lines);
Expand Down Expand Up @@ -1972,6 +2013,32 @@ impl LoftLanguageServer {
));
}
}
Stmt::For { var, body, .. } => {
// Add loop variable to symbols
symbols.push(SymbolInfo {
name: var.clone(),
kind: SymbolKind::Variable {
var_type: None, // Could potentially infer from iterable
mutable: false, // Loft loop variables are typically immutable
},
detail: Some(format!("loop variable {}", var)),
documentation: None,
scope_level,
range: None,
selection_range: None,
source_uri: None,
is_exported: false,
});

// Recursively extract symbols from loop body
if let Stmt::Block(body_stmts) = body.as_ref() {
symbols.extend(Self::extract_symbols(
body_stmts,
scope_level + 1,
stdlib_types,
));
}
}
Stmt::StructDecl { name, fields } => {
let field_list: Vec<(String, String)> = fields
.iter()
Expand Down
Loading