diff options
Diffstat (limited to 'clang/lib/Lex/PPDirectives.cpp')
| -rw-r--r-- | clang/lib/Lex/PPDirectives.cpp | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp index 2bb96c1f15a..ca2b3d5d027 100644 --- a/clang/lib/Lex/PPDirectives.cpp +++ b/clang/lib/Lex/PPDirectives.cpp @@ -1879,12 +1879,40 @@ void Preprocessor::HandleIncludeDirective(SourceLocation HashLoc, Callbacks ? &RelativePath : nullptr, &SuggestedModule, &IsMapped); if (File) { SourceRange Range(FilenameTok.getLocation(), CharEnd); - Diag(FilenameTok, diag::err_pp_file_not_found_not_fatal) << + Diag(FilenameTok, diag::err_pp_file_not_found_angled_include_not_fatal) << Filename << FixItHint::CreateReplacement(Range, "\"" + Filename.str() + "\""); } } + // Check for likely typos due to leading or trailing non-isAlphanumeric + // characters + if (!File) { + StringRef OriginalFilename = Filename; + while (!isAlphanumeric(Filename.front())) { + Filename = Filename.drop_front(); + } + while (!isAlphanumeric(Filename.back())) { + Filename = Filename.drop_back(); + } + + File = LookupFile( + FilenameLoc, + LangOpts.MSVCCompat ? NormalizedPath.c_str() : Filename, isAngled, + LookupFrom, LookupFromFile, CurDir, + Callbacks ? &SearchPath : nullptr, + Callbacks ? &RelativePath : nullptr, &SuggestedModule, &IsMapped); + if (File) { + SourceRange Range(FilenameTok.getLocation(), CharEnd); + auto Hint = isAngled ? FixItHint::CreateReplacement( + Range, "<" + Filename.str() + ">") + : FixItHint::CreateReplacement( + Range, "\"" + Filename.str() + "\""); + Diag(FilenameTok, diag::err_pp_file_not_found_typo_not_fatal) + << OriginalFilename << Filename << Hint; + } + } + // If the file is still not found, just go with the vanilla diagnostic if (!File) Diag(FilenameTok, diag::err_pp_file_not_found) << Filename |
