Dismantle crate::lang::inspect module

commit-id:ac76a216

src/ide/code_actions/add_missing_trait.rs

@@ -15,8 +15,8 @@ use lsp_types::{CodeAction, CodeActionKind, Range, TextEdit, Url, WorkspaceEdit}
 use tracing::debug;
 
 use crate::lang::db::{AnalysisDatabase, LsSemanticGroup, LsSyntaxGroup};
-use crate::lang::inspect::methods::find_methods_for_type;
 use crate::lang::lsp::{LsProtoGroup, ToLsp};
+use crate::lang::methods::find_methods_for_type;
 
 /// Create a Quick Fix code action to add a missing trait given a `CannotCallMethod` diagnostic.
 pub fn add_missing_trait(db: &AnalysisDatabase, node: &SyntaxNode, uri: Url) -> Vec<CodeAction> {

src/ide/completion/completions.rs

@@ -24,8 +24,8 @@ use lsp_types::{CompletionItem, CompletionItemKind, InsertTextFormat, Position,
 use tracing::debug;
 
 use crate::lang::db::{AnalysisDatabase, LsSemanticGroup};
-use crate::lang::inspect::methods::find_methods_for_type;
 use crate::lang::lsp::ToLsp;
+use crate::lang::methods::find_methods_for_type;
 
 pub fn generic_completions(
     db: &AnalysisDatabase,

src/ide/hover/render/definition.rs

@@ -9,7 +9,7 @@ use lsp_types::Hover;
 use crate::ide::hover::markdown_contents;
 use crate::ide::hover::render::markdown::{RULE, fenced_code_block};
 use crate::lang::db::AnalysisDatabase;
-use crate::lang::inspect::defs::SymbolDef;
+use crate::lang::defs::SymbolDef;
 use crate::lang::lsp::ToLsp;
 
 /// Get declaration and documentation "definition" of an item referred by the given identifier.

src/ide/introspection/mod.rs

@@ -0,0 +1,3 @@
+//! Various CairoLS features facilitating introspection of source code analysis state.
+
+pub mod crates;

src/ide/mod.rs

@@ -2,6 +2,7 @@ pub mod code_actions;
 pub mod completion;
 pub mod formatter;
 pub mod hover;
+pub mod introspection;
 pub mod macros;
 pub mod navigation;
 pub mod semantic_highlighting;

src/ide/navigation/goto_definition.rs

@@ -2,7 +2,7 @@ use cairo_lang_utils::Upcast;
 use lsp_types::{GotoDefinitionParams, GotoDefinitionResponse, Location};
 
 use crate::lang::db::{AnalysisDatabase, LsSyntaxGroup};
-use crate::lang::inspect::defs::SymbolDef;
+use crate::lang::defs::SymbolDef;
 use crate::lang::lsp::{LsProtoGroup, ToCairo, ToLsp};
 
 /// Get the definition location of a symbol at a given text document position.

src/ide/navigation/references.rs

@@ -3,7 +3,7 @@ use itertools::Itertools;
 use lsp_types::{Location, ReferenceParams};
 
 use crate::lang::db::{AnalysisDatabase, LsSyntaxGroup};
-use crate::lang::inspect::defs::SymbolDef;
+use crate::lang::defs::SymbolDef;
 use crate::lang::lsp::{LsProtoGroup, ToCairo, ToLsp};
 
 pub fn references(params: ReferenceParams, db: &AnalysisDatabase) -> Option<Vec<Location>> {

src/lang/inspect/defs.rs → src/lang/defs.rs

@@ -31,8 +31,8 @@ use smol_str::SmolStr;
 use tracing::error;
 
 use crate::lang::db::{AnalysisDatabase, LsSemanticGroup, LsSyntaxGroup};
-use crate::lang::inspect::usages::FindUsages;
-use crate::lang::inspect::usages::search_scope::SearchScope;
+use crate::lang::usages::FindUsages;
+use crate::lang::usages::search_scope::SearchScope;
 
 /// Keeps information about the symbol that is being searched for/inspected.
 ///

src/lang/mod.rs

@@ -1,5 +1,7 @@
 pub mod db;
+pub mod defs;
 pub mod diagnostics;
-pub mod inspect;
 pub mod lsp;
+pub mod methods;
 pub mod proc_macros;
+pub mod usages;

src/lang/inspect/usages/mod.rs → src/lang/usages/mod.rs

@@ -9,7 +9,7 @@ use memchr::memmem::Finder;
 use smol_str::format_smolstr;
 
 use crate::lang::db::{AnalysisDatabase, LsSyntaxGroup};
-use crate::lang::inspect::defs::SymbolDef;
+use crate::lang::defs::SymbolDef;
 
 pub mod search_scope;
 

src/server/routing/traits.rs

@@ -37,7 +37,7 @@ use crate::server::client::{Notifier, Requester};
 use crate::server::commands::ServerCommands;
 use crate::state::{State, StateSnapshot};
 use crate::toolchain::info::toolchain_info;
-use crate::{Backend, ide, lang};
+use crate::{Backend, ide};
 
 /// A request handler that needs mutable access to the session.
 /// This will block the main message receiver loop, meaning that no
@@ -345,7 +345,7 @@ impl BackgroundDocumentRequestHandler for ViewAnalyzedCrates {
         _notifier: Notifier,
         _params: (),
     ) -> LSPResult<String> {
-        Ok(lang::inspect::crates::inspect_analyzed_crates(&snapshot.db))
+        Ok(ide::introspection::crates::inspect_analyzed_crates(&snapshot.db))
     }
 }