Fixes for ASTScope lookup

1. Track real EndLoc of TypeAliasDecl and SubscriptDecl.
2. Ensure TypeAliasDecl gets added to AST when doing completion.

Author: David Ungar

include/swift/AST/Decl.h

@@ -2919,6 +2919,9 @@ class TypeAliasDecl : public GenericTypeDecl {
   /// The location of the equal '=' token
   SourceLoc EqualLoc;
 
+  /// The end of the type
+  SourceLoc EndLoc;
+
   /// The location of the right-hand side of the typealias binding
   TypeLoc UnderlyingTy;
 
@@ -2935,6 +2938,8 @@ class TypeAliasDecl : public GenericTypeDecl {
     return EqualLoc;
   }
 
+  void setEndLoc(SourceLoc e) { EndLoc = e; }
+
   TypeLoc &getUnderlyingTypeLoc() {
     return UnderlyingTy;
   }
@@ -5410,6 +5415,7 @@ enum class ObjCSubscriptKind {
 class SubscriptDecl : public GenericContext, public AbstractStorageDecl {
   SourceLoc StaticLoc;
   SourceLoc ArrowLoc;
+  SourceLoc EndLoc;
   ParameterList *Indices;
   TypeLoc ElementTy;
 
@@ -5442,6 +5448,9 @@ class SubscriptDecl : public GenericContext, public AbstractStorageDecl {
   SourceLoc getStartLoc() const {
     return getStaticLoc().isValid() ? getStaticLoc() : getSubscriptLoc();
   }
+  SourceLoc getEndLoc() const { return EndLoc; }
+
+  void setEndLoc(SourceLoc sl) { EndLoc = sl; }
   SourceRange getSourceRange() const;
   SourceRange getSignatureSourceRange() const;
 

lib/AST/Decl.cpp

@@ -3503,7 +3503,7 @@ SourceRange TypeAliasDecl::getSourceRange() const {
     return { TypeAliasLoc, TrailingWhereClauseSourceRange.End };
   if (UnderlyingTy.hasLocation())
     return { TypeAliasLoc, UnderlyingTy.getSourceRange().End };
-  return { TypeAliasLoc, getNameLoc() };
+  return {TypeAliasLoc, EndLoc};
 }
 
 void TypeAliasDecl::setUnderlyingType(Type underlying) {
@@ -6069,15 +6069,7 @@ ObjCSubscriptKind SubscriptDecl::getObjCSubscriptKind() const {
 }
 
 SourceRange SubscriptDecl::getSourceRange() const {
-  if (getBracesRange().isValid()) {
-    return { getSubscriptLoc(), getBracesRange().End };
-  } else if (ElementTy.getSourceRange().End.isValid()) {
-    return { getSubscriptLoc(), ElementTy.getSourceRange().End };
-  } else if (ArrowLoc.isValid()) {
-    return { getSubscriptLoc(), ArrowLoc };
-  } else {
-    return getSubscriptLoc();
-  }
+  return {getSubscriptLoc(), getEndLoc()};
 }
 
 SourceRange SubscriptDecl::getSignatureSourceRange() const {

lib/Parse/ParseDecl.cpp

@@ -3256,6 +3256,8 @@ void Parser::parseDeclDelayed() {
       } else if (auto *ED = dyn_cast<ExtensionDecl>(parent)) {
         ED->addMember(D);
       } else if (auto *SF = dyn_cast<SourceFile>(parent)) {
+        // FIXME: unify notification to ASTSourceFileScope with addMember
+        // mechanism used above
         SF->Decls.push_back(D);
       }
     }
@@ -4118,8 +4120,8 @@ parseDeclTypeAlias(Parser::ParseDeclOptions Flags, DeclAttributes &Attributes) {
     if (EqualLoc.isInvalid()) {
       diagnose(Tok, diag::expected_equal_in_typealias);
       Status.setIsParseError();
+      return Status;
     }
-    return Status;
   }
 
   // Exit the scope introduced for the generic parameters.
@@ -6391,6 +6393,7 @@ Parser::parseDeclSubscript(SourceLoc StaticLoc,
     SignatureHasCodeCompletion |= whereStatus.hasCodeCompletion();
     if (whereStatus.hasCodeCompletion() && !CodeCompletion) {
       // Trigger delayed parsing, no need to continue.
+      Subscript->setEndLoc(getEndOfPreviousLoc());
       return whereStatus;
     }
   }
@@ -6434,6 +6437,8 @@ Parser::parseDeclSubscript(SourceLoc StaticLoc,
 
   accessors.record(*this, Subscript, (Invalid || !Status.isSuccess()), Decls);
 
+  Subscript->setEndLoc(getEndOfPreviousLoc());
+
   // No need to setLocalDiscriminator because subscripts cannot
   // validly appear outside of type decls.
   return makeParserResult(Status, Subscript);

test/SourceKit/CodeFormat/indent-implicit-getter.swift

@@ -63,7 +63,7 @@ class var foo: Int {
 // CHECK: key.sourcetext: "    subscript(a: Int) -> Int {"
 // CHECK: key.sourcetext: "        let x = 3"
 // CHECK: key.sourcetext: "        return x"
-// CHECK: key.sourcetext: "    }"
+// CHECK: key.sourcetext: "        }"
 // CHECK: key.sourcetext: "}"
 // CHECK: key.sourcetext: "    var foo: Int {"
 // CHECK: key.sourcetext: "    class var foo: Int {"

test/SourceKit/DocSupport/doc_source_file.swift.response

@@ -2188,7 +2188,7 @@
         key.name: "subscript(_:)",
         key.usr: "s:4main3CC2CyS2icip",
         key.offset: 1129,
-        key.length: 99,
+        key.length: 100,
         key.fully_annotated_decl: "<decl.function.subscript><syntaxtype.keyword>subscript</syntaxtype.keyword>(<decl.var.parameter><decl.var.parameter.name>i</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr=\"s:Si\">Int</ref.struct></decl.var.parameter.type></decl.var.parameter>) -&gt; <decl.function.returntype><ref.struct usr=\"s:Si\">Int</ref.struct></decl.function.returntype> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.function.subscript>",
         key.entities: [
           {