Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make language settings accessors take an arc dyn file

Browse source
This commit is contained in:
Max Brunsfeld 2023-05-31 14:57:04 -07:00
parent a2ab7c9eb9
commit 03a351fb26
10 changed files with 41 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/editor/src/editor.rs
View file

@ -3211,7 +3211,7 @@ impl Editor {
let language_name = snapshot
.language_at(location)
.map(|language| language.name());
let settings = all_language_settings(file.map(|f| f.as_ref() as _), cx);
let settings = all_language_settings(file, cx);
settings.copilot_enabled(language_name.as_deref(), file.map(|f| f.path().as_ref()))
}
@ -7093,8 +7093,7 @@ impl Editor {
.get("vim_mode")
== Some(&serde_json::Value::Bool(true));
let telemetry_settings = *settings::get::<TelemetrySettings>(cx);
let copilot_enabled =
all_language_settings(file.map(|f| f.as_ref()), cx).copilot_enabled(None, None);
let copilot_enabled = all_language_settings(file, cx).copilot_enabled(None, None);
let copilot_enabled_for_language = self
.buffer
.read(cx)

4
crates/editor/src/multi_buffer.rs
View file

@ -1382,7 +1382,7 @@ impl MultiBuffer {
if let Some((buffer, offset)) = self.point_to_buffer_offset(point, cx) {
let buffer = buffer.read(cx);
language = buffer.language_at(offset).map(|l| l.name());
file = buffer.file().map(|f| f.as_ref());
file = buffer.file();
}
language_settings(language.as_deref(), file, cx)
}
@ -2795,7 +2795,7 @@ impl MultiBufferSnapshot {
let mut file = None;
if let Some((buffer, offset)) = self.point_to_buffer_offset(point) {
language = buffer.language_at(offset).map(|l| l.name());
file = buffer.file().map(|f| f.as_ref());
file = buffer.file();
}
language_settings(language.as_deref(), file, cx)
}