Manually fix the rest of clippy warnings.

ace-design · Jul 7, 2023 · f26323a · f26323a
1 parent c42dea3
commit f26323a
Show file tree

Hide file tree

Showing 9 changed files with 155 additions and 207 deletions.
diff --git a/src/features/diagnostics/mod.rs b/src/features/diagnostics/mod.rs
@@ -1,4 +1,4 @@
-mod diagnostics;
 mod parse;
+mod provider;
 
-pub use diagnostics::{get_full_diagnostics, get_quick_diagnostics};
+pub use provider::{get_full_diagnostics, get_quick_diagnostics};
diff --git a/src/features/diagnostics/parse.rs b/src/features/diagnostics/parse.rs
@@ -3,7 +3,7 @@ use std::sync::{Arc, Mutex};
 use crate::metadata::{AstQuery, NodeKind, SymbolTableQuery, VisitNode, Visitable};
 use tower_lsp::lsp_types::{Diagnostic, DiagnosticSeverity};
 
-use super::diagnostics::DiagnosticProvider;
+use super::provider::DiagnosticProvider;
 
 pub struct Parse {}
 

diff --git a/src/features/diagnostics/diagnostics.rs → src/features/diagnostics/provider.rs b/src/features/diagnostics/diagnostics.rs → src/features/diagnostics/provider.rs
diff --git a/src/features/semantic_tokens.rs b/src/features/semantic_tokens.rs
@@ -52,11 +52,11 @@ pub fn get_tokens(ast_query: &Arc<Mutex<impl AstQuery>>) -> SemanticTokensResult
             let mut max_val = 0;
             temp_array.sort_by_key(|&token| token.delta_start); //sorting the start pos
                                                                 //setting the first deltaline to conatin the diff value (line) and setting all other to 0
