rubydex 0.2.9 → 0.4.0

data/rust/rubydex/src/query.rs

@@ -15,6 +15,8 @@ use crate::model::keywords::{self, Keyword};
 use crate::model::name::NameRef;
 use crate::model::visibility::Visibility;
 
+pub mod cypher;
+
 /// Controls how declaration names are matched against the search query.
 #[derive(Default)]
 pub enum MatchMode {
@@ -1171,7 +1173,13 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Child"), ParentScope::None, None).id();
+        let name_id = Name::new(
+            context.graph().names(),
+            StringId::from("Child"),
+            ParentScope::None,
+            None,
+        )
+        .id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -1220,7 +1228,13 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Child"), ParentScope::None, None).id();
+        let name_id = Name::new(
+            context.graph().names(),
+            StringId::from("Child"),
+            ParentScope::None,
+            None,
+        )
+        .id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -1269,7 +1283,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -1318,8 +1332,14 @@ mod tests {
         );
         context.resolve();
 
-        let foo_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
-        let name_id = Name::new(StringId::from("<Foo>"), ParentScope::Attached(foo_id), Some(foo_id)).id();
+        let foo_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
+        let name_id = Name::new(
+            context.graph().names(),
+            StringId::from("<Foo>"),
+            ParentScope::Attached(foo_id),
+            Some(foo_id),
+        )
+        .id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -1339,7 +1359,7 @@ mod tests {
             ]
         );
 
