json: Register tasks on Rust side and not via tasks.json (#12345)

/cc @RemcoSmitsDev new task indicators weren't showing for me in JSON
files.
`tasks.json` of native grammars is not being read by anything by
default, so we tend to register tasks as Rust structs, foregoing the
deserialization step. This doesn't apply to tasks registered in
extensions, which have to have tasks.json.

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2024-05-27 11:50:45 +02:00 committed by GitHub
parent e19339bc1d
commit 345361cd38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 24 additions and 15 deletions

View file

@ -7,6 +7,7 @@ use gpui::{AppContext, AsyncAppContext};
use language::{LanguageRegistry, LanguageServerName, LspAdapter, LspAdapterDelegate}; use language::{LanguageRegistry, LanguageServerName, LspAdapter, LspAdapterDelegate};
use lsp::LanguageServerBinary; use lsp::LanguageServerBinary;
use node_runtime::NodeRuntime; use node_runtime::NodeRuntime;
use project::ContextProviderWithTasks;
use serde_json::{json, Value}; use serde_json::{json, Value};
use settings::{KeymapFile, SettingsJsonSchemaParams, SettingsStore}; use settings::{KeymapFile, SettingsJsonSchemaParams, SettingsStore};
use smol::fs; use smol::fs;
@ -16,10 +17,30 @@ use std::{
path::{Path, PathBuf}, path::{Path, PathBuf},
sync::{Arc, OnceLock}, sync::{Arc, OnceLock},
}; };
use task::{TaskTemplate, TaskTemplates, VariableName};
use util::{maybe, paths, ResultExt}; use util::{maybe, paths, ResultExt};
const SERVER_PATH: &str = "node_modules/vscode-json-languageserver/bin/vscode-json-languageserver"; const SERVER_PATH: &str = "node_modules/vscode-json-languageserver/bin/vscode-json-languageserver";
pub(super) fn json_task_context() -> ContextProviderWithTasks {
ContextProviderWithTasks::new(TaskTemplates(vec![
TaskTemplate {
label: "package script $ZED_CUSTOM_script".to_owned(),
command: "npm run".to_owned(),
args: vec![VariableName::Custom("script".into()).template_value()],
tags: vec!["package-script".into()],
..TaskTemplate::default()
},
TaskTemplate {
label: "composer script $ZED_CUSTOM_script".to_owned(),
command: "composer".to_owned(),
args: vec![VariableName::Custom("script".into()).template_value()],
tags: vec!["composer-script".into()],
..TaskTemplate::default()
},
]))
}
fn server_binary_arguments(server_path: &Path) -> Vec<OsString> { fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
vec![server_path.into(), "--stdio".into()] vec![server_path.into(), "--stdio".into()]
} }

View file

@ -1,14 +0,0 @@
[
{
"label": "package script $ZED_CUSTOM_script",
"command": "npm run",
"args": ["$ZED_CUSTOM_script"],
"tags": ["package-script"]
},
{
"label": "composer script $ZED_CUSTOM_script",
"command": "composer",
"args": ["$ZED_CUSTOM_script"],
"tags": ["composer-script"]
}
]

View file

@ -1,5 +1,6 @@
use anyhow::Context; use anyhow::Context;
use gpui::{AppContext, UpdateGlobal}; use gpui::{AppContext, UpdateGlobal};
use json::json_task_context;
pub use language::*; pub use language::*;
use node_runtime::NodeRuntime; use node_runtime::NodeRuntime;
use rust_embed::RustEmbed; use rust_embed::RustEmbed;
@ -119,7 +120,8 @@ pub fn init(
vec![Arc::new(json::JsonLspAdapter::new( vec![Arc::new(json::JsonLspAdapter::new(
node_runtime.clone(), node_runtime.clone(),
languages.clone(), languages.clone(),
))] ))],
json_task_context()
); );
language!("markdown"); language!("markdown");
language!( language!(