Merge pull request #1742 from bstaletic/lsp-root-workspace

[READY] Pass the project root as one of the workspaces to LSP servers

Author: mergify[bot]

ycmd/completers/language_server/language_server_completer.py

@@ -2366,15 +2366,14 @@ def _SendInitialize( self, request_data ):
       # the settings on the Initialize request are somehow subtly different from
       # the settings supplied in didChangeConfiguration, though it's not exactly
       # clear how/where that is specified.
-      additional_workspace_dirs = self._settings.get(
-                                    'additional_workspace_dirs',
-                                    [] )
-      self._server_workspace_dirs.update( additional_workspace_dirs )
+      self._server_workspace_dirs.update( self._settings.get(
+                                          'additional_workspace_dirs',
+                                          [] ) )
       msg = lsp.Initialize( request_id,
                             self._project_directory,
                             self.ExtraCapabilities(),
                             self._settings.get( 'ls', {} ),
-                            additional_workspace_dirs )
+                            self._server_workspace_dirs )
 
       def response_handler( response, message ):
         if message is None: