ef3d0c3e/nml
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix variables in LSP

Browse source
This commit is contained in:
ef3d0c3e 2024-11-03 10:54:27 +01:00
parent ef041fcb5f
commit 379a7c7c59
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/document/variable.rs
View file

@ -52,7 +52,7 @@ impl Variable for BaseVariable {
fn parse<'a>(&self, state: &ParserState, _location: Token, document: &'a dyn Document<'a>) { fn parse<'a>(&self, state: &ParserState, _location: Token, document: &'a dyn Document<'a>) {
let source = Rc::new(VirtualSource::new( let source = Rc::new(VirtualSource::new(
self.location().clone(), self.location().clone(),
self.name().to_string(), format!(":VAR:{}", self.name()),
self.to_string(), self.to_string(),
)); ));

5
src/elements/toc.rs
View file

@ -66,9 +66,8 @@ impl Element for Toc {
} }
} }
if sections.is_empty() if sections.is_empty() {
{ return Ok("".into());
return Ok("".into())
} }
match compiler.target() { match compiler.target() {

4
src/lsp/hints.rs
View file

@ -45,7 +45,9 @@ impl<'a> Hints<'a> {
lsp: &'a Option<RefCell<LSPData>>, lsp: &'a Option<RefCell<LSPData>>,
original_source: Rc<dyn Source>, original_source: Rc<dyn Source>,
) -> Option<Self> { ) -> Option<Self> {
if source.name().starts_with(":LUA:") && source.downcast_ref::<VirtualSource>().is_some() { if (source.name().starts_with(":LUA:") || source.name().starts_with(":VAR:"))
&& source.downcast_ref::<VirtualSource>().is_some()
{
return None; return None;
} }

4
src/lsp/semantic.rs
View file

@ -320,7 +320,9 @@ impl<'a> Semantics<'a> {
lsp: &'a Option<RefCell<LSPData>>, lsp: &'a Option<RefCell<LSPData>>,
original_source: Rc<dyn Source>, original_source: Rc<dyn Source>,
) -> Option<(Self, Ref<'a, Tokens>)> { ) -> Option<(Self, Ref<'a, Tokens>)> {
if source.name().starts_with(":LUA:") && source.downcast_ref::<VirtualSource>().is_some() { if (source.name().starts_with(":LUA:") || source.name().starts_with(":VAR:"))
&& source.downcast_ref::<VirtualSource>().is_some()
{
return None; return None;
} }