Make Buffer::language_at fall back to Buffer::language

For languages with no grammar (plain text), there will be no layers.
2022-09-28 13:38:54 -07:00
parent 2da32af340
commit 4f44375abd
3 changed files with 12 additions and 0 deletions
@@ -648,6 +648,7 @@ impl Buffer {
            .layers_for_range(offset..offset, &self.text)
            .last()
            .map(|info| info.language.clone())
+            .or_else(|| self.language.clone())
    }

    pub fn parse_count(&self) -> usize {
@@ -1841,6 +1842,7 @@ impl BufferSnapshot {
            .layers_for_range(offset..offset, &self.text)
            .last()
            .map(|info| info.language)
+            .or(self.language.as_ref())
    }

    pub fn surrounding_word<T: ToOffset>(&self, start: T) -> (Range<usize>, Option<CharKind>) {