Now we need to take modeline into account they are not viable.
Showing the changes to crates/buffer_diff/src/buffer_diff.rs (1 of 14 files). Show all
Unified · Split
| @@ -2,7 +2,7 @@ use futures::channel::oneshot; · 1 unmodified line | ||
| 2 | 2 | use git2::{DiffLineType as GitDiffLineType, DiffOptions as GitOptions, Patch as GitPatch}; |
| 3 | 3 | use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Task, TaskLabel}; |
| 4 | 4 | use language::{ |
| 5 | − BufferRow, Capability, DiffOptions, File, Language, LanguageName, LanguageRegistry, | |
| 5 | + BufferRow, Capability, DiffOptions, Language, LanguageName, LanguageRegistry, | |
| 6 | 6 | language_settings::language_settings, word_diff_ranges, |
| 7 | 7 | }; |
| 8 | 8 | use rope::Rope; |
| @@ -771,7 +771,6 @@ impl BufferDiffInner<language::BufferSnapshot> { · 762 unmodified lines | ||
| 771 | 771 | } |
| 772 | 772 | |
| 773 | 773 | fn build_diff_options( |
| 774 | − file: Option<&Arc<dyn File>>, | |
| 775 | 774 | language: Option<LanguageName>, |
| 776 | 775 | language_scope: Option<language::LanguageScope>, |
| 777 | 776 | cx: &App, |
| @@ -789,7 +788,6 @@ fn build_diff_options( · 11 unmodified lines | ||
| 789 | 788 | |
| 790 | 789 | language_settings(cx) |
| 791 | 790 | .language(language) |
| 792 | − .file(file) | |
| 793 | 791 | .get() |
| 794 | 792 | .word_diff_enabled |
| 795 | 793 | .then_some(DiffOptions { |
| @@ -1251,7 +1249,6 @@ impl BufferDiff { · 455 unmodified lines | ||
| 1251 | 1249 | ) -> Task<BufferDiffUpdate> { |
| 1252 | 1250 | let prev_base_text = self.base_text(cx).as_rope().clone(); |
| 1253 | 1251 | let diff_options = build_diff_options( |
| 1254 | − None, | |
| 1255 | 1252 | language.as_ref().map(|l| l.name()), |
| 1256 | 1253 | language.as_ref().map(|l| l.default_scope()), |
| 1257 | 1254 | cx, |