Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DAP: Deserialize number IDs #10943

Merged
merged 5 commits into from
Jun 15, 2024
Merged

DAP: Deserialize number IDs #10943

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27962af
Fix deserialization of id
Jun 13, 2024
d1cb4fe
Removing external dependencies
Jun 13, 2024
e97c34e
Fix incorrect import
Jun 13, 2024
5af9bac
Adding tests
Jun 13, 2024
dcb935f
Moved tests
Jun 13, 2024
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
22 changes: 20 additions & 2 deletions helix-dap/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use serde::{Deserialize, Serialize};
use serde::{Deserialize, Deserializer, Serialize};
use serde_json::Value;
use std::collections::HashMap;
use std::i64;
the-mikedavis marked this conversation as resolved.
Show resolved Hide resolved
use std::path::PathBuf;

#[derive(
Expand Down Expand Up @@ -311,7 +312,8 @@ pub struct Variable {
#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
pub struct Module {
pub id: String, // TODO: || number
#[serde(deserialize_with = "from_number")]
pub id: String,
pub name: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub path: Option<PathBuf>,
Expand All @@ -331,6 +333,22 @@ pub struct Module {
pub address_range: Option<String>,
}

fn from_number<'de, D>(deserializer: D) -> Result<String, D::Error>
where
D: Deserializer<'de>,
{
#[derive(Deserialize)]
enum NumberOrString {
Number(i64),
String(String),
}

match NumberOrString::deserialize(deserializer)? {
NumberOrString::Number(n) => Ok(n.to_string()),
NumberOrString::String(s) => Ok(s),
}
}

pub mod requests {
use super::*;
#[derive(Debug, Default, PartialEq, Eq, Clone, Deserialize, Serialize)]
Expand Down