···

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
use crate::{

     

       
9
       
9
       
 
       
    projectparse::{FileIndexing, ProjectContext},

     

       
10
       
10
       
-
       
    stringtools::{split_keep_delimiters, strings_to_tokens},

     

       
10
       
10
       
+
       
    stringtools::{split_keep_delimiters, split_to_tokens, strings_to_tokens},

     

       
11
       
11
       
 
       
    types::{InputFile, Token},

     

       
12
       
12
       
 
       
};

     

       
13
       
13
       
 
       


     
···

       
76
       
76
       
 
       
        output.pop();

     

       
77
       
77
       
 
       
    } //remove trailing newlines

     

       
78
       
78
       
 
       


     

       
79
       
79
       
-
       
    let split_output = split_keep_delimiters(output);

     

       
80
       
80
       
-
       
    return strings_to_tokens(

     

       
81
       
81
       
-
       
        split_output,

     

       
82
       
82
       
-
       
        context.index_of_file(&PathBuf::from(&include_file)),

     

       
83
       
83
       
-
       
    );

     

       
79
       
79
       
+
       
    return split_to_tokens(output, context.index_of_file(&PathBuf::from(&include_file)));

     

       
84
       
80
       
 
       
}