language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

move testing functions

Browse source
This commit is contained in:
Aleksey Kladov 2019-02-24 21:54:13 +03:00
parent 98510ec5d3
commit d5f6a5f5e2
10 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/ra_ide_api/src/completion.rs
View file

@ -21,7 +21,10 @@ use crate::{
completion_item::{Completions, CompletionKind}, completion_item::{Completions, CompletionKind},
completion_context::CompletionContext, completion_context::CompletionContext,
}, },
}; };
#[cfg(test)]
use crate::completion::completion_item::{do_completion, check_completion};
pub use crate::completion::completion_item::{CompletionItem, CompletionItemKind, InsertTextFormat}; pub use crate::completion::completion_item::{CompletionItem, CompletionItemKind, InsertTextFormat};

3
crates/ra_ide_api/src/completion/complete_dot.rs
View file

@ -58,8 +58,7 @@ fn complete_methods(acc: &mut Completions, ctx: &CompletionContext, receiver: Ty
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::completion::*; use crate::completion::{check_completion, CompletionKind};
use crate::completion::completion_item::check_completion;
fn check_ref_completion(name: &str, code: &str) { fn check_ref_completion(name: &str, code: &str) {
check_completion(name, code, CompletionKind::Reference); check_completion(name, code, CompletionKind::Reference);

3
crates/ra_ide_api/src/completion/complete_fn_param.rs
View file

@ -54,8 +54,7 @@ pub(super) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::completion::*; use crate::completion::{check_completion, CompletionKind};
use crate::completion::completion_item::check_completion;
fn check_magic_completion(name: &str, code: &str) { fn check_magic_completion(name: &str, code: &str) {
check_completion(name, code, CompletionKind::Magic); check_completion(name, code, CompletionKind::Magic);

3
crates/ra_ide_api/src/completion/complete_keyword.rs
View file

@ -109,8 +109,7 @@ fn complete_return(
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::completion::CompletionKind; use crate::completion::{check_completion, CompletionKind};
use crate::completion::completion_item::check_completion;
fn check_keyword_completion(name: &str, code: &str) { fn check_keyword_completion(name: &str, code: &str) {
check_completion(name, code, CompletionKind::Keyword); check_completion(name, code, CompletionKind::Keyword);

7
crates/ra_ide_api/src/completion/complete_path.rs
View file

@ -57,13 +57,10 @@ pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::completion::{
CompletionKind,
completion_item::{check_completion, do_completion},
};
use test_utils::covers; use test_utils::covers;
use crate::completion::{CompletionKind, check_completion, do_completion};
fn check_reference_completion(code: &str, expected_completions: &str) { fn check_reference_completion(code: &str, expected_completions: &str) {
check_completion(code, expected_completions, CompletionKind::Reference); check_completion(code, expected_completions, CompletionKind::Reference);
} }

3
crates/ra_ide_api/src/completion/complete_postfix.rs
View file

@ -56,8 +56,7 @@ pub(super) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::completion::completion_item::CompletionKind; use crate::completion::{CompletionKind, check_completion};
use crate::completion::completion_item::check_completion;
fn check_snippet_completion(test_name: &str, code: &str) { fn check_snippet_completion(test_name: &str, code: &str) {
check_completion(test_name, code, CompletionKind::Postfix); check_completion(test_name, code, CompletionKind::Postfix);

3
crates/ra_ide_api/src/completion/complete_scope.rs
View file

@ -11,8 +11,7 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::completion::CompletionKind; use crate::completion::{CompletionKind, check_completion};
use crate::completion::completion_item::check_completion;
fn check_reference_completion(name: &str, code: &str) { fn check_reference_completion(name: &str, code: &str) {
check_completion(name, code, CompletionKind::Reference); check_completion(name, code, CompletionKind::Reference);

3
crates/ra_ide_api/src/completion/complete_snippet.rs
View file

@ -36,8 +36,7 @@ fn ${1:feature}() {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::completion::CompletionKind; use crate::completion::{CompletionKind, check_completion};
use crate::completion::completion_item::check_completion;
fn check_snippet_completion(name: &str, code: &str) { fn check_snippet_completion(name: &str, code: &str) {
check_completion(name, code, CompletionKind::Snippet); check_completion(name, code, CompletionKind::Snippet);

4
crates/ra_ide_api/src/completion/complete_struct_literal.rs
View file

@ -34,10 +34,10 @@ pub(super) fn complete_struct_literal(acc: &mut Completions, ctx: &CompletionCon
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use insta::assert_debug_snapshot_matches; use insta::assert_debug_snapshot_matches;
use crate::completion::{CompletionItem, CompletionKind}; use crate::completion::{CompletionItem, CompletionKind, do_completion};
fn complete(code: &str) -> Vec<CompletionItem> { fn complete(code: &str) -> Vec<CompletionItem> {
crate::completion::completion_item::do_completion(code, CompletionKind::Reference) do_completion(code, CompletionKind::Reference)
} }
#[test] #[test]

2
crates/ra_ide_api/src/completion/presentation.rs
View file

@ -168,7 +168,7 @@ impl Completions {
mod tests { mod tests {
use test_utils::covers; use test_utils::covers;
use crate::completion::{CompletionKind, completion_item::check_completion}; use crate::completion::{CompletionKind, check_completion};
fn check_reference_completion(code: &str, expected_completions: &str) { fn check_reference_completion(code: &str, expected_completions: &str) {
check_completion(code, expected_completions, CompletionKind::Reference); check_completion(code, expected_completions, CompletionKind::Reference);