83a8167 · helix · git.iko.soy

Cargo.lock+1−1

compare with master

unifiedsplit

@@ -362,7 +362,6 @@ version = "0.4.1"

362dependencies = [

363 "arc-swap",

364 "etcetera",

365− "helix-dap",

366 "helix-syntax",

365 "helix-syntax",

367 "once_cell",

366 "once_cell",

368 "quickcheck",

367 "quickcheck",

@@ -386,6 +385,7 @@ version = "0.4.1"

386dependencies = [

385dependencies = [

387 "anyhow",

386 "anyhow",

388 "fern",

387 "fern",

388+ "helix-core",

389 "log",

390 "serde",

391 "serde_json",

helix-core/Cargo.toml−1

@@ -14,7 +14,6 @@ include = ["src/**/*", "README.md"]

14

15[dependencies]

16helix-syntax = { version = "0.4", path = "../helix-syntax" }

17−helix-dap = { version = "0.4", path = "../helix-dap" }

18

17

19ropey = "1.3"

18ropey = "1.3"

20smallvec = "1.7"

19smallvec = "1.7"

helix-core/src/syntax.rs+7−1

@@ -5,7 +5,6 @@ use crate::{

5 Rope, RopeSlice, Tendril,

6};

7

8−use helix_dap::DebuggerQuirks;

9pub use helix_syntax::get_language;

8pub use helix_syntax::get_language;

10

9

11use arc_swap::ArcSwap;

10use arc_swap::ArcSwap;

@@ -129,6 +128,13 @@ pub struct DebugAdapterConfig {

129 pub quirks: DebuggerQuirks,

128 pub quirks: DebuggerQuirks,

130}

129}

131

130

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+

132#[derive(Debug, Serialize, Deserialize)]

138#[derive(Debug, Serialize, Deserialize)]

133#[serde(rename_all = "kebab-case")]

139#[serde(rename_all = "kebab-case")]

134pub struct IndentationConfiguration {

140pub struct IndentationConfiguration {

helix-dap/Cargo.toml+1

@@ -12,6 +12,7 @@ homepage = "https://helix-editor.com"

12# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

13

14[dependencies]

15+helix-core = { version = "0.4", path = "../helix-core" }

15anyhow = "1.0"

16anyhow = "1.0"

16log = "0.4"

17log = "0.4"

17serde = { version = "1.0", features = ["derive"] }

18serde = { version = "1.0", features = ["derive"] }

helix-dap/src/client.rs+2−8

@@ -3,9 +3,10 @@ use crate::{

3 types::*,

4 Error, Result,

5};

6+use helix_core::syntax::DebuggerQuirks;

7+

6use anyhow::anyhow;

8use anyhow::anyhow;

7pub use log::{error, info};

9pub use log::{error, info};

8−use serde::{Deserialize, Serialize};

9use std::{

10use std::{

10 collections::HashMap,

11 collections::HashMap,

11 net::{IpAddr, Ipv4Addr, SocketAddr},

12 net::{IpAddr, Ipv4Addr, SocketAddr},

@@ -21,13 +22,6 @@ use tokio::{

21 time,

22 time,

22};

23};

23

24

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−

31#[derive(Debug)]

25#[derive(Debug)]

32pub struct Client {

26pub struct Client {

33 id: usize,

27 id: usize,

helix-dap/src/lib.rs+1−1

@@ -2,7 +2,7 @@ mod client;

2mod transport;

3mod types;

4

5−pub use client::{Client, DebuggerQuirks};

5+pub use client::Client;

6pub use events::Event;

7pub use transport::{Payload, Response, Transport};

8pub use types::*;