Merge branch 'master' into master

Author: mergify[bot]

build.py

@@ -292,6 +292,7 @@ def GetPossiblePythonLibraryDirectories():
   return [
     sysconfig.get_config_var( 'LIBPL' ),
     p.join( prefix, 'lib64' ),
+    p.join( prefix, 'lib/64' ),
     p.join( prefix, 'lib' )
   ]
 

cpp/ycm/CMakeLists.txt

@@ -57,13 +57,13 @@ if ( USE_CLANG_COMPLETER AND
       set( LIBCLANG_DIRNAME
            "libclang-${CLANG_VERSION}-amd64-unknown-freebsd13" )
       set( LIBCLANG_SHA256
-           "0d3e808e04d4ebb6023402310316799b6c9c4220763fd13d7691dc24969ce4c4" )
+          "6efd6cc111939766dde6873fbd371280c13ffbb3c7fae193d5f66bd988ccf440" )
     else()
       set( LIBCLANG_DIRNAME
            "libclang-${CLANG_VERSION}-i386-unknown-freebsd13" )
       set( LIBCLANG_SHA256
-           "6efd6cc111939766dde6873fbd371280c13ffbb3c7fae193d5f66bd988ccf440" )
-    endif()
+           "0d3e808e04d4ebb6023402310316799b6c9c4220763fd13d7691dc24969ce4c4" )
+   endif()
   elseif ( CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)" )
     set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-aarch64-linux-gnu" )
     set( LIBCLANG_SHA256

cpp/ycm/ClangCompleter/TranslationUnit.cpp

@@ -482,9 +482,21 @@ void TranslationUnit::UpdateLatestDiagnostics() {
                         clang_disposeDiagnostic ),
         clang_translation_unit_ );
 
-    if ( diagnostic.kind_ != DiagnosticKind::INFORMATION ) {
-      latest_diagnostics_.push_back( diagnostic );
+    if ( diagnostic.kind_ == DiagnosticKind::INFORMATION ) {
+        continue;
     }
+
+    // Sometimes libclang returns invalid ranges causing ycm in trouble
+    // Specially editing incomplete macros
+    diagnostic.ranges_.erase( std::remove_if( diagnostic.ranges_.begin(),
+                                              diagnostic.ranges_.end(),
+                                              []( const auto &range ) -> bool {
+        return range.start_.line_number_ == 0 ||
+               range.start_.column_number_ == 0 ||
+               range.end_.line_number_ == 0 ||
+               range.end_.column_number_ == 0;
+        } ), diagnostic.ranges_.end() );
+    latest_diagnostics_.push_back( diagnostic );
   }
 }
 

ycmd/completers/cpp/flags.py

@@ -34,8 +34,8 @@
 # checks prefixes).
 INCLUDE_FLAGS = [ '-isystem', '-I', '-iquote', '-isysroot', '--sysroot',
                   '-gcc-toolchain', '-include-pch', '-include', '-iframework',
-                  '-F', '-imacros', '-idirafter', '-B' ]
-INCLUDE_FLAGS_WIN_STYLE = [ '/I' ]
+                  '-F', '-imacros', '-idirafter', '-B', '-imsvc' ]
+INCLUDE_FLAGS_WIN_STYLE = [ '/I', '-imsvc' ]
 PATH_FLAGS =  [ '--sysroot=' ] + INCLUDE_FLAGS
 
 # We need to remove --fcolor-diagnostics because it will cause shell escape

ycmd/tests/clang/diagnostics_test.py

@@ -265,8 +265,6 @@ def test_Diagnostics_LocationExtent_MissingSemicolon( self, app ):
         'location': LocationMatcher( filepath, 8, 7 ),
         'location_extent': RangeMatcher( filepath, ( 8, 7 ), ( 8, 11 ) ),
         'ranges': contains_exactly(
-          # FIXME: empty ranges from libclang should be ignored.
-          RangeMatcher( '', ( 0, 0 ), ( 0, 0 ) ),
           RangeMatcher( filepath, ( 8, 7 ), ( 8, 11 ) )
         ),
         'text': equal_to( 'constructor cannot have a return type' ),