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

Rename LanguageRegistry::get_language to language_for_name

Browse source
This commit is contained in:
Antonio Scandurra 2023-01-20 10:39:06 +01:00
parent f086fa3f21
commit c49dc8d6e5
4 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/zed/src/zed.rs
View file

@ -226,7 +226,11 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut gpui::MutableAppContext) {
|workspace: &mut Workspace, _: &DebugElements, cx: &mut ViewContext<Workspace>| {
let content = to_string_pretty(&cx.debug_elements()).unwrap();
let project = workspace.project().clone();
let json_language = project.read(cx).languages().get_language("JSON").unwrap();
let json_language = project
.read(cx)
.languages()
.language_for_name("JSON")
.unwrap();
if project.read(cx).is_remote() {
cx.propagate_action();
} else if let Some(buffer) = project
@ -624,7 +628,7 @@ fn open_telemetry_log_file(
.update(cx, |project, cx| project.create_buffer("", None, cx))
.expect("creating buffers on a local workspace always succeeds");
buffer.update(cx, |buffer, cx| {
buffer.set_language(app_state.languages.get_language("JSON"), cx);
buffer.set_language(app_state.languages.language_for_name("JSON"), cx);
buffer.edit(
[(
0..0,
@ -670,7 +674,7 @@ fn open_bundled_config_file(
let text = Assets::get(asset_path).unwrap().data;
let text = str::from_utf8(text.as_ref()).unwrap();
project
.create_buffer(text, project.languages().get_language("JSON"), cx)
.create_buffer(text, project.languages().language_for_name("JSON"), cx)
.expect("creating buffers on a local workspace always succeeds")
});
let buffer =