Apply review points

Author: Felixoid

README.md

@@ -292,11 +292,11 @@ let g:ycm_completer_settings = {
 \}
 ```
 
-**Supported keys**: `java`/`jdtls`, `go`/`gopls`, `rust`/`rust-analyzer`,
-`cpp`/`c`/`objc`/`objcpp`/`cuda`/`clangd`
+**Supported keys**: `java`, `go`, `rust`, `cpp`/`c`/`objc`/`objcpp`/`cuda`.
 
-**Settings priority**: hardcoded defaults < `g:ycm_completer_settings` <
-`.ycm_extra_conf.py`
+**Settings priority**: hardcoded defaults have the lowest priorities,
+then to set user's defaults `g:ycm_completer_settings`, and finally the
+settings from the `ls` key returned by the `Settings()` function in `.ycm_extra_conf.py`
 
 ##### `language_server` configuration
 

ycmd/completers/cpp/clangd_completer.py

@@ -239,10 +239,6 @@ def GetServerName( self ):
     return 'Clangd'
 
 
-  def GetBinaryName( self ):
-    return 'clangd'
-
-
   def GetCommandLine( self ):
     return self._clangd_command
 

ycmd/completers/go/go_completer.py

@@ -57,10 +57,6 @@ def GetServerName( self ):
     return 'gopls'
 
 
-  def GetBinaryName( self ):
-    return 'gopls'
-
-
   def GetProjectRootFiles( self ):
     # Without LSP workspaces support, GOPLS relies on the rootUri to detect a
     # project.

ycmd/completers/java/java_completer.py

@@ -643,11 +643,6 @@ def GetServerName( self ):
     return 'jdt.ls'
 
 
-  def GetBinaryName( self ):
-    # Return 'jdtls' without the dot for cleaner configuration key
-    return 'jdtls'
-
-
   def GetCommandLine( self ):
     return self._command
 

ycmd/completers/language_server/language_server_completer.py

@@ -1883,35 +1883,6 @@ def DefaultSettings( self, request_data ):
     return {}
 
 
-  def GetBinaryName( self ):
-    """Returns the binary/alias name for this completer to use as a lookup key.
-
-    Subclasses should override this to return the server binary name
-    (e.g., 'gopls', 'rust-analyzer', 'jdtls', 'clangd').
-
-    Returns None by default (no alias support).
-    """
-    return None
-
-
-  def GetCompleterSettingsLookupKeys( self ):
-    """Returns a list of keys to look up in user_options['completer_settings'].
-
-    The keys are checked in order and the first match is used. This allows
-    supporting both language names (primary) and server binary names (aliases).
-
-    Default implementation returns SupportedFiletypes() and GetBinaryName().
-
-    Returns:
-      List of strings representing the lookup keys in priority order.
-    """
-    keys = list( self.SupportedFiletypes() )
-    binary_name = self.GetBinaryName()
-    if binary_name and binary_name not in keys:
-      keys.append( binary_name )
-    return keys
-
-
   def _GetSettingsFromExtraConf( self, request_data ):
     # The DefaultSettings method returns only the 'language server" ('ls')
     # settings, but self._settings is a wider dict containing a 'ls' key and any
@@ -1922,7 +1893,7 @@ def _GetSettingsFromExtraConf( self, request_data ):
     merged_ls_settings = self.DefaultSettings( request_data )
 
     # Layer 2: Merge with global settings from g:ycm_completer_settings
-    lookup_keys = self.GetCompleterSettingsLookupKeys()
+    lookup_keys = self.SupportedFiletypes()
     completer_settings = self.user_options.get( 'completer_settings', {} )
 
     # Find first matching key and detect duplicates

ycmd/completers/rust/rust_completer.py

@@ -92,10 +92,6 @@ def GetServerName( self ):
     return 'Rust Language Server'
 
 
-  def GetBinaryName( self ):
-    return 'rust-analyzer'
-
-
   def GetCommandLine( self ):
     return [ self._ra_path ]
 

ycmd/tests/language_server/language_server_completer_test.py

@@ -1585,27 +1585,6 @@ def test_LanguageServerCompleter_DistanceOfPointToRange_MultiLineRange(
 class LanguageServerCompleterSettings_test( TestCase ):
   """Tests for completer_settings configuration option."""
 
-  @IsolatedYcmd()
-  def test_GetCompleterSettingsLookupKeys_DefaultImpl( self, app ):
-    # Base implementation returns supported filetypes only
-    completer = MockCompleter()
-    completer.SupportedFiletypes = lambda: [ 'test' ]
-
-    keys = completer.GetCompleterSettingsLookupKeys()
-    assert_that( keys, equal_to( [ 'test' ] ) )
-
-
-  @IsolatedYcmd()
-  def test_GetCompleterSettingsLookupKeys_WithBinaryName( self, app ):
-    # When GetBinaryName() returns a value, it's appended to the list
-    completer = MockCompleter()
-    completer.SupportedFiletypes = lambda: [ 'test' ]
-    completer.GetBinaryName = lambda: 'test-server'
-
-    keys = completer.GetCompleterSettingsLookupKeys()
-    assert_that( keys, equal_to( [ 'test', 'test-server' ] ) )
-
-
   @IsolatedYcmd( {
     'completer_settings': {
       'test': {
@@ -1619,7 +1598,6 @@ def test_GetSettingsFromExtraConf_WithCompleterSettings_PrimaryKey( self,
     # Test that primary key (language name) is used from completer_settings
     completer = MockCompleter()
     completer.SupportedFiletypes = lambda: [ 'test' ]
-    completer.GetBinaryName = lambda: 'test-server'
     completer.DefaultSettings = lambda req: { 'setting1': 'hardcoded' }
 
     request_data = BuildRequest( filepath = '/tmp/test.test',
@@ -1635,28 +1613,6 @@ def test_GetSettingsFromExtraConf_WithCompleterSettings_PrimaryKey( self,
 
 
 
-  @IsolatedYcmd( {
-    'completer_settings': {
-      'test-server': {
-        'setting1': 'from_alias'
-      }
-    }
-  } )
-  def test_GetSettingsFromExtraConf_WithCompleterSettings_AliasKey( self, app ):
-    # Test that alias key (binary name) works when primary key is not present
-    completer = MockCompleter()
-    completer.SupportedFiletypes = lambda: [ 'test' ]
-    completer.GetBinaryName = lambda: 'test-server'
-    completer.DefaultSettings = lambda req: { 'setting1': 'hardcoded' }
-
-    request_data = BuildRequest( filepath = '/tmp/test.test',
-                                 filetype = 'test' )
-    completer._GetSettingsFromExtraConf( request_data )
-
-    assert_that( completer._settings[ 'ls' ][ 'setting1' ],
-                 equal_to( 'from_alias' ) )
-
-
   @IsolatedYcmd( {
     'completer_settings': {
       'test': { 'setting1': 'from_primary' },
@@ -1668,8 +1624,7 @@ def test_GetSettingsFromExtraConf_WithDuplicateKeys_UsesFirst( self, app ):
     with patch( 'ycmd.completers.language_server.'
                 'language_server_completer.LOGGER' ) as logger:
       completer = MockCompleter()
-      completer.SupportedFiletypes = lambda: [ 'test' ]
-      completer.GetBinaryName = lambda: 'test-server'
+      completer.SupportedFiletypes = lambda: [ 'test', 'test-server' ]
       completer.DefaultSettings = lambda req: {}
 
       request_data = BuildRequest( filepath = '/tmp/test.test',