Update SourceInfo syntax_type and fully_qualified_name fields' type to ControlledOption

Author: Rick Winfrey

stack-graphs/src/graph.rs

@@ -1337,7 +1337,7 @@ pub struct SourceInfo {
     /// The location in its containing file of the source code that this node represents.
     pub span: lsp_positions::Span,
     /// The kind of syntax entity this node represents (e.g. `function`, `class`, `method`, etc.).
-    pub syntax_type: Option<Handle<InternedString>>,
+    pub syntax_type: ControlledOption<Handle<InternedString>>,
     /// The full content of the line containing this node in its source file.
     pub containing_line: ControlledOption<Handle<InternedString>>,
     /// The location in its containing file of the source code that this node's definiens represents.
@@ -1347,7 +1347,7 @@ pub struct SourceInfo {
     pub definiens_span: lsp_positions::Span,
     /// The fully qualified name is a representation of the symbol that captures its name and its
     /// embedded context (e.g. `foo.bar` for the symbol `bar` defined in the module `foo`).
-    pub fully_qualified_name: Option<Handle<InternedString>>,
+    pub fully_qualified_name: ControlledOption<Handle<InternedString>>,
 }
 
 impl StackGraph {
@@ -1568,14 +1568,16 @@ impl StackGraph {
                         span: source_info.span.clone(),
                         syntax_type: source_info
                             .syntax_type
-                            .map(|st| self.add_string(&other[st])),
+                            .into_option()
+                            .map(|st| self.add_string(&other[st]))
+                            .into(),
                         containing_line: source_info
                             .containing_line
                             .into_option()
                             .map(|cl| self.add_string(&other[cl]))
                             .into(),
                         definiens_span: source_info.definiens_span.clone(),
-                        fully_qualified_name: None,
+                        fully_qualified_name: ControlledOption::default(),
                     };
                 }
                 if let Some(debug_info) = other.node_debug_info(other_node) {

stack-graphs/src/serde/graph.rs

@@ -141,7 +141,8 @@ impl StackGraph {
                         syntax_type: source_info
                             .syntax_type
                             .as_ref()
-                            .map(|st| graph.add_string(&st)),
+                            .map(|st| graph.add_string(&st))
+                            .into(),
                         ..Default::default()
                     };
                 }
@@ -444,7 +445,7 @@ impl crate::graph::StackGraph {
     ) -> Option<SourceInfo> {
         self.source_info(handle).map(|info| SourceInfo {
             span: info.span.clone(),
-            syntax_type: info.syntax_type.map(|ty| self[ty].to_owned()),
+            syntax_type: info.syntax_type.into_option().map(|ty| self[ty].to_owned()),
         })
     }
 

stack-graphs/tests/it/test_graphs/simple.rs

@@ -5,6 +5,7 @@
 // Please see the LICENSE-APACHE or LICENSE-MIT files in this distribution for license details.
 // ------------------------------------------------------------------------------------------------
 
+use controlled_option::ControlledOption;
 use lsp_positions::Offset;
 use lsp_positions::Position;
 use lsp_positions::Span;
@@ -77,7 +78,7 @@ pub fn new() -> StackGraph {
         syntax_type: str_var.into(),
         containing_line: str_line0.into(),
         definiens_span: Span::default(),
-        fully_qualified_name: None,
+        fully_qualified_name: ControlledOption::default(),
     };
     *graph.source_info_mut(ref_x) = SourceInfo {
         span: Span {
@@ -105,7 +106,7 @@ pub fn new() -> StackGraph {
         syntax_type: str_var.into(),
         containing_line: str_line1.into(),
         definiens_span: Span::default(),
-        fully_qualified_name: None,
+        fully_qualified_name: ControlledOption::default(),
     };
 
     let str_dsl_var = graph.add_string("dsl_var");