Invert core -> dap dependency

pull/574/head
Blaž Hrastnik 3 years ago
parent ea59f77a6b
commit 83a8167402

2
Cargo.lock generated

@ -362,7 +362,6 @@ version = "0.4.1"
dependencies = [ dependencies = [
"arc-swap", "arc-swap",
"etcetera", "etcetera",
"helix-dap",
"helix-syntax", "helix-syntax",
"once_cell", "once_cell",
"quickcheck", "quickcheck",
@ -386,6 +385,7 @@ version = "0.4.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"fern", "fern",
"helix-core",
"log", "log",
"serde", "serde",
"serde_json", "serde_json",

@ -14,7 +14,6 @@ include = ["src/**/*", "README.md"]
[dependencies] [dependencies]
helix-syntax = { version = "0.4", path = "../helix-syntax" } helix-syntax = { version = "0.4", path = "../helix-syntax" }
helix-dap = { version = "0.4", path = "../helix-dap" }
ropey = "1.3" ropey = "1.3"
smallvec = "1.7" smallvec = "1.7"

@ -5,7 +5,6 @@ use crate::{
Rope, RopeSlice, Tendril, Rope, RopeSlice, Tendril,
}; };
use helix_dap::DebuggerQuirks;
pub use helix_syntax::get_language; pub use helix_syntax::get_language;
use arc_swap::ArcSwap; use arc_swap::ArcSwap;
@ -129,6 +128,13 @@ pub struct DebugAdapterConfig {
pub quirks: DebuggerQuirks, pub quirks: DebuggerQuirks,
} }
// Different workarounds for adapters' differences
#[derive(Debug, Default, PartialEq, Clone, Serialize, Deserialize)]
pub struct DebuggerQuirks {
#[serde(default)]
pub absolute_paths: bool,
}
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub struct IndentationConfiguration { pub struct IndentationConfiguration {

@ -12,6 +12,7 @@ homepage = "https://helix-editor.com"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
helix-core = { version = "0.4", path = "../helix-core" }
anyhow = "1.0" anyhow = "1.0"
log = "0.4" log = "0.4"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }

@ -3,9 +3,10 @@ use crate::{
types::*, types::*,
Error, Result, Error, Result,
}; };
use helix_core::syntax::DebuggerQuirks;
use anyhow::anyhow; use anyhow::anyhow;
pub use log::{error, info}; pub use log::{error, info};
use serde::{Deserialize, Serialize};
use std::{ use std::{
collections::HashMap, collections::HashMap,
net::{IpAddr, Ipv4Addr, SocketAddr}, net::{IpAddr, Ipv4Addr, SocketAddr},
@ -21,13 +22,6 @@ use tokio::{
time, time,
}; };
// Different workarounds for adapters' differences
#[derive(Debug, Default, PartialEq, Clone, Serialize, Deserialize)]
pub struct DebuggerQuirks {
#[serde(default)]
pub absolute_paths: bool,
}
#[derive(Debug)] #[derive(Debug)]
pub struct Client { pub struct Client {
id: usize, id: usize,

@ -2,7 +2,7 @@ mod client;
mod transport; mod transport;
mod types; mod types;
pub use client::{Client, DebuggerQuirks}; pub use client::Client;
pub use events::Event; pub use events::Event;
pub use transport::{Payload, Response, Transport}; pub use transport::{Payload, Response, Transport};
pub use types::*; pub use types::*;

Loading…
Cancel
Save