Rename `LanguageRegistry::get_language` to `language_for_name`

Antonio Scandurra created 3 years ago

Change summary

crates/editor/src/hover_popover.rs |  2 +-
crates/language/src/language.rs    |  2 +-
crates/language/src/syntax_map.rs  |  7 ++++---
crates/zed/src/zed.rs              | 10 +++++++---
4 files changed, 13 insertions(+), 8 deletions(-)

Detailed changes

crates/editor/src/hover_popover.rs

@@ -331,7 +331,7 @@ impl InfoPopover {
                 if let Some(language) = content
                     .language
                     .clone()
-                    .and_then(|language| project.languages().get_language(&language))
+                    .and_then(|language| project.languages().language_for_name(&language))
                 {
                     let runs = language
                         .highlight_text(&content.text.as_str().into(), 0..content.text.len());

crates/language/src/language.rs

@@ -466,7 +466,7 @@ impl LanguageRegistry {
         self.language_server_download_dir = Some(path.into());
     }
 
-    pub fn get_language(&self, name: &str) -> Option<Arc<Language>> {
+    pub fn language_for_name(&self, name: &str) -> Option<Arc<Language>> {
         self.languages
             .read()
             .iter()

crates/language/src/syntax_map.rs

@@ -976,7 +976,7 @@ fn get_injections(
     combined_injection_ranges.clear();
     for pattern in &config.patterns {
         if let (Some(language_name), true) = (pattern.language.as_ref(), pattern.combined) {
-            if let Some(language) = language_registry.get_language(language_name) {
+            if let Some(language) = language_registry.language_for_name(language_name) {
                 combined_injection_ranges.insert(language, Vec::new());
             }
         }
@@ -1015,7 +1015,8 @@ fn get_injections(
                 });
 
             if let Some(language_name) = language_name {
-                if let Some(language) = language_registry.get_language(language_name.as_ref()) {
+                if let Some(language) = language_registry.language_for_name(language_name.as_ref())
+                {
                     result = true;
                     let range = text.anchor_before(content_range.start)
                         ..text.anchor_after(content_range.end);
@@ -2254,7 +2255,7 @@ mod tests {
         registry.add(Arc::new(ruby_lang()));
         registry.add(Arc::new(html_lang()));
         registry.add(Arc::new(erb_lang()));
-        let language = registry.get_language(language_name).unwrap();
+        let language = registry.language_for_name(language_name).unwrap();
         let mut buffer = Buffer::new(0, 0, Default::default());
 
         let mut mutated_syntax_map = SyntaxMap::new();

crates/zed/src/zed.rs

@@ -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 =