@@ -977,6 +977,7 @@ pub mod test {
977977 use crate :: lsp_data:: { ClientCapabilities , InitializationOptions } ;
978978 use crate :: lsp_data:: { Position , TextDocumentIdentifier , TextDocumentPositionParams } ;
979979 use crate :: server:: { Output , RequestId } ;
980+ use crate :: test:: FIXTURES_DIR ;
980981 use rls_analysis as analysis;
981982 use serde_derive:: { Deserialize , Serialize } ;
982983 use serde_json as json;
@@ -991,7 +992,7 @@ pub mod test {
991992
992993 #[ derive( Debug , Serialize , Deserialize , PartialEq , Eq , Clone ) ]
993994 pub struct Test {
994- /// Relative to the project _source_ dir (e.g. relative to test_data /hover/src)
995+ /// Relative to the project _source_ dir (e.g. relative to FIXTURES_DIR /hover/src)
995996pub file : String ,
996997 /// One-based line number
997998pub line : u64 ,
@@ -1672,67 +1673,67 @@ pub mod test {
16721673 #[ test]
16731674 fn test_extract_decl ( ) {
16741675 let vfs = Vfs :: new ( ) ;
1675- let file = Path :: new ( "test_data/ hover/src/test_extract_decl.rs") ;
1676+ let file = FIXTURES_DIR . join ( " hover/src/test_extract_decl.rs") ;
16761677
16771678 let expected = "pub fn foo() -> Foo<u32>" ;
16781679 let row_start = Row :: new_zero_indexed ( 10 ) ;
1679- let actual = extract_decl ( & vfs, file, row_start)
1680+ let actual = extract_decl ( & vfs, & file, row_start)
16801681 . expect ( "function declaration" )
16811682 . join ( "\n " ) ;
16821683 assert_eq ! ( expected, actual) ;
16831684
16841685 let expected = "pub struct Foo<T>" ;
16851686 let row_start = Row :: new_zero_indexed ( 15 ) ;
1686- let actual = extract_decl ( & vfs, file, row_start)
1687+ let actual = extract_decl ( & vfs, & file, row_start)
16871688 . expect ( "struct declaration" )
16881689 . join ( "\n " ) ;
16891690 assert_eq ! ( expected, actual) ;
16901691
16911692 let expected = "pub enum Bar" ;
16921693 let row_start = Row :: new_zero_indexed ( 20 ) ;
1693- let actual = extract_decl ( & vfs, file, row_start)
1694+ let actual = extract_decl ( & vfs, & file, row_start)
16941695 . expect ( "enum declaration" )
16951696 . join ( "\n " ) ;
16961697 assert_eq ! ( expected, actual) ;
16971698
16981699 let expected = "pub struct NewType(pub u32, f32)" ;
16991700 let row_start = Row :: new_zero_indexed ( 25 ) ;
1700- let actual = extract_decl ( & vfs, file, row_start)
1701+ let actual = extract_decl ( & vfs, & file, row_start)
17011702 . expect ( "tuple declaration" )
17021703 . join ( "\n " ) ;
17031704 assert_eq ! ( expected, actual) ;
17041705
17051706 let expected = "pub fn new() -> NewType" ;
17061707 let row_start = Row :: new_zero_indexed ( 28 ) ;
1707- let actual = extract_decl ( & vfs, file, row_start)
1708+ let actual = extract_decl ( & vfs, & file, row_start)
17081709 . expect ( "struct function declaration" )
17091710 . join ( "\n " ) ;
17101711 assert_eq ! ( expected, actual) ;
17111712
17121713 let expected = "pub fn bar<T: Copy + Add>(&self, the_really_long_name_string: String, the_really_long_name_foo: Foo<T>) -> Vec<(String, Foo<T>)>" ;
17131714 let row_start = Row :: new_zero_indexed ( 32 ) ;
1714- let actual = extract_decl ( & vfs, file, row_start)
1715+ let actual = extract_decl ( & vfs, & file, row_start)
17151716 . expect ( "long struct method declaration with generics" )
17161717 . join ( "\n " ) ;
17171718 assert_eq ! ( expected, actual) ;
17181719
17191720 let expected = "pub trait Baz<T> where T: Copy" ;
17201721 let row_start = Row :: new_zero_indexed ( 37 ) ;
1721- let actual = extract_decl ( & vfs, file, row_start)
1722+ let actual = extract_decl ( & vfs, & file, row_start)
17221723 . expect ( "enum declaration" )
17231724 . join ( "\n " ) ;
17241725 assert_eq ! ( expected, actual) ;
17251726
17261727 let expected = "fn make_copy(&self) -> Self" ;
17271728 let row_start = Row :: new_zero_indexed ( 38 ) ;
1728- let actual = extract_decl ( & vfs, file, row_start)
1729+ let actual = extract_decl ( & vfs, & file, row_start)
17291730 . expect ( "trait method declaration" )
17301731 . join ( "\n " ) ;
17311732 assert_eq ! ( expected, actual) ;
17321733
17331734 let expected = "fn make_copy(&self) -> Self" ;
17341735 let row_start = Row :: new_zero_indexed ( 42 ) ;
1735- let actual = extract_decl ( & vfs, file, row_start)
1736+ let actual = extract_decl ( & vfs, & file, row_start)
17361737 . expect ( "trait method implementation" )
17371738 . join ( "\n " ) ;
17381739 assert_eq ! ( expected, actual) ;
@@ -1745,7 +1746,7 @@ pub mod test {
17451746 " ,
17461747 ) ;
17471748 let row_start = Row :: new_zero_indexed ( 47 ) ;
1748- let actual = extract_decl ( & vfs, file, row_start)
1749+ let actual = extract_decl ( & vfs, & file, row_start)
17491750 . expect ( "trait declaration multiline" )
17501751 . join ( "\n " ) ;
17511752 assert_eq ! ( expected, actual) ;
@@ -1759,7 +1760,7 @@ pub mod test {
17591760 " ,
17601761 ) ;
17611762 let row_start = Row :: new_zero_indexed ( 53 ) ;
1762- let actual = extract_decl ( & vfs, file, row_start)
1763+ let actual = extract_decl ( & vfs, & file, row_start)
17631764 . expect ( "function declaration multiline" )
17641765 . join ( "\n " ) ;
17651766 assert_eq ! ( expected, actual) ;
@@ -1837,7 +1838,7 @@ pub mod test {
18371838 #[ test]
18381839 fn test_extract_decl_multiline_empty_function ( ) {
18391840 let vfs = Vfs :: new ( ) ;
1840- let file = Path :: new ( "test_data/ hover/src/test_extract_decl_multiline_empty_function.rs") ;
1841+ let file = FIXTURES_DIR . join ( " hover/src/test_extract_decl_multiline_empty_function.rs") ;
18411842
18421843 let expected = noindent (
18431844 "
@@ -1850,7 +1851,7 @@ pub mod test {
18501851 " ,
18511852 ) ;
18521853 let row_start = Row :: new_zero_indexed ( 21 ) ;
1853- let actual = extract_decl ( & vfs, file, row_start)
1854+ let actual = extract_decl ( & vfs, & file, row_start)
18541855 . expect ( "the empty body should not be extracted" )
18551856 . join ( "\n " ) ;
18561857 assert_eq ! ( expected, actual) ;
@@ -1859,7 +1860,7 @@ pub mod test {
18591860 #[ test]
18601861 fn test_extract_docs_module_docs_with_attribute ( ) {
18611862 let vfs = Vfs :: new ( ) ;
1862- let file = Path :: new ( "test_data/ hover/src/test_extract_docs_module_docs_with_attribute.rs") ;
1863+ let file = FIXTURES_DIR . join ( " hover/src/test_extract_docs_module_docs_with_attribute.rs") ;
18631864 let row_start = Row :: new_zero_indexed ( 0 ) ;
18641865 let actual = extract_docs ( & vfs, & file, row_start)
18651866 . expect ( & format ! ( "failed to extract docs: {:?}" , file) )
@@ -1883,7 +1884,7 @@ pub mod test {
18831884 #[ test]
18841885 fn test_extract_docs_module_docs_no_copyright ( ) {
18851886 let vfs = Vfs :: new ( ) ;
1886- let file = Path :: new ( "test_data/ hover/src/test_extract_docs_module_docs_no_copyright.rs") ;
1887+ let file = FIXTURES_DIR . join ( " hover/src/test_extract_docs_module_docs_no_copyright.rs") ;
18871888 let row_start = Row :: new_zero_indexed ( 0 ) ;
18881889 let actual = extract_docs ( & vfs, & file, row_start)
18891890 . expect ( & format ! ( "failed to extract docs: {:?}" , file) )
@@ -1907,7 +1908,7 @@ pub mod test {
19071908 #[ test]
19081909 fn test_extract_docs_comment_block ( ) {
19091910 let vfs = Vfs :: new ( ) ;
1910- let file = Path :: new ( "test_data/ hover/src/test_extract_docs_comment_block.rs") ;
1911+ let file = FIXTURES_DIR . join ( " hover/src/test_extract_docs_comment_block.rs") ;
19111912 let row_start = Row :: new_zero_indexed ( 21 ) ;
19121913 let actual = extract_docs ( & vfs, & file, row_start)
19131914 . expect ( & format ! ( "failed to extract docs: {:?}" , file) )
@@ -1931,7 +1932,7 @@ pub mod test {
19311932 #[ test]
19321933 fn test_extract_docs_empty_line_before_decl ( ) {
19331934 let vfs = Vfs :: new ( ) ;
1934- let file = Path :: new ( "test_data/ hover/src/test_extract_docs_empty_line_before_decl.rs") ;
1935+ let file = FIXTURES_DIR . join ( " hover/src/test_extract_docs_empty_line_before_decl.rs") ;
19351936 let row_start = Row :: new_zero_indexed ( 18 ) ;
19361937 let actual = extract_docs ( & vfs, & file, row_start)
19371938 . expect ( & format ! ( "failed to extract docs: {:?}" , file) )
@@ -1955,7 +1956,7 @@ pub mod test {
19551956 #[ test]
19561957 fn test_extract_docs_module_docs ( ) {
19571958 let vfs = Vfs :: new ( ) ;
1958- let file = Path :: new ( "test_data/ hover/src/test_extract_docs_module_docs.rs") ;
1959+ let file = FIXTURES_DIR . join ( " hover/src/test_extract_docs_module_docs.rs") ;
19591960
19601961 let row_start = Row :: new_zero_indexed ( 0 ) ;
19611962 let actual = extract_docs ( & vfs, & file, row_start)
@@ -1995,7 +1996,7 @@ pub mod test {
19951996 #[ test]
19961997 fn test_extract_docs_attributes ( ) {
19971998 let vfs = Vfs :: new ( ) ;
1998- let file = Path :: new ( "test_data/ hover/src/test_extract_docs_attributes.rs") ;
1999+ let file = FIXTURES_DIR . join ( " hover/src/test_extract_docs_attributes.rs") ;
19992000
20002001 let row_start = Row :: new_zero_indexed ( 21 ) ;
20012002 let actual = extract_docs ( & vfs, & file, row_start)
@@ -2039,7 +2040,7 @@ pub mod test {
20392040 #[ test]
20402041 fn test_extract_docs_comment_first_line ( ) {
20412042 let vfs = Vfs :: new ( ) ;
2042- let file = Path :: new ( "test_data/ hover/src/test_extract_docs_comment_first_line.rs") ;
2043+ let file = FIXTURES_DIR . join ( " hover/src/test_extract_docs_comment_first_line.rs") ;
20432044
20442045 let row_start = Row :: new_zero_indexed ( 1 ) ;
20452046 let actual = extract_docs ( & vfs, & file, row_start)
@@ -2113,7 +2114,7 @@ pub mod test {
21132114
21142115 let cwd = env:: current_dir ( ) ?;
21152116 let out = LineOutput :: default ( ) ;
2116- let proj_dir = cwd . join ( "test_data" ) . join ( "hover" ) ;
2117+ let proj_dir = FIXTURES_DIR . join ( "hover" ) ;
21172118 let save_dir = cwd
21182119 . join ( "target" )
21192120 . join ( "tests" )
@@ -2168,7 +2169,7 @@ pub mod test {
21682169
21692170 let cwd = env:: current_dir ( ) ?;
21702171 let out = LineOutput :: default ( ) ;
2171- let proj_dir = cwd . join ( "test_data" ) . join ( "hover" ) ;
2172+ let proj_dir = FIXTURES_DIR . join ( "hover" ) ;
21722173 let save_dir = cwd
21732174 . join ( "target" )
21742175 . join ( "tests" )
0 commit comments