@@ -854,9 +854,11 @@ impl Document {
854 /// `language-server` configuration, or the document language if no
854 /// `language-server` configuration, or the document language if no
855 /// `language-id` has been specified.
855 /// `language-id` has been specified.
856 pub fn language_id(&self) -> Option<&str> {
856 pub fn language_id(&self) -> Option<&str> {
857− self.language_config()
857+ self.language_config()?
858− .and_then(|config| config.language_server.as_ref())
858+ .language_server
859− .and_then(|lsp_config| lsp_config.language_id.as_deref())
859+ .as_ref()?
860 .or_else(|| Some(self.language()?.rsplit_once('.')?.1))
862 .or_else(|| Some(self.language()?.rsplit_once('.')?.1))