Snippets: Move snippets into the core of editor (#13937)
Release Notes: - Move snippet support into core editor experience, marking the official extension as deprecated. Snippets now show up in any buffer (including plain text buffers).
This commit is contained in:
parent
b3dad0bfcb
commit
9a6f30fd95
9 changed files with 400 additions and 6 deletions
20
crates/snippet_provider/Cargo.toml
Normal file
20
crates/snippet_provider/Cargo.toml
Normal file
|
@ -0,0 +1,20 @@
|
|||
[package]
|
||||
name = "snippet_provider"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
license = "GPL-3.0-or-later"
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
||||
[dependencies]
|
||||
anyhow.workspace = true
|
||||
collections.workspace = true
|
||||
fs.workspace = true
|
||||
futures.workspace = true
|
||||
gpui.workspace = true
|
||||
serde.workspace = true
|
||||
serde_json.workspace = true
|
||||
snippet.workspace = true
|
||||
util.workspace = true
|
1
crates/snippet_provider/LICENSE-GPL
Symbolic link
1
crates/snippet_provider/LICENSE-GPL
Symbolic link
|
@ -0,0 +1 @@
|
|||
../../LICENSE-GPL
|
44
crates/snippet_provider/src/format.rs
Normal file
44
crates/snippet_provider/src/format.rs
Normal file
|
@ -0,0 +1,44 @@
|
|||
use collections::HashMap;
|
||||
use serde::Deserialize;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub(crate) struct VSSnippetsFile {
|
||||
#[serde(flatten)]
|
||||
pub(crate) snippets: HashMap<String, VSCodeSnippet>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[serde(untagged)]
|
||||
pub(crate) enum ListOrDirect {
|
||||
Single(String),
|
||||
List(Vec<String>),
|
||||
}
|
||||
|
||||
impl From<ListOrDirect> for Vec<String> {
|
||||
fn from(list: ListOrDirect) -> Self {
|
||||
match list {
|
||||
ListOrDirect::Single(entry) => vec![entry],
|
||||
ListOrDirect::List(entries) => entries,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for ListOrDirect {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
|
||||
write!(
|
||||
f,
|
||||
"{}",
|
||||
match self {
|
||||
Self::Single(v) => v.to_owned(),
|
||||
Self::List(v) => v.join("\n"),
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub(crate) struct VSCodeSnippet {
|
||||
pub(crate) prefix: Option<ListOrDirect>,
|
||||
pub(crate) body: ListOrDirect,
|
||||
pub(crate) description: Option<ListOrDirect>,
|
||||
}
|
196
crates/snippet_provider/src/lib.rs
Normal file
196
crates/snippet_provider/src/lib.rs
Normal file
|
@ -0,0 +1,196 @@
|
|||
mod format;
|
||||
|
||||
use std::{
|
||||
path::{Path, PathBuf},
|
||||
sync::Arc,
|
||||
time::Duration,
|
||||
};
|
||||
|
||||
use anyhow::Result;
|
||||
use collections::{BTreeMap, BTreeSet, HashMap};
|
||||
use format::VSSnippetsFile;
|
||||
use fs::Fs;
|
||||
use futures::stream::StreamExt;
|
||||
use gpui::{AppContext, AsyncAppContext, Context, Model, ModelContext, Task, WeakModel};
|
||||
use util::ResultExt;
|
||||
|
||||
// Is `None` if the snippet file is global.
|
||||
type SnippetKind = Option<String>;
|
||||
fn file_stem_to_key(stem: &str) -> SnippetKind {
|
||||
if stem == "snippets" {
|
||||
None
|
||||
} else {
|
||||
Some(stem.to_owned())
|
||||
}
|
||||
}
|
||||
|
||||
fn file_to_snippets(file_contents: VSSnippetsFile) -> Vec<Arc<Snippet>> {
|
||||
let mut snippets = vec![];
|
||||
for (prefix, snippet) in file_contents.snippets {
|
||||
let prefixes = snippet
|
||||
.prefix
|
||||
.map_or_else(move || vec![prefix], |prefixes| prefixes.into());
|
||||
let description = snippet
|
||||
.description
|
||||
.map(|description| description.to_string());
|
||||
let body = snippet.body.to_string();
|
||||
if snippet::Snippet::parse(&body).log_err().is_none() {
|
||||
continue;
|
||||
};
|
||||
snippets.push(Arc::new(Snippet {
|
||||
body,
|
||||
prefix: prefixes,
|
||||
description,
|
||||
}));
|
||||
}
|
||||
snippets
|
||||
}
|
||||
// Snippet with all of the metadata
|
||||
#[derive(Debug)]
|
||||
pub struct Snippet {
|
||||
pub prefix: Vec<String>,
|
||||
pub body: String,
|
||||
pub description: Option<String>,
|
||||
}
|
||||
|
||||
async fn process_updates(
|
||||
this: WeakModel<SnippetProvider>,
|
||||
entries: Vec<PathBuf>,
|
||||
mut cx: AsyncAppContext,
|
||||
) -> Result<()> {
|
||||
let fs = this.update(&mut cx, |this, _| this.fs.clone())?;
|
||||
for entry_path in entries {
|
||||
if !entry_path
|
||||
.extension()
|
||||
.map_or(false, |extension| extension == "json")
|
||||
{
|
||||
continue;
|
||||
}
|
||||
let entry_metadata = fs.metadata(&entry_path).await;
|
||||
// Entry could have been removed, in which case we should no longer show completions for it.
|
||||
let entry_exists = entry_metadata.is_ok();
|
||||
if entry_metadata.map_or(false, |entry| entry.map_or(false, |e| e.is_dir)) {
|
||||
// Don't process dirs.
|
||||
continue;
|
||||
}
|
||||
let Some(stem) = entry_path.file_stem().and_then(|s| s.to_str()) else {
|
||||
continue;
|
||||
};
|
||||
let key = file_stem_to_key(stem);
|
||||
|
||||
let contents = if entry_exists {
|
||||
fs.load(&entry_path).await.ok()
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
this.update(&mut cx, move |this, _| {
|
||||
let snippets_of_kind = this.snippets.entry(key).or_default();
|
||||
if entry_exists {
|
||||
let Some(file_contents) = contents else {
|
||||
return;
|
||||
};
|
||||
let Ok(as_json) = serde_json::from_str::<VSSnippetsFile>(&file_contents) else {
|
||||
return;
|
||||
};
|
||||
let snippets = file_to_snippets(as_json);
|
||||
*snippets_of_kind.entry(entry_path).or_default() = snippets;
|
||||
} else {
|
||||
snippets_of_kind.remove(&entry_path);
|
||||
}
|
||||
})?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn initial_scan(
|
||||
this: WeakModel<SnippetProvider>,
|
||||
path: Arc<Path>,
|
||||
mut cx: AsyncAppContext,
|
||||
) -> Result<()> {
|
||||
let fs = this.update(&mut cx, |this, _| this.fs.clone())?;
|
||||
let entries = fs.read_dir(&path).await;
|
||||
if let Ok(entries) = entries {
|
||||
let entries = entries
|
||||
.collect::<Vec<_>>()
|
||||
.await
|
||||
.into_iter()
|
||||
.collect::<Result<Vec<_>>>()?;
|
||||
process_updates(this, entries, cx).await?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub struct SnippetProvider {
|
||||
fs: Arc<dyn Fs>,
|
||||
snippets: HashMap<SnippetKind, BTreeMap<PathBuf, Vec<Arc<Snippet>>>>,
|
||||
}
|
||||
|
||||
impl SnippetProvider {
|
||||
pub fn new(
|
||||
fs: Arc<dyn Fs>,
|
||||
dirs_to_watch: BTreeSet<PathBuf>,
|
||||
cx: &mut AppContext,
|
||||
) -> Model<Self> {
|
||||
cx.new_model(move |cx| {
|
||||
let mut this = Self {
|
||||
fs,
|
||||
snippets: Default::default(),
|
||||
};
|
||||
|
||||
let mut task_handles = vec![];
|
||||
for dir in dirs_to_watch {
|
||||
task_handles.push(this.watch_directory(&dir, cx));
|
||||
}
|
||||
cx.spawn(|_, _| async move {
|
||||
futures::future::join_all(task_handles).await;
|
||||
})
|
||||
.detach();
|
||||
|
||||
this
|
||||
})
|
||||
}
|
||||
|
||||
/// Add directory to be watched for content changes
|
||||
fn watch_directory(&mut self, path: &Path, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
|
||||
let path: Arc<Path> = Arc::from(path);
|
||||
|
||||
cx.spawn(|this, mut cx| async move {
|
||||
let fs = this.update(&mut cx, |this, _| this.fs.clone())?;
|
||||
let watched_path = path.clone();
|
||||
let watcher = fs.watch(&watched_path, Duration::from_secs(1));
|
||||
initial_scan(this.clone(), path, cx.clone()).await?;
|
||||
|
||||
let (mut entries, _) = watcher.await;
|
||||
while let Some(entries) = entries.next().await {
|
||||
process_updates(this.clone(), entries, cx.clone()).await?;
|
||||
}
|
||||
Ok(())
|
||||
})
|
||||
}
|
||||
fn lookup_snippets<'a>(
|
||||
&'a self,
|
||||
language: &'a SnippetKind,
|
||||
) -> Option<impl Iterator<Item = Arc<Snippet>> + 'a> {
|
||||
Some(
|
||||
self.snippets
|
||||
.get(&language)?
|
||||
.iter()
|
||||
.flat_map(|(_, snippets)| snippets.iter().cloned()),
|
||||
)
|
||||
}
|
||||
|
||||
pub fn snippets_for(&self, language: SnippetKind) -> Vec<Arc<Snippet>> {
|
||||
let mut requested_snippets: Vec<_> = self
|
||||
.lookup_snippets(&language)
|
||||
.map(|snippets| snippets.collect())
|
||||
.unwrap_or_default();
|
||||
if language.is_some() {
|
||||
// Look up global snippets as well.
|
||||
if let Some(global_snippets) = self.lookup_snippets(&None) {
|
||||
requested_snippets.extend(global_snippets);
|
||||
}
|
||||
}
|
||||
requested_snippets
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue