[clangd] Fix path edge-case condition.

sam-mccall · sam-mccall · commit d99da80841cb · 2020-11-29T13:40:29.000+01:00
diff --git a/clang-tools-extra/clangd/ConfigProvider.cpp b/clang-tools-extra/clangd/ConfigProvider.cpp
@@ -103,7 +103,7 @@ Provider::fromAncestorRelativeYAMLFiles(llvm::StringRef RelPath,
            I != E; ++I) {
         // Avoid weird non-substring cases like phantom "." components.
         // In practice, Component is a substring for all "normal" ancestors.
-        if (I->end() < Parent.begin() && I->end() > Parent.end())
+        if (I->end() < Parent.begin() || I->end() > Parent.end())
           continue;
         Ancestors.emplace_back(Parent.begin(), I->end() - Parent.begin());
       }

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ Provider::fromAncestorRelativeYAMLFiles(llvm::StringRef RelPath,`
`103`	`103`	`I != E; ++I) {`
`104`	`104`	`// Avoid weird non-substring cases like phantom "." components.`
`105`	`105`	`// In practice, Component is a substring for all "normal" ancestors.`
`106`		`- if (I->end() < Parent.begin() && I->end() > Parent.end())`
	`106`	`+ if (I->end() < Parent.begin() \|\| I->end() > Parent.end())`
`107`	`107`	`continue;`
`108`	`108`	`Ancestors.emplace_back(Parent.begin(), I->end() - Parent.begin());`
`109`	`109`	`}`