From 3d9923969afb56be03b87a6a1cc47c486bead66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= Date: Tue, 7 Jun 2022 00:11:08 +0900 Subject: [PATCH] minor: Simplify Document.language_id() --- helix-view/src/document.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs index 2c4b5de9..a2d2af77 100644 --- a/helix-view/src/document.rs +++ b/helix-view/src/document.rs @@ -854,9 +854,11 @@ impl Document { /// `language-server` configuration, or the document language if no /// `language-id` has been specified. pub fn language_id(&self) -> Option<&str> { - self.language_config() - .and_then(|config| config.language_server.as_ref()) - .and_then(|lsp_config| lsp_config.language_id.as_deref()) + self.language_config()? + .language_server + .as_ref()? + .language_id + .as_deref() .or_else(|| Some(self.language()?.rsplit_once('.')?.1)) }