Skip to content

Commit

Permalink
LS: Move all Salsa extensions to lang::db module (#5782)
Browse files Browse the repository at this point in the history
  • Loading branch information
mkaput committed Jun 13, 2024
1 parent 6d41eb8 commit 88f0506
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use tower_lsp::lsp_types::{
};
use tracing::debug;

use crate::lang::db::LsSyntaxGroup;
use crate::lang::lsp::{LsProtoGroup, ToCairo};
use crate::lang::syntax::LsSyntaxGroup;

mod rename_unused_variable;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ use cairo_lang_utils::LookupIntern;
use tower_lsp::lsp_types::{CompletionItem, CompletionItemKind, Position, Range, TextEdit};
use tracing::debug;

use crate::lang::db::LsSemanticGroup;
use crate::lang::lsp::ToLsp;
use crate::lang::semantic::LsSemanticGroup;

#[tracing::instrument(level = "trace", skip_all)]
pub fn generic_completions(
Expand Down
3 changes: 1 addition & 2 deletions crates/cairo-lang-language-server/src/ide/completion/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ use tower_lsp::lsp_types::{CompletionParams, CompletionResponse, CompletionTrigg
use tracing::debug;

use self::completions::{colon_colon_completions, dot_completions, generic_completions};
use crate::lang::db::{LsSemanticGroup, LsSyntaxGroup};
use crate::lang::lsp::{LsProtoGroup, ToCairo};
use crate::lang::semantic::LsSemanticGroup;
use crate::lang::syntax::LsSyntaxGroup;

mod completions;

Expand Down
2 changes: 1 addition & 1 deletion crates/cairo-lang-language-server/src/ide/hover/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use cairo_lang_compiler::db::RootDatabase;
use cairo_lang_utils::Upcast;
use tower_lsp::lsp_types::{Hover, HoverContents, HoverParams, MarkupContent, MarkupKind};

use crate::lang::db::LsSyntaxGroup;
use crate::lang::lsp::{LsProtoGroup, ToCairo};
use crate::lang::syntax::LsSyntaxGroup;
use crate::markdown::Markdown;

mod render;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use tower_lsp::lsp_types::Hover;

use crate::find_definition;
use crate::ide::hover::markdown_contents;
use crate::lang::db::LsSemanticGroup;
use crate::lang::lsp::ToLsp;
use crate::lang::semantic::LsSemanticGroup;
use crate::markdown::Markdown;

/// Get declaration and documentation "definition" of an item referred by the given identifier.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use cairo_lang_syntax::node::utils::grandparent_kind;
use cairo_lang_syntax::node::{ast, SyntaxNode, Terminal, TypedSyntaxNode};
use tower_lsp::lsp_types::SemanticTokenType;

use crate::lang::semantic::LsSemanticGroup;
use crate::lang::db::LsSemanticGroup;

#[allow(dead_code)]
pub enum SemanticTokenKind {
Expand Down
5 changes: 5 additions & 0 deletions crates/cairo-lang-language-server/src/lang/db/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pub use self::semantic::*;
pub use self::syntax::*;

mod semantic;
mod syntax;
3 changes: 1 addition & 2 deletions crates/cairo-lang-language-server/src/lang/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
pub mod db;
pub mod diagnostics;
pub mod lsp;
pub mod semantic;
pub mod syntax;
3 changes: 1 addition & 2 deletions crates/cairo-lang-language-server/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,9 @@ use tracing::{debug, error, info, trace_span, warn, Instrument};

use crate::config::Config;
use crate::ide::semantic_highlighting::SemanticTokenKind;
use crate::lang::db::{LsSemanticGroup, LsSyntaxGroup};
use crate::lang::diagnostics::lsp::map_cairo_diagnostics_to_lsp;
use crate::lang::lsp::LsProtoGroup;
use crate::lang::semantic::LsSemanticGroup;
use crate::lang::syntax::LsSyntaxGroup;
use crate::lsp::client_capabilities::ClientCapabilitiesExt;
use crate::project::scarb::db::update_crate_roots;
use crate::project::unmanaged_core_crate::try_to_init_unmanaged_core;
Expand Down

0 comments on commit 88f0506

Please sign in to comment.