Skip to content

Commit 35e6207

Browse files
0xSwapFeeder0xmemorygrinder
0xSwapFeeder
authored and
0xmemorygrinder
committed
fix(libs/code-actions): ran format and lint
1 parent 9e282e5 commit 35e6207

20 files changed

+785
-772
lines changed

‎libs/code-actions/src/code_actions_provider.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,12 @@ impl CodeActionsProvider {
6363
}
6464
}
6565

66-
6766
#[cfg(test)]
6867
mod test {
6968
use super::*;
7069

7170
#[test]
72-
fn test_set_base_path() {
71+
fn test_set_base_path() {
7372
let provider = CodeActionsProvider::new();
7473
provider.set_base_path("test".to_string());
7574
assert_eq!(*provider.base_path.read().unwrap(), "test");

‎libs/code-actions/src/completions/auto_complete_provider.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,19 @@ mod test {
110110
use crate::test_utils::{create_test_ast_file, create_test_ast_file_struct_definition};
111111

112112
use super::*;
113-
113+
114114
#[test]
115115
fn test_get_suggestions() {
116116
let provider = AutoCompleteProvider::new();
117117
let uri = "test.sol";
118-
let position = Position { line: 10, column: 15 };
119-
let files = vec![create_test_ast_file(), create_test_ast_file_struct_definition()];
118+
let position = Position {
119+
line: 10,
120+
column: 15,
121+
};
122+
let files = vec![
123+
create_test_ast_file(),
124+
create_test_ast_file_struct_definition(),
125+
];
120126
let completes = provider.get_suggestions(uri, position, &files);
121127
assert_eq!(completes.len(), 4);
122128
}

‎libs/code-actions/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ mod code_actions_provider;
22
mod completions;
33
mod error;
44
mod references;
5+
mod test_utils;
56
mod types;
67
mod utils;
7-
mod test_utils;
88

99
pub use code_actions_provider::CodeActionsProvider;
1010
pub use types::{Location, Position};

‎libs/code-actions/src/references/definition_visitor.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,12 @@ impl DefinitionVisitor {
8080

8181
#[cfg(test)]
8282
mod test {
83-
use crate::test_utils::{create_test_ast_file_contract_definition, create_test_ast_file_enum_definition, create_test_ast_file_enum_value, create_test_ast_file_event_definition, create_test_ast_file_function_definition, create_test_ast_file_modifier_definition, create_test_ast_file_struct_definition, create_test_ast_file_variable_declaration};
83+
use crate::test_utils::{
84+
create_test_ast_file_contract_definition, create_test_ast_file_enum_definition,
85+
create_test_ast_file_enum_value, create_test_ast_file_event_definition,
86+
create_test_ast_file_function_definition, create_test_ast_file_modifier_definition,
87+
create_test_ast_file_struct_definition, create_test_ast_file_variable_declaration,
88+
};
8489

8590
use super::*;
8691

@@ -267,5 +272,4 @@ mod test {
267272
let node = visitor.find(&file.ast);
268273
assert!(node.is_none());
269274
}
270-
271275
}

‎libs/code-actions/src/references/position_node_visitor.rs

+32-77
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,17 @@ impl PositionNodeVisitor {
188188
#[cfg(test)]
189189
mod test {
190190
use super::*;
191-
use crate::test_utils::{create_test_ast_file_contract_definition, create_test_ast_file_enum_definition, create_test_ast_file_enum_value, create_test_ast_file_error_definition, create_test_ast_file_event_definition, create_test_ast_file_function_call, create_test_ast_file_function_definition, create_test_ast_file_identifier, create_test_ast_file_inheritance_specifier, create_test_ast_file_member_access, create_test_ast_file_modifier_definition, create_test_ast_file_modifier_invocation, create_test_ast_file_new_expression, create_test_ast_file_struct_definition, create_test_ast_file_user_defined_type_name, create_test_ast_file_using_for_directive, create_test_ast_file_variable_declaration};
192-
191+
use crate::test_utils::{
192+
create_test_ast_file_contract_definition, create_test_ast_file_enum_definition,
193+
create_test_ast_file_enum_value, create_test_ast_file_error_definition,
194+
create_test_ast_file_event_definition, create_test_ast_file_function_call,
195+
create_test_ast_file_function_definition, create_test_ast_file_identifier,
196+
create_test_ast_file_inheritance_specifier, create_test_ast_file_member_access,
197+
create_test_ast_file_modifier_definition, create_test_ast_file_modifier_invocation,
198+
create_test_ast_file_new_expression, create_test_ast_file_struct_definition,
199+
create_test_ast_file_user_defined_type_name, create_test_ast_file_using_for_directive,
200+
create_test_ast_file_variable_declaration,
201+
};
193202

194203
#[test]
195204
fn test_find_contract_definition() {
@@ -211,10 +220,7 @@ mod test {
211220
#[test]
212221
fn test_find_contract_definition_wrong_position() {
213222
let file = create_test_ast_file_contract_definition();
214-
let position = Position {
215-
line: 1,
216-
column: 1,
217-
};
223+
let position = Position { line: 1, column: 1 };
218224
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
219225
let node = visitor.find(&file.ast);
220226
assert!(node.is_none());
@@ -240,16 +246,11 @@ mod test {
240246
#[test]
241247
fn test_find_function_definition_wrong_position() {
242248
let file = create_test_ast_file_function_definition();
243-
let position = Position {
244-
line: 2,
245-
column: 1,
246-
};
249+
let position = Position { line: 2, column: 1 };
247250
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
248251
let node = visitor.find(&file.ast);
249252
assert!(node.is_none());
250253
}
251-
252-
253254

254255
#[test]
255256
fn test_find_variable_declaration() {
@@ -268,14 +269,10 @@ mod test {
268269
}
269270
}
270271

271-
272272
#[test]
273273
fn test_find_variable_declaration_wrong_position() {
274274
let file = create_test_ast_file_variable_declaration();
275-
let position = Position {
276-
line: 2,
277-
column: 1,
278-
};
275+
let position = Position { line: 2, column: 1 };
279276
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
280277
let node = visitor.find(&file.ast);
281278
assert!(node.is_none());
@@ -301,10 +298,7 @@ mod test {
301298
#[test]
302299
fn test_find_enum_definition_wrong_position() {
303300
let file = create_test_ast_file_enum_definition();
304-
let position = Position {
305-
line: 2,
306-
column: 1,
307-
};
301+
let position = Position { line: 2, column: 1 };
308302
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
309303
let node = visitor.find(&file.ast);
310304
assert!(node.is_none());
@@ -330,10 +324,7 @@ mod test {
330324
#[test]
331325
fn test_find_enum_value_wrong_position() {
332326
let file = create_test_ast_file_enum_value();
333-
let position = Position {
334-
line: 2,
335-
column: 1,
336-
};
327+
let position = Position { line: 2, column: 1 };
337328
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
338329
let node = visitor.find(&file.ast);
339330
assert!(node.is_none());
@@ -359,10 +350,7 @@ mod test {
359350
#[test]
360351
fn test_find_struct_definition_wrong_position() {
361352
let file = create_test_ast_file_struct_definition();
362-
let position = Position {
363-
line: 2,
364-
column: 1,
365-
};
353+
let position = Position { line: 2, column: 1 };
366354
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
367355
let node = visitor.find(&file.ast);
368356
assert!(node.is_none());
@@ -388,10 +376,7 @@ mod test {
388376
#[test]
389377
fn test_find_event_definition_wrong_position() {
390378
let file = create_test_ast_file_event_definition();
391-
let position = Position {
392-
line: 2,
393-
column: 1,
394-
};
379+
let position = Position { line: 2, column: 1 };
395380
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
396381
let node = visitor.find(&file.ast);
397382
assert!(node.is_none());
@@ -417,10 +402,7 @@ mod test {
417402
#[test]
418403
fn test_find_using_for_directive_wrong_position() {
419404
let file = create_test_ast_file_using_for_directive();
420-
let position = Position {
421-
line: 2,
422-
column: 1,
423-
};
405+
let position = Position { line: 2, column: 1 };
424406
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
425407
let node = visitor.find(&file.ast);
426408
assert!(node.is_none());
@@ -446,10 +428,7 @@ mod test {
446428
#[test]
447429
fn test_find_error_defintion_wrong_position() {
448430
let file = create_test_ast_file_error_definition();
449-
let position = Position {
450-
line: 2,
451-
column: 1,
452-
};
431+
let position = Position { line: 2, column: 1 };
453432
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
454433
let node = visitor.find(&file.ast);
455434
assert!(node.is_none());
@@ -475,16 +454,12 @@ mod test {
475454
#[test]
476455
fn test_find_function_call_wrong_position() {
477456
let file = create_test_ast_file_function_call();
478-
let position = Position {
479-
line: 2,
480-
column: 1,
481-
};
457+
let position = Position { line: 2, column: 1 };
482458
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
483459
let node = visitor.find(&file.ast);
484460
assert!(node.is_none());
485461
}
486462

487-
488463
#[test]
489464
fn test_find_modifier_definition() {
490465
let file = create_test_ast_file_modifier_definition();
@@ -505,10 +480,7 @@ mod test {
505480
#[test]
506481
fn test_find_modifier_definition_wrong_position() {
507482
let file = create_test_ast_file_modifier_definition();
508-
let position = Position {
509-
line: 2,
510-
column: 1,
511-
};
483+
let position = Position { line: 2, column: 1 };
512484
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
513485
let node = visitor.find(&file.ast);
514486
assert!(node.is_none());
@@ -534,10 +506,7 @@ mod test {
534506
#[test]
535507
fn test_find_modifier_invocation_wrong_position() {
536508
let file = create_test_ast_file_modifier_invocation();
537-
let position = Position {
538-
line: 2,
539-
column: 1,
540-
};
509+
let position = Position { line: 2, column: 1 };
541510
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
542511
let node = visitor.find(&file.ast);
543512
assert!(node.is_none());
@@ -563,10 +532,7 @@ mod test {
563532
#[test]
564533
fn test_find_inheritance_specifier_wrong_position() {
565534
let file = create_test_ast_file_inheritance_specifier();
566-
let position = Position {
567-
line: 2,
568-
column: 1,
569-
};
535+
let position = Position { line: 2, column: 1 };
570536
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
571537
let node = visitor.find(&file.ast);
572538
assert!(node.is_none());
@@ -593,10 +559,7 @@ mod test {
593559
#[test]
594560
fn test_find_indentifier_wrong_position() {
595561
let file = create_test_ast_file_identifier();
596-
let position = Position {
597-
line: 2,
598-
column: 1,
599-
};
562+
let position = Position { line: 2, column: 1 };
600563

601564
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
602565
let node = visitor.find(&file.ast);
@@ -623,10 +586,7 @@ mod test {
623586
#[test]
624587
fn test_find_member_access_wrong_position() {
625588
let file = create_test_ast_file_member_access();
626-
let position = Position {
627-
line: 2,
628-
column: 1,
629-
};
589+
let position = Position { line: 2, column: 1 };
630590

631591
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
632592
let node = visitor.find(&file.ast);
@@ -645,7 +605,10 @@ mod test {
645605
let node = visitor.find(&file.ast);
646606
assert!(node.is_some());
647607
if let Some(InteractableNode::NewExpression(new_expression, _)) = node {
648-
assert_eq!(new_expression.node_type, NewExpressionNodeType::NewExpression);
608+
assert_eq!(
609+
new_expression.node_type,
610+
NewExpressionNodeType::NewExpression
611+
);
649612
} else {
650613
panic!("Expected NewExpression, got {:?}", node);
651614
}
@@ -654,17 +617,13 @@ mod test {
654617
#[test]
655618
fn test_find_new_expression_wrong_position() {
656619
let file = create_test_ast_file_new_expression();
657-
let position = Position {
658-
line: 2,
659-
column: 1,
660-
};
620+
let position = Position { line: 2, column: 1 };
661621

662622
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
663623
let node = visitor.find(&file.ast);
664624
assert!(node.is_none());
665625
}
666626

667-
668627
#[test]
669628
fn test_find_user_defined_type_name() {
670629
let file = create_test_ast_file_user_defined_type_name();
@@ -685,13 +644,9 @@ mod test {
685644
#[test]
686645
fn test_find_user_defined_type_name_wrong_position() {
687646
let file = create_test_ast_file_user_defined_type_name();
688-
let position = Position {
689-
line: 2,
690-
column: 1,
691-
};
647+
let position = Position { line: 2, column: 1 };
692648
let mut visitor = PositionNodeVisitor::new(position, &file.file.content);
693649
let node = visitor.find(&file.ast);
694650
assert!(node.is_none());
695651
}
696-
697652
}

‎libs/code-actions/src/references/reference_provider.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,7 @@ mod test {
125125
fn test_get_references() {
126126
let provider = ReferenceProvider::new();
127127
let uri = "test.sol";
128-
let position = Position {
129-
line: 0,
130-
column: 0,
131-
};
128+
let position = Position { line: 0, column: 0 };
132129
let files = vec![create_test_ast_file_contract_definition()];
133130
let references = provider.get_references(uri, position, &files);
134131
assert_eq!(references.len(), 0);

‎libs/code-actions/src/references/usage_visitor.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,12 @@ impl UsageVisitor {
107107
#[cfg(test)]
108108
mod test {
109109
use super::*;
110+
use crate::test_utils::{
111+
create_test_ast_file_identifier, create_test_ast_file_identifier_path,
112+
create_test_ast_file_import_directive, create_test_ast_file_member_access,
113+
create_test_ast_file_user_defined_type_name,
114+
};
110115
use crate::types::InteractableNode;
111-
use crate::test_utils::{create_test_ast_file_identifier, create_test_ast_file_identifier_path, create_test_ast_file_import_directive, create_test_ast_file_member_access, create_test_ast_file_user_defined_type_name};
112116

113117
#[test]
114118
fn test_find_usages_identifier() {

0 commit comments

Comments
 (0)