Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ members = [
"crates/harp",
"crates/libr",
"crates/oak_core",
"crates/oak_ide",
"crates/oak_index",
"crates/oak_package",
"crates/stdext",
Expand Down Expand Up @@ -78,6 +79,7 @@ mime_guess = "2.0.4"
nix = { version = "0.26.2", features = ["signal"] }
notify = "6.0.0"
oak_core = { path = "crates/oak_core" }
oak_ide = { path = "crates/oak_ide" }
oak_index = { path = "crates/oak_index" }
oak_package = { path = "crates/oak_package" }
once_cell = "1.17.1"
Expand Down
3 changes: 3 additions & 0 deletions crates/ark/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ log.workspace = true
mime_guess.workspace = true
nix.workspace = true
notify.workspace = true
oak_core.workspace = true
oak_ide.workspace = true
oak_index.workspace = true
oak_package.workspace = true
once_cell.workspace = true
regex.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/ark/src/lsp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ pub mod comm;
pub mod completions;
mod config;
mod declarations;
pub mod definitions;
pub mod diagnostics;
pub mod diagnostics_syntax;
pub mod document;
pub mod document_context;
pub mod events;
pub mod folding_range;
pub mod goto_definition;
pub mod handler;
pub mod handlers;
pub mod help;
Expand Down
268 changes: 0 additions & 268 deletions crates/ark/src/lsp/definitions.rs

This file was deleted.

6 changes: 6 additions & 0 deletions crates/ark/src/lsp/document.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use aether_lsp_utils::proto::from_proto;
use aether_lsp_utils::proto::to_proto;
use aether_lsp_utils::proto::PositionEncoding;
use oak_index::semantic_index::SemanticIndex;
use tower_lsp::lsp_types;
use tree_sitter::Parser;
use tree_sitter::Tree;
Expand Down Expand Up @@ -206,6 +207,11 @@ impl Document {
self.parse.syntax()
}

/// Recomputed every time for now, we'll track this with Salsa soon.
pub fn semantic_index(&self) -> SemanticIndex {
oak_index::semantic_index(&self.parse.tree())
}

pub fn tree_sitter_point_from_lsp_position(
&self,
position: lsp_types::Position,
Expand Down
Loading
Loading