-        let name_id = Name::new(StringId::from("Bar"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Bar"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -1381,8 +1401,14 @@ mod tests {
         );
         context.resolve();
 
-        let foo_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
-        let name_id = Name::new(StringId::from("<Foo>"), ParentScope::Attached(foo_id), Some(foo_id)).id();
+        let foo_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
+        let name_id = Name::new(
+            context.graph().names(),
+            StringId::from("<Foo>"),
+            ParentScope::Attached(foo_id),
+            Some(foo_id),
+        )
+        .id();
 
         assert_declaration_completion_eq!(
             context,
@@ -1429,9 +1455,10 @@ mod tests {
         context.resolve();
 
         let name_id = Name::new(
+            context.graph().names(),
             StringId::from("Bar"),
             ParentScope::TopLevel,
-            Some(Name::new(StringId::from("Foo"), ParentScope::None, None).id()),
+            Some(Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id()),
         )
         .id();
 
@@ -1455,7 +1482,7 @@ mod tests {
             ]
         );
 
-        let name_id = Name::new(StringId::from("Bar"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Bar"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -1496,8 +1523,14 @@ mod tests {
         );
         context.resolve();
 
-        let foo_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
-        let name_id = Name::new(StringId::from("Bar"), ParentScope::None, Some(foo_id)).id();
+        let foo_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
+        let name_id = Name::new(
+            context.graph().names(),
+            StringId::from("Bar"),
+            ParentScope::None,
+            Some(foo_id),
+        )
+        .id();
         // Foo::CONST is reachable from Foo::Bar through lexical scoping, so it must appear as a completion candidate
         // when the user types the unqualified name CONST
         assert_declaration_completion_eq!(
@@ -1542,9 +1575,10 @@ mod tests {
         context.resolve();
 
         let name_id = Name::new(
+            context.graph().names(),
             StringId::from("Bar"),
             ParentScope::None,
-            Some(Name::new(StringId::from("Foo"), ParentScope::None, None).id()),
+            Some(Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id()),
         )
         .id();
         assert_declaration_completion_eq!(
@@ -2076,7 +2110,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::MethodArgument {
@@ -2117,7 +2151,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::MethodArgument {
@@ -2154,7 +2188,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::MethodArgument {
@@ -2180,7 +2214,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::MethodArgument {
@@ -2224,7 +2258,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::MethodArgument {
@@ -2252,7 +2286,7 @@ mod tests {
         context.index_uri("file:///foo.rb", "class Foo; end");
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
         assert_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -2317,7 +2351,7 @@ mod tests {
         context.index_uri("file:///foo.rb", "class Foo; def bar(name:); end; end");
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
         assert_completion_eq!(
             context,
             CompletionReceiver::MethodArgument {
@@ -2438,7 +2472,13 @@ mod tests {
         );
         context.resolve();
 
-        let outer_name_id = Name::new(StringId::from("Outer"), ParentScope::None, None).id();
+        let outer_name_id = Name::new(
+            context.graph().names(),
+            StringId::from("Outer"),
+            ParentScope::None,
+            None,
+        )
+        .id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -2477,7 +2517,13 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Outer"), ParentScope::None, None).id();
+        let name_id = Name::new(
+            context.graph().names(),
+            StringId::from("Outer"),
+            ParentScope::None,
+            None,
+        )
+        .id();
         // `self_decl_id` points to the alias `Outer::MyAlias`, which is a `ConstantAlias` rather than a `Namespace`.
         // The completion should still collect members from the aliased namespace (`Outer::Original`) instead of
         // returning an error, so callers do not have to unwrap aliases themselves.
@@ -2523,7 +2569,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Bar"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Bar"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -2566,7 +2612,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Bar"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Bar"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -2611,7 +2657,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Bar"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Bar"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -2648,7 +2694,13 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Object"), ParentScope::None, None).id();
+        let name_id = Name::new(
+            context.graph().names(),
+            StringId::from("Object"),
+            ParentScope::None,
+            None,
+        )
+        .id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -2675,7 +2727,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Mod"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Mod"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -2713,7 +2765,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Mod"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Mod"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -2748,7 +2800,13 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Object"), ParentScope::None, None).id();
+        let name_id = Name::new(
+            context.graph().names(),
+            StringId::from("Object"),
+            ParentScope::None,
+            None,
+        )
+        .id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -2783,7 +2841,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Bar"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Bar"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -2816,9 +2874,21 @@ mod tests {
         );
         context.resolve();
 
-        let bar_id = Name::new(StringId::from("Bar"), ParentScope::None, None).id();
-        let foo_ref_id = Name::new(StringId::from("Foo"), ParentScope::None, Some(bar_id)).id();
-        let nesting_name_id = Name::new(StringId::from("<Foo>"), ParentScope::Attached(foo_ref_id), Some(bar_id)).id();
+        let bar_id = Name::new(context.graph().names(), StringId::from("Bar"), ParentScope::None, None).id();
+        let foo_ref_id = Name::new(
+            context.graph().names(),
+            StringId::from("Foo"),
+            ParentScope::None,
+            Some(bar_id),
+        )
+        .id();
+        let nesting_name_id = Name::new(
+            context.graph().names(),
+            StringId::from("<Foo>"),
+            ParentScope::Attached(foo_ref_id),
+            Some(bar_id),
+        )
+        .id();
 
         assert_declaration_completion_eq!(
             context,
@@ -2857,7 +2927,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Mod"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Mod"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -2895,8 +2965,14 @@ mod tests {
         );
         context.resolve();
 
-        let foo_ref_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
-        let nesting_name_id = Name::new(StringId::from("<Foo>"), ParentScope::Attached(foo_ref_id), None).id();
+        let foo_ref_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
+        let nesting_name_id = Name::new(
+            context.graph().names(),
+            StringId::from("<Foo>"),
+            ParentScope::Attached(foo_ref_id),
+            None,
+        )
+        .id();
 
         assert_declaration_completion_eq!(
             context,
@@ -2921,7 +2997,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
         let result = completion_candidates(
             context.graph(),
             CompletionContext::new(CompletionReceiver::Expression {
@@ -2947,7 +3023,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
         let result = completion_candidates(
             context.graph(),
             CompletionContext::new(CompletionReceiver::Expression {
@@ -2979,7 +3055,13 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Outer"), ParentScope::None, None).id();
+        let name_id = Name::new(
+            context.graph().names(),
+            StringId::from("Outer"),
+            ParentScope::None,
+            None,
+        )
+        .id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -3022,7 +3104,7 @@ mod tests {
         );
         context.resolve();
 
-        let name_id = Name::new(StringId::from("Bar"), ParentScope::None, None).id();
+        let name_id = Name::new(context.graph().names(), StringId::from("Bar"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -3095,7 +3177,7 @@ mod tests {
         );
         context.resolve();
 
-        let foo_name_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
+        let foo_name_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -3115,7 +3197,7 @@ mod tests {
             ]
         );
 
-        let bar_name_id = Name::new(StringId::from("Bar"), ParentScope::None, None).id();
+        let bar_name_id = Name::new(context.graph().names(), StringId::from("Bar"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {
@@ -3431,7 +3513,7 @@ mod tests {
         );
         context.resolve();
 
-        let foo_name_id = Name::new(StringId::from("Foo"), ParentScope::None, None).id();
+        let foo_name_id = Name::new(context.graph().names(), StringId::from("Foo"), ParentScope::None, None).id();
         assert_declaration_completion_eq!(
             context,
             CompletionReceiver::Expression {