Add resolution tests for Todo declarations and promotion

Author: Morriar

rust/rubydex/src/model/graph.rs

@@ -639,9 +639,6 @@ impl Graph {
                     it.add_member(member_str_id, member_declaration_id);
                 }
                 Declaration::Namespace(Namespace::Todo(it)) => it.add_member(member_str_id, member_declaration_id),
-                Declaration::Constant(_) => {
-                    // TODO: temporary hack to avoid crashing on `Struct.new`, `Class.new` and `Module.new`
-                }
                 _ => panic!("Tried to add member to a declaration that isn't a namespace"),
             }
         }

rust/rubydex/src/resolution.rs

@@ -211,7 +211,6 @@ impl<'a> Resolver<'a> {
             }
             Outcome::Unresolved(None) => {
                 // We couldn't resolve this name. Emit a diagnostic
-                self.unit_queue.push_back(unit_id);
             }
             Outcome::Retry(Some(id_needing_linearization)) | Outcome::Unresolved(Some(id_needing_linearization)) => {
                 self.unit_queue.push_back(unit_id);
@@ -1673,8 +1672,8 @@ mod tests {
         assert_constant_reference_to, assert_declaration_definitions_count_eq, assert_declaration_does_not_exist,
         assert_declaration_exists, assert_declaration_kind_eq, assert_declaration_references_count_eq,
         assert_descendants, assert_diagnostics_eq, assert_instance_variables_eq, assert_members_eq,
-        assert_no_constant_alias_target, assert_no_diagnostics, assert_no_members, assert_no_todo_declarations,
-        assert_owner_eq, assert_singleton_class_eq, assert_todo_declarations_eq,
+        assert_no_constant_alias_target, assert_no_diagnostics, assert_no_members, assert_owner_eq,
+        assert_singleton_class_eq,
     };
 
     #[test]
@@ -1802,7 +1801,6 @@ mod tests {
         context.resolve();
 
         assert_no_diagnostics!(&context);
-        assert_no_todo_declarations!(context);
 
         assert_members_eq!(context, "Foo", ["Bar", "Baz"]);
         assert_owner_eq!(context, "Foo", "Object");
@@ -1860,7 +1858,6 @@ mod tests {
         context.resolve();
 
         assert_no_diagnostics!(&context);
-        assert_no_todo_declarations!(context);
 
         assert_no_members!(context, "Foo");
         assert_owner_eq!(context, "Foo", "Object");
@@ -1885,7 +1882,6 @@ mod tests {
         context.resolve();
 
         assert_no_diagnostics!(&context);
-        assert_no_todo_declarations!(context);
 
         assert_no_members!(context, "Foo");
         assert_owner_eq!(context, "Foo", "Object");
@@ -1912,7 +1908,7 @@ mod tests {
 
         assert_no_diagnostics!(&context);
 
-        assert_todo_declarations_eq!(context, ["Foo"]);
+        assert_declaration_kind_eq!(context, "Foo", "<TODO>");
 
         assert_members_eq!(context, "Object", vec!["Foo"]);
         assert_members_eq!(context, "Foo", vec!["Bar"]);
@@ -4152,7 +4148,6 @@ mod tests {
         context.resolve();
 
         assert_no_diagnostics!(&context);
-        assert_no_todo_declarations!(context);
 
         // In the same order of appearence
         assert_declaration_exists!(context, "Foo");
@@ -4198,7 +4193,6 @@ mod tests {
         context.resolve();
 
         assert_no_diagnostics!(&context, &[Rule::ParseWarning]);
-        assert_no_todo_declarations!(context);
 
         // FIXME: this is wrong, the reference is not to `Bar::Foo`, but to `Foo`
         assert_constant_reference_to!(context, "Bar::Foo", "file:///foo.rb:4:3-4:6");
@@ -5036,11 +5030,71 @@ mod tests {
 
         assert_no_diagnostics!(&context);
 
-        assert_todo_declarations_eq!(context, ["Foo"]);
+        assert_declaration_kind_eq!(context, "Foo", "<TODO>");
 
         assert_members_eq!(context, "Object", vec!["Foo"]);
         assert_members_eq!(context, "Foo", vec!["Bar", "Baz"]);
         assert_members_eq!(context, "Foo::Bar", vec!["bar()"]);
         assert_members_eq!(context, "Foo::Baz", vec!["baz()"]);
     }
+
+    #[test]
+    fn todo_declaration_promoted_to_real_namespace() {
+        let mut context = GraphTest::new();
+        context.index_uri("file:///foo.rb", {
+            r"
+            class Foo::Bar
+              def bar; end
+            end
+
+            class Foo
+              def foo; end
+            end
+            "
+        });
+        context.resolve();
+
+        assert_no_diagnostics!(&context);
+
+        // Foo was initially created as a Todo (from class Foo::Bar), then promoted to Class
+        assert_declaration_kind_eq!(context, "Foo", "Class");
+
+        assert_members_eq!(context, "Object", vec!["Foo"]);
+        assert_members_eq!(context, "Foo", vec!["Bar", "foo()"]);
+        assert_members_eq!(context, "Foo::Bar", vec!["bar()"]);
+    }
+
+    #[test]
+    fn todo_declaration_promoted_to_real_namespace_incrementally() {
+        let mut context = GraphTest::new();
+        context.index_uri("file:///bar.rb", {
+            r"
+            class Foo::Bar
+              def bar; end
+            end
+            "
+        });
+        context.resolve();
+
+        assert_no_diagnostics!(&context);
+        assert_declaration_kind_eq!(context, "Foo", "<TODO>");
+
+        context.index_uri("file:///foo.rb", {
+            r"
+            class Foo
+              def foo; end
+            end
+            "
+        });
+        context.resolve();
+
+        assert_no_diagnostics!(&context);
+
+        // Foo was promoted from Todo to Class after the second resolution
+        assert_declaration_kind_eq!(context, "Foo", "Class");
+
+        assert_members_eq!(context, "Object", vec!["Foo"]);
+        assert_members_eq!(context, "Foo", vec!["Bar", "foo()"]);
+        assert_members_eq!(context, "Foo::Bar", vec!["bar()"]);
+    }
 }