commit 450ba99c08a6155aac85ded2967c836a65b63c75
author Alexander Kornienko <alexfh@google.com> Thu Sep 05 14:48:31 2019 +0000
committer Alexander Kornienko <alexfh@google.com> Thu Sep 05 14:48:31 2019 +0000
tree d9566fa618fb0883e0d6e37f65880b3519f741e3
parent ca7bac56dcfe6a86e396492a1284c030c703e0fc

[clang-tidy] Make most ArgumentCommentCheck options local, as they should be

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@371076 91177308-0d34-0410-b5e6-96231b3b80d8

clang-tidy/bugprone/ArgumentCommentCheck.cpp

diff --git a/clang-tidy/bugprone/ArgumentCommentCheck.cpp b/clang-tidy/bugprone/ArgumentCommentCheck.cpp
index 9849b65..c690e79 100644
--- a/clang-tidy/bugprone/ArgumentCommentCheck.cpp
+++ b/clang-tidy/bugprone/ArgumentCommentCheck.cpp
@@ -25,19 +25,14 @@
     : ClangTidyCheck(Name, Context),
       StrictMode(Options.getLocalOrGlobal("StrictMode", 0) != 0),
       IgnoreSingleArgument(Options.get("IgnoreSingleArgument", 0) != 0),
-      CommentBoolLiterals(Options.getLocalOrGlobal("CommentBoolLiterals", 0) !=
-                          0),
-      CommentIntegerLiterals(
-          Options.getLocalOrGlobal("CommentIntegerLiterals", 0) != 0),
-      CommentFloatLiterals(
-          Options.getLocalOrGlobal("CommentFloatLiterals", 0) != 0),
-      CommentStringLiterals(
-          Options.getLocalOrGlobal("CommentStringLiterals", 0) != 0),
-      CommentUserDefinedLiterals(
-          Options.getLocalOrGlobal("CommentUserDefinedLiterals", 0) != 0),
-      CommentCharacterLiterals(
-          Options.getLocalOrGlobal("CommentCharacterLiterals", 0) != 0),
-      CommentNullPtrs(Options.getLocalOrGlobal("CommentNullPtrs", 0) != 0),
+      CommentBoolLiterals(Options.get("CommentBoolLiterals", 0) != 0),
+      CommentIntegerLiterals(Options.get("CommentIntegerLiterals", 0) != 0),
+      CommentFloatLiterals(Options.get("CommentFloatLiterals", 0) != 0),
+      CommentStringLiterals(Options.get("CommentStringLiterals", 0) != 0),
+      CommentUserDefinedLiterals(Options.get("CommentUserDefinedLiterals", 0) !=
+                                 0),
+      CommentCharacterLiterals(Options.get("CommentCharacterLiterals", 0) != 0),
+      CommentNullPtrs(Options.get("CommentNullPtrs", 0) != 0),
       IdentRE("^(/\\* *)([_A-Za-z][_A-Za-z0-9]*)( *= *\\*/)$") {}
 
 void ArgumentCommentCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {

test/clang-tidy/bugprone-argument-comment-ignore-single-argument.cpp

diff --git a/test/clang-tidy/bugprone-argument-comment-ignore-single-argument.cpp b/test/clang-tidy/bugprone-argument-comment-ignore-single-argument.cpp
index 077723e..ea72656 100644
--- a/test/clang-tidy/bugprone-argument-comment-ignore-single-argument.cpp
+++ b/test/clang-tidy/bugprone-argument-comment-ignore-single-argument.cpp
@@ -1,5 +1,13 @@
 // RUN: %check_clang_tidy %s bugprone-argument-comment %t -- \
-// RUN:   -config="{CheckOptions: [{key: bugprone-argument-comment.IgnoreSingleArgument, value: 1}, {key: CommentBoolLiterals, value: 1},{key: CommentIntegerLiterals, value: 1}, {key: CommentFloatLiterals, value: 1}, {key: CommentUserDefinedLiterals, value: 1}, {key: CommentStringLiterals, value: 1}, {key: CommentNullPtrs, value: 1}, {key: CommentCharacterLiterals, value: 1}]}" --
+// RUN:   -config="{CheckOptions: [ \
+// RUN:     {key: bugprone-argument-comment.IgnoreSingleArgument, value: 1}, \
+// RUN:     {key: bugprone-argument-comment.CommentBoolLiterals, value: 1}, \
+// RUN:     {key: bugprone-argument-comment.CommentIntegerLiterals, value: 1}, \
+// RUN:     {key: bugprone-argument-comment.CommentFloatLiterals, value: 1}, \
+// RUN:     {key: bugprone-argument-comment.CommentUserDefinedLiterals, value: 1}, \
+// RUN:     {key: bugprone-argument-comment.CommentStringLiterals, value: 1}, \
+// RUN:     {key: bugprone-argument-comment.CommentNullPtrs, value: 1}, \
+// RUN:     {key: bugprone-argument-comment.CommentCharacterLiterals, value: 1}]}" --
 
 struct A {
   void foo(bool abc);

test/clang-tidy/bugprone-argument-comment-literals.cpp

diff --git a/test/clang-tidy/bugprone-argument-comment-literals.cpp b/test/clang-tidy/bugprone-argument-comment-literals.cpp
index ac2cdc8..5642960 100644
--- a/test/clang-tidy/bugprone-argument-comment-literals.cpp
+++ b/test/clang-tidy/bugprone-argument-comment-literals.cpp
@@ -1,5 +1,12 @@
 // RUN: %check_clang_tidy %s bugprone-argument-comment %t -- \
-// RUN:   -config="{CheckOptions: [{key: CommentBoolLiterals, value: 1},{key: CommentIntegerLiterals, value: 1}, {key: CommentFloatLiterals, value: 1}, {key: CommentUserDefinedLiterals, value: 1}, {key: CommentStringLiterals, value: 1}, {key: CommentNullPtrs, value: 1}, {key: CommentCharacterLiterals, value: 1}]}" --
+// RUN:   -config="{CheckOptions: [ \
+// RUN:     {key: bugprone-argument-comment.CommentBoolLiterals, value: 1}, \
+// RUN:     {key: bugprone-argument-comment.CommentIntegerLiterals, value: 1}, \
+// RUN:     {key: bugprone-argument-comment.CommentFloatLiterals, value: 1}, \
+// RUN:     {key: bugprone-argument-comment.CommentUserDefinedLiterals, value: 1}, \
+// RUN:     {key: bugprone-argument-comment.CommentStringLiterals, value: 1}, \
+// RUN:     {key: bugprone-argument-comment.CommentNullPtrs, value: 1}, \
+// RUN:     {key: bugprone-argument-comment.CommentCharacterLiterals, value: 1}]}" --
 
 struct A {
   void foo(bool abc);