FixIt: use getLocForEndOfToken to insert fix-it after a type name.

[manmanren]

Summary

Before this fix, we will add the FixIt before the type name:
^(NSView view) to ^(*NSView view)

After this commit, fixit will change it to ^(NSView* view).

[rjmccall]

Hmm. No, I think the original code is correct here — RangeEnd is a token range, and those are generally inclusive rather than exclusive. The fix-it needs to be inserting at the end of the token.

[manmanren]

In D20844#445762, @rjmccall wrote:

Hmm. No, I think the original code is correct here — RangeEnd is a token range, and those are generally inclusive rather than exclusive. The fix-it needs to be inserting at the end of the token.

We currently insert the fix-it here
SourceLocation TypeEndLoc = TSInfo->getTypeLoc().getLocEnd();

And we call "TL.setNameEndLoc(DS.getLocEnd());" for ObjCInterfaceTypeLoc.

The problem is that for annotation token, both the start and the end point to the same location. With "DS.SetRangeEnd(Tok.getAnnotationEndLoc());", the DeclSpec has the same start and end location.

Is there a way to get the real end of the annotation token, since getAnnotationEndLoc returns the start location?

Thanks,
Manman

[cfe-commits]

• msg-22400-127.txt159 BDownload

[manmanren]

Use getLocForEndOfToken to insert fix-it after a type name instead of setting DeclSpec's range end.

[rjmccall]

LGTM.

lib/Parse/ParseDecl.cpp

case tok::annot_typename: {
         isInvalid = DS.SetTypeSpecType(DeclSpec::TST_typename, Loc, PrevSpec,
                                        DiagID, T, Policy);
       } else
         DS.SetTypeSpecError();
 
       if (isInvalid)
         break;
 
-      DS.SetRangeEnd(Tok.getAnnotationEndLoc());
       ConsumeToken(); // The typename
+      DS.SetRangeEnd(Tok.getLocation());
 
       continue;
     }
 
     case tok::kw___is_signed:
       // GNU libstdc++ 4.4 uses __is_signed as an identifier, but Clang
       // typically treats it as a trait. If we see __is_signed as it appears
       // in libstdc++, e.g.,

test/FixIt/fixit-interface-as-param.m

 // RUN: not %clang_cc1 -triple x86_64-apple-darwin10  -fdiagnostics-parseable-fixits -x objective-c %s 2>&1 | FileCheck %s
 // rdar://11311333
 
 @interface NSView @end
 
 @interface INTF
 - (void) drawRect : inView:(NSView)view;
+- (void)test:(NSView )a;
+- (void)foo;
 @end
 
 // CHECK: {7:35-7:35}:"*"
-
+// CHECK: {8:22-8:22}:"*"
+@implementation INTF
+-(void)foo {
+  ^(NSView view) {
+  };
+}
+@end
+// CHECK: {16:12-16:12}:"*"