cleanup: Remove some TODOs and add a named FIXME for aliases.

Author: varungandhi-src

class_flatten/class_flatten.cc

@@ -111,7 +111,6 @@ class ClassFlattenWalk {
         ast::MethodDef::ARGS_store args;
         args.emplace_back(ast::make_expression<ast::Local>(blkLoc, blkLocalVar));
 
-        // TODO(varun): What does classDef->declLoc correspond to?
         auto init = ast::make_expression<ast::MethodDef>(classDef->declLoc, classDef->declLoc, classDef->declLoc, sym,
                                                          core::Names::staticInit(), std::move(args), std::move(inits),
                                                          ast::MethodDef::Flags());

core/GlobalState.cc

@@ -1725,8 +1725,6 @@ void GlobalState::mangleRenameSymbolInternal(SymbolRef what, NameRef origName, U
         }
         case SymbolRef::Kind::Method:
             what.asMethodRef().data(*this)->name = name;
-            // TODO(varun): This code path seems to be triggered when processing the stdlib.
-            // Should we be setting nameLoc here?
             break;
         case SymbolRef::Kind::FieldOrStaticField:
             what.asFieldRef().data(*this)->name = name;
@@ -2347,7 +2345,7 @@ const vector<shared_ptr<File>> &GlobalState::getFiles() const {
 MethodRef GlobalState::staticInitForClass(ClassOrModuleRef klass, Loc loc) {
     auto prevCount = methodsUsed();
     auto sym = enterMethodSymbol(loc, klass.data(*this)->singletonClass(*this), core::Names::staticInit(),
-                                 klass.data(*this)->loc().offsets()); // TODO(varun): Check if this is OK
+                                 klass.data(*this)->loc().offsets());
     if (prevCount != methodsUsed()) {
         auto blkLoc = core::Loc::none(loc.file());
         auto &blkSym = enterMethodArgumentSymbol(blkLoc, sym, core::Names::blkArg());

resolver/resolver.cc

@@ -1874,6 +1874,7 @@ class ResolveTypeMembersAndFieldsWalk {
         core::ClassOrModuleRef owner;
         core::LocOffsets loc;
         core::LocOffsets toNameLoc;
+        // FIXME[alias-support]: Add a fromNameLoc field here
         core::NameRef toName;
         core::NameRef fromName;
     };
@@ -2439,8 +2440,8 @@ class ResolveTypeMembersAndFieldsWalk {
             return;
         }
 
-        // TODO(varun): is toNameLoc the right field?
-        auto alias = ctx.state.enterMethodSymbol(ctx.locAt(job.loc), job.owner, job.fromName, job.toNameLoc);
+        // FIXME[alias-support]: Use job.fromNameLoc here for the last argument.
+        auto alias = ctx.state.enterMethodSymbol(ctx.locAt(job.loc), job.owner, job.fromName, job.loc);
         alias.data(ctx)->resultType = core::make_type<core::AliasType>(core::SymbolRef(toMethod));
 
         // Add a fake keyword argument to remember the toName (for fast path hashing).

test/scip/testdata/alias.rb

@@ -0,0 +1,14 @@
+# typed: true
+
+class X
+  alias_method :am_aaa, :aaa
+  alias :a_aaa :aaa
+
+  def aaa
+    puts "AAA"
+  end
+
+  def check_alias
+    return [am_aaa, a_aaa]
+  end
+end

test/scip/testdata/alias.snapshot.rb

@@ -0,0 +1,19 @@
+ # typed: true
+ 
+ class X
+#      ^ definition [..] X#
+   alias_method :am_aaa, :aaa
+   alias :a_aaa :aaa
+ 
+   def aaa
+#      ^^^ definition [..] X#aaa().
+     puts "AAA"
+   end
+ 
+   def check_alias
+#      ^^^^^^^^^^^ definition [..] X#check_alias().
+     return [am_aaa, a_aaa]
+#            ^^^^^^ reference [..] X#am_aaa().
+#                    ^^^^^ reference [..] X#a_aaa().
+   end
+ end