language-servers/testing-language-server
1
0
Fork 0
mirror of https://github.com/kbwo/testing-language-server.git synced 2025-08-03 15:18:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename some symbols

Browse source
This commit is contained in:
kbwo 2024-06-22 19:59:37 +09:00
parent 4a4f5411e4
commit b6899587db
9 changed files with 75 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/adapter/Cargo.toml
View file

@ -8,8 +8,7 @@ license = "MIT"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
# testing-language-server = "0.0.1"
testing-language-server = { path = "../../" }
testing-language-server = "0.0.2"
lsp-types = { workspace = true }
serde_json = { workspace = true }
serde = { workspace = true }

6
crates/adapter/src/main.rs
View file

@ -6,7 +6,7 @@ use std::io::Write;
use std::str::FromStr;
use testing_language_server::error::LSError;
use testing_language_server::spec::AdapterCommands;
use testing_language_server::spec::DetectWorkspaceRootArgs;
use testing_language_server::spec::DetectWorkspaceArgs;
use testing_language_server::spec::DiscoverArgs;
use testing_language_server::spec::RunFileTestArgs;
pub mod model;
@ -39,9 +39,9 @@ fn handle(commands: AdapterCommands) -> Result<(), LSError> {
test_kind.run_file_test(RunFileTestArgs { extra, ..commands })?;
Ok(())
}
AdapterCommands::DetectWorkspaceRoot(mut commands) => {
AdapterCommands::DetectWorkspace(mut commands) => {
let (extra, test_kind) = pick_test_from_extra(&mut commands.extra)?;
test_kind.detect_workspaces_root(DetectWorkspaceRootArgs { extra, ..commands })?;
test_kind.detect_workspaces_root(DetectWorkspaceArgs { extra, ..commands })?;
Ok(())
}
}

6
crates/adapter/src/model.rs
View file

@ -1,7 +1,7 @@
use crate::runner::cargo_test::CargoTestRunner;
use std::str::FromStr;
use testing_language_server::error::LSError;
use testing_language_server::spec::DetectWorkspaceRootArgs;
use testing_language_server::spec::DetectWorkspaceArgs;
use testing_language_server::spec::DiscoverArgs;
use testing_language_server::spec::RunFileTestArgs;
@ -27,7 +27,7 @@ impl Runner for AvailableTestKind {
}
}
fn detect_workspaces_root(&self, args: DetectWorkspaceRootArgs) -> Result<(), LSError> {
fn detect_workspaces_root(&self, args: DetectWorkspaceArgs) -> Result<(), LSError> {
match self {
AvailableTestKind::CargoTest(runner) => runner.detect_workspaces_root(args),
AvailableTestKind::Jest(runner) => runner.detect_workspaces_root(args),
@ -50,5 +50,5 @@ impl FromStr for AvailableTestKind {
pub trait Runner {
fn disover(&self, args: DiscoverArgs) -> Result<(), LSError>;
fn run_file_test(&self, args: RunFileTestArgs) -> Result<(), LSError>;
fn detect_workspaces_root(&self, args: DetectWorkspaceRootArgs) -> Result<(), LSError>;
fn detect_workspaces_root(&self, args: DetectWorkspaceArgs) -> Result<(), LSError>;
}

6
crates/adapter/src/runner/cargo_test.rs
View file

@ -3,7 +3,7 @@ use std::path::PathBuf;
use std::process::Output;
use std::str::FromStr;
use testing_language_server::error::LSError;
use testing_language_server::spec::DetectWorkspaceRootResult;
use testing_language_server::spec::DetectWorkspaceResult;
use testing_language_server::spec::RunFileTestResult;
use testing_language_server::spec::TestItem;
use tree_sitter::Point;
@ -194,7 +194,7 @@ fn detect_workspace_from_file(file_path: PathBuf) -> Option<String> {
}
}
fn detect_workspaces(file_paths: Vec<String>) -> Result<DetectWorkspaceRootResult, LSError> {
fn detect_workspaces(file_paths: Vec<String>) -> Result<DetectWorkspaceResult, LSError> {
let mut result_map: HashMap<String, Vec<String>> = HashMap::new();
let mut file_paths = file_paths.clone();
file_paths.sort_by_key(|b| std::cmp::Reverse(b.len()));
@ -265,7 +265,7 @@ impl Runner for CargoTestRunner {
fn detect_workspaces_root(
&self,
args: testing_language_server::spec::DetectWorkspaceRootArgs,
args: testing_language_server::spec::DetectWorkspaceArgs,
) -> Result<(), LSError> {
let file_paths = args.file_paths;
let detect_result = detect_workspaces(file_paths)?;

6
crates/adapter/src/runner/jest.rs
View file

@ -10,7 +10,7 @@ use std::str::FromStr;
use tempfile::tempdir;
use testing_language_server::error::LSError;
use testing_language_server::spec::DetectWorkspaceRootResult;
use testing_language_server::spec::DetectWorkspaceResult;
use testing_language_server::spec::DiscoverResult;
use testing_language_server::spec::DiscoverResultItem;
use testing_language_server::spec::RunFileTestResult;
@ -94,7 +94,7 @@ fn detect_workspace_from_file(file_path: PathBuf) -> Option<String> {
}
}
fn detect_workspaces(file_paths: Vec<String>) -> Result<DetectWorkspaceRootResult, LSError> {
fn detect_workspaces(file_paths: Vec<String>) -> Result<DetectWorkspaceResult, LSError> {
let mut result_map: HashMap<String, Vec<String>> = HashMap::new();
let mut file_paths: Vec<String> = file_paths
.into_iter()
@ -305,7 +305,7 @@ impl Runner for JestRunner {
fn detect_workspaces_root(
&self,
args: testing_language_server::spec::DetectWorkspaceRootArgs,
args: testing_language_server::spec::DetectWorkspaceArgs,
) -> Result<(), LSError> {
let file_paths = args.file_paths;
let detect_result = detect_workspaces(file_paths)?;