This was caused by r163588.

Use in InclusionDirective separate location variable pointing before >
Looks like this bug was introduced in r163588: in lib/Lex/PPDirectives.cpp by

case tok::angle_string_literal:
case tok::string_literal:
Filename = getSpelling(FilenameTok, FilenameBuffer);
End = FilenameTok.getLocation();

• // For an angled include, point the end location at the closing '>'.
• if (FilenameTok.is(tok::angle_string_literal))

• End = End.getLocWithOffset(Filename.size()-1);
  

  CharEnd = End.getLocWithOffset(Filename.size());
  break;

Later CharEnd is used to compute fixit range, causing too long range. Also the same problem should be present for @​__experimental_modules_import fixit, but I didn't try to reproduce it.

I'd like to note that mentioned change also causes clang::SourceManager::getIncludeLoc(FileID FID) const to return location pointing at '>'. But for include-what-you-use tool I need to get include name as typed and it was convenient when getIncludeLoc() returned location pointing at '<' or '"' (opening quotation mark).

I've created a patch according to my getIncludeLoc() preferences which fixes this issue. Please find patch attached.

We're already in discussion about the right way to fix this:

http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20120917/064551.html

Fixed in r164743.

Confirm that bug is fixed. Should I change the issue state to VERIFIED or CLOSED?