diff options
| -rw-r--r-- | clang-tools-extra/include-fixer/IncludeFixer.cpp | 22 | ||||
| -rw-r--r-- | clang-tools-extra/unittests/include-fixer/IncludeFixerTest.cpp | 12 |
2 files changed, 27 insertions, 7 deletions
diff --git a/clang-tools-extra/include-fixer/IncludeFixer.cpp b/clang-tools-extra/include-fixer/IncludeFixer.cpp index 55476f95e68..f64aedcbbe9 100644 --- a/clang-tools-extra/include-fixer/IncludeFixer.cpp +++ b/clang-tools-extra/include-fixer/IncludeFixer.cpp @@ -129,11 +129,7 @@ public: } } - /// If we have a scope specification, use that to get more precise results. - std::string QueryString; - if (SS && SS->getRange().isValid()) { - auto Range = CharSourceRange::getTokenRange(SS->getRange().getBegin(), - Typo.getLoc()); + auto ExtendNestedNameSpecifier = [this](CharSourceRange Range) { StringRef Source = Lexer::getSourceText(Range, getCompilerInstance().getSourceManager(), getCompilerInstance().getLangOpts()); @@ -158,7 +154,21 @@ public: while (isIdentifierBody(*End) || *End == ':') ++End; - QueryString = std::string(Source.begin(), End); + return std::string(Source.begin(), End); + }; + + /// If we have a scope specification, use that to get more precise results. + std::string QueryString; + if (SS && SS->getRange().isValid()) { + auto Range = CharSourceRange::getTokenRange(SS->getRange().getBegin(), + Typo.getLoc()); + + QueryString = ExtendNestedNameSpecifier(Range); + } else if (Typo.getName().isIdentifier() && !Typo.getLoc().isMacroID()) { + auto Range = + CharSourceRange::getTokenRange(Typo.getBeginLoc(), Typo.getEndLoc()); + + QueryString = ExtendNestedNameSpecifier(Range); } else { QueryString = Typo.getAsString(); } diff --git a/clang-tools-extra/unittests/include-fixer/IncludeFixerTest.cpp b/clang-tools-extra/unittests/include-fixer/IncludeFixerTest.cpp index 53601463cc5..e69a408c085 100644 --- a/clang-tools-extra/unittests/include-fixer/IncludeFixerTest.cpp +++ b/clang-tools-extra/unittests/include-fixer/IncludeFixerTest.cpp @@ -126,10 +126,20 @@ TEST(IncludeFixer, MinimizeInclude) { runIncludeFixer("a::b::foo bar;\n", IncludePath)); } -#if 0 +#ifndef _WIN32 // It doesn't pass for targeting win32. Investigating. TEST(IncludeFixer, NestedName) { EXPECT_EQ("#include \"dir/otherdir/qux.h\"\n" + "int x = a::b::foo(0);\n", + runIncludeFixer("int x = a::b::foo(0);\n")); + + // FIXME: Handle simple macros. + EXPECT_EQ("#define FOO a::b::foo\nint x = FOO;\n", + runIncludeFixer("#define FOO a::b::foo\nint x = FOO;\n")); + EXPECT_EQ("#define FOO(x) a::##x\nint x = FOO(b::foo);\n", + runIncludeFixer("#define FOO(x) a::##x\nint x = FOO(b::foo);\n")); + + EXPECT_EQ("#include \"dir/otherdir/qux.h\"\n" "namespace a {}\nint a = a::b::foo(0);\n", runIncludeFixer("namespace a {}\nint a = a::b::foo(0);\n")); } |
