git.iko.soy/helix
on master help sign in
Invert core -> dap dependency
commit83a816740268ec527bf2f908cf752cfcbedc81f9 authorBlaž Hrastnik <blaz@mxxn.io> dateSun 17 Oct 2021, 13:58 (5 years ago) parentea59f77
6 files changed+12−12
compare with master
unifiedsplit
Cargo.lock+1−1 helix-core/Cargo.toml−1 helix-core/src/syntax.rs+7−1 helix-dap/Cargo.toml+1 helix-dap/src/client.rs+2−8 helix-dap/src/lib.rs+1−1
Cargo.lock+1−1
@@ -362,7 +362,6 @@ version = "0.4.1"
362362dependencies = [
363363 "arc-swap",
364364 "etcetera",
365− "helix-dap",
366365 "helix-syntax",
367366 "once_cell",
368367 "quickcheck",
@@ -386,6 +385,7 @@ version = "0.4.1"
386385dependencies = [
387386 "anyhow",
388387 "fern",
388+ "helix-core",
389389 "log",
390390 "serde",
391391 "serde_json",
helix-core/Cargo.toml−1
@@ -14,7 +14,6 @@ include = ["src/**/*", "README.md"]
1414
1515[dependencies]
1616helix-syntax = { version = "0.4", path = "../helix-syntax" }
17−helix-dap = { version = "0.4", path = "../helix-dap" }
1817
1918ropey = "1.3"
2019smallvec = "1.7"
helix-core/src/syntax.rs+7−1
@@ -5,7 +5,6 @@ use crate::{
55 Rope, RopeSlice, Tendril,
66};
77
8−use helix_dap::DebuggerQuirks;
98pub use helix_syntax::get_language;
109
1110use arc_swap::ArcSwap;
@@ -129,6 +128,13 @@ pub struct DebugAdapterConfig {
129128 pub quirks: DebuggerQuirks,
130129}
131130
131+// Different workarounds for adapters' differences
132+#[derive(Debug, Default, PartialEq, Clone, Serialize, Deserialize)]
133+pub struct DebuggerQuirks {
134+ #[serde(default)]
135+ pub absolute_paths: bool,
136+}
137+
132138#[derive(Debug, Serialize, Deserialize)]
133139#[serde(rename_all = "kebab-case")]
134140pub struct IndentationConfiguration {
helix-dap/Cargo.toml+1
@@ -12,6 +12,7 @@ homepage = "https://helix-editor.com"
1212# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1313
1414[dependencies]
15+helix-core = { version = "0.4", path = "../helix-core" }
1516anyhow = "1.0"
1617log = "0.4"
1718serde = { version = "1.0", features = ["derive"] }
helix-dap/src/client.rs+2−8
@@ -3,9 +3,10 @@ use crate::{
33 types::*,
44 Error, Result,
55};
6+use helix_core::syntax::DebuggerQuirks;
7+
68use anyhow::anyhow;
79pub use log::{error, info};
8−use serde::{Deserialize, Serialize};
910use std::{
1011 collections::HashMap,
1112 net::{IpAddr, Ipv4Addr, SocketAddr},
@@ -21,13 +22,6 @@ use tokio::{
2122 time,
2223};
2324
24−// Different workarounds for adapters' differences
25−#[derive(Debug, Default, PartialEq, Clone, Serialize, Deserialize)]
26−pub struct DebuggerQuirks {
27− #[serde(default)]
28− pub absolute_paths: bool,
29−}
30−
3125#[derive(Debug)]
3226pub struct Client {
3327 id: usize,
helix-dap/src/lib.rs+1−1
@@ -2,7 +2,7 @@ mod client;
22mod transport;
33mod types;
44
5−pub use client::{Client, DebuggerQuirks};
5+pub use client::Client;
66pub use events::Event;
77pub use transport::{Payload, Response, Transport};
88pub use types::*;