Merge branch 'master' into fix-libclag-14-flags

Author: mergify[bot]

benchmark.py

@@ -6,6 +6,7 @@
 from __future__ import absolute_import
 
 import argparse
+import platform
 import os
 import os.path as p
 import subprocess
@@ -31,7 +32,7 @@ def BuildYcmdLibsAndRunBenchmark( args, extra_args ):
 
   os.environ[ 'YCM_BENCHMARK' ] = '1'
 
-  if args.msvc:
+  if args.msvc and platform.system() == 'Windows':
     build_cmd.extend( [ '--msvc', str( args.msvc ) ] )
 
   subprocess.check_call( build_cmd )

build.py

@@ -95,7 +95,7 @@ def Exit( self ):
   '09650af5c9dc39f0b40981bcdaa2170cbbc5bb003ac90cdb07fbb57381ac47b2'
 )
 
-RUST_TOOLCHAIN = 'nightly-2021-10-26'
+RUST_TOOLCHAIN = 'nightly-2022-08-17'
 RUST_ANALYZER_DIR = p.join( DIR_OF_THIRD_PARTY, 'rust-analyzer' )
 
 BUILD_ERROR_MESSAGE = (
@@ -115,6 +115,64 @@ def Exit( self ):
   'See the YCM docs for details on how to use a custom Clangd.' )
 
 
+def FindLatestMSVC( quiet ):
+  ACCEPTABLE_VERSIONS = [ 17, 16, 15 ]
+
+  VSWHERE_EXE = os.path.join( os.environ[ 'ProgramFiles(x86)' ],
+                             'Microsoft Visual Studio',
+                             'Installer', 'vswhere.exe' )
+
+  if os.path.exists( VSWHERE_EXE ):
+    if not quiet:
+      print( "Calling vswhere -latest -installationVersion" )
+    latest_full_v = subprocess.check_output(
+      [ VSWHERE_EXE, '-latest', '-property', 'installationVersion' ]
+    ).strip().decode()
+    if '.' in latest_full_v:
+      try:
+        latest_v = int( latest_full_v.split( '.' )[ 0 ] )
+      except ValueError:
+        raise ValueError( f"{latest_full_v} is not a version number." )
+
+      if not quiet:
+        print( f'vswhere -latest returned version {latest_full_v}' )
+
+      if latest_v not in ACCEPTABLE_VERSIONS:
+        if latest_v > 17:
+          if not quiet:
+            print( f'MSVC Version {latest_full_v} is newer than expected.' )
+        else:
+          raise ValueError(
+            f'vswhere returned {latest_full_v} which is unexpected.'
+            'Pass --msvc <version> argument.' )
+      return latest_v
+    else:
+      if not quiet:
+        print( f'vswhere returned nothing usable, {latest_full_v}' )
+
+  # Fall back to registry parsing, which works at least until MSVC 2019 (16)
+  # but is likely failing on MSVC 2022 (17)
+  if not quiet:
+    print( "vswhere method failed, falling back to searching the registry" )
+
+  import winreg
+  handle = winreg.ConnectRegistry( None, winreg.HKEY_LOCAL_MACHINE )
+  msvc = None
+  for i in ACCEPTABLE_VERSIONS:
+    if not quiet:
+      print( 'Trying to find '
+             rf'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\{i}.0' )
+    try:
+      winreg.OpenKey( handle, rf'SOFTWARE\Microsoft\VisualStudio\{i}.0' )
+      if not quiet:
+        print( f"Found MSVC version {i}" )
+      msvc = i
+      break
+    except FileNotFoundError:
+      pass
+  return msvc
+
+
 def RemoveDirectory( directory ):
   try_number = 0
   max_tries = 10
@@ -409,9 +467,11 @@ def ParseArguments():
   parser.add_argument( '--system-libclang', action = 'store_true',
                        help = 'Use system libclang instead of downloading one '
                        'from llvm.org. NOT RECOMMENDED OR SUPPORTED!' )
-  parser.add_argument( '--msvc', type = int, choices = [ 15, 16, 17 ],
-                       default = 16, help = 'Choose the Microsoft Visual '
-                       'Studio version (default: %(default)s).' )
+  if OnWindows():
+    parser.add_argument( '--msvc', type = int, choices = [ 15, 16, 17 ],
+                          default=None,
+                          help= 'Choose the Microsoft Visual Studio version '
+                                '(default: %(default)s).' )
   parser.add_argument( '--ninja', action = 'store_true',
                        help = 'Use Ninja build system.' )
   parser.add_argument( '--all',
@@ -490,6 +550,11 @@ def ParseArguments():
     # We always want a debug build when running with coverage enabled
     args.enable_debug = True
 
+  if OnWindows() and args.msvc is None:
+    args.msvc = FindLatestMSVC( args.quiet )
+    if args.msvc is None:
+      raise FileNotFoundError( "Could not find a valid MSVC version." )
+
   if args.core_tests:
     os.environ[ 'YCM_TESTRUN' ] = '1'
   elif os.environ.get( 'YCM_TESTRUN' ):
@@ -868,7 +933,7 @@ def EnableGoCompleter( args ):
   new_env.pop( 'GOROOT', None )
   new_env[ 'GOBIN' ] = p.join( new_env[ 'GOPATH' ], 'bin' )
 
-  gopls = 'golang.org/x/tools/gopls@v0.7.1'
+  gopls = 'golang.org/x/tools/gopls@v0.9.4'
   CheckCall( [ go, 'install', gopls ],
              env = new_env,
              quiet = args.quiet,

cpp/ycm/CodePoint.cpp

@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cstdint>
 #include <cstring>
 
 namespace YouCompleteMe {

cpp/ycm/CodePoint.h

@@ -18,6 +18,7 @@
 #ifndef CODE_POINT_H_3W0LNCLY
 #define CODE_POINT_H_3W0LNCLY
 
+#include <cstdint>
 #include <stdexcept>
 #include <string>
 #include <vector>