Remove the file accessors for settings

Now we need to take modeline into account they are not viable.

Conrad Irwin committed 9 months ago

Commit 3cecde01 parent 20560c414 files · +136 −150Browse files

Showing the changes to crates/buffer_diff/src/buffer_diff.rs (1 of 14 files). Show all

Unified · Split

 use git2::{DiffLineType as GitDiffLineType, DiffOptions as GitOptions, Patch as GitPatch};
 use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Task, TaskLabel};
 use language::{
-    BufferRow, Capability, DiffOptions, File, Language, LanguageName, LanguageRegistry,
+    BufferRow, Capability, DiffOptions, Language, LanguageName, LanguageRegistry,
     language_settings::language_settings, word_diff_ranges,
 };
 use rope::Rope;
 }
 fn build_diff_options(
-    file: Option<&Arc<dyn File>>,
     language: Option<LanguageName>,
     language_scope: Option<language::LanguageScope>,
     cx: &App,
     language_settings(cx)
         .language(language)
-        .file(file)
         .get()
         .word_diff_enabled
         .then_some(DiffOptions {
     ) -> Task<BufferDiffUpdate> {
         let prev_base_text = self.base_text(cx).as_rope().clone();
         let diff_options = build_diff_options(
-            None,
             language.as_ref().map(|l| l.name()),
             language.as_ref().map(|l| l.default_scope()),
             cx,