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

Return CycleError directly

Browse source
This commit is contained in:
Noah Santschi-Cooney 2020-08-13 20:14:29 +01:00
parent b535ede737
commit 756498ee3c
No known key found for this signature in database
GPG key ID: 3B22282472C8AE48
2 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/src/dfs.rs
View file

@ -37,15 +37,13 @@ impl <'a> Dfs<'a> {
}
}
fn check_for_cycle(&self, children: &[NodeIndex]) -> Result<()> {
fn check_for_cycle(&self, children: &[NodeIndex]) -> Result<(), error::CycleError> {
for prev in &self.cycle {
for child in children {
if prev.node == *child {
let cycle_nodes: Vec<NodeIndex> = self.cycle.iter().map(|n| n.node).collect();
return Err(
Error::new(
error::CycleError::new(&cycle_nodes, *child, self.graph)
)
error::CycleError::new(&cycle_nodes, *child, self.graph)
);
}
}
@ -55,9 +53,9 @@ impl <'a> Dfs<'a> {
}
impl <'a> Iterator for Dfs<'a> {
type Item = Result<(NodeIndex, Option<NodeIndex>)>;
type Item = Result<(NodeIndex, Option<NodeIndex>), error::CycleError>;
fn next(&mut self) -> Option<Result<(NodeIndex, Option<NodeIndex>)>> {
fn next(&mut self) -> Option<Result<(NodeIndex, Option<NodeIndex>), error::CycleError>> {
let parent = match self.cycle.last() {
Some(p) => Some(p.node),
None => None,

20
server/src/main.rs
View file

@ -241,7 +241,6 @@ impl MinecraftShaderLanguageServer {
let tree = match self.get_dfs_for_node(root) {
Ok(tree) => tree,
Err(e) => {
let e = e.downcast::<dfs::error::CycleError>().unwrap();
diagnostics.insert(Url::from_file_path(uri).unwrap(), vec![e.into()]);
return Ok(diagnostics);
}
@ -255,9 +254,8 @@ impl MinecraftShaderLanguageServer {
let views = merger.generate_merge_list(&tree);
let stdout = self.invoke_validator(views)?;
let stdout = stdout.trim();
eprintln!("glslangValidator output: {}\n", stdout);
diagnostics.extend(self.parse_validator_stdout(stdout, ""));
diagnostics.extend(self.parse_validator_stdout(&stdout, ""));
} else {
let mut all_trees = Vec::new();
@ -265,7 +263,6 @@ impl MinecraftShaderLanguageServer {
let nodes = match self.get_dfs_for_node(*root) {
Ok(nodes) => nodes,
Err(e) => {
let e = e.downcast::<dfs::error::CycleError>().unwrap();
diagnostics.insert(Url::from_file_path(uri).unwrap(), vec![e.into()]);
return Ok(diagnostics);
}
@ -275,8 +272,6 @@ impl MinecraftShaderLanguageServer {
all_sources.extend(sources);
}
//self.graph.borrow().
for tree in all_trees {
let graph = self.graph.borrow();
let mut merger = merge_views::MergeViewGenerator::new(&mut all_sources, &graph);
@ -284,9 +279,8 @@ impl MinecraftShaderLanguageServer {
let views = merger.generate_merge_list(&tree);
let stdout = self.invoke_validator(views)?;
let stdout = stdout.trim();
eprintln!("glslangValidator output: {}\n", stdout);
diagnostics.extend(self.parse_validator_stdout(stdout, ""));
diagnostics.extend(self.parse_validator_stdout(&stdout, ""));
}
};
@ -358,7 +352,7 @@ impl MinecraftShaderLanguageServer {
};
let origin_url = Url::from_file_path(origin).unwrap();
match diagnostics.get_mut(&origin_url) {//.get_or_insert(Vec::new());
match diagnostics.get_mut(&origin_url) {
Some(d) => d.push(diagnostic),
None => {
diagnostics.insert(origin_url, vec![diagnostic]);
@ -368,7 +362,7 @@ impl MinecraftShaderLanguageServer {
diagnostics
}
pub fn get_dfs_for_node(&self, root: NodeIndex) -> Result<Vec<(NodeIndex, Option<NodeIndex>)>> {
pub fn get_dfs_for_node(&self, root: NodeIndex) -> Result<Vec<(NodeIndex, Option<NodeIndex>)>, dfs::error::CycleError> {
let graph_ref = self.graph.borrow();
let dfs = dfs::Dfs::new(&graph_ref, root);
@ -427,7 +421,7 @@ impl MinecraftShaderLanguageServer {
stdin.flush()?;
let output = child.wait_with_output()?;//.expect("expected output");
let stdout = String::from_utf8(output.stdout).unwrap();
Ok(stdout)
Ok(stdout.trim().to_string())
}
pub fn publish_diagnostic(&self, diagnostics: HashMap<Url, Vec<Diagnostic>>, document_version: Option<i64>) {
@ -551,8 +545,8 @@ impl LanguageServerHandling for MinecraftShaderLanguageServer {
fn did_change_text_document(&mut self, params: DidChangeTextDocumentParams) {
self.wait.wait();
#[allow(unused_variables)]
let text_change = params.content_changes[0].clone();
/* #[allow(unused_variables)]
let text_change = params.content_changes[0]; */
//eprintln!("changed {} changes: {}", text_change., params.text_document.uri);
}