@@ -14,6 +14,8 @@ use anyhow::bail;
1414use anyhow:: Result ;
1515use harp:: syntax:: is_valid_symbol;
1616use harp:: syntax:: sym_quote_invalid;
17+ use oak_package:: library:: Library ;
18+ use oak_package:: package:: Package ;
1719use stdext:: * ;
1820use tower_lsp:: lsp_types:: Diagnostic ;
1921use tower_lsp:: lsp_types:: DiagnosticSeverity ;
@@ -26,8 +28,6 @@ use crate::lsp::declarations::top_level_declare;
2628use crate :: lsp:: diagnostics_syntax:: syntax_diagnostics;
2729use crate :: lsp:: document:: Document ;
2830use crate :: lsp:: indexer;
29- use crate :: lsp:: inputs:: library:: Library ;
30- use crate :: lsp:: inputs:: package:: Package ;
3131use crate :: lsp:: inputs:: source_root:: SourceRoot ;
3232use crate :: lsp:: state:: WorldState ;
3333use crate :: lsp:: traits:: node:: NodeExt ;
@@ -1132,17 +1132,17 @@ mod tests {
11321132 use std:: path:: PathBuf ;
11331133
11341134 use harp:: eval:: RParseEvalOptions ;
1135+ use oak_package:: library:: Library ;
1136+ use oak_package:: package:: Package ;
1137+ use oak_package:: package_description:: Dcf ;
1138+ use oak_package:: package_description:: Description ;
1139+ use oak_package:: package_namespace:: Namespace ;
11351140 use once_cell:: sync:: Lazy ;
11361141 use tower_lsp:: lsp_types;
11371142 use tower_lsp:: lsp_types:: Position ;
11381143
11391144 use crate :: console:: console_inputs;
11401145 use crate :: lsp:: document:: Document ;
1141- use crate :: lsp:: inputs:: library:: Library ;
1142- use crate :: lsp:: inputs:: package:: Package ;
1143- use crate :: lsp:: inputs:: package_description:: Dcf ;
1144- use crate :: lsp:: inputs:: package_description:: Description ;
1145- use crate :: lsp:: inputs:: package_namespace:: Namespace ;
11461146 use crate :: lsp:: state:: WorldState ;
11471147 use crate :: r_task;
11481148
@@ -1845,7 +1845,7 @@ foo
18451845 #[ test]
18461846 fn test_penguins_symbol_no_diagnostic ( ) {
18471847 r_task ( || {
1848- let palmerpenguins_dir = crate :: lsp :: inputs :: package:: temp_palmerpenguin ( ) ;
1848+ let palmerpenguins_dir = oak_package :: package:: temp_palmerpenguin ( ) ;
18491849 let palmerpenguins_pkg = Package :: load_from_folder ( palmerpenguins_dir. path ( ) )
18501850 . unwrap ( )
18511851 . unwrap ( ) ;
0 commit comments