Revert sync with llvm xf672b6170ce

Signed-off-by: Dmitry Sidorov <dmitry.sidorov@intel.com>

Author: MrSidims

clang-tools-extra/CMakeLists.txt

@@ -1,5 +1,3 @@
-include(CMakeDependentOption)
-
 add_subdirectory(clang-apply-replacements)
 add_subdirectory(clang-reorder-fields)
 add_subdirectory(modularize)
@@ -11,6 +9,7 @@ add_subdirectory(clang-doc)
 add_subdirectory(clang-include-fixer)
 add_subdirectory(clang-move)
 add_subdirectory(clang-query)
+add_subdirectory(clangd)
 add_subdirectory(pp-trace)
 add_subdirectory(tool-template)
 
@@ -26,9 +25,3 @@ if( CLANG_TOOLS_EXTRA_INCLUDE_DOCS )
   add_subdirectory(docs)
 endif()
 
-# clangd has its own CMake tree. It requires threads.
-CMAKE_DEPENDENT_OPTION(CLANG_ENABLE_CLANGD "Build clangd language server" ON
-                       "LLVM_ENABLE_THREADS" OFF)
-if (CLANG_ENABLE_CLANGD)
-  add_subdirectory(clangd)
-endif()

clang-tools-extra/clang-tidy/add_new_check.py

@@ -46,7 +46,7 @@ def adapt_cmake(module_path, check_name_camel):
 
 
 # Adds a header for the new check.
-def write_header(module_path, module, namespace, check_name, check_name_camel):
+def write_header(module_path, module, check_name, check_name_camel):
   check_name_dashes = module + '-' + check_name
   filename = os.path.join(module_path, check_name_camel) + '.h'
   print('Creating %s...' % filename)
@@ -73,7 +73,7 @@ def write_header(module_path, module, namespace, check_name, check_name_camel):
 
 namespace clang {
 namespace tidy {
-namespace %(namespace)s {
+namespace %(module)s {
 
 /// FIXME: Write a short description.
 ///
@@ -87,20 +87,19 @@ class %(check_name)s : public ClangTidyCheck {
   void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
 };
 
-} // namespace %(namespace)s
+} // namespace %(module)s
 } // namespace tidy
 } // namespace clang
 
 #endif // %(header_guard)s
 """ % {'header_guard': header_guard,
        'check_name': check_name_camel,
        'check_name_dashes': check_name_dashes,
-       'module': module,
-       'namespace': namespace})
+       'module': module})
 
 
 # Adds the implementation of the new check.
-def write_implementation(module_path, module, namespace, check_name_camel):
+def write_implementation(module_path, module, check_name_camel):
   filename = os.path.join(module_path, check_name_camel) + '.cpp'
   print('Creating %s...' % filename)
   with open(filename, 'w') as f:
@@ -125,7 +124,7 @@ def write_implementation(module_path, module, namespace, check_name_camel):
 
 namespace clang {
 namespace tidy {
-namespace %(namespace)s {
+namespace %(module)s {
 
 void %(check_name)s::registerMatchers(MatchFinder *Finder) {
   // FIXME: Add matchers.
@@ -143,12 +142,11 @@ def write_implementation(module_path, module, namespace, check_name_camel):
       << FixItHint::CreateInsertion(MatchedDecl->getLocation(), "awesome_");
 }
 
-} // namespace %(namespace)s
+} // namespace %(module)s
 } // namespace tidy
 } // namespace clang
 """ % {'check_name': check_name_camel,
-       'module': module,
-       'namespace': namespace})
+       'module': module})
 
 
 # Modifies the module to include the new check.
@@ -377,15 +375,8 @@ def main():
 
   if not adapt_cmake(module_path, check_name_camel):
     return
-
-  # Map module names to namespace names that don't conflict with widely used top-level namespaces.
-  if module == 'llvm':
-    namespace = module + '_check'
-  else:
-    namespace = module
-
-  write_header(module_path, module, namespace, check_name, check_name_camel)
-  write_implementation(module_path, module, namespace, check_name_camel)
+  write_header(module_path, module, check_name, check_name_camel)
+  write_implementation(module_path, module, check_name_camel)
   adapt_module(module_path, module, check_name, check_name_camel)
   add_release_notes(module_path, module, check_name)
   test_extension = language_to_extension.get(args.language)