From 937c135dd57e86ccd3fd64ca7b07915a75157986 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Fri, 19 Jun 2020 15:41:06 -0700 Subject: [PATCH] As part of using inclusive language within the llvm project, migrate away from the use of blacklist and whitelist. --- clang-tools-extra/clangd/QueryDriverDatabase.cpp | 4 ++-- clang-tools-extra/clangd/XRefs.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clang-tools-extra/clangd/QueryDriverDatabase.cpp b/clang-tools-extra/clangd/QueryDriverDatabase.cpp index ba3aa0d..9d731f55 100644 --- a/clang-tools-extra/clangd/QueryDriverDatabase.cpp +++ b/clang-tools-extra/clangd/QueryDriverDatabase.cpp @@ -27,7 +27,7 @@ // First argument of the command line received from underlying compilation // database is used as compiler driver path. Due to this arbitrary binary // execution, this mechanism is not used by default and only executes binaries -// in the paths that are explicitly whitelisted by the user. +// in the paths that are explicitly included by the user. #include "GlobalCompilationDatabase.h" #include "support/Logger.h" @@ -94,7 +94,7 @@ extractSystemIncludes(PathRef Driver, llvm::StringRef Lang, SPAN_ATTACH(Tracer, "lang", Lang); if (!QueryDriverRegex.match(Driver)) { - vlog("System include extraction: not whitelisted driver {0}", Driver); + vlog("System include extraction: not allowed driver {0}", Driver); return {}; } diff --git a/clang-tools-extra/clangd/XRefs.cpp b/clang-tools-extra/clangd/XRefs.cpp index 6aa0315..a7bbfd4 100644 --- a/clang-tools-extra/clangd/XRefs.cpp +++ b/clang-tools-extra/clangd/XRefs.cpp @@ -363,8 +363,8 @@ locateSymbolTextually(const SpelledWord &Word, ParsedAST &AST, if ((Word.ExpandedToken && !isDependentName(NodeKind)) || !Word.LikelyIdentifier || !Index) return {}; - // We don't want to handle words in string literals. It'd be nice to whitelist - // comments instead, but they're not retained in TokenBuffer. + // We don't want to handle words in string literals. It'd be nice to include + // comments, but they're not retained in TokenBuffer. if (Word.PartOfSpelledToken && isStringLiteral(Word.PartOfSpelledToken->kind())) return {}; @@ -469,8 +469,8 @@ const syntax::Token *findNearbyIdentifier(const SpelledWord &Word, // Unlikely identifiers are OK if they were used as identifiers nearby. if (Word.ExpandedToken) return nullptr; - // We don't want to handle words in string literals. It'd be nice to whitelist - // comments instead, but they're not retained in TokenBuffer. + // We don't want to handle words in string literals. It'd be nice to include + // comments, but they're not retained in TokenBuffer. if (Word.PartOfSpelledToken && isStringLiteral(Word.PartOfSpelledToken->kind())) return {}; -- 2.7.4