Merge pull request #1654 from puremourning/fix-libclag-14-flags

Fix after clang 14 upgrade. compilation database now includes a trail…

Author: mergify[bot]

ycmd/completers/cpp/flags.py

@@ -54,7 +54,8 @@
                        '-MT',
                        '-MQ',
                        '-o',
-                       '--serialize-diagnostics' }
+                       '--serialize-diagnostics',
+                       '--' }
 
 # Use a regex to correctly detect c++/c language for both versioned and
 # non-versioned compiler executable names suffixes

ycmd/tests/clang/flags_test.py

@@ -20,6 +20,7 @@
 from hamcrest import ( assert_that,
                        calling,
                        contains_exactly,
+                       matches_regexp,
                        empty,
                        equal_to,
                        raises )
@@ -30,7 +31,7 @@
 from ycmd.completers.cpp import flags
 from ycmd.completers.cpp.flags import ShouldAllowWinStyleFlags, INCLUDE_FLAGS
 from ycmd.tests.test_utils import ( MacOnly, TemporaryTestDir, WindowsOnly,
-                                    TemporaryClangProject )
+                                    TemporaryClangProject, UnixOnly )
 from ycmd.tests.clang import setUpModule # noqa
 from ycmd.utils import CLANG_RESOURCE_DIR
 from ycmd.responses import NoExtraConfDetected
@@ -1424,8 +1425,7 @@ def test_CompilationDatabase_UseFlagsFromSameDir( self ):
                               '-x',
                               'c++',
                               '--driver-mode=g++',
-                              '-Wall',
-                              '--' ),
+                              '-Wall' ),
             os.path.join( tmp_dir, 'test1.cc' )
           )
         )
@@ -1441,8 +1441,7 @@ def test_CompilationDatabase_UseFlagsFromSameDir( self ):
                       '-x',
                       'c++',
                       '--driver-mode=g++',
-                      '-Wall',
-                      '--' ),
+                      '-Wall' ),
             os.path.join( tmp_dir, 'some_dir', 'test1.cc' )
           )
         )
@@ -1472,8 +1471,40 @@ def test_CompilationDatabase_HeaderFile_SameNameAsSourceFile( self ):
                             '--driver-mode=g++',
                             '-Wall',
                             '-x',
-                            'c++-header',
-                            '--' ) )
+                            'c++-header' ) )
+
+
+  @UnixOnly
+  def test_CompilationDatabase_HeaderFile_SameNameAsSourceFile_ExtraClang(
+    self ):
+    with TemporaryTestDir() as tmp_dir:
+      compile_commands = [
+        {
+          'directory': tmp_dir,
+          'command': 'clang++ -x c++ -Wall',
+          'file': os.path.join( tmp_dir, 'test.cc' ),
+        },
+      ]
+
+      with patch( 'ycmd.completers.cpp.flags.OnMac', return_value=False ):
+        with TemporaryClangProject( tmp_dir, compile_commands ):
+          # If we ask for a header file with the same name as a source file, it
+          # returns the flags of that cc file (and a special language flag for
+          # C++ # headers). It also includes a trailing `--` flag which breaks
+          # our "add_extra_clang_flags", so test here that works correctly.
+          assert_that(
+            flags.Flags().FlagsForFile(
+              os.path.join( tmp_dir, 'test.h' ),
+              add_extra_clang_flags = True )[ 0 ],
+            contains_exactly( 'clang++',
+                              '-x',
+                              'c++',
+                              '--driver-mode=g++',
+                              '-Wall',
+                              '-x',
+                              'c++-header',
+                              matches_regexp( '-resource-dir=.*' ),
+                              '-fspell-checking' ) )
 
 
   def test_CompilationDatabase_HeaderFile_DifferentNameFromSourceFile( self ):
@@ -1500,8 +1531,7 @@ def test_CompilationDatabase_HeaderFile_DifferentNameFromSourceFile( self ):
                             '--driver-mode=g++',
                             '-Wall',
                             '-x',
-                            'c++-header',
-                            '--' ) )
+                            'c++-header' ) )
 
 
   def test_CompilationDatabase_ExplicitHeaderFileEntry( self ):
@@ -1553,8 +1583,7 @@ def test_CompilationDatabase_CUDALanguageFlags( self ):
                             '--driver-mode=g++',
                             '-Wall',
                             '-x',
-                            'cuda',
-                            '--' ) )
+                            'cuda' ) )
 
 
   def test_MakeRelativePathsInFlagsAbsolute( self ):

ycmd/tests/clang/get_completions_test.py

@@ -47,6 +47,8 @@
                                     CompletionEntryMatcher,
                                     ErrorMatcher,
                                     LocationMatcher,
+                                    TemporaryClangProject,
+                                    TemporaryTestDir,
                                     WindowsOnly )
 from ycmd.utils import ImportCore, ReadFile
 ycm_core = ImportCore()
@@ -139,6 +141,43 @@ def test_GetCompletions_ForcedWithNoTrigger( self, app ):
     } )
 
 
+  @SharedYcmd
+  def test_GetCompletions_In_HeaderFile_WithCompDB( self, app ):
+    import shutil
+    import os
+    with TemporaryTestDir() as tmp_dir:
+      shutil.copy( PathToTestFile( 'headerfileflags.cc' ), tmp_dir )
+      shutil.copy( PathToTestFile( 'headerfileflags.h' ), tmp_dir )
+      compile_commands = [
+        {
+          'directory': tmp_dir,
+          'command': 'clang++ -x c++ -I. -Wall',
+          'file': os.path.join( tmp_dir, 'headerfileflags.cc' ),
+        },
+      ]
+      with TemporaryClangProject( tmp_dir, compile_commands ):
+        RunTest( app, {
+          'description': 'completion works in header files using cdb',
+          'request': {
+            'filetype'  : 'cpp',
+            'filepath'  : os.path.join( tmp_dir, 'headerfileflags.h' ),
+            'line_num'  : 11,
+            'column_num': 7
+          },
+          'expect': {
+            'response': requests.codes.ok,
+            'data': has_entries( {
+              'completions': has_item(
+                CompletionEntryMatcher( 'foo', 'int' ),
+              ),
+              'errors': empty(),
+            } )
+          },
+        } )
+
+
+
+
   # This test is isolated to make sure we trigger c hook for clangd, instead of
   # fetching completer from cache.
   @IsolatedYcmd()

ycmd/tests/clang/testdata/headerfileflags.cc

@@ -0,0 +1,7 @@
+#include "headerfileflags.h"
+
+int main()
+{
+  Struct s = {};
+  declared_in_header( s.foo );
+}

ycmd/tests/clang/testdata/headerfileflags.h

@@ -0,0 +1,12 @@
+#pragma once
+
+struct Struct
+{
+  int foo;
+};
+
+void declared_in_header( int s )
+{
+  Struct bar;
+  bar.foo = s;
+}