andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

remove unused languag.scope option

Browse Source
This commit is contained in:
Pascal Kuthe 2024-01-13 16:31:42 +01:00
parent fb13130701
commit dcbe8496b9
No known key found for this signature in database
GPG Key ID: D715E8655AE166A6
3 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
helix-core/src/syntax.rs
View File

@ -97,7 +97,6 @@ pub struct LanguageConfiguration {
#[serde(rename = "language-id")] #[serde(rename = "language-id")]
// see the table under https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentItem // see the table under https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentItem
pub language_server_language_id: Option<String>, // csharp, rust, typescriptreact, for the language-server pub language_server_language_id: Option<String>, // csharp, rust, typescriptreact, for the language-server
pub scope: String, // source.rust
pub file_types: Vec<FileType>, // filename extension or ends_with? <Gemfile, rb, etc> pub file_types: Vec<FileType>, // filename extension or ends_with? <Gemfile, rb, etc>
#[serde(default)] #[serde(default)]
pub shebangs: Vec<String>, // interpreter(s) associated with language pub shebangs: Vec<String>, // interpreter(s) associated with language
@ -700,10 +699,6 @@ pub fn textobject_query(&self) -> Option<&TextObjectQuery> {
.as_ref() .as_ref()
} }
pub fn scope(&self) -> &str {
&self.scope
}
fn load_query(&self, kind: &str) -> Option<Query> { fn load_query(&self, kind: &str) -> Option<Query> {
let query_text = read_query(&self.language_id, kind); let query_text = read_query(&self.language_id, kind);
if query_text.is_empty() { if query_text.is_empty() {
@ -848,13 +843,6 @@ pub fn language_config_for_shebang(
configuration_id.and_then(|&id| self.language_configs.get(id).cloned()) configuration_id.and_then(|&id| self.language_configs.get(id).cloned())
} }
pub fn language_config_for_scope(&self, scope: &str) -> Option<Arc<LanguageConfiguration>> {
self.language_configs
.iter()
.find(|config| config.scope == scope)
.cloned()
}
pub fn language_config_for_language_id(&self, id: &str) -> Option<Arc<LanguageConfiguration>> { pub fn language_config_for_language_id(&self, id: &str) -> Option<Arc<LanguageConfiguration>> {
self.language_configs self.language_configs
.iter() .iter()

7
helix-view/src/document.rs
View File

@ -1518,13 +1518,6 @@ pub fn get_current_revision(&mut self) -> usize {
current_revision current_revision
} }
/// Corresponding language scope name. Usually `source.<lang>`.
pub fn language_scope(&self) -> Option<&str> {
self.language
.as_ref()
.map(|language| language.scope.as_str())
}
/// Language name for the document. Corresponds to the `name` key in /// Language name for the document. Corresponds to the `name` key in
/// `languages.toml` configuration. /// `languages.toml` configuration.
pub fn language_name(&self) -> Option<&str> { pub fn language_name(&self) -> Option<&str> {

3
helix-view/src/editor.rs
View File

@ -1236,8 +1236,7 @@ fn launch_language_servers(&mut self, doc_id: DocumentId) {
Ok(client) => Some((lang, client)), Ok(client) => Some((lang, client)),
Err(err) => { Err(err) => {
log::error!( log::error!(
"Failed to initialize the language servers for `{}` - `{}` {{ {} }}", "Failed to initialize the language servers for `{}` {{ {} }}",
language.scope(),
lang, lang,
err err
); );