-            for i in 0..temp_array.len() {
-                if temp_array[i].delta_line > max_val {
-                    max_val = temp_array[i].delta_line;
+            for item in &mut temp_array {
+                if item.delta_line > max_val {
+                    max_val = item.delta_line;
                 }
-                temp_array[i].delta_line = 0;
+                item.delta_line = 0;
             }
             temp_array[0].delta_line = max_val;
 

diff --git a/src/main.rs b/src/main.rs
@@ -61,8 +61,6 @@ impl LanguageServer for Backend {
 
         self.plugin_manager.write().unwrap().load_plugins();
 
-        let mut completion_temp = CompletionOptions::default();
-        completion_temp.trigger_characters = Some(vec![".".to_string()]);
         Ok(InitializeResult {
             capabilities: ServerCapabilities {
                 semantic_tokens_provider: Some(
@@ -76,7 +74,10 @@ impl LanguageServer for Backend {
                     ),
                 ),
                 hover_provider: Some(HoverProviderCapability::Simple(true)),
-                completion_provider: Some(completion_temp),
+                completion_provider: Some(CompletionOptions {
+                    trigger_characters: Some(vec![String::from(".")]),
+                    ..Default::default()
+                }),
                 text_document_sync: Some(TextDocumentSyncCapability::Options(
                     TextDocumentSyncOptions {
                         open_close: Some(true),

diff --git a/src/metadata/ast/translator.rs b/src/metadata/ast/translator.rs
diff --git a/src/metadata/ast/tree.rs b/src/metadata/ast/tree.rs
@@ -329,15 +329,13 @@ impl Ast {
             indent.to_string() + "|  "
         };
 
-        let mut i = 0;
-        for child in node_id.children(&self.arena) {
+        for (i, child) in node_id.children(&self.arena).enumerate() {
             self._get_debug_tree(
                 child,
                 &indent,
                 i == node_id.children(&self.arena).collect::<Vec<_>>().len() - 1,
                 result,
             );
-            i += 1;
         }
     }
 }
diff --git a/src/metadata/symbol_table.rs b/src/metadata/symbol_table.rs
@@ -104,9 +104,9 @@ impl SymbolTableActions for SymbolTable {
                         }
                     }
                 }
-                for index_name in 1..(names.len() - 1) {
-                    let test = names[index_name];
-                    let fields = symbol.contains_fields(test.to_string());
+
+                for name in names.iter().take(names.len() - 1).skip(1) {
+                    let fields = symbol.contains_fields(name.to_string());
                     if let Some(field) = fields {
                         if let Some(x) = field.type_.get_name() {
                             if x == Type::Name {
@@ -394,50 +394,34 @@ impl Symbols {
     }
 
     pub fn find_mut(&mut self, name: &str) -> Option<&mut Symbol> {
-        for symbol in &mut self.types {
-            if symbol.name == name {
-                return Some(symbol);
-            }
+        if let Some(s) = self.types.iter_mut().find(|symbol| symbol.name == name) {
+            return Some(s);
         }
-        for symbol in &mut self.constants {
-            if symbol.name == name {
-                return Some(symbol);
-            }
+        if let Some(s) = self.constants.iter_mut().find(|symbol| symbol.name == name) {
+            return Some(s);
         }
-        for symbol in &mut self.variables {
-            if symbol.name == name {
-                return Some(symbol);
-            }
+        if let Some(s) = self.variables.iter_mut().find(|symbol| symbol.name == name) {
+            return Some(s);
         }
-        for symbol in &mut self.functions {
-            if symbol.name == name {
-                return Some(symbol);
-            }
+        if let Some(s) = self.functions.iter_mut().find(|symbol| symbol.name == name) {
+            return Some(s);
         }
 
         None
     }
 
     pub fn get_mut(&mut self, id: usize) -> Option<&mut Symbol> {
-        for symbol in &mut self.types {
-            if symbol.id == id {
-                return Some(symbol);
-            }
+        if let Some(s) = self.types.iter_mut().find(|symbol| symbol.id == id) {
+            return Some(s);
         }
-        for symbol in &mut self.constants {
-            if symbol.id == id {
-                return Some(symbol);
-            }
+        if let Some(s) = self.constants.iter_mut().find(|symbol| symbol.id == id) {
+            return Some(s);
         }
-        for symbol in &mut self.variables {
-            if symbol.id == id {
-                return Some(symbol);
-            }
+        if let Some(s) = self.variables.iter_mut().find(|symbol| symbol.id == id) {
+            return Some(s);
         }
-        for symbol in &mut self.functions {
-            if symbol.id == id {
-                return Some(symbol);
-            }
+        if let Some(s) = self.functions.iter_mut().find(|symbol| symbol.id == id) {
+            return Some(s);
         }
 
         None
@@ -558,16 +542,14 @@ impl ScopeSymbolTable {
                             type2: NodeKind,
                         ) -> Vec<Field> {
                             let mut fields: Vec<Field> = vec![];
+                            let fields_node: VisitNode =
+                                match child_visit_node.get_child_of_kind(type1) {
+                                    Some(x) => x,
+                                    None => {
+                                        return fields;
+                                    }
+                                };
 
-                            let fields_node: VisitNode;
-                            match child_visit_node.get_child_of_kind(type1) {
-                                Some(x) => {
-                                    fields_node = x;
-                                }
-                                None => {
-                                    return fields;
-                                }
-                            }
                             for field_visit in fields_node.get_children() {
                                 let param_node = field_visit.get();
                                 if param_node.kind == type2 {
@@ -636,12 +618,11 @@ impl ScopeSymbolTable {
                             TypeDecType::Package => {}
                         }
 
-                        let fields_symbol: Option<Vec<Field>>;
-                        if fields.is_empty() {
-                            fields_symbol = None;
+                        let fields_symbol: Option<Vec<Field>> = if fields.is_empty() {
+                            None
                         } else {
-                            fields_symbol = Some(fields);
-                        }
+                            Some(fields)
+                        };
 
                         table.symbols.types.push(Symbol::new(
                             name,

diff --git a/src/plugin_manager/manager.rs b/src/plugin_manager/manager.rs
@@ -29,23 +29,21 @@ impl PluginManager {
                 }
             };
 
-            for path in paths {
-                if let Ok(dir_entry) = path {
-                    info!("Loading plugin: {}", dir_entry.path().display());
-                    let file_content = fs::read(dir_entry.path()).unwrap();
-                    let functions = (*FUNCTIONS).clone();
+            for dir_entry in paths.flatten() {
+                info!("Loading plugin: {}", dir_entry.path().display());
+                let file_content = fs::read(dir_entry.path()).unwrap();
+                let functions = (*FUNCTIONS).clone();
 
-                    match Plugin::create(file_content, functions, true) {
-                        Ok(plugin) => {
-                            self.plugins.push(plugin);
-                        }
-                        Err(err) => {
-                            error!(
-                                "Failed loading plugin: {} Error: {}",
-                                dir_entry.path().display(),
-                                err
-                            );
-                        }
+                match Plugin::create(file_content, functions, true) {
+                    Ok(plugin) => {
+                        self.plugins.push(plugin);
+                    }
+                    Err(err) => {
+                        error!(
+                            "Failed loading plugin: {} Error: {}",
+                            dir_entry.path().display(),
+                            err
+                        );
                     }
                 }
             }