language-servers/mcshader-lsp
1
0
Fork 0
mirror of https://github.com/Strum355/mcshader-lsp.git synced 2025-08-03 16:39:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed tree-type inference when the saved file is not a top-level

Browse source
This commit is contained in:
Noah Santschi-Cooney 2021-01-11 22:50:39 +00:00
parent dc1495686a
commit 96eaac213a
No known key found for this signature in database
GPG key ID: 3B22282472C8AE48
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server/src/main.rs
View file

@ -64,10 +64,10 @@ fn main() {
langserver.command_provider = Some(commands::CustomCommandProvider::new(vec![
(
"graphDot",
"graphDot",
Box::new(commands::GraphDotCommand {
graph: Rc::clone(&langserver.graph),
}),
graph: Rc::clone(&langserver.graph),
}),
),
(
"virtualMerge",
@ -265,7 +265,7 @@ impl MinecraftShaderLanguageServer {
};
eprintln!("ancestors for {}:\n\t{:?}", uri, file_ancestors.iter().map(|e| self.graph.borrow().graph.node_weight(*e).unwrap().clone()).collect::<Vec<String>>());
// the set of all filepath->content. TODO: change to Url?
let mut all_sources: HashMap<String, String> = HashMap::new();
// the set of filepath->list of diagnostics to report
@ -294,7 +294,7 @@ impl MinecraftShaderLanguageServer {
let graph = self.graph.borrow();
let views = merge_views::generate_merge_list(&tree, &all_sources, &graph);
let tree_type = if uri.ends_with(".fsh") {
TreeType::Fragment
} else {
@ -323,7 +323,7 @@ impl MinecraftShaderLanguageServer {
}
};
let tree_type = if uri.ends_with(".fsh") {
let tree_type = if self.graph.borrow().get_node(*root).ends_with(".fsh") {
TreeType::Fragment
} else {
TreeType::Vertex