Fix SubscriptDecl end position

Author: David Ungar

lib/Parse/ParseDecl.cpp

@@ -6393,7 +6393,7 @@ Parser::parseDeclSubscript(SourceLoc StaticLoc,
     SignatureHasCodeCompletion |= whereStatus.hasCodeCompletion();
     if (whereStatus.hasCodeCompletion() && !CodeCompletion) {
       // Trigger delayed parsing, no need to continue.
-      Subscript->setEndLoc(getEndOfPreviousLoc());
+      Subscript->setEndLoc(getEndOfPreviousLoc().getAdvancedLoc(-1));
       return whereStatus;
     }
   }
@@ -6437,7 +6437,7 @@ Parser::parseDeclSubscript(SourceLoc StaticLoc,
 
   accessors.record(*this, Subscript, (Invalid || !Status.isSuccess()), Decls);
 
-  Subscript->setEndLoc(getEndOfPreviousLoc());
+  Subscript->setEndLoc(getEndOfPreviousLoc().getAdvancedLoc(-1));
 
   // No need to setLocalDiscriminator because subscripts cannot
   // validly appear outside of type decls.

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 {"