Merge branches 'pm-master-commits', 'snippets' and 'semantic-tokens'

puremourning · Nov 20, 2021 · f86e995 · f86e995
3 parents c864839 + 2578f9e + c36927b
commit f86e995
Show file tree

Hide file tree

Showing 8 changed files with 402 additions and 93 deletions.
diff --git a/cpp/ycm/ClangCompleter/FixIt.h b/cpp/ycm/ClangCompleter/FixIt.h
@@ -52,6 +52,8 @@ struct FixIt {
   /// multiple diagnostics offering different fixit options. The text is
   /// displayed to the user, allowing them choose which diagnostic to apply.
   std::string text;
+
+  bool is_completion{ false };
 };
 
 } // namespace YouCompleteMe

diff --git a/cpp/ycm/ycm_core.cpp b/cpp/ycm/ycm_core.cpp
@@ -201,7 +201,8 @@ PYBIND11_MODULE( ycm_core, mod )
     .def_readonly( "text", &FixIt::text )
     .def_property_readonly( "kind", [](const py::handle) {
       return py::none();
-    });
+    })
+    .def_readonly( "is_completion", &FixIt::is_completion );
 
   py::bind_vector< std::vector< FixIt > >( mod, "FixItVector" );
 

diff --git a/ycmd/completers/completer.py b/ycmd/completers/completer.py
@@ -370,6 +370,10 @@ def ComputeSignaturesInner( self, request_data ):
     return {}
 
 
+  def ComputeSemanticTokens( self, request_data ):
+    return {}
+
+
   def DefinedSubcommands( self ):
     subcommands = sorted( self.GetSubcommandsMap().keys() )
     try: