Extract Dockerfile extension (#9832)
This PR extracts Dockerfile support into an extension and removes the built-in Dockerfile support from Zed. There's already an existing [Dockerfile extension](https://github.com/d1y/dockerfile.zed) that was just missing language server support. Language server support is being added to that extension in https://github.com/d1y/dockerfile.zed/pull/2. Release Notes: - Removed built-in support for Dockerfile, in favor of making it available as an extension. The Dockerfile extension will be suggested for download when you open a `Dockerfile`.
This commit is contained in:
Marshall Bowers
GitHub
parent
181dc86b48
commit
7807f23e2a
8 changed files with 0 additions and 223 deletions
|
|
@ -1,124 +0,0 @@
|
|||
use anyhow::{anyhow, Result};
|
||||
use async_trait::async_trait;
|
||||
use futures::StreamExt;
|
||||
use language::{LanguageServerName, LspAdapter, LspAdapterDelegate};
|
||||
use lsp::LanguageServerBinary;
|
||||
use node_runtime::NodeRuntime;
|
||||
use smol::fs;
|
||||
use std::{
|
||||
any::Any,
|
||||
ffi::OsString,
|
||||
path::{Path, PathBuf},
|
||||
sync::Arc,
|
||||
};
|
||||
use util::{maybe, ResultExt};
|
||||
|
||||
const SERVER_PATH: &str = "node_modules/dockerfile-language-server-nodejs/bin/docker-langserver";
|
||||
|
||||
fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
|
||||
vec![server_path.into(), "--stdio".into()]
|
||||
}
|
||||
|
||||
pub struct DockerfileLspAdapter {
|
||||
node: Arc<dyn NodeRuntime>,
|
||||
}
|
||||
|
||||
impl DockerfileLspAdapter {
|
||||
pub fn new(node: Arc<dyn NodeRuntime>) -> Self {
|
||||
Self { node }
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait(?Send)]
|
||||
impl LspAdapter for DockerfileLspAdapter {
|
||||
fn name(&self) -> LanguageServerName {
|
||||
LanguageServerName("docker-langserver".into())
|
||||
}
|
||||
|
||||
async fn fetch_latest_server_version(
|
||||
&self,
|
||||
_: &dyn LspAdapterDelegate,
|
||||
) -> Result<Box<dyn 'static + Send + Any>> {
|
||||
Ok(Box::new(
|
||||
self.node
|
||||
.npm_package_latest_version("dockerfile-language-server-nodejs")
|
||||
.await?,
|
||||
) as Box<_>)
|
||||
}
|
||||
|
||||
async fn fetch_server_binary(
|
||||
&self,
|
||||
latest_version: Box<dyn 'static + Send + Any>,
|
||||
container_dir: PathBuf,
|
||||
_: &dyn LspAdapterDelegate,
|
||||
) -> Result<LanguageServerBinary> {
|
||||
let latest_version = latest_version.downcast::<String>().unwrap();
|
||||
let server_path = container_dir.join(SERVER_PATH);
|
||||
let package_name = "dockerfile-language-server-nodejs";
|
||||
|
||||
let should_install_language_server = self
|
||||
.node
|
||||
.should_install_npm_package(package_name, &server_path, &container_dir, &latest_version)
|
||||
.await;
|
||||
|
||||
if should_install_language_server {
|
||||
self.node
|
||||
.npm_install_packages(&container_dir, &[(package_name, latest_version.as_str())])
|
||||
.await?;
|
||||
}
|
||||
|
||||
Ok(LanguageServerBinary {
|
||||
path: self.node.binary_path().await?,
|
||||
env: None,
|
||||
arguments: server_binary_arguments(&server_path),
|
||||
})
|
||||
}
|
||||
|
||||
async fn cached_server_binary(
|
||||
&self,
|
||||
container_dir: PathBuf,
|
||||
_: &dyn LspAdapterDelegate,
|
||||
) -> Option<LanguageServerBinary> {
|
||||
get_cached_server_binary(container_dir, &*self.node).await
|
||||
}
|
||||
|
||||
async fn installation_test_binary(
|
||||
&self,
|
||||
container_dir: PathBuf,
|
||||
) -> Option<LanguageServerBinary> {
|
||||
get_cached_server_binary(container_dir, &*self.node).await
|
||||
}
|
||||
}
|
||||
|
||||
async fn get_cached_server_binary(
|
||||
container_dir: PathBuf,
|
||||
node: &dyn NodeRuntime,
|
||||
) -> Option<LanguageServerBinary> {
|
||||
maybe!(async {
|
||||
let mut last_version_dir = None;
|
||||
let mut entries = fs::read_dir(&container_dir).await?;
|
||||
while let Some(entry) = entries.next().await {
|
||||
let entry = entry?;
|
||||
if entry.file_type().await?.is_dir() {
|
||||
last_version_dir = Some(entry.path());
|
||||
}
|
||||
}
|
||||
|
||||
let last_version_dir = last_version_dir.ok_or_else(|| anyhow!("no cached binary"))?;
|
||||
let server_path = last_version_dir.join(SERVER_PATH);
|
||||
if server_path.exists() {
|
||||
Ok(LanguageServerBinary {
|
||||
path: node.binary_path().await?,
|
||||
env: None,
|
||||
arguments: server_binary_arguments(&server_path),
|
||||
})
|
||||
} else {
|
||||
Err(anyhow!(
|
||||
"missing executable in directory {:?}",
|
||||
last_version_dir
|
||||
))
|
||||
}
|
||||
})
|
||||
.await
|
||||
.log_err()
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
name = "Dockerfile"
|
||||
grammar = "dockerfile"
|
||||
path_suffixes = ["Dockerfile"]
|
||||
line_comments = ["# "]
|
||||
brackets = [
|
||||
{ start = "{", end = "}", close = true, newline = true },
|
||||
{ start = "[", end = "]", close = true, newline = true },
|
||||
{ start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
|
||||
]
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
; Dockerfile instructions set taken from:
|
||||
; https://docs.docker.com/engine/reference/builder/#overview
|
||||
; https://github.com/helix-editor/helix/blob/78c34194b5c83beb26ca04f12bf9d53fd5aba801/runtime/queries/dockerfile/highlights.scm
|
||||
[
|
||||
"ADD"
|
||||
"ARG"
|
||||
"CMD"
|
||||
"COPY"
|
||||
"ENTRYPOINT"
|
||||
"ENV"
|
||||
"EXPOSE"
|
||||
"FROM"
|
||||
"HEALTHCHECK"
|
||||
"LABEL"
|
||||
"MAINTAINER"
|
||||
"ONBUILD"
|
||||
"RUN"
|
||||
"SHELL"
|
||||
"STOPSIGNAL"
|
||||
"USER"
|
||||
"VOLUME"
|
||||
"WORKDIR"
|
||||
|
||||
; "as" for multi-stage builds
|
||||
"AS"
|
||||
] @keyword
|
||||
|
||||
[
|
||||
":"
|
||||
"@"
|
||||
] @operator
|
||||
|
||||
(comment) @comment
|
||||
|
||||
(image_spec
|
||||
(image_tag
|
||||
":" @punctuation.special)
|
||||
(image_digest
|
||||
"@" @punctuation.special))
|
||||
|
||||
[
|
||||
(double_quoted_string)
|
||||
(single_quoted_string)
|
||||
(json_string)
|
||||
] @string
|
||||
|
||||
[
|
||||
(env_pair)
|
||||
(label_pair)
|
||||
] @constant
|
||||
|
||||
[
|
||||
(param)
|
||||
(mount_param)
|
||||
] @function
|
||||
|
||||
(expansion
|
||||
[
|
||||
"$"
|
||||
"{"
|
||||
"}"
|
||||
] @punctuation.special
|
||||
) @constant
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
; We need impl this
|
||||
; ((comment) @injection.content
|
||||
; (#set! injection.language "comment"))
|
||||
|
||||
((shell_command) @content
|
||||
(#set! "language" "bash"))
|
||||
|
|
@ -18,7 +18,6 @@ mod csharp;
|
|||
mod css;
|
||||
mod dart;
|
||||
mod deno;
|
||||
mod dockerfile;
|
||||
mod elixir;
|
||||
mod elm;
|
||||
mod erlang;
|
||||
|
|
@ -70,7 +69,6 @@ pub fn init(
|
|||
("clojure", tree_sitter_clojure::language()),
|
||||
("cpp", tree_sitter_cpp::language()),
|
||||
("css", tree_sitter_css::language()),
|
||||
("dockerfile", tree_sitter_dockerfile::language()),
|
||||
("elixir", tree_sitter_elixir::language()),
|
||||
("elm", tree_sitter_elm::language()),
|
||||
(
|
||||
|
|
@ -190,13 +188,6 @@ pub fn init(
|
|||
]
|
||||
);
|
||||
|
||||
language!(
|
||||
"dockerfile",
|
||||
vec![Arc::new(dockerfile::DockerfileLspAdapter::new(
|
||||
node_runtime.clone(),
|
||||
))]
|
||||
);
|
||||
|
||||
match &ElixirSettings::get(None, cx).lsp {
|
||||
elixir::ElixirLspSetting::ElixirLs => {
|
||||
language!(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue