Tweak clang-tidy-diff.py to pass JSON argument correctly to clang-tidy on win32 arg parser.

  - Single quotation is not recognized.
  - Use """ to pass a double quotation.

It also reverts r211831.

llvm-svn: 245567

1 files changed, 8 insertions, 2 deletions

diff --git a/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py b/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
index aee6ab7df6c..4db3326cd74 100755
--- a/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
+++ b/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
@@ -99,13 +99,19 @@ def main():
     [{"name" : name, "lines" : lines_by_file[name]} for name in lines_by_file],
     separators = (',', ':'))
 
+  quote = "";
+  if sys.platform == 'win32':
+    line_filter_json=re.sub(r'"', r'"""', line_filter_json)
+  else:
+    quote = "'";
+
   # Run clang-tidy on files containing changes.
   command = [args.clang_tidy_binary]
-  command.append('-line-filter=\'' + line_filter_json + '\'')
+  command.append('-line-filter=' + quote + line_filter_json + quote)
   if args.fix:
     command.append('-fix')
   if args.checks != '':
-    command.append('-checks=\'' + args.checks + '\'')
+    command.append('-checks=' + quote + args.checks + quote)
   command.extend(lines_by_file.keys())
   command.extend(clang_tidy_args)