This extracts a `language_core` crate from the existing `language`
crate, and creates a `grammars` data crate. The goal is to separate
tree-sitter grammar infrastructure, language configuration, and LSP
adapter types from the heavier buffer/editor integration layer in
`language`.
## Motivation
The `language` crate pulls in `text`, `theme`, `settings`, `rpc`,
`task`, `fs`, `clock`, `sum_tree`, and `fuzzy` — all of which are needed
for buffer integration (`Buffer`, `SyntaxMap`, `Outline`,
`DiagnosticSet`) but not for grammar parsing or language configuration.
Extracting the core types lets downstream consumers depend on
`language_core` without pulling in the full integration stack.
## Dependency graph after extraction
```
language_core ← gpui, lsp, tree-sitter, util, collections
grammars ← language_core, rust_embed, tree-sitter-{rust,python,...}
language ← language_core, text, theme, settings, rpc, task, fs, ...
languages ← language, grammars
```
## What moved to `language_core`
- `Grammar`, `GrammarId`, and all query config/builder types
- `LanguageConfig`, `LanguageMatcher`, bracket/comment/indent config
types
- `HighlightMap`, `HighlightId` (theme-dependent free functions
`highlight_style` and `highlight_name` stay in `language`)
- `LanguageName`, `LanguageId`
- `LanguageQueries`, `QUERY_FILENAME_PREFIXES`
- `CodeLabel`, `CodeLabelBuilder`, `Symbol`
- `Diagnostic`, `DiagnosticSourceKind`
- `Toolchain`, `ToolchainScope`, `ToolchainList`, `ToolchainMetadata`
- `ManifestName`
- `SoftWrap`
- LSP data types: `BinaryStatus`, `ServerHealth`,
`LanguageServerStatusUpdate`, `PromptResponseContext`, `ToLspPosition`
## What stays in `language`
- `Buffer`, `BufferSnapshot`, `SyntaxMap`, `Outline`, `DiagnosticSet`,
`LanguageScope`
- `LspAdapter`, `CachedLspAdapter`, `LspAdapterDelegate` (reference
`Arc<Language>` and `WorktreeId`)
- `ToolchainLister`, `LanguageToolchainStore` (reference `task` and
`settings` types)
- `ManifestQuery`, `ManifestProvider`, `ManifestDelegate` (reference
`WorktreeId`)
- Parser/query cursor pools, `PLAIN_TEXT`, point conversion functions
## What the `grammars` crate provides
- Embedded `.scm` query files and `config.toml` files for all built-in
languages (via `rust_embed`)
- `load_queries(name)`, `load_config(name)`,
`load_config_for_feature(name, grammars_loaded)`, and `get_file(path)`
functions
- `native_grammars()` for tree-sitter grammar registration (behind
`load-grammars` feature)
## Pre-cleanup (also in this PR)
- Removed unused `Option<&Buffer>` from
`LspAdapter::process_diagnostics`
- Removed unused `&App` from `LspAdapter::retain_old_diagnostic`
- Removed `fs: &dyn Fs` from `ToolchainLister` trait methods
(`PythonToolchainProvider` captures `fs` at construction time instead)
- Moved `Diagnostic`/`DiagnosticSourceKind` out of `buffer.rs` into
their own module
## Backward compatibility
The `language` crate re-exports everything from `language_core`, so
existing `use language::Grammar` (etc.) continues to work unchanged. The
only downstream change required is importing `CodeLabelExt` where
`.fallback_for_completion()` is called on the now-foreign `CodeLabel`
type.
Release Notes:
- N/A
---------
Co-authored-by: Agus Zubiaga <agus@zed.dev>
Co-authored-by: Tom Houlé <tom@tomhoule.com>
85 lines
2.6 KiB
Rust
85 lines
2.6 KiB
Rust
//! Provides support for language toolchains.
|
|
//!
|
|
//! A language can have associated toolchains,
|
|
//! which is a set of tools used to interact with the projects written in said language.
|
|
//! For example, a Python project can have an associated virtual environment; a Rust project can have a toolchain override.
|
|
|
|
use std::{path::PathBuf, sync::Arc};
|
|
|
|
use async_trait::async_trait;
|
|
use collections::HashMap;
|
|
|
|
use futures::future::BoxFuture;
|
|
use gpui::{App, AsyncApp};
|
|
use settings::WorktreeId;
|
|
use task::ShellKind;
|
|
use util::rel_path::RelPath;
|
|
|
|
use crate::LanguageName;
|
|
|
|
// Re-export core data types from language_core.
|
|
pub use language_core::{Toolchain, ToolchainList, ToolchainMetadata, ToolchainScope};
|
|
|
|
#[async_trait]
|
|
pub trait ToolchainLister: Send + Sync + 'static {
|
|
/// List all available toolchains for a given path.
|
|
async fn list(
|
|
&self,
|
|
worktree_root: PathBuf,
|
|
subroot_relative_path: Arc<RelPath>,
|
|
project_env: Option<HashMap<String, String>>,
|
|
) -> ToolchainList;
|
|
|
|
/// Given a user-created toolchain, resolve lister-specific details.
|
|
/// Put another way: fill in the details of the toolchain so the user does not have to.
|
|
async fn resolve(
|
|
&self,
|
|
path: PathBuf,
|
|
project_env: Option<HashMap<String, String>>,
|
|
) -> anyhow::Result<Toolchain>;
|
|
|
|
fn activation_script(
|
|
&self,
|
|
toolchain: &Toolchain,
|
|
shell: ShellKind,
|
|
cx: &App,
|
|
) -> BoxFuture<'static, Vec<String>>;
|
|
|
|
/// Returns various "static" bits of information about this toolchain lister. This function should be pure.
|
|
fn meta(&self) -> ToolchainMetadata;
|
|
}
|
|
|
|
#[async_trait(?Send)]
|
|
pub trait LanguageToolchainStore: Send + Sync + 'static {
|
|
async fn active_toolchain(
|
|
self: Arc<Self>,
|
|
worktree_id: WorktreeId,
|
|
relative_path: Arc<RelPath>,
|
|
language_name: LanguageName,
|
|
cx: &mut AsyncApp,
|
|
) -> Option<Toolchain>;
|
|
}
|
|
|
|
pub trait LocalLanguageToolchainStore: Send + Sync + 'static {
|
|
fn active_toolchain(
|
|
self: Arc<Self>,
|
|
worktree_id: WorktreeId,
|
|
relative_path: &Arc<RelPath>,
|
|
language_name: LanguageName,
|
|
cx: &mut AsyncApp,
|
|
) -> Option<Toolchain>;
|
|
}
|
|
|
|
#[async_trait(?Send)]
|
|
impl<T: LocalLanguageToolchainStore> LanguageToolchainStore for T {
|
|
async fn active_toolchain(
|
|
self: Arc<Self>,
|
|
worktree_id: WorktreeId,
|
|
relative_path: Arc<RelPath>,
|
|
language_name: LanguageName,
|
|
cx: &mut AsyncApp,
|
|
) -> Option<Toolchain> {
|
|
self.active_toolchain(worktree_id, &relative_path, language_name, cx)
|
|
}
|
|
}
|