Merge pull request #180 from nerdypepper/impl-deser-simple

implement Deserialize for stack-graphs

Author: Hendrik van Antwerpen

AUTHORS

@@ -1,2 +1,3 @@
 Douglas Creager <[email protected]>
 Hendrik van Antwerpen <[email protected]>
+Akshay <[email protected]>

lsp-positions/Cargo.toml

@@ -23,3 +23,4 @@ default = ["tree-sitter"]
 memchr = "2.4"
 tree-sitter = { version=">= 0.19", optional=true }
 unicode-segmentation = { version="1.8" }
+serde = { version="1", optional=true, features=["derive"] }

lsp-positions/src/lib.rs

@@ -44,6 +44,7 @@ fn utf16_len(string: &str) -> usize {
 /// All of the position information that we have about a character in a source file
 #[repr(C)]
 #[derive(Clone, Debug, Default, Eq, Hash, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Position {
     /// The 0-indexed line number containing the character
     pub line: usize,
@@ -106,6 +107,7 @@ impl PartialOrd<tree_sitter::Point> for Position {
 /// All of the position information that we have about a range of content in a source file
 #[repr(C)]
 #[derive(Clone, Debug, Default, Eq, Hash, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Span {
     pub start: Position,
     pub end: Position,
@@ -141,6 +143,7 @@ impl PartialOrd for Span {
 ///
 /// All offsets are 0-indexed.
 #[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Offset {
     /// The number of UTF-8-encoded bytes appearing before this character in the string
     pub utf8_offset: usize,

stack-graphs/Cargo.toml

@@ -14,7 +14,8 @@ edition = "2018"
 
 [features]
 copious-debugging = []
-json = ["serde", "serde_json"]
+serde = ["dep:serde", "lsp-positions/serde"]
+json = ["serde", "serde_json", "lsp-positions/serde"]
 
 [lib]
 # All of our tests are in the tests/it "integration" test executable.
@@ -29,7 +30,7 @@ fxhash = "0.2"
 itertools = "0.10"
 libc = "0.2"
 lsp-positions = { version="0.3", path="../lsp-positions" }
-serde = { version="1.0", optional=true }
+serde = { version="1.0", optional=true, features = ["derive"] }
 serde_json = { version="1.0", optional=true }
 smallvec = { version="1.6", features=["union"] }
 thiserror = { version="1.0" }
@@ -38,6 +39,7 @@ thiserror = { version="1.0" }
 itertools = "0.10"
 maplit = "1.0"
 pretty_assertions = "0.7"
+serde_json = { version="1.0" }
 
 [package.metadata.docs.rs]
-all-features = true
+all-features = true

stack-graphs/src/graph.rs

@@ -429,8 +429,8 @@ pub struct NodeID {
     local_id: u32,
 }
 
-const ROOT_NODE_ID: u32 = 1;
-const JUMP_TO_NODE_ID: u32 = 2;
+pub(crate) const ROOT_NODE_ID: u32 = 1;
+pub(crate) const JUMP_TO_NODE_ID: u32 = 2;
 
 impl NodeID {
     /// Returns the ID of the singleton _root node_.