Detailed changes
@@ -4,6 +4,8 @@ rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"]
[alias]
xtask = "run --package xtask --"
+perf-test = ["test", "--profile", "release-fast", "--lib", "--bins", "--tests", "--config", "target.'cfg(true)'.runner='cargo run -p perf --release'", "--config", "target.'cfg(true)'.rustflags=[\"--cfg\", \"perf_enabled\"]"]
+perf-compare = ["run", "--release", "-p", "perf", "--", "compare"]
[target.x86_64-unknown-linux-gnu]
linker = "clang"
@@ -20,6 +20,7 @@
.venv
.vscode
.wrangler
+.perf-runs
/assets/*licenses.*
/crates/collab/seed.json
/crates/theme/schemas/theme.json
@@ -195,9 +195,9 @@ dependencies = [
[[package]]
name = "agent-client-protocol"
-version = "0.4.0"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2526e80463b9742afed4829aedd6ae5632d6db778c6cc1fecb80c960c3521b"
+checksum = "00e33b9f4bd34d342b6f80b7156d3a37a04aeec16313f264001e52d6a9118600"
dependencies = [
"anyhow",
"async-broadcast",
@@ -337,6 +337,7 @@ dependencies = [
"gpui",
"language_model",
"paths",
+ "project",
"schemars 1.0.1",
"serde",
"serde_json",
@@ -418,6 +419,7 @@ dependencies = [
"serde_json",
"serde_json_lenient",
"settings",
+ "shlex",
"smol",
"streaming_diff",
"task",
@@ -497,8 +499,9 @@ dependencies = [
[[package]]
name = "alacritty_terminal"
-version = "0.25.1-dev"
-source = "git+https://github.com/zed-industries/alacritty.git?branch=add-hush-login-flag#828457c9ff1f7ea0a0469337cc8a37ee3a1b0590"
+version = "0.25.1-rc1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cb5f4f1ef69bdb8b2095ddd14b09dd74ee0303aae8bd5372667a54cff689a1b"
dependencies = [
"base64 0.22.1",
"bitflags 2.9.0",
@@ -510,10 +513,11 @@ dependencies = [
"piper",
"polling",
"regex-automata",
+ "rustix 1.0.7",
"rustix-openpty",
"serde",
"signal-hook",
- "unicode-width 0.1.14",
+ "unicode-width 0.2.0",
"vte",
"windows-sys 0.59.0",
]
@@ -4928,7 +4932,7 @@ dependencies = [
"libc",
"option-ext",
"redox_users 0.5.0",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.0",
]
[[package]]
@@ -5294,6 +5298,7 @@ dependencies = [
"url",
"util",
"uuid",
+ "vim_mode_setting",
"workspace",
"workspace-hack",
"zed_actions",
@@ -7920,6 +7925,7 @@ dependencies = [
"unicode-segmentation",
"usvg",
"util",
+ "util_macros",
"uuid",
"waker-fn",
"wayland-backend",
@@ -8219,12 +8225,6 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-[[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
[[package]]
name = "hermit-abi"
version = "0.5.0"
@@ -10165,6 +10165,7 @@ dependencies = [
"simplelog",
"smallvec",
"tokio-tungstenite 0.26.2",
+ "ui",
"util",
"workspace-hack",
]
@@ -10421,6 +10422,7 @@ version = "0.1.0"
dependencies = [
"assets",
"base64 0.22.1",
+ "collections",
"env_logger 0.11.8",
"fs",
"futures 0.3.31",
@@ -12166,6 +12168,16 @@ version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+[[package]]
+name = "perf"
+version = "0.1.0"
+dependencies = [
+ "collections",
+ "serde",
+ "serde_json",
+ "workspace-hack",
+]
+
[[package]]
name = "pest"
version = "2.8.0"
@@ -12668,6 +12680,7 @@ dependencies = [
"schemars 1.0.1",
"serde",
"serde_json",
+ "theme",
"ui",
"workspace",
"workspace-hack",
@@ -12821,17 +12834,16 @@ dependencies = [
[[package]]
name = "polling"
-version = "3.7.4"
+version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
dependencies = [
"cfg-if",
"concurrent-queue",
- "hermit-abi 0.4.0",
+ "hermit-abi 0.5.0",
"pin-project-lite",
- "rustix 0.38.44",
- "tracing",
- "windows-sys 0.59.0",
+ "rustix 1.0.7",
+ "windows-sys 0.61.0",
]
[[package]]
@@ -14678,7 +14690,6 @@ checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
dependencies = [
"bitflags 2.9.0",
"errno 0.3.11",
- "itoa",
"libc",
"linux-raw-sys 0.4.15",
"windows-sys 0.59.0",
@@ -14709,13 +14720,13 @@ dependencies = [
[[package]]
name = "rustix-openpty"
-version = "0.1.1"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a25c3aad9fc1424eb82c88087789a7d938e1829724f3e4043163baf0d13cfc12"
+checksum = "1de16c7c59892b870a6336f185dc10943517f1327447096bbb7bb32cd85e2393"
dependencies = [
"errno 0.3.11",
"libc",
- "rustix 0.38.44",
+ "rustix 1.0.7",
]
[[package]]
@@ -18583,6 +18594,7 @@ name = "util_macros"
version = "0.1.0"
dependencies = [
"convert_case 0.8.0",
+ "perf",
"proc-macro2",
"quote",
"syn 2.0.101",
@@ -18734,6 +18746,7 @@ dependencies = [
"tokio",
"ui",
"util",
+ "util_macros",
"vim_mode_setting",
"workspace",
"workspace-hack",
@@ -20040,6 +20053,15 @@ dependencies = [
"windows-targets 0.53.2",
]
+[[package]]
+name = "windows-sys"
+version = "0.61.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa"
+dependencies = [
+ "windows-link 0.2.0",
+]
+
[[package]]
name = "windows-targets"
version = "0.42.2"
@@ -20837,7 +20859,7 @@ dependencies = [
"windows-sys 0.48.0",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.0",
"winnow",
"zeroize",
"zvariant",
@@ -219,6 +219,7 @@ members = [
# Tooling
#
+ "tooling/perf",
"tooling/workspace-hack",
"tooling/xtask",
]
@@ -355,6 +356,7 @@ outline = { path = "crates/outline" }
outline_panel = { path = "crates/outline_panel" }
panel = { path = "crates/panel" }
paths = { path = "crates/paths" }
+perf = { path = "tooling/perf" }
picker = { path = "crates/picker" }
plugin = { path = "crates/plugin" }
plugin_macros = { path = "crates/plugin_macros" }
@@ -437,9 +439,9 @@ zlog_settings = { path = "crates/zlog_settings" }
# External crates
#
-agent-client-protocol = { version = "0.4.0", features = ["unstable"] }
+agent-client-protocol = { version = "0.4.2", features = ["unstable"] }
aho-corasick = "1.1"
-alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
+alacritty_terminal = "0.25.1-rc1"
any_vec = "0.14"
anyhow = "1.0.86"
arrayvec = { version = "0.7.4", features = ["serde"] }
@@ -550,6 +550,8 @@
"cmd-ctrl-left": "editor::SelectSmallerSyntaxNode", // Shrink selection
"cmd-ctrl-right": "editor::SelectLargerSyntaxNode", // Expand selection
"cmd-ctrl-up": "editor::SelectPreviousSyntaxNode", // Move selection up
+ "ctrl-shift-right": "editor::SelectLargerSyntaxNode", // Expand selection (VSCode version)
+ "ctrl-shift-left": "editor::SelectSmallerSyntaxNode", // Shrink selection (VSCode version)
"cmd-ctrl-down": "editor::SelectNextSyntaxNode", // Move selection down
"cmd-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch / find_under_expand
"cmd-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection
@@ -497,8 +497,6 @@
"shift-alt-down": "editor::DuplicateLineDown",
"shift-alt-right": "editor::SelectLargerSyntaxNode", // Expand selection
"shift-alt-left": "editor::SelectSmallerSyntaxNode", // Shrink selection
- "ctrl-shift-right": "editor::SelectLargerSyntaxNode", // Expand selection (VSCode version)
- "ctrl-shift-left": "editor::SelectSmallerSyntaxNode", // Shrink selection (VSCode version)
"ctrl-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection
"ctrl-f2": "editor::SelectAllMatches", // Select all occurrences of current word
"ctrl-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch / find_under_expand
@@ -95,8 +95,8 @@
"g g": "vim::StartOfDocument",
"g h": "editor::Hover",
"g B": "editor::BlameHover",
- "g t": "pane::ActivateNextItem",
- "g shift-t": "pane::ActivatePreviousItem",
+ "g t": "vim::GoToTab",
+ "g shift-t": "vim::GoToPreviousTab",
"g d": "editor::GoToDefinition",
"g shift-d": "editor::GoToDeclaration",
"g y": "editor::GoToTypeDefinition",
@@ -433,6 +433,8 @@
"h": "vim::WrappingLeft",
"l": "vim::WrappingRight",
"y": "vim::HelixYank",
+ "p": "vim::HelixPaste",
+ "shift-p": ["vim::HelixPaste", { "before": true }],
"alt-;": "vim::OtherEnd",
"ctrl-r": "vim::Redo",
"f": ["vim::PushFindForward", { "before": false, "multiline": true }],
@@ -1514,7 +1514,7 @@
// }
//
"file_types": {
- "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json", "**/.vscode/**/*.json"],
+ "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json", "**/.vscode/**/*.json", "tsconfig*.json"],
"Shell Script": [".env.*"]
},
// Settings for which version of Node.js and NPM to use when installing
@@ -1,6 +1,6 @@
services:
postgres:
- image: postgres:15
+ image: docker.io/library/postgres:15
container_name: zed_postgres
ports:
- 5432:5432
@@ -23,7 +23,7 @@ services:
- ./.blob_store:/data
livekit_server:
- image: livekit/livekit-server
+ image: docker.io/livekit/livekit-server
container_name: livekit_server
entrypoint: /livekit-server --config /livekit.yaml
ports:
@@ -34,7 +34,7 @@ services:
- ./livekit.yaml:/livekit.yaml
postgrest_app:
- image: postgrest/postgrest
+ image: docker.io/postgrest/postgrest
container_name: postgrest_app
ports:
- 8081:8081
@@ -47,7 +47,7 @@ services:
- postgres
postgrest_llm:
- image: postgrest/postgrest
+ image: docker.io/postgrest/postgrest
container_name: postgrest_llm
ports:
- 8082:8082
@@ -60,7 +60,7 @@ services:
- postgres
stripe-mock:
- image: stripe/stripe-mock:v0.178.0
+ image: docker.io/stripe/stripe-mock:v0.178.0
ports:
- 12111:12111
- 12112:12112
@@ -68,7 +68,7 @@ pub trait AgentConnection {
///
/// If the agent does not support model selection, returns [None].
/// This allows sharing the selector in UI components.
- fn model_selector(&self) -> Option<Rc<dyn AgentModelSelector>> {
+ fn model_selector(&self, _session_id: &acp::SessionId) -> Option<Rc<dyn AgentModelSelector>> {
None
}
@@ -177,61 +177,48 @@ pub trait AgentModelSelector: 'static {
/// If the session doesn't exist or the model is invalid, it returns an error.
///
/// # Parameters
- /// - `session_id`: The ID of the session (thread) to apply the model to.
/// - `model`: The model to select (should be one from [list_models]).
/// - `cx`: The GPUI app context.
///
/// # Returns
/// A task resolving to `Ok(())` on success or an error.
- fn select_model(
- &self,
- session_id: acp::SessionId,
- model_id: AgentModelId,
- cx: &mut App,
- ) -> Task<Result<()>>;
+ fn select_model(&self, model_id: acp::ModelId, cx: &mut App) -> Task<Result<()>>;
/// Retrieves the currently selected model for a specific session (thread).
///
/// # Parameters
- /// - `session_id`: The ID of the session (thread) to query.
/// - `cx`: The GPUI app context.
///
/// # Returns
/// A task resolving to the selected model (always set) or an error (e.g., session not found).
- fn selected_model(
- &self,
- session_id: &acp::SessionId,
- cx: &mut App,
- ) -> Task<Result<AgentModelInfo>>;
+ fn selected_model(&self, cx: &mut App) -> Task<Result<AgentModelInfo>>;
/// Whenever the model list is updated the receiver will be notified.
- fn watch(&self, cx: &mut App) -> watch::Receiver<()>;
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct AgentModelId(pub SharedString);
-
-impl std::ops::Deref for AgentModelId {
- type Target = SharedString;
-
- fn deref(&self) -> &Self::Target {
- &self.0
- }
-}
-
-impl fmt::Display for AgentModelId {
- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
- self.0.fmt(f)
+ /// Optional for agents that don't update their model list.
+ fn watch(&self, _cx: &mut App) -> Option<watch::Receiver<()>> {
+ None
}
}
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct AgentModelInfo {
- pub id: AgentModelId,
+ pub id: acp::ModelId,
pub name: SharedString,
+ pub description: Option<SharedString>,
pub icon: Option<IconName>,
}
+impl From<acp::ModelInfo> for AgentModelInfo {
+ fn from(info: acp::ModelInfo) -> Self {
+ Self {
+ id: info.model_id,
+ name: info.name.into(),
+ description: info.description.map(|desc| desc.into()),
+ icon: None,
+ }
+ }
+}
+
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct AgentModelGroupName(pub SharedString);
@@ -56,7 +56,7 @@ struct Session {
pub struct LanguageModels {
/// Access language model by ID
- models: HashMap<acp_thread::AgentModelId, Arc<dyn LanguageModel>>,
+ models: HashMap<acp::ModelId, Arc<dyn LanguageModel>>,
/// Cached list for returning language model information
model_list: acp_thread::AgentModelList,
refresh_models_rx: watch::Receiver<()>,
@@ -132,10 +132,7 @@ impl LanguageModels {
self.refresh_models_rx.clone()
}
- pub fn model_from_id(
- &self,
- model_id: &acp_thread::AgentModelId,
- ) -> Option<Arc<dyn LanguageModel>> {
+ pub fn model_from_id(&self, model_id: &acp::ModelId) -> Option<Arc<dyn LanguageModel>> {
self.models.get(model_id).cloned()
}
@@ -146,12 +143,13 @@ impl LanguageModels {
acp_thread::AgentModelInfo {
id: Self::model_id(model),
name: model.name().0,
+ description: None,
icon: Some(provider.icon()),
}
}
- fn model_id(model: &Arc<dyn LanguageModel>) -> acp_thread::AgentModelId {
- acp_thread::AgentModelId(format!("{}/{}", model.provider_id().0, model.id().0).into())
+ fn model_id(model: &Arc<dyn LanguageModel>) -> acp::ModelId {
+ acp::ModelId(format!("{}/{}", model.provider_id().0, model.id().0).into())
}
fn authenticate_all_language_model_providers(cx: &mut App) -> Task<()> {
@@ -836,10 +834,15 @@ impl NativeAgentConnection {
}
}
-impl AgentModelSelector for NativeAgentConnection {
+struct NativeAgentModelSelector {
+ session_id: acp::SessionId,
+ connection: NativeAgentConnection,
+}
+
+impl acp_thread::AgentModelSelector for NativeAgentModelSelector {
fn list_models(&self, cx: &mut App) -> Task<Result<acp_thread::AgentModelList>> {
log::debug!("NativeAgentConnection::list_models called");
- let list = self.0.read(cx).models.model_list.clone();
+ let list = self.connection.0.read(cx).models.model_list.clone();
Task::ready(if list.is_empty() {
Err(anyhow::anyhow!("No models available"))
} else {
@@ -847,24 +850,24 @@ impl AgentModelSelector for NativeAgentConnection {
})
}
- fn select_model(
- &self,
- session_id: acp::SessionId,
- model_id: acp_thread::AgentModelId,
- cx: &mut App,
- ) -> Task<Result<()>> {
- log::debug!("Setting model for session {}: {}", session_id, model_id);
+ fn select_model(&self, model_id: acp::ModelId, cx: &mut App) -> Task<Result<()>> {
+ log::debug!(
+ "Setting model for session {}: {}",
+ self.session_id,
+ model_id
+ );
let Some(thread) = self
+ .connection
.0
.read(cx)
.sessions
- .get(&session_id)
+ .get(&self.session_id)
.map(|session| session.thread.clone())
else {
return Task::ready(Err(anyhow!("Session not found")));
};
- let Some(model) = self.0.read(cx).models.model_from_id(&model_id) else {
+ let Some(model) = self.connection.0.read(cx).models.model_from_id(&model_id) else {
return Task::ready(Err(anyhow!("Invalid model ID {}", model_id)));
};
@@ -872,33 +875,32 @@ impl AgentModelSelector for NativeAgentConnection {
thread.set_model(model.clone(), cx);
});
- update_settings_file(self.0.read(cx).fs.clone(), cx, move |settings, _cx| {
- let provider = model.provider_id().0.to_string();
- let model = model.id().0.to_string();
- settings
- .agent
- .get_or_insert_default()
- .set_model(LanguageModelSelection {
- provider: provider.into(),
- model,
- });
- });
+ update_settings_file(
+ self.connection.0.read(cx).fs.clone(),
+ cx,
+ move |settings, _cx| {
+ let provider = model.provider_id().0.to_string();
+ let model = model.id().0.to_string();
+ settings
+ .agent
+ .get_or_insert_default()
+ .set_model(LanguageModelSelection {
+ provider: provider.into(),
+ model,
+ });
+ },
+ );
Task::ready(Ok(()))
}
- fn selected_model(
- &self,
- session_id: &acp::SessionId,
- cx: &mut App,
- ) -> Task<Result<acp_thread::AgentModelInfo>> {
- let session_id = session_id.clone();
-
+ fn selected_model(&self, cx: &mut App) -> Task<Result<acp_thread::AgentModelInfo>> {
let Some(thread) = self
+ .connection
.0
.read(cx)
.sessions
- .get(&session_id)
+ .get(&self.session_id)
.map(|session| session.thread.clone())
else {
return Task::ready(Err(anyhow!("Session not found")));
@@ -915,8 +917,8 @@ impl AgentModelSelector for NativeAgentConnection {
)))
}
- fn watch(&self, cx: &mut App) -> watch::Receiver<()> {
- self.0.read(cx).models.watch()
+ fn watch(&self, cx: &mut App) -> Option<watch::Receiver<()>> {
+ Some(self.connection.0.read(cx).models.watch())
}
}
@@ -972,8 +974,11 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
Task::ready(Ok(()))
}
- fn model_selector(&self) -> Option<Rc<dyn AgentModelSelector>> {
- Some(Rc::new(self.clone()) as Rc<dyn AgentModelSelector>)
+ fn model_selector(&self, session_id: &acp::SessionId) -> Option<Rc<dyn AgentModelSelector>> {
+ Some(Rc::new(NativeAgentModelSelector {
+ session_id: session_id.clone(),
+ connection: self.clone(),
+ }) as Rc<dyn AgentModelSelector>)
}
fn prompt(
@@ -1196,9 +1201,7 @@ mod tests {
use crate::HistoryEntryId;
use super::*;
- use acp_thread::{
- AgentConnection, AgentModelGroupName, AgentModelId, AgentModelInfo, MentionUri,
- };
+ use acp_thread::{AgentConnection, AgentModelGroupName, AgentModelInfo, MentionUri};
use fs::FakeFs;
use gpui::TestAppContext;
use indoc::indoc;
@@ -1292,7 +1295,25 @@ mod tests {
.unwrap(),
);
- let models = cx.update(|cx| connection.list_models(cx)).await.unwrap();
+ // Create a thread/session
+ let acp_thread = cx
+ .update(|cx| {
+ Rc::new(connection.clone()).new_thread(project.clone(), Path::new("/a"), cx)
+ })
+ .await
+ .unwrap();
+
+ let session_id = cx.update(|cx| acp_thread.read(cx).session_id().clone());
+
+ let models = cx
+ .update(|cx| {
+ connection
+ .model_selector(&session_id)
+ .unwrap()
+ .list_models(cx)
+ })
+ .await
+ .unwrap();
let acp_thread::AgentModelList::Grouped(models) = models else {
panic!("Unexpected model group");
@@ -1302,8 +1323,9 @@ mod tests {
IndexMap::from_iter([(
AgentModelGroupName("Fake".into()),
vec![AgentModelInfo {
- id: AgentModelId("fake/fake".into()),
+ id: acp::ModelId("fake/fake".into()),
name: "Fake".into(),
+ description: None,
icon: Some(ui::IconName::ZedAssistant),
}]
)])
@@ -1360,8 +1382,9 @@ mod tests {
let session_id = cx.update(|cx| acp_thread.read(cx).session_id().clone());
// Select a model
- let model_id = AgentModelId("fake/fake".into());
- cx.update(|cx| connection.select_model(session_id.clone(), model_id.clone(), cx))
+ let selector = connection.model_selector(&session_id).unwrap();
+ let model_id = acp::ModelId("fake/fake".into());
+ cx.update(|cx| selector.select_model(model_id.clone(), cx))
.await
.unwrap();
@@ -1850,8 +1850,18 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
.unwrap();
let connection = NativeAgentConnection(agent.clone());
+ // Create a thread using new_thread
+ let connection_rc = Rc::new(connection.clone());
+ let acp_thread = cx
+ .update(|cx| connection_rc.new_thread(project, cwd, cx))
+ .await
+ .expect("new_thread should succeed");
+
+ // Get the session_id from the AcpThread
+ let session_id = acp_thread.read_with(cx, |thread, _| thread.session_id().clone());
+
// Test model_selector returns Some
- let selector_opt = connection.model_selector();
+ let selector_opt = connection.model_selector(&session_id);
assert!(
selector_opt.is_some(),
"agent2 should always support ModelSelector"
@@ -1868,23 +1878,16 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
};
assert!(!listed_models.is_empty(), "should have at least one model");
assert_eq!(
- listed_models[&AgentModelGroupName("Fake".into())][0].id.0,
+ listed_models[&AgentModelGroupName("Fake".into())][0]
+ .id
+ .0
+ .as_ref(),
"fake/fake"
);
- // Create a thread using new_thread
- let connection_rc = Rc::new(connection.clone());
- let acp_thread = cx
- .update(|cx| connection_rc.new_thread(project, cwd, cx))
- .await
- .expect("new_thread should succeed");
-
- // Get the session_id from the AcpThread
- let session_id = acp_thread.read_with(cx, |thread, _| thread.session_id().clone());
-
// Test selected_model returns the default
let model = cx
- .update(|cx| selector.selected_model(&session_id, cx))
+ .update(|cx| selector.selected_model(cx))
.await
.expect("selected_model should succeed");
let model = cx
@@ -44,6 +44,7 @@ pub struct AcpConnection {
pub struct AcpSession {
thread: WeakEntity<AcpThread>,
suppress_abort_err: bool,
+ models: Option<Rc<RefCell<acp::SessionModelState>>>,
session_modes: Option<Rc<RefCell<acp::SessionModeState>>>,
}
@@ -264,6 +265,7 @@ impl AgentConnection for AcpConnection {
})?;
let modes = response.modes.map(|modes| Rc::new(RefCell::new(modes)));
+ let models = response.models.map(|models| Rc::new(RefCell::new(models)));
if let Some(default_mode) = default_mode {
if let Some(modes) = modes.as_ref() {
@@ -326,10 +328,12 @@ impl AgentConnection for AcpConnection {
)
})?;
+
let session = AcpSession {
thread: thread.downgrade(),
suppress_abort_err: false,
- session_modes: modes
+ session_modes: modes,
+ models,
};
sessions.borrow_mut().insert(session_id, session);
@@ -450,6 +454,27 @@ impl AgentConnection for AcpConnection {
}
}
+ fn model_selector(
+ &self,
+ session_id: &acp::SessionId,
+ ) -> Option<Rc<dyn acp_thread::AgentModelSelector>> {
+ let sessions = self.sessions.clone();
+ let sessions_ref = sessions.borrow();
+ let Some(session) = sessions_ref.get(session_id) else {
+ return None;
+ };
+
+ if let Some(models) = session.models.as_ref() {
+ Some(Rc::new(AcpModelSelector::new(
+ session_id.clone(),
+ self.connection.clone(),
+ models.clone(),
+ )) as _)
+ } else {
+ None
+ }
+ }
+
fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
self
}
@@ -500,6 +525,82 @@ impl acp_thread::AgentSessionModes for AcpSessionModes {
}
}
+struct AcpModelSelector {
+ session_id: acp::SessionId,
+ connection: Rc<acp::ClientSideConnection>,
+ state: Rc<RefCell<acp::SessionModelState>>,
+}
+
+impl AcpModelSelector {
+ fn new(
+ session_id: acp::SessionId,
+ connection: Rc<acp::ClientSideConnection>,
+ state: Rc<RefCell<acp::SessionModelState>>,
+ ) -> Self {
+ Self {
+ session_id,
+ connection,
+ state,
+ }
+ }
+}
+
+impl acp_thread::AgentModelSelector for AcpModelSelector {
+ fn list_models(&self, _cx: &mut App) -> Task<Result<acp_thread::AgentModelList>> {
+ Task::ready(Ok(acp_thread::AgentModelList::Flat(
+ self.state
+ .borrow()
+ .available_models
+ .clone()
+ .into_iter()
+ .map(acp_thread::AgentModelInfo::from)
+ .collect(),
+ )))
+ }
+
+ fn select_model(&self, model_id: acp::ModelId, cx: &mut App) -> Task<Result<()>> {
+ let connection = self.connection.clone();
+ let session_id = self.session_id.clone();
+ let old_model_id;
+ {
+ let mut state = self.state.borrow_mut();
+ old_model_id = state.current_model_id.clone();
+ state.current_model_id = model_id.clone();
+ };
+ let state = self.state.clone();
+ cx.foreground_executor().spawn(async move {
+ let result = connection
+ .set_session_model(acp::SetSessionModelRequest {
+ session_id,
+ model_id,
+ meta: None,
+ })
+ .await;
+
+ if result.is_err() {
+ state.borrow_mut().current_model_id = old_model_id;
+ }
+
+ result?;
+
+ Ok(())
+ })
+ }
+
+ fn selected_model(&self, _cx: &mut App) -> Task<Result<acp_thread::AgentModelInfo>> {
+ let state = self.state.borrow();
+ Task::ready(
+ state
+ .available_models
+ .iter()
+ .find(|m| m.model_id == state.current_model_id)
+ .cloned()
+ .map(acp_thread::AgentModelInfo::from)
+ .ok_or_else(|| anyhow::anyhow!("Model not found")),
+ )
+ }
+}
+
struct ClientDelegate {
sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
cx: AsyncApp,
@@ -19,6 +19,7 @@ convert_case.workspace = true
fs.workspace = true
gpui.workspace = true
language_model.workspace = true
+project.workspace = true
schemars.workspace = true
serde.workspace = true
settings.workspace = true
@@ -5,6 +5,7 @@ use std::sync::Arc;
use collections::IndexMap;
use gpui::{App, Pixels, px};
use language_model::LanguageModel;
+use project::DisableAiSettings;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use settings::{
@@ -53,6 +54,10 @@ pub struct AgentSettings {
}
impl AgentSettings {
+ pub fn enabled(&self, cx: &App) -> bool {
+ self.enabled && !DisableAiSettings::get_global(cx).disable_ai
+ }
+
pub fn temperature_for_model(model: &Arc<dyn LanguageModel>, cx: &App) -> Option<f32> {
let settings = Self::get_global(cx);
for setting in settings.model_parameters.iter().rev() {
@@ -80,6 +80,7 @@ serde.workspace = true
serde_json.workspace = true
serde_json_lenient.workspace = true
settings.workspace = true
+shlex.workspace = true
smol.workspace = true
streaming_diff.workspace = true
task.workspace = true
@@ -1,7 +1,6 @@
use std::{cmp::Reverse, rc::Rc, sync::Arc};
use acp_thread::{AgentModelInfo, AgentModelList, AgentModelSelector};
-use agent_client_protocol as acp;
use anyhow::Result;
use collections::IndexMap;
use futures::FutureExt;
@@ -10,20 +9,19 @@ use gpui::{Action, AsyncWindowContext, BackgroundExecutor, DismissEvent, Task, W
use ordered_float::OrderedFloat;
use picker::{Picker, PickerDelegate};
use ui::{
- AnyElement, App, Context, IntoElement, ListItem, ListItemSpacing, SharedString, Window,
- prelude::*, rems,
+ AnyElement, App, Context, DocumentationAside, DocumentationEdge, DocumentationSide,
+ IntoElement, ListItem, ListItemSpacing, SharedString, Window, prelude::*, rems,
};
use util::ResultExt;
pub type AcpModelSelector = Picker<AcpModelPickerDelegate>;
pub fn acp_model_selector(
- session_id: acp::SessionId,
selector: Rc<dyn AgentModelSelector>,
window: &mut Window,
cx: &mut Context<AcpModelSelector>,
) -> AcpModelSelector {
- let delegate = AcpModelPickerDelegate::new(session_id, selector, window, cx);
+ let delegate = AcpModelPickerDelegate::new(selector, window, cx);
Picker::list(delegate, window, cx)
.show_scrollbar(true)
.width(rems(20.))
@@ -36,61 +34,63 @@ enum AcpModelPickerEntry {
}
pub struct AcpModelPickerDelegate {
- session_id: acp::SessionId,
selector: Rc<dyn AgentModelSelector>,
filtered_entries: Vec<AcpModelPickerEntry>,
models: Option<AgentModelList>,
selected_index: usize,
+ selected_description: Option<(usize, SharedString)>,
selected_model: Option<AgentModelInfo>,
_refresh_models_task: Task<()>,
}
impl AcpModelPickerDelegate {
fn new(
- session_id: acp::SessionId,
selector: Rc<dyn AgentModelSelector>,
window: &mut Window,
cx: &mut Context<AcpModelSelector>,
) -> Self {
- let mut rx = selector.watch(cx);
- let refresh_models_task = cx.spawn_in(window, {
- let session_id = session_id.clone();
- async move |this, cx| {
- async fn refresh(
- this: &WeakEntity<Picker<AcpModelPickerDelegate>>,
- session_id: &acp::SessionId,
- cx: &mut AsyncWindowContext,
- ) -> Result<()> {
- let (models_task, selected_model_task) = this.update(cx, |this, cx| {
- (
- this.delegate.selector.list_models(cx),
- this.delegate.selector.selected_model(session_id, cx),
- )
- })?;
-
- let (models, selected_model) = futures::join!(models_task, selected_model_task);
+ let rx = selector.watch(cx);
+ let refresh_models_task = {
+ cx.spawn_in(window, {
+ async move |this, cx| {
+ async fn refresh(
+ this: &WeakEntity<Picker<AcpModelPickerDelegate>>,
+ cx: &mut AsyncWindowContext,
+ ) -> Result<()> {
+ let (models_task, selected_model_task) = this.update(cx, |this, cx| {
+ (
+ this.delegate.selector.list_models(cx),
+ this.delegate.selector.selected_model(cx),
+ )
+ })?;
- this.update_in(cx, |this, window, cx| {
- this.delegate.models = models.ok();
- this.delegate.selected_model = selected_model.ok();
- this.refresh(window, cx)
- })
- }
+ let (models, selected_model) =
+ futures::join!(models_task, selected_model_task);
- refresh(&this, &session_id, cx).await.log_err();
- while let Ok(()) = rx.recv().await {
- refresh(&this, &session_id, cx).await.log_err();
+ this.update_in(cx, |this, window, cx| {
+ this.delegate.models = models.ok();
+ this.delegate.selected_model = selected_model.ok();
+ this.refresh(window, cx)
+ })
+ }
+
+ refresh(&this, cx).await.log_err();
+ if let Some(mut rx) = rx {
+ while let Ok(()) = rx.recv().await {
+ refresh(&this, cx).await.log_err();
+ }
+ }
}
- }
- });
+ })
+ };
Self {
- session_id,
selector,
filtered_entries: Vec::new(),
models: None,
selected_model: None,
selected_index: 0,
+ selected_description: None,
_refresh_models_task: refresh_models_task,
}
}
@@ -182,7 +182,7 @@ impl PickerDelegate for AcpModelPickerDelegate {
self.filtered_entries.get(self.selected_index)
{
self.selector
- .select_model(self.session_id.clone(), model_info.id.clone(), cx)
+ .select_model(model_info.id.clone(), cx)
.detach_and_log_err(cx);
self.selected_model = Some(model_info.clone());
let current_index = self.selected_index;
@@ -233,31 +233,46 @@ impl PickerDelegate for AcpModelPickerDelegate {
};
Some(
- ListItem::new(ix)
- .inset(true)
- .spacing(ListItemSpacing::Sparse)
- .toggle_state(selected)
- .start_slot::<Icon>(model_info.icon.map(|icon| {
- Icon::new(icon)
- .color(model_icon_color)
- .size(IconSize::Small)
- }))
+ div()
+ .id(("model-picker-menu-child", ix))
+ .when_some(model_info.description.clone(), |this, description| {
+ this
+ .on_hover(cx.listener(move |menu, hovered, _, cx| {
+ if *hovered {
+ menu.delegate.selected_description = Some((ix, description.clone()));
+ } else if matches!(menu.delegate.selected_description, Some((id, _)) if id == ix) {
+ menu.delegate.selected_description = None;
+ }
+ cx.notify();
+ }))
+ })
.child(
- h_flex()
- .w_full()
- .pl_0p5()
- .gap_1p5()
- .w(px(240.))
- .child(Label::new(model_info.name.clone()).truncate()),
+ ListItem::new(ix)
+ .inset(true)
+ .spacing(ListItemSpacing::Sparse)
+ .toggle_state(selected)
+ .start_slot::<Icon>(model_info.icon.map(|icon| {
+ Icon::new(icon)
+ .color(model_icon_color)
+ .size(IconSize::Small)
+ }))
+ .child(
+ h_flex()
+ .w_full()
+ .pl_0p5()
+ .gap_1p5()
+ .w(px(240.))
+ .child(Label::new(model_info.name.clone()).truncate()),
+ )
+ .end_slot(div().pr_3().when(is_selected, |this| {
+ this.child(
+ Icon::new(IconName::Check)
+ .color(Color::Accent)
+ .size(IconSize::Small),
+ )
+ })),
)
- .end_slot(div().pr_3().when(is_selected, |this| {
- this.child(
- Icon::new(IconName::Check)
- .color(Color::Accent)
- .size(IconSize::Small),
- )
- }))
- .into_any_element(),
+ .into_any_element()
)
}
}
@@ -292,6 +307,21 @@ impl PickerDelegate for AcpModelPickerDelegate {
.into_any(),
)
}
+
+ fn documentation_aside(
+ &self,
+ _window: &mut Window,
+ _cx: &mut Context<Picker<Self>>,
+ ) -> Option<ui::DocumentationAside> {
+ self.selected_description.as_ref().map(|(_, description)| {
+ let description = description.clone();
+ DocumentationAside::new(
+ DocumentationSide::Left,
+ DocumentationEdge::Bottom,
+ Rc::new(move |_| Label::new(description.clone()).into_any_element()),
+ )
+ })
+ }
}
fn info_list_to_picker_entries(
@@ -371,6 +401,7 @@ async fn fuzzy_search(
#[cfg(test)]
mod tests {
+ use agent_client_protocol as acp;
use gpui::TestAppContext;
use super::*;
@@ -383,8 +414,9 @@ mod tests {
models
.into_iter()
.map(|model| acp_thread::AgentModelInfo {
- id: acp_thread::AgentModelId(model.to_string().into()),
+ id: acp::ModelId(model.to_string().into()),
name: model.to_string().into(),
+ description: None,
icon: None,
})
.collect::<Vec<_>>(),
@@ -1,7 +1,6 @@
use std::rc::Rc;
use acp_thread::AgentModelSelector;
-use agent_client_protocol as acp;
use gpui::{Entity, FocusHandle};
use picker::popover_menu::PickerPopoverMenu;
use ui::{
@@ -20,7 +19,6 @@ pub struct AcpModelSelectorPopover {
impl AcpModelSelectorPopover {
pub(crate) fn new(
- session_id: acp::SessionId,
selector: Rc<dyn AgentModelSelector>,
menu_handle: PopoverMenuHandle<AcpModelSelector>,
focus_handle: FocusHandle,
@@ -28,7 +26,7 @@ impl AcpModelSelectorPopover {
cx: &mut Context<Self>,
) -> Self {
Self {
- selector: cx.new(move |cx| acp_model_selector(session_id, selector, window, cx)),
+ selector: cx.new(move |cx| acp_model_selector(selector, window, cx)),
menu_handle,
focus_handle,
}
@@ -9,7 +9,7 @@ use agent_client_protocol::{self as acp, PromptCapabilities};
use agent_servers::{AgentServer, AgentServerDelegate};
use agent_settings::{AgentProfileId, AgentSettings, CompletionMode};
use agent2::{DbThreadMetadata, HistoryEntry, HistoryEntryId, HistoryStore, NativeAgentServer};
-use anyhow::{Result, anyhow, bail};
+use anyhow::{Context as _, Result, anyhow, bail};
use arrayvec::ArrayVec;
use audio::{Audio, Sound};
use buffer_diff::BufferDiff;
@@ -577,23 +577,21 @@ impl AcpThreadView {
AgentDiff::set_active_thread(&workspace, thread.clone(), window, cx);
- this.model_selector =
- thread
- .read(cx)
- .connection()
- .model_selector()
- .map(|selector| {
- cx.new(|cx| {
- AcpModelSelectorPopover::new(
- thread.read(cx).session_id().clone(),
- selector,
- PopoverMenuHandle::default(),
- this.focus_handle(cx),
- window,
- cx,
- )
- })
- });
+ this.model_selector = thread
+ .read(cx)
+ .connection()
+ .model_selector(thread.read(cx).session_id())
+ .map(|selector| {
+ cx.new(|cx| {
+ AcpModelSelectorPopover::new(
+ selector,
+ PopoverMenuHandle::default(),
+ this.focus_handle(cx),
+ window,
+ cx,
+ )
+ })
+ });
let mode_selector = thread
.read(cx)
@@ -1582,6 +1580,19 @@ impl AcpThreadView {
window.spawn(cx, async move |cx| {
let mut task = login.clone();
+ task.command = task
+ .command
+ .map(|command| anyhow::Ok(shlex::try_quote(&command)?.to_string()))
+ .transpose()?;
+ task.args = task
+ .args
+ .iter()
+ .map(|arg| {
+ Ok(shlex::try_quote(arg)
+ .context("Failed to quote argument")?
+ .to_string())
+ })
+ .collect::<Result<Vec<_>>>()?;
task.full_label = task.label.clone();
task.id = task::TaskId(format!("external-agent-{}-login", task.label));
task.command_label = task.label.clone();
@@ -1591,7 +1602,7 @@ impl AcpThreadView {
task.shell = shell;
let terminal = terminal_panel.update_in(cx, |terminal_panel, window, cx| {
- terminal_panel.spawn_task(&login, window, cx)
+ terminal_panel.spawn_task(&task, window, cx)
})?;
let terminal = terminal.await?;
@@ -5669,23 +5680,6 @@ pub(crate) mod tests {
});
}
- #[gpui::test]
- async fn test_spawn_external_agent_login_handles_spaces(cx: &mut TestAppContext) {
- init_test(cx);
-
- // Verify paths with spaces aren't pre-quoted
- let path_with_spaces = "/Users/test/Library/Application Support/Zed/cli.js";
- let login_task = task::SpawnInTerminal {
- command: Some("node".to_string()),
- args: vec![path_with_spaces.to_string(), "/login".to_string()],
- ..Default::default()
- };
-
- // Args should be passed as-is, not pre-quoted
- assert!(!login_task.args[0].starts_with('"'));
- assert!(!login_task.args[0].starts_with('\''));
- }
-
#[gpui::test]
async fn test_notification_for_tool_authorization(cx: &mut TestAppContext) {
init_test(cx);
@@ -543,35 +543,23 @@ impl AgentConfiguration {
window: &mut Window,
cx: &mut Context<Self>,
) -> impl IntoElement {
- let mut registry_descriptors = self
+ let mut context_server_ids = self
.context_server_store
.read(cx)
- .all_registry_descriptor_ids(cx);
- let server_count = registry_descriptors.len();
-
- // Sort context servers: non-mcp-server ones first, then mcp-server ones
- registry_descriptors.sort_by(|a, b| {
- let has_mcp_prefix_a = a.0.starts_with("mcp-server-");
- let has_mcp_prefix_b = b.0.starts_with("mcp-server-");
+ .server_ids(cx)
+ .into_iter()
+ .collect::<Vec<_>>();
- match (has_mcp_prefix_a, has_mcp_prefix_b) {
+ // Sort context servers: ones without mcp-server- prefix first, then prefixed ones
+ context_server_ids.sort_by(|a, b| {
+ const MCP_PREFIX: &str = "mcp-server-";
+ match (a.0.strip_prefix(MCP_PREFIX), b.0.strip_prefix(MCP_PREFIX)) {
// If one has mcp-server- prefix and other doesn't, non-mcp comes first
- (true, false) => std::cmp::Ordering::Greater,
- (false, true) => std::cmp::Ordering::Less,
+ (Some(_), None) => std::cmp::Ordering::Greater,
+ (None, Some(_)) => std::cmp::Ordering::Less,
// If both have same prefix status, sort by appropriate key
- _ => {
- let get_sort_key = |server_id: &str| -> String {
- if let Some(suffix) = server_id.strip_prefix("mcp-server-") {
- suffix.to_string()
- } else {
- server_id.to_string()
- }
- };
-
- let key_a = get_sort_key(&a.0);
- let key_b = get_sort_key(&b.0);
- key_a.cmp(&key_b)
- }
+ (Some(a), Some(b)) => a.cmp(b),
+ (None, None) => a.0.cmp(&b.0),
}
});
@@ -636,8 +624,8 @@ impl AgentConfiguration {
)
.child(add_server_popover),
)
- .child(v_flex().w_full().gap_1().map(|parent| {
- if registry_descriptors.is_empty() {
+ .child(v_flex().w_full().gap_1().map(|mut parent| {
+ if context_server_ids.is_empty() {
parent.child(
h_flex()
.p_4()
@@ -653,26 +641,18 @@ impl AgentConfiguration {
),
)
} else {
- {
- parent.children(registry_descriptors.into_iter().enumerate().flat_map(
- |(index, context_server_id)| {
- let mut elements: Vec<AnyElement> = vec![
- self.render_context_server(context_server_id, window, cx)
- .into_any_element(),
- ];
-
- if index < server_count - 1 {
- elements.push(
- Divider::horizontal()
- .color(DividerColor::BorderFaded)
- .into_any_element(),
- );
- }
-
- elements
- },
- ))
+ for (index, context_server_id) in context_server_ids.into_iter().enumerate() {
+ if index > 0 {
+ parent = parent.child(
+ Divider::horizontal()
+ .color(DividerColor::BorderFaded)
+ .into_any_element(),
+ );
+ }
+ parent =
+ parent.child(self.render_context_server(context_server_id, window, cx));
}
+ parent
}
}))
}
@@ -1106,7 +1086,13 @@ impl AgentConfiguration {
IconName::AiClaude,
"Claude Code",
))
- .children(user_defined_agents),
+ .map(|mut parent| {
+ for agent in user_defined_agents {
+ parent = parent.child(Divider::horizontal().color(DividerColor::BorderFaded))
+ .child(agent);
+ }
+ parent
+ })
)
}
@@ -1,4 +1,4 @@
-use std::ops::{Not, Range};
+use std::ops::Range;
use std::path::Path;
use std::rc::Rc;
use std::sync::Arc;
@@ -408,6 +408,7 @@ impl ActiveView {
pub struct AgentPanel {
workspace: WeakEntity<Workspace>,
+ loading: bool,
user_store: Entity<UserStore>,
project: Entity<Project>,
fs: Arc<dyn Fs>,
@@ -513,6 +514,7 @@ impl AgentPanel {
cx,
)
});
+ panel.as_mut(cx).loading = true;
if let Some(serialized_panel) = serialized_panel {
panel.update(cx, |panel, cx| {
panel.width = serialized_panel.width.map(|w| w.round());
@@ -527,6 +529,7 @@ impl AgentPanel {
panel.new_agent_thread(AgentType::NativeAgent, window, cx);
});
}
+ panel.as_mut(cx).loading = false;
panel
})?;
@@ -662,6 +665,43 @@ impl AgentPanel {
)
});
+ let mut old_disable_ai = false;
+ cx.observe_global_in::<SettingsStore>(window, move |panel, window, cx| {
+ let disable_ai = DisableAiSettings::get_global(cx).disable_ai;
+ if old_disable_ai != disable_ai {
+ let agent_panel_id = cx.entity_id();
+ let agent_panel_visible = panel
+ .workspace
+ .update(cx, |workspace, cx| {
+ let agent_dock_position = panel.position(window, cx);
+ let agent_dock = workspace.dock_at_position(agent_dock_position);
+ let agent_panel_focused = agent_dock
+ .read(cx)
+ .active_panel()
+ .is_some_and(|panel| panel.panel_id() == agent_panel_id);
+
+ let active_panel_visible = agent_dock
+ .read(cx)
+ .visible_panel()
+ .is_some_and(|panel| panel.panel_id() == agent_panel_id);
+
+ if agent_panel_focused {
+ cx.dispatch_action(&ToggleFocus);
+ }
+
+ active_panel_visible
+ })
+ .unwrap_or_default();
+
+ if agent_panel_visible {
+ cx.emit(PanelEvent::Close);
+ }
+
+ old_disable_ai = disable_ai;
+ }
+ })
+ .detach();
+
Self {
active_view,
workspace,
@@ -674,11 +714,9 @@ impl AgentPanel {
prompt_store,
configuration: None,
configuration_subscription: None,
-
inline_assist_context_store,
previous_view: None,
history_store: history_store.clone(),
-
new_thread_menu_handle: PopoverMenuHandle::default(),
agent_panel_menu_handle: PopoverMenuHandle::default(),
assistant_navigation_menu_handle: PopoverMenuHandle::default(),
@@ -691,6 +729,7 @@ impl AgentPanel {
acp_history,
acp_history_store,
selected_agent: AgentType::default(),
+ loading: false,
}
}
@@ -703,7 +742,6 @@ impl AgentPanel {
if workspace
.panel::<Self>(cx)
.is_some_and(|panel| panel.read(cx).enabled(cx))
- && !DisableAiSettings::get_global(cx).disable_ai
{
workspace.toggle_panel_focus::<Self>(window, cx);
}
@@ -823,6 +861,7 @@ impl AgentPanel {
agent: crate::ExternalAgent,
}
+ let loading = self.loading;
let history = self.acp_history_store.clone();
cx.spawn_in(window, async move |this, cx| {
@@ -864,7 +903,9 @@ impl AgentPanel {
}
};
- telemetry::event!("Agent Thread Started", agent = ext_agent.name());
+ if !loading {
+ telemetry::event!("Agent Thread Started", agent = ext_agent.name());
+ }
let server = ext_agent.server(fs, history);
@@ -1499,7 +1540,7 @@ impl Panel for AgentPanel {
}
fn enabled(&self, cx: &App) -> bool {
- DisableAiSettings::get_global(cx).disable_ai.not() && AgentSettings::get_global(cx).enabled
+ AgentSettings::get_global(cx).enabled(cx)
}
fn is_zoomed(&self, _window: &Window, _cx: &App) -> bool {
@@ -251,7 +251,7 @@ pub(crate) fn search_files(
fuzzy::match_path_sets(
candidate_sets.as_slice(),
query.as_str(),
- None,
+ &None,
false,
100,
&cancellation_flag,
@@ -144,8 +144,7 @@ impl InlineAssistant {
let Some(terminal_panel) = workspace.read(cx).panel::<TerminalPanel>(cx) else {
return;
};
- let enabled = !DisableAiSettings::get_global(cx).disable_ai
- && AgentSettings::get_global(cx).enabled;
+ let enabled = AgentSettings::get_global(cx).enabled(cx);
terminal_panel.update(cx, |terminal_panel, cx| {
terminal_panel.set_assistant_enabled(enabled, cx)
});
@@ -257,8 +256,7 @@ impl InlineAssistant {
window: &mut Window,
cx: &mut Context<Workspace>,
) {
- let settings = AgentSettings::get_global(cx);
- if !settings.enabled || DisableAiSettings::get_global(cx).disable_ai {
+ if !AgentSettings::get_global(cx).enabled(cx) {
return;
}
@@ -1788,7 +1786,7 @@ impl CodeActionProvider for AssistantCodeActionProvider {
_: &mut Window,
cx: &mut App,
) -> Task<Result<Vec<CodeAction>>> {
- if !AgentSettings::get_global(cx).enabled {
+ if !AgentSettings::get_global(cx).enabled(cx) {
return Task::ready(Ok(Vec::new()));
}
@@ -2445,7 +2445,7 @@ impl AssistantContext {
.message_anchors
.get(next_message_ix)
.map_or(buffer.len(), |message| {
- buffer.clip_offset(message.start.to_offset(buffer) - 1, Bias::Left)
+ buffer.clip_offset(message.start.to_previous_offset(buffer), Bias::Left)
});
Some(self.insert_message_at_offset(offset, role, status, cx))
} else {
@@ -73,7 +73,7 @@ impl DiagnosticsSlashCommand {
fuzzy::match_path_sets(
candidate_sets.as_slice(),
query.as_str(),
- None,
+ &None,
false,
100,
&cancellation_flag,
@@ -104,7 +104,7 @@ impl FileSlashCommand {
fuzzy::match_path_sets(
candidate_sets.as_slice(),
query.as_str(),
- None,
+ &None,
false,
100,
&cancellation_flag,
@@ -20,6 +20,8 @@ use util::paths::PathWithPosition;
#[cfg(any(target_os = "linux", target_os = "freebsd"))]
use std::io::IsTerminal;
+const URL_PREFIX: [&'static str; 5] = ["zed://", "http://", "https://", "file://", "ssh://"];
+
struct Detect;
trait InstalledApp {
@@ -310,12 +312,7 @@ fn main() -> Result<()> {
let wsl = None;
for path in args.paths_with_position.iter() {
- if path.starts_with("zed://")
- || path.starts_with("http://")
- || path.starts_with("https://")
- || path.starts_with("file://")
- || path.starts_with("ssh://")
- {
+ if URL_PREFIX.iter().any(|&prefix| path.starts_with(prefix)) {
urls.push(path.to_string());
} else if path == "-" && args.paths_with_position.len() == 1 {
let file = NamedTempFile::new()?;
@@ -625,6 +625,15 @@ impl DebugPanel {
})
};
+ let edit_debug_json_button = || {
+ IconButton::new("debug-edit-debug-json", IconName::Code)
+ .icon_size(IconSize::Small)
+ .on_click(|_, window, cx| {
+ window.dispatch_action(zed_actions::OpenProjectDebugTasks.boxed_clone(), cx);
+ })
+ .tooltip(Tooltip::text("Edit debug.json"))
+ };
+
let documentation_button = || {
IconButton::new("debug-open-documentation", IconName::CircleHelp)
.icon_size(IconSize::Small)
@@ -899,8 +908,9 @@ impl DebugPanel {
)
.when(is_side, |this| {
this.child(new_session_button())
- .child(logs_button())
+ .child(edit_debug_json_button())
.child(documentation_button())
+ .child(logs_button())
}),
)
.child(
@@ -951,8 +961,9 @@ impl DebugPanel {
))
.when(!is_side, |this| {
this.child(new_session_button())
- .child(logs_button())
+ .child(edit_debug_json_button())
.child(documentation_button())
+ .child(logs_button())
}),
),
),
@@ -1514,7 +1514,6 @@ impl PickerDelegate for DebugDelegate {
let highlighted_location = HighlightedMatch {
text: hit.string.clone(),
highlight_positions: hit.positions.clone(),
- char_count: hit.string.chars().count(),
color: Color::Default,
};
@@ -12,7 +12,7 @@ use gpui::{
Action as _, AppContext, Context, Corner, Entity, FocusHandle, Focusable, HighlightStyle, Hsla,
Render, Subscription, Task, TextStyle, WeakEntity, actions,
};
-use language::{Anchor, Buffer, CodeLabel, TextBufferSnapshot, ToOffset};
+use language::{Anchor, Buffer, CharScopeContext, CodeLabel, TextBufferSnapshot, ToOffset};
use menu::{Confirm, SelectNext, SelectPrevious};
use project::{
Completion, CompletionDisplayOptions, CompletionResponse,
@@ -575,7 +575,9 @@ impl CompletionProvider for ConsoleQueryBarCompletionProvider {
return false;
}
- let classifier = snapshot.char_classifier_at(position).for_completion(true);
+ let classifier = snapshot
+ .char_classifier_at(position)
+ .scope_context(Some(CharScopeContext::Completion));
if trigger_in_words && classifier.is_word(char) {
return true;
}
@@ -89,6 +89,7 @@ ui.workspace = true
url.workspace = true
util.workspace = true
uuid.workspace = true
+vim_mode_setting.workspace = true
workspace.workspace = true
zed_actions.workspace = true
workspace-hack.workspace = true
@@ -121,10 +121,10 @@ use inlay_hint_cache::{InlayHintCache, InlaySplice, InvalidationStrategy};
use itertools::{Either, Itertools};
use language::{
AutoindentMode, BlockCommentConfig, BracketMatch, BracketPair, Buffer, BufferRow,
- BufferSnapshot, Capability, CharClassifier, CharKind, CodeLabel, CursorShape, DiagnosticEntry,
- DiffOptions, EditPredictionsMode, EditPreview, HighlightedText, IndentKind, IndentSize,
- Language, OffsetRangeExt, Point, Runnable, RunnableRange, Selection, SelectionGoal, TextObject,
- TransactionId, TreeSitterOptions, WordsQuery,
+ BufferSnapshot, Capability, CharClassifier, CharKind, CharScopeContext, CodeLabel, CursorShape,
+ DiagnosticEntry, DiffOptions, EditPredictionsMode, EditPreview, HighlightedText, IndentKind,
+ IndentSize, Language, OffsetRangeExt, Point, Runnable, RunnableRange, Selection, SelectionGoal,
+ TextObject, TransactionId, TreeSitterOptions, WordsQuery,
language_settings::{
self, InlayHintSettings, LspInsertMode, RewrapBehavior, WordsCompletionMode,
all_language_settings, language_settings,
@@ -3123,7 +3123,8 @@ impl Editor {
let position_matches = start_offset == completion_position.to_offset(buffer);
let continue_showing = if position_matches {
if self.snippet_stack.is_empty() {
- buffer.char_kind_before(start_offset, true) == Some(CharKind::Word)
+ buffer.char_kind_before(start_offset, Some(CharScopeContext::Completion))
+ == Some(CharKind::Word)
} else {
// Snippet choices can be shown even when the cursor is in whitespace.
// Dismissing the menu with actions like backspace is handled by
@@ -3551,7 +3552,7 @@ impl Editor {
let position = display_map
.clip_point(position, Bias::Left)
.to_offset(&display_map, Bias::Left);
- let (range, _) = buffer.surrounding_word(position, false);
+ let (range, _) = buffer.surrounding_word(position, None);
start = buffer.anchor_before(range.start);
end = buffer.anchor_before(range.end);
mode = SelectMode::Word(start..end);
@@ -3711,10 +3712,10 @@ impl Editor {
.to_offset(&display_map, Bias::Left);
let original_range = original_range.to_offset(buffer);
- let head_offset = if buffer.is_inside_word(offset, false)
+ let head_offset = if buffer.is_inside_word(offset, None)
|| original_range.contains(&offset)
{
- let (word_range, _) = buffer.surrounding_word(offset, false);
+ let (word_range, _) = buffer.surrounding_word(offset, None);
if word_range.start < original_range.start {
word_range.start
} else {
@@ -4244,7 +4245,7 @@ impl Editor {
let is_word_char = text.chars().next().is_none_or(|char| {
let classifier = snapshot
.char_classifier_at(start_anchor.to_offset(&snapshot))
- .ignore_punctuation(true);
+ .scope_context(Some(CharScopeContext::LinkedEdit));
classifier.is_word(char)
});
@@ -5101,7 +5102,8 @@ impl Editor {
fn completion_query(buffer: &MultiBufferSnapshot, position: impl ToOffset) -> Option<String> {
let offset = position.to_offset(buffer);
- let (word_range, kind) = buffer.surrounding_word(offset, true);
+ let (word_range, kind) =
+ buffer.surrounding_word(offset, Some(CharScopeContext::Completion));
if offset > word_range.start && kind == Some(CharKind::Word) {
Some(
buffer
@@ -5571,7 +5573,7 @@ impl Editor {
} = buffer_position;
let (word_replace_range, word_to_exclude) = if let (word_range, Some(CharKind::Word)) =
- buffer_snapshot.surrounding_word(buffer_position, false)
+ buffer_snapshot.surrounding_word(buffer_position, None)
{
let word_to_exclude = buffer_snapshot
.text_for_range(word_range.clone())
@@ -6787,8 +6789,8 @@ impl Editor {
}
let snapshot = cursor_buffer.read(cx).snapshot();
- let (start_word_range, _) = snapshot.surrounding_word(cursor_buffer_position, false);
- let (end_word_range, _) = snapshot.surrounding_word(tail_buffer_position, false);
+ let (start_word_range, _) = snapshot.surrounding_word(cursor_buffer_position, None);
+ let (end_word_range, _) = snapshot.surrounding_word(tail_buffer_position, None);
if start_word_range != end_word_range {
self.document_highlights_task.take();
self.clear_background_highlights::<DocumentHighlightRead>(cx);
@@ -11440,7 +11442,7 @@ impl Editor {
let selection_is_empty = selection.is_empty();
let (start, end) = if selection_is_empty {
- let (word_range, _) = buffer.surrounding_word(selection.start, false);
+ let (word_range, _) = buffer.surrounding_word(selection.start, None);
(word_range.start, word_range.end)
} else {
(
@@ -12450,13 +12452,14 @@ impl Editor {
return;
}
- let clipboard_text = Cow::Borrowed(text);
+ let clipboard_text = Cow::Borrowed(text.as_str());
self.transact(window, cx, |this, window, cx| {
let had_active_edit_prediction = this.has_active_edit_prediction();
+ let old_selections = this.selections.all::<usize>(cx);
+ let cursor_offset = this.selections.last::<usize>(cx).head();
if let Some(mut clipboard_selections) = clipboard_selections {
- let old_selections = this.selections.all::<usize>(cx);
let all_selections_were_entire_line =
clipboard_selections.iter().all(|s| s.is_entire_line);
let first_selection_indent_column =
@@ -12464,7 +12467,6 @@ impl Editor {
if clipboard_selections.len() != old_selections.len() {
clipboard_selections.drain(..);
}
- let cursor_offset = this.selections.last::<usize>(cx).head();
let mut auto_indent_on_paste = true;
this.buffer.update(cx, |buffer, cx| {
@@ -12487,22 +12489,36 @@ impl Editor {
start_offset = end_offset + 1;
original_indent_column = Some(clipboard_selection.first_line_indent);
} else {
- to_insert = clipboard_text.as_str();
+ to_insert = &*clipboard_text;
entire_line = all_selections_were_entire_line;
original_indent_column = first_selection_indent_column
}
- // If the corresponding selection was empty when this slice of the
- // clipboard text was written, then the entire line containing the
- // selection was copied. If this selection is also currently empty,
- // then paste the line before the current line of the buffer.
- let range = if selection.is_empty() && handle_entire_lines && entire_line {
- let column = selection.start.to_point(&snapshot).column as usize;
- let line_start = selection.start - column;
- line_start..line_start
- } else {
- selection.range()
- };
+ let (range, to_insert) =
+ if selection.is_empty() && handle_entire_lines && entire_line {
+ // If the corresponding selection was empty when this slice of the
+ // clipboard text was written, then the entire line containing the
+ // selection was copied. If this selection is also currently empty,
+ // then paste the line before the current line of the buffer.
+ let column = selection.start.to_point(&snapshot).column as usize;
+ let line_start = selection.start - column;
+ (line_start..line_start, Cow::Borrowed(to_insert))
+ } else {
+ let language = snapshot.language_at(selection.head());
+ let range = selection.range();
+ if let Some(language) = language
+ && language.name() == "Markdown".into()
+ {
+ edit_for_markdown_paste(
+ &snapshot,
+ range,
+ to_insert,
+ url::Url::parse(to_insert).ok(),
+ )
+ } else {
+ (range, Cow::Borrowed(to_insert))
+ }
+ };
edits.push((range, to_insert));
original_indent_columns.push(original_indent_column);
@@ -12525,7 +12541,53 @@ impl Editor {
let selections = this.selections.all::<usize>(cx);
this.change_selections(Default::default(), window, cx, |s| s.select(selections));
} else {
- this.insert(&clipboard_text, window, cx);
+ let url = url::Url::parse(&clipboard_text).ok();
+
+ let auto_indent_mode = if !clipboard_text.is_empty() {
+ Some(AutoindentMode::Block {
+ original_indent_columns: Vec::new(),
+ })
+ } else {
+ None
+ };
+
+ let selection_anchors = this.buffer.update(cx, |buffer, cx| {
+ let snapshot = buffer.snapshot(cx);
+
+ let anchors = old_selections
+ .iter()
+ .map(|s| {
+ let anchor = snapshot.anchor_after(s.head());
+ s.map(|_| anchor)
+ })
+ .collect::<Vec<_>>();
+
+ let mut edits = Vec::new();
+
+ for selection in old_selections.iter() {
+ let language = snapshot.language_at(selection.head());
+ let range = selection.range();
+
+ let (edit_range, edit_text) = if let Some(language) = language
+ && language.name() == "Markdown".into()
+ {
+ edit_for_markdown_paste(&snapshot, range, &clipboard_text, url.clone())
+ } else {
+ (range, clipboard_text.clone())
+ };
+
+ edits.push((edit_range, edit_text));
+ }
+
+ drop(snapshot);
+ buffer.edit(edits, auto_indent_mode, cx);
+
+ anchors
+ });
+
+ this.change_selections(Default::default(), window, cx, |s| {
+ s.select_anchors(selection_anchors);
+ });
}
let trigger_in_words =
@@ -14206,8 +14268,8 @@ impl Editor {
start_offset + query_match.start()..start_offset + query_match.end();
if !select_next_state.wordwise
- || (!buffer.is_inside_word(offset_range.start, false)
- && !buffer.is_inside_word(offset_range.end, false))
+ || (!buffer.is_inside_word(offset_range.start, None)
+ && !buffer.is_inside_word(offset_range.end, None))
{
// TODO: This is n^2, because we might check all the selections
if !selections
@@ -14271,7 +14333,7 @@ impl Editor {
if only_carets {
for selection in &mut selections {
- let (word_range, _) = buffer.surrounding_word(selection.start, false);
+ let (word_range, _) = buffer.surrounding_word(selection.start, None);
selection.start = word_range.start;
selection.end = word_range.end;
selection.goal = SelectionGoal::None;
@@ -14356,8 +14418,8 @@ impl Editor {
};
if !select_next_state.wordwise
- || (!buffer.is_inside_word(offset_range.start, false)
- && !buffer.is_inside_word(offset_range.end, false))
+ || (!buffer.is_inside_word(offset_range.start, None)
+ && !buffer.is_inside_word(offset_range.end, None))
{
new_selections.push(offset_range.start..offset_range.end);
}
@@ -14431,8 +14493,8 @@ impl Editor {
end_offset - query_match.end()..end_offset - query_match.start();
if !select_prev_state.wordwise
- || (!buffer.is_inside_word(offset_range.start, false)
- && !buffer.is_inside_word(offset_range.end, false))
+ || (!buffer.is_inside_word(offset_range.start, None)
+ && !buffer.is_inside_word(offset_range.end, None))
{
next_selected_range = Some(offset_range);
break;
@@ -14490,7 +14552,7 @@ impl Editor {
if only_carets {
for selection in &mut selections {
- let (word_range, _) = buffer.surrounding_word(selection.start, false);
+ let (word_range, _) = buffer.surrounding_word(selection.start, None);
selection.start = word_range.start;
selection.end = word_range.end;
selection.goal = SelectionGoal::None;
@@ -14968,11 +15030,10 @@ impl Editor {
if let Some((node, _)) = buffer.syntax_ancestor(old_range.clone()) {
// manually select word at selection
if ["string_content", "inline"].contains(&node.kind()) {
- let (word_range, _) = buffer.surrounding_word(old_range.start, false);
+ let (word_range, _) = buffer.surrounding_word(old_range.start, None);
// ignore if word is already selected
if !word_range.is_empty() && old_range != word_range {
- let (last_word_range, _) =
- buffer.surrounding_word(old_range.end, false);
+ let (last_word_range, _) = buffer.surrounding_word(old_range.end, None);
// only select word if start and end point belongs to same word
if word_range == last_word_range {
selected_larger_node = true;
@@ -19247,6 +19308,8 @@ impl Editor {
&& let Some(path) = path.to_str()
{
cx.write_to_clipboard(ClipboardItem::new_string(path.to_string()));
+ } else {
+ cx.propagate();
}
}
@@ -19260,6 +19323,8 @@ impl Editor {
&& let Some(path) = path.to_str()
{
cx.write_to_clipboard(ClipboardItem::new_string(path.to_string()));
+ } else {
+ cx.propagate();
}
}
@@ -21678,12 +21743,30 @@ impl Editor {
}
}
-// todo(settings_refactor) this should not be!
+fn edit_for_markdown_paste<'a>(
+ buffer: &MultiBufferSnapshot,
+ range: Range<usize>,
+ to_insert: &'a str,
+ url: Option<url::Url>,
+) -> (Range<usize>, Cow<'a, str>) {
+ if url.is_none() {
+ return (range, Cow::Borrowed(to_insert));
+ };
+
+ let old_text = buffer.text_for_range(range.clone()).collect::<String>();
+
+ let new_text = if range.is_empty() || url::Url::parse(&old_text).is_ok() {
+ Cow::Borrowed(to_insert)
+ } else {
+ Cow::Owned(format!("[{old_text}]({to_insert})"))
+ };
+ (range, new_text)
+}
+
fn vim_enabled(cx: &App) -> bool {
- cx.global::<SettingsStore>()
- .raw_user_settings()
- .and_then(|settings| settings.content.vim_mode)
- == Some(true)
+ vim_mode_setting::VimModeSetting::try_get(cx)
+ .map(|vim_mode| vim_mode.0)
+ .unwrap_or(false)
}
fn process_completion_for_edit(
@@ -22547,7 +22630,8 @@ fn snippet_completions(
let mut is_incomplete = false;
let mut completions: Vec<Completion> = Vec::new();
for (scope, snippets) in scopes.into_iter() {
- let classifier = CharClassifier::new(Some(scope)).for_completion(true);
+ let classifier =
+ CharClassifier::new(Some(scope)).scope_context(Some(CharScopeContext::Completion));
let mut last_word = chars
.chars()
.take_while(|c| classifier.is_word(*c))
@@ -22768,7 +22852,9 @@ impl CompletionProvider for Entity<Project> {
if !menu_is_open && !snapshot.settings_at(position, cx).show_completions_on_input {
return false;
}
- let classifier = snapshot.char_classifier_at(position).for_completion(true);
+ let classifier = snapshot
+ .char_classifier_at(position)
+ .scope_context(Some(CharScopeContext::Completion));
if trigger_in_words && classifier.is_word(char) {
return true;
}
@@ -22881,7 +22967,7 @@ impl SemanticsProvider for Entity<Project> {
// Fallback on using TreeSitter info to determine identifier range
buffer.read_with(cx, |buffer, _| {
let snapshot = buffer.snapshot();
- let (range, kind) = snapshot.surrounding_word(position, false);
+ let (range, kind) = snapshot.surrounding_word(position, None);
if kind != Some(CharKind::Word) {
return None;
}
@@ -13,6 +13,7 @@ use crate::{
},
};
use buffer_diff::{BufferDiff, DiffHunkSecondaryStatus, DiffHunkStatus, DiffHunkStatusKind};
+use collections::HashMap;
use futures::StreamExt;
use gpui::{
BackgroundExecutor, DismissEvent, Rgba, SemanticVersion, TestAppContext, UpdateGlobal,
@@ -23773,6 +23774,28 @@ async fn test_hide_mouse_context_menu_on_modal_opened(cx: &mut TestAppContext) {
});
}
+fn set_linked_edit_ranges(
+ opening: (Point, Point),
+ closing: (Point, Point),
+ editor: &mut Editor,
+ cx: &mut Context<Editor>,
+) {
+ let Some((buffer, _)) = editor
+ .buffer
+ .read(cx)
+ .text_anchor_for_position(editor.selections.newest_anchor().start, cx)
+ else {
+ panic!("Failed to get buffer for selection position");
+ };
+ let buffer = buffer.read(cx);
+ let buffer_id = buffer.remote_id();
+ let opening_range = buffer.anchor_before(opening.0)..buffer.anchor_after(opening.1);
+ let closing_range = buffer.anchor_before(closing.0)..buffer.anchor_after(closing.1);
+ let mut linked_ranges = HashMap::default();
+ linked_ranges.insert(buffer_id, vec![(opening_range, vec![closing_range])]);
+ editor.linked_edit_ranges = LinkedEditingRanges(linked_ranges);
+}
+
#[gpui::test]
async fn test_html_linked_edits_on_completion(cx: &mut TestAppContext) {
init_test(cx, |_| {});
@@ -23851,22 +23874,12 @@ async fn test_html_linked_edits_on_completion(cx: &mut TestAppContext) {
editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
selections.select_ranges([Point::new(0, 3)..Point::new(0, 3)]);
});
- let Some((buffer, _)) = editor
- .buffer
- .read(cx)
- .text_anchor_for_position(editor.selections.newest_anchor().start, cx)
- else {
- panic!("Failed to get buffer for selection position");
- };
- let buffer = buffer.read(cx);
- let buffer_id = buffer.remote_id();
- let opening_range =
- buffer.anchor_before(Point::new(0, 1))..buffer.anchor_after(Point::new(0, 3));
- let closing_range =
- buffer.anchor_before(Point::new(0, 6))..buffer.anchor_after(Point::new(0, 8));
- let mut linked_ranges = HashMap::default();
- linked_ranges.insert(buffer_id, vec![(opening_range, vec![closing_range])]);
- editor.linked_edit_ranges = LinkedEditingRanges(linked_ranges);
+ set_linked_edit_ranges(
+ (Point::new(0, 1), Point::new(0, 3)),
+ (Point::new(0, 6), Point::new(0, 8)),
+ editor,
+ cx,
+ );
});
let mut completion_handle =
fake_server.set_request_handler::<lsp::request::Completion, _, _>(move |_, _| async move {
@@ -23910,6 +23923,77 @@ async fn test_html_linked_edits_on_completion(cx: &mut TestAppContext) {
});
}
+#[gpui::test]
+async fn test_linked_edits_on_typing_punctuation(cx: &mut TestAppContext) {
+ init_test(cx, |_| {});
+
+ let mut cx = EditorTestContext::new(cx).await;
+ let language = Arc::new(Language::new(
+ LanguageConfig {
+ name: "TSX".into(),
+ matcher: LanguageMatcher {
+ path_suffixes: vec!["tsx".to_string()],
+ ..LanguageMatcher::default()
+ },
+ brackets: BracketPairConfig {
+ pairs: vec![BracketPair {
+ start: "<".into(),
+ end: ">".into(),
+ close: true,
+ ..Default::default()
+ }],
+ ..Default::default()
+ },
+ linked_edit_characters: HashSet::from_iter(['.']),
+ ..Default::default()
+ },
+ Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
+ ));
+ cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
+
+ // Test typing > does not extend linked pair
+ cx.set_state("<divˇ<div></div>");
+ cx.update_editor(|editor, _, cx| {
+ set_linked_edit_ranges(
+ (Point::new(0, 1), Point::new(0, 4)),
+ (Point::new(0, 11), Point::new(0, 14)),
+ editor,
+ cx,
+ );
+ });
+ cx.update_editor(|editor, window, cx| {
+ editor.handle_input(">", window, cx);
+ });
+ cx.assert_editor_state("<div>ˇ<div></div>");
+
+ // Test typing . do extend linked pair
+ cx.set_state("<Animatedˇ></Animated>");
+ cx.update_editor(|editor, _, cx| {
+ set_linked_edit_ranges(
+ (Point::new(0, 1), Point::new(0, 9)),
+ (Point::new(0, 12), Point::new(0, 20)),
+ editor,
+ cx,
+ );
+ });
+ cx.update_editor(|editor, window, cx| {
+ editor.handle_input(".", window, cx);
+ });
+ cx.assert_editor_state("<Animated.ˇ></Animated.>");
+ cx.update_editor(|editor, _, cx| {
+ set_linked_edit_ranges(
+ (Point::new(0, 1), Point::new(0, 10)),
+ (Point::new(0, 13), Point::new(0, 21)),
+ editor,
+ cx,
+ );
+ });
+ cx.update_editor(|editor, window, cx| {
+ editor.handle_input("V", window, cx);
+ });
+ cx.assert_editor_state("<Animated.Vˇ></Animated.V>");
+}
+
#[gpui::test]
async fn test_invisible_worktree_servers(cx: &mut TestAppContext) {
init_test(cx, |_| {});
@@ -25890,6 +25974,217 @@ let result = variable * 2;",
);
}
+#[gpui::test]
+async fn test_paste_url_from_other_app_creates_markdown_link_over_selected_text(
+ cx: &mut gpui::TestAppContext,
+) {
+ init_test(cx, |_| {});
+
+ let url = "https://zed.dev";
+
+ let markdown_language = Arc::new(Language::new(
+ LanguageConfig {
+ name: "Markdown".into(),
+ ..LanguageConfig::default()
+ },
+ None,
+ ));
+
+ let mut cx = EditorTestContext::new(cx).await;
+ cx.update_buffer(|buffer, cx| buffer.set_language(Some(markdown_language), cx));
+ cx.set_state("Hello, «editorˇ».\nZed is «ˇgreat» (see this link: ˇ)");
+
+ cx.update_editor(|editor, window, cx| {
+ cx.write_to_clipboard(ClipboardItem::new_string(url.to_string()));
+ editor.paste(&Paste, window, cx);
+ });
+
+ cx.assert_editor_state(&format!(
+ "Hello, [editor]({url})ˇ.\nZed is [great]({url})ˇ (see this link: {url}ˇ)"
+ ));
+}
+
+#[gpui::test]
+async fn test_paste_url_from_zed_copy_creates_markdown_link_over_selected_text(
+ cx: &mut gpui::TestAppContext,
+) {
+ init_test(cx, |_| {});
+
+ let url = "https://zed.dev";
+
+ let markdown_language = Arc::new(Language::new(
+ LanguageConfig {
+ name: "Markdown".into(),
+ ..LanguageConfig::default()
+ },
+ None,
+ ));
+
+ let mut cx = EditorTestContext::new(cx).await;
+ cx.update_buffer(|buffer, cx| buffer.set_language(Some(markdown_language), cx));
+ cx.set_state(&format!(
+ "Hello, editor.\nZed is great (see this link: )\n«{url}ˇ»"
+ ));
+
+ cx.update_editor(|editor, window, cx| {
+ editor.copy(&Copy, window, cx);
+ });
+
+ cx.set_state(&format!(
+ "Hello, «editorˇ».\nZed is «ˇgreat» (see this link: ˇ)\n{url}"
+ ));
+
+ cx.update_editor(|editor, window, cx| {
+ editor.paste(&Paste, window, cx);
+ });
+
+ cx.assert_editor_state(&format!(
+ "Hello, [editor]({url})ˇ.\nZed is [great]({url})ˇ (see this link: {url}ˇ)\n{url}"
+ ));
+}
+
+#[gpui::test]
+async fn test_paste_url_from_other_app_replaces_existing_url_without_creating_markdown_link(
+ cx: &mut gpui::TestAppContext,
+) {
+ init_test(cx, |_| {});
+
+ let url = "https://zed.dev";
+
+ let markdown_language = Arc::new(Language::new(
+ LanguageConfig {
+ name: "Markdown".into(),
+ ..LanguageConfig::default()
+ },
+ None,
+ ));
+
+ let mut cx = EditorTestContext::new(cx).await;
+ cx.update_buffer(|buffer, cx| buffer.set_language(Some(markdown_language), cx));
+ cx.set_state("Please visit zed's homepage: «https://www.apple.comˇ»");
+
+ cx.update_editor(|editor, window, cx| {
+ cx.write_to_clipboard(ClipboardItem::new_string(url.to_string()));
+ editor.paste(&Paste, window, cx);
+ });
+
+ cx.assert_editor_state(&format!("Please visit zed's homepage: {url}ˇ"));
+}
+
+#[gpui::test]
+async fn test_paste_plain_text_from_other_app_replaces_selection_without_creating_markdown_link(
+ cx: &mut gpui::TestAppContext,
+) {
+ init_test(cx, |_| {});
+
+ let text = "Awesome";
+
+ let markdown_language = Arc::new(Language::new(
+ LanguageConfig {
+ name: "Markdown".into(),
+ ..LanguageConfig::default()
+ },
+ None,
+ ));
+
+ let mut cx = EditorTestContext::new(cx).await;
+ cx.update_buffer(|buffer, cx| buffer.set_language(Some(markdown_language), cx));
+ cx.set_state("Hello, «editorˇ».\nZed is «ˇgreat»");
+
+ cx.update_editor(|editor, window, cx| {
+ cx.write_to_clipboard(ClipboardItem::new_string(text.to_string()));
+ editor.paste(&Paste, window, cx);
+ });
+
+ cx.assert_editor_state(&format!("Hello, {text}ˇ.\nZed is {text}ˇ"));
+}
+
+#[gpui::test]
+async fn test_paste_url_from_other_app_without_creating_markdown_link_in_non_markdown_language(
+ cx: &mut gpui::TestAppContext,
+) {
+ init_test(cx, |_| {});
+
+ let url = "https://zed.dev";
+
+ let markdown_language = Arc::new(Language::new(
+ LanguageConfig {
+ name: "Rust".into(),
+ ..LanguageConfig::default()
+ },
+ None,
+ ));
+
+ let mut cx = EditorTestContext::new(cx).await;
+ cx.update_buffer(|buffer, cx| buffer.set_language(Some(markdown_language), cx));
+ cx.set_state("// Hello, «editorˇ».\n// Zed is «ˇgreat» (see this link: ˇ)");
+
+ cx.update_editor(|editor, window, cx| {
+ cx.write_to_clipboard(ClipboardItem::new_string(url.to_string()));
+ editor.paste(&Paste, window, cx);
+ });
+
+ cx.assert_editor_state(&format!(
+ "// Hello, {url}ˇ.\n// Zed is {url}ˇ (see this link: {url}ˇ)"
+ ));
+}
+
+#[gpui::test]
+async fn test_paste_url_from_other_app_creates_markdown_link_selectively_in_multi_buffer(
+ cx: &mut TestAppContext,
+) {
+ init_test(cx, |_| {});
+
+ let url = "https://zed.dev";
+
+ let markdown_language = Arc::new(Language::new(
+ LanguageConfig {
+ name: "Markdown".into(),
+ ..LanguageConfig::default()
+ },
+ None,
+ ));
+
+ let (editor, cx) = cx.add_window_view(|window, cx| {
+ let multi_buffer = MultiBuffer::build_multi(
+ [
+ ("this will embed -> link", vec![Point::row_range(0..1)]),
+ ("this will replace -> link", vec![Point::row_range(0..1)]),
+ ],
+ cx,
+ );
+ let mut editor = Editor::new(EditorMode::full(), multi_buffer.clone(), None, window, cx);
+ editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+ s.select_ranges(vec![
+ Point::new(0, 19)..Point::new(0, 23),
+ Point::new(1, 21)..Point::new(1, 25),
+ ])
+ });
+ let first_buffer_id = multi_buffer
+ .read(cx)
+ .excerpt_buffer_ids()
+ .into_iter()
+ .next()
+ .unwrap();
+ let first_buffer = multi_buffer.read(cx).buffer(first_buffer_id).unwrap();
+ first_buffer.update(cx, |buffer, cx| {
+ buffer.set_language(Some(markdown_language.clone()), cx);
+ });
+
+ editor
+ });
+ let mut cx = EditorTestContext::for_editor_in(editor.clone(), cx).await;
+
+ cx.update_editor(|editor, window, cx| {
+ cx.write_to_clipboard(ClipboardItem::new_string(url.to_string()));
+ editor.paste(&Paste, window, cx);
+ });
+
+ cx.assert_editor_state(&format!(
+ "this will embed -> [link]({url})ˇ\nthis will replace -> {url}ˇ"
+ ));
+}
+
#[track_caller]
fn extract_color_inlays(editor: &Editor, cx: &App) -> Vec<Rgba> {
editor
@@ -3838,7 +3838,11 @@ impl EditorElement {
Tooltip::with_meta_in(
"Toggle Excerpt Fold",
Some(&ToggleFold),
- "Alt+click to toggle all",
+ if cfg!(target_os = "macos") {
+ "Option+click to toggle all"
+ } else {
+ "Alt+click to toggle all"
+ },
&focus_handle,
window,
cx,
@@ -29,7 +29,9 @@ pub fn refresh_matching_bracket_highlights(
if (editor.cursor_shape == CursorShape::Block || editor.cursor_shape == CursorShape::Hollow)
&& head < snapshot.buffer_snapshot.len()
{
- tail += 1;
+ if let Some(tail_ch) = snapshot.buffer_snapshot.chars_at(tail).next() {
+ tail += tail_ch.len_utf8();
+ }
}
if let Some((opening_range, closing_range)) = snapshot
@@ -627,7 +627,7 @@ pub fn show_link_definition(
TriggerPoint::Text(trigger_anchor) => {
// If no symbol range returned from language server, use the surrounding word.
let (offset_range, _) =
- snapshot.surrounding_word(*trigger_anchor, false);
+ snapshot.surrounding_word(*trigger_anchor, None);
RangeInEditor::Text(
snapshot.anchor_before(offset_range.start)
..snapshot.anchor_after(offset_range.end),
@@ -17,8 +17,8 @@ use gpui::{
ParentElement, Pixels, SharedString, Styled, Task, WeakEntity, Window, point,
};
use language::{
- Bias, Buffer, BufferRow, CharKind, DiskState, LocalFile, Point, SelectionGoal,
- proto::serialize_anchor as serialize_text_anchor,
+ Bias, Buffer, BufferRow, CharKind, CharScopeContext, DiskState, LocalFile, Point,
+ SelectionGoal, proto::serialize_anchor as serialize_text_anchor,
};
use lsp::DiagnosticSeverity;
use project::{
@@ -1573,7 +1573,8 @@ impl SearchableItem for Editor {
}
SeedQuerySetting::Selection => String::new(),
SeedQuerySetting::Always => {
- let (range, kind) = snapshot.surrounding_word(selection.start, true);
+ let (range, kind) =
+ snapshot.surrounding_word(selection.start, Some(CharScopeContext::Completion));
if kind == Some(CharKind::Word) {
let text: String = snapshot.text_for_range(range).collect();
if !text.trim().is_empty() {
@@ -35,7 +35,7 @@ use util::{archive::extract_zip, fs::make_file_executable, maybe};
use wasmtime::component::{Linker, Resource};
pub const MIN_VERSION: SemanticVersion = SemanticVersion::new(0, 6, 0);
-pub const MAX_VERSION: SemanticVersion = SemanticVersion::new(0, 6, 0);
+pub const MAX_VERSION: SemanticVersion = SemanticVersion::new(0, 7, 0);
wasmtime::component::bindgen!({
async: true,
@@ -886,14 +886,14 @@ impl FileFinderDelegate {
.collect::<Vec<_>>();
let search_id = util::post_inc(&mut self.search_count);
- self.cancel_flag.store(true, atomic::Ordering::Relaxed);
+ self.cancel_flag.store(true, atomic::Ordering::Release);
self.cancel_flag = Arc::new(AtomicBool::new(false));
let cancel_flag = self.cancel_flag.clone();
cx.spawn_in(window, async move |picker, cx| {
let matches = fuzzy::match_path_sets(
candidate_sets.as_slice(),
query.path_query(),
- relative_to,
+ &relative_to,
false,
100,
&cancel_flag,
@@ -902,7 +902,7 @@ impl FileFinderDelegate {
.await
.into_iter()
.map(ProjectPanelOrdMatch);
- let did_cancel = cancel_flag.load(atomic::Ordering::Relaxed);
+ let did_cancel = cancel_flag.load(atomic::Ordering::Acquire);
picker
.update(cx, |picker, cx| {
picker
@@ -76,7 +76,7 @@ impl<'a> Matcher<'a> {
continue;
}
- if cancel_flag.load(atomic::Ordering::Relaxed) {
+ if cancel_flag.load(atomic::Ordering::Acquire) {
break;
}
@@ -121,7 +121,7 @@ pub fn match_fixed_path_set(
pub async fn match_path_sets<'a, Set: PathMatchCandidateSet<'a>>(
candidate_sets: &'a [Set],
query: &str,
- relative_to: Option<Arc<Path>>,
+ relative_to: &Option<Arc<Path>>,
smart_case: bool,
max_results: usize,
cancel_flag: &AtomicBool,
@@ -148,7 +148,6 @@ pub async fn match_path_sets<'a, Set: PathMatchCandidateSet<'a>>(
executor
.scoped(|scope| {
for (segment_idx, results) in segment_results.iter_mut().enumerate() {
- let relative_to = relative_to.clone();
scope.spawn(async move {
let segment_start = segment_idx * segment_size;
let segment_end = segment_start + segment_size;
@@ -157,7 +156,7 @@ pub async fn match_path_sets<'a, Set: PathMatchCandidateSet<'a>>(
let mut tree_start = 0;
for candidate_set in candidate_sets {
- if cancel_flag.load(atomic::Ordering::Relaxed) {
+ if cancel_flag.load(atomic::Ordering::Acquire) {
break;
}
@@ -209,7 +208,7 @@ pub async fn match_path_sets<'a, Set: PathMatchCandidateSet<'a>>(
})
.await;
- if cancel_flag.load(atomic::Ordering::Relaxed) {
+ if cancel_flag.load(atomic::Ordering::Acquire) {
return Vec::new();
}
@@ -189,7 +189,7 @@ where
})
.await;
- if cancel_flag.load(atomic::Ordering::Relaxed) {
+ if cancel_flag.load(atomic::Ordering::Acquire) {
return Vec::new();
}
@@ -2,9 +2,10 @@ use editor::Editor;
use futures::channel::oneshot;
use gpui::{AppContext, DismissEvent, Entity, EventEmitter, Focusable, Styled};
use ui::{
- ActiveTheme, App, Context, DynamicSpacing, Headline, HeadlineSize, Icon, IconName, IconSize,
- InteractiveElement, IntoElement, ParentElement, Render, SharedString, StyledExt,
- StyledTypography, Window, div, h_flex, v_flex,
+ ActiveTheme, AnyElement, App, Button, Clickable, Color, Context, DynamicSpacing, Headline,
+ HeadlineSize, Icon, IconName, IconSize, InteractiveElement, IntoElement, Label, LabelCommon,
+ LabelSize, ParentElement, Render, SharedString, StyledExt, StyledTypography, Window, div,
+ h_flex, v_flex,
};
use workspace::ModalView;
@@ -33,7 +34,7 @@ impl AskPassModal {
) -> Self {
let editor = cx.new(|cx| {
let mut editor = Editor::single_line(window, cx);
- if prompt.contains("yes/no") {
+ if prompt.contains("yes/no") || prompt.contains("Username") {
editor.set_masked(false, cx);
} else {
editor.set_masked(true, cx);
@@ -58,6 +59,36 @@ impl AskPassModal {
}
cx.emit(DismissEvent);
}
+
+ fn render_hint(&mut self, cx: &mut Context<Self>) -> Option<AnyElement> {
+ let color = cx.theme().status().info_background;
+ if (self.prompt.contains("Password") || self.prompt.contains("Username"))
+ && self.prompt.contains("github.com")
+ {
+ return Some(
+ div()
+ .p_2()
+ .bg(color)
+ .border_t_1()
+ .border_color(cx.theme().status().info_border)
+ .child(
+ h_flex().gap_2()
+ .child(
+ Icon::new(IconName::Github).size(IconSize::Small)
+ )
+ .child(
+ Label::new("You may need to configure git for Github.")
+ .size(LabelSize::Small),
+ )
+ .child(Button::new("learn-more", "Learn more").color(Color::Accent).label_size(LabelSize::Small).on_click(|_, _, cx| {
+ cx.open_url("https://docs.github.com/en/get-started/git-basics/set-up-git#authenticating-with-github-from-git")
+ })),
+ )
+ .into_any_element(),
+ );
+ }
+ None
+ }
}
impl Render for AskPassModal {
@@ -68,9 +99,9 @@ impl Render for AskPassModal {
.on_action(cx.listener(Self::confirm))
.elevation_2(cx)
.size_full()
- .font_buffer(cx)
.child(
h_flex()
+ .font_buffer(cx)
.px(DynamicSpacing::Base12.rems(cx))
.pt(DynamicSpacing::Base08.rems(cx))
.pb(DynamicSpacing::Base04.rems(cx))
@@ -86,6 +117,7 @@ impl Render for AskPassModal {
)
.child(
div()
+ .font_buffer(cx)
.text_buffer(cx)
.py_2()
.px_3()
@@ -97,5 +129,6 @@ impl Render for AskPassModal {
.child(self.prompt.clone())
.child(self.editor.clone()),
)
+ .children(self.render_hint(cx))
}
}
@@ -368,10 +368,6 @@ impl CommitModal {
.icon_color(Color::Placeholder)
.color(Color::Muted)
.icon_position(IconPosition::Start)
- .tooltip(Tooltip::for_action_title(
- "Switch Branch",
- &zed_actions::git::Branch,
- ))
.on_click(cx.listener(|_, _, window, cx| {
window.dispatch_action(zed_actions::git::Branch.boxed_clone(), cx);
}))
@@ -46,7 +46,7 @@ use panel::{
panel_icon_button,
};
use project::{
- DisableAiSettings, Fs, Project, ProjectPath,
+ Fs, Project, ProjectPath,
git_store::{GitStoreEvent, Repository, RepositoryEvent, RepositoryId},
};
use serde::{Deserialize, Serialize};
@@ -405,15 +405,11 @@ impl GitPanel {
let scroll_handle = UniformListScrollHandle::new();
- let mut assistant_enabled = AgentSettings::get_global(cx).enabled;
- let mut was_ai_disabled = DisableAiSettings::get_global(cx).disable_ai;
+ let mut was_ai_enabled = AgentSettings::get_global(cx).enabled(cx);
let _settings_subscription = cx.observe_global::<SettingsStore>(move |_, cx| {
- let is_ai_disabled = DisableAiSettings::get_global(cx).disable_ai;
- if assistant_enabled != AgentSettings::get_global(cx).enabled
- || was_ai_disabled != is_ai_disabled
- {
- assistant_enabled = AgentSettings::get_global(cx).enabled;
- was_ai_disabled = is_ai_disabled;
+ let is_ai_enabled = AgentSettings::get_global(cx).enabled(cx);
+ if was_ai_enabled != is_ai_enabled {
+ was_ai_enabled = is_ai_enabled;
cx.notify();
}
});
@@ -1739,10 +1735,7 @@ impl GitPanel {
/// Generates a commit message using an LLM.
pub fn generate_commit_message(&mut self, cx: &mut Context<Self>) {
- if !self.can_commit()
- || DisableAiSettings::get_global(cx).disable_ai
- || !agent_settings::AgentSettings::get_global(cx).enabled
- {
+ if !self.can_commit() || !AgentSettings::get_global(cx).enabled(cx) {
return;
}
@@ -2996,8 +2989,7 @@ impl GitPanel {
&self,
cx: &Context<Self>,
) -> Option<AnyElement> {
- if !agent_settings::AgentSettings::get_global(cx).enabled
- || DisableAiSettings::get_global(cx).disable_ai
+ if !agent_settings::AgentSettings::get_global(cx).enabled(cx)
|| LanguageModelRegistry::read_global(cx)
.commit_message_model()
.is_none()
@@ -4583,10 +4575,6 @@ impl RenderOnce for PanelRepoFooter {
.size(ButtonSize::None)
.label_size(LabelSize::Small)
.truncate(true)
- .tooltip(Tooltip::for_action_title(
- "Switch Branch",
- &zed_actions::git::Switch,
- ))
.on_click(|_, window, cx| {
window.dispatch_action(zed_actions::git::Switch.boxed_clone(), cx);
});
@@ -110,6 +110,7 @@ resvg = { version = "0.45.0", default-features = false, features = [
"memmap-fonts",
] }
usvg = { version = "0.45.0", default-features = false }
+util_macros.workspace = true
schemars.workspace = true
seahash = "4.1"
semantic_version.workspace = true
@@ -2401,6 +2401,20 @@ impl<'a, T: 'static> std::borrow::BorrowMut<T> for GpuiBorrow<'a, T> {
}
}
+impl<'a, T: 'static> std::ops::Deref for GpuiBorrow<'a, T> {
+ type Target = T;
+
+ fn deref(&self) -> &Self::Target {
+ self.inner.as_ref().unwrap()
+ }
+}
+
+impl<'a, T: 'static> std::ops::DerefMut for GpuiBorrow<'a, T> {
+ fn deref_mut(&mut self) -> &mut T {
+ self.inner.as_mut().unwrap()
+ }
+}
+
impl<'a, T> Drop for GpuiBorrow<'a, T> {
fn drop(&mut self) {
let lease = self.inner.take().unwrap();
@@ -1,6 +1,6 @@
use crate::{
Bounds, DevicePixels, Font, FontFeatures, FontId, FontMetrics, FontRun, FontStyle, FontWeight,
- GlyphId, LineLayout, Pixels, PlatformTextSystem, Point, RenderGlyphParams, SUBPIXEL_VARIANTS,
+ GlyphId, LineLayout, Pixels, PlatformTextSystem, Point, RenderGlyphParams, SUBPIXEL_VARIANTS_X,
ShapedGlyph, ShapedRun, SharedString, Size, point, size,
};
use anyhow::{Context as _, Ok, Result};
@@ -276,7 +276,7 @@ impl CosmicTextSystemState {
let font = &self.loaded_fonts[params.font_id.0].font;
let subpixel_shift = params
.subpixel_variant
- .map(|v| v as f32 / (SUBPIXEL_VARIANTS as f32 * params.scale_factor));
+ .map(|v| v as f32 / (SUBPIXEL_VARIANTS_X as f32 * params.scale_factor));
let image = self
.swash_cache
.get_image(
@@ -311,7 +311,7 @@ impl CosmicTextSystemState {
let font = &self.loaded_fonts[params.font_id.0].font;
let subpixel_shift = params
.subpixel_variant
- .map(|v| v as f32 / (SUBPIXEL_VARIANTS as f32 * params.scale_factor));
+ .map(|v| v as f32 / (SUBPIXEL_VARIANTS_X as f32 * params.scale_factor));
let mut image = self
.swash_cache
.get_image(
@@ -1,7 +1,7 @@
use crate::{
Bounds, DevicePixels, Font, FontFallbacks, FontFeatures, FontId, FontMetrics, FontRun,
FontStyle, FontWeight, GlyphId, LineLayout, Pixels, PlatformTextSystem, Point,
- RenderGlyphParams, Result, SUBPIXEL_VARIANTS, ShapedGlyph, ShapedRun, SharedString, Size,
+ RenderGlyphParams, Result, SUBPIXEL_VARIANTS_X, ShapedGlyph, ShapedRun, SharedString, Size,
point, px, size, swap_rgba_pa_to_bgra,
};
use anyhow::anyhow;
@@ -395,9 +395,8 @@ impl MacTextSystemState {
let subpixel_shift = params
.subpixel_variant
- .map(|v| v as f32 / SUBPIXEL_VARIANTS as f32);
+ .map(|v| v as f32 / SUBPIXEL_VARIANTS_X as f32);
cx.set_allows_font_smoothing(true);
- cx.set_should_smooth_fonts(true);
cx.set_text_drawing_mode(CGTextDrawingMode::CGTextFill);
cx.set_gray_fill_color(0.0, 1.0);
cx.set_allows_antialiasing(true);
@@ -513,10 +513,11 @@ impl MacWindowState {
fn bounds(&self) -> Bounds<Pixels> {
let mut window_frame = unsafe { NSWindow::frame(self.native_window) };
- let screen_frame = unsafe {
- let screen = NSWindow::screen(self.native_window);
- NSScreen::frame(screen)
- };
+ let screen = unsafe { NSWindow::screen(self.native_window) };
+ if screen == nil {
+ return Bounds::new(point(px(0.), px(0.)), crate::DEFAULT_WINDOW_SIZE);
+ }
+ let screen_frame = unsafe { NSScreen::frame(screen) };
// Flip the y coordinate to be top-left origin
window_frame.origin.y =
@@ -1565,7 +1566,7 @@ fn get_scale_factor(native_window: id) -> f32 {
let factor = unsafe {
let screen: id = msg_send![native_window, screen];
if screen.is_null() {
- return 1.0;
+ return 2.0;
}
NSScreen::backingScaleFactor(screen) as f32
};
@@ -723,11 +723,10 @@ impl DirectWriteState {
dx: 0.0,
dy: 0.0,
};
- let subpixel_shift = params
- .subpixel_variant
- .map(|v| v as f32 / SUBPIXEL_VARIANTS as f32);
- let baseline_origin_x = subpixel_shift.x / params.scale_factor;
- let baseline_origin_y = subpixel_shift.y / params.scale_factor;
+ let baseline_origin_x =
+ params.subpixel_variant.x as f32 / SUBPIXEL_VARIANTS_X as f32 / params.scale_factor;
+ let baseline_origin_y =
+ params.subpixel_variant.y as f32 / SUBPIXEL_VARIANTS_Y as f32 / params.scale_factor;
let mut rendering_mode = DWRITE_RENDERING_MODE1::default();
let mut grid_fit_mode = DWRITE_GRID_FIT_MODE::default();
@@ -859,7 +858,7 @@ impl DirectWriteState {
let bitmap_size = glyph_bounds.size;
let subpixel_shift = params
.subpixel_variant
- .map(|v| v as f32 / SUBPIXEL_VARIANTS as f32);
+ .map(|v| v as f32 / SUBPIXEL_VARIANTS_X as f32);
let baseline_origin_x = subpixel_shift.x / params.scale_factor;
let baseline_origin_y = subpixel_shift.y / params.scale_factor;
@@ -1300,7 +1300,9 @@ mod tests {
use super::*;
- #[test]
+ use util_macros::perf;
+
+ #[perf]
fn test_basic_highlight_style_combination() {
let style_a = HighlightStyle::default();
let style_b = HighlightStyle::default();
@@ -1385,7 +1387,7 @@ mod tests {
);
}
- #[test]
+ #[perf]
fn test_combine_highlights() {
assert_eq!(
combine_highlights(
@@ -41,7 +41,13 @@ pub struct FontId(pub usize);
#[derive(Hash, PartialEq, Eq, Clone, Copy, Debug)]
pub struct FontFamilyId(pub usize);
-pub(crate) const SUBPIXEL_VARIANTS: u8 = 4;
+pub(crate) const SUBPIXEL_VARIANTS_X: u8 = 4;
+
+pub(crate) const SUBPIXEL_VARIANTS_Y: u8 = if cfg!(target_os = "windows") {
+ 1
+} else {
+ SUBPIXEL_VARIANTS_X
+};
/// The GPUI text rendering sub system.
pub struct TextSystem {
@@ -11,8 +11,8 @@ use crate::{
MouseMoveEvent, MouseUpEvent, Path, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput,
PlatformInputHandler, PlatformWindow, Point, PolychromeSprite, PromptButton, PromptLevel, Quad,
Render, RenderGlyphParams, RenderImage, RenderImageParams, RenderSvgParams, Replay, ResizeEdge,
- SMOOTH_SVG_SCALE_FACTOR, SUBPIXEL_VARIANTS, ScaledPixels, Scene, Shadow, SharedString, Size,
- StrikethroughStyle, Style, SubscriberSet, Subscription, SystemWindowTab,
+ SMOOTH_SVG_SCALE_FACTOR, SUBPIXEL_VARIANTS_X, SUBPIXEL_VARIANTS_Y, ScaledPixels, Scene, Shadow,
+ SharedString, Size, StrikethroughStyle, Style, SubscriberSet, Subscription, SystemWindowTab,
SystemWindowTabController, TabHandles, TaffyLayoutEngine, Task, TextStyle, TextStyleRefinement,
TransformationMatrix, Underline, UnderlineStyle, WindowAppearance, WindowBackgroundAppearance,
WindowBounds, WindowControls, WindowDecorations, WindowOptions, WindowParams, WindowTextSystem,
@@ -2944,9 +2944,10 @@ impl Window {
let element_opacity = self.element_opacity();
let scale_factor = self.scale_factor();
let glyph_origin = origin.scale(scale_factor);
+
let subpixel_variant = Point {
- x: (glyph_origin.x.0.fract() * SUBPIXEL_VARIANTS as f32).floor() as u8,
- y: (glyph_origin.y.0.fract() * SUBPIXEL_VARIANTS as f32).floor() as u8,
+ x: (glyph_origin.x.0.fract() * SUBPIXEL_VARIANTS_X as f32).floor() as u8,
+ y: (glyph_origin.y.0.fract() * SUBPIXEL_VARIANTS_Y as f32).floor() as u8,
};
let params = RenderGlyphParams {
font_id,
@@ -546,6 +546,23 @@ pub enum CharKind {
Word,
}
+/// Context for character classification within a specific scope.
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub enum CharScopeContext {
+ /// Character classification for completion queries.
+ ///
+ /// This context treats certain characters as word constituents that would
+ /// normally be considered punctuation, such as '-' in Tailwind classes
+ /// ("bg-yellow-100") or '.' in import paths ("foo.ts").
+ Completion,
+ /// Character classification for linked edits.
+ ///
+ /// This context handles characters that should be treated as part of
+ /// identifiers during linked editing operations, such as '.' in JSX
+ /// component names like `<Animated.View>`.
+ LinkedEdit,
+}
+
/// A runnable is a set of data about a region that could be resolved into a task
pub struct Runnable {
pub tags: SmallVec<[RunnableTag; 1]>,
@@ -3449,16 +3466,14 @@ impl BufferSnapshot {
pub fn surrounding_word<T: ToOffset>(
&self,
start: T,
- for_completion: bool,
+ scope_context: Option<CharScopeContext>,
) -> (Range<usize>, Option<CharKind>) {
let mut start = start.to_offset(self);
let mut end = start;
let mut next_chars = self.chars_at(start).take(128).peekable();
let mut prev_chars = self.reversed_chars_at(start).take(128).peekable();
- let classifier = self
- .char_classifier_at(start)
- .for_completion(for_completion);
+ let classifier = self.char_classifier_at(start).scope_context(scope_context);
let word_kind = cmp::max(
prev_chars.peek().copied().map(|c| classifier.kind(c)),
next_chars.peek().copied().map(|c| classifier.kind(c)),
@@ -4106,8 +4121,7 @@ impl BufferSnapshot {
range: Range<T>,
) -> impl Iterator<Item = BracketMatch> + '_ {
// Find bracket pairs that *inclusively* contain the given range.
- let range = range.start.to_offset(self).saturating_sub(1)
- ..self.len().min(range.end.to_offset(self) + 1);
+ let range = range.start.to_previous_offset(self)..range.end.to_next_offset(self);
self.all_bracket_ranges(range)
.filter(|pair| !pair.newline_only)
}
@@ -4116,8 +4130,7 @@ impl BufferSnapshot {
&self,
range: Range<T>,
) -> impl Iterator<Item = (Range<usize>, DebuggerTextObject)> + '_ {
- let range = range.start.to_offset(self).saturating_sub(1)
- ..self.len().min(range.end.to_offset(self) + 1);
+ let range = range.start.to_previous_offset(self)..range.end.to_next_offset(self);
let mut matches = self.syntax.matches_with_options(
range.clone(),
@@ -4185,8 +4198,8 @@ impl BufferSnapshot {
range: Range<T>,
options: TreeSitterOptions,
) -> impl Iterator<Item = (Range<usize>, TextObject)> + '_ {
- let range = range.start.to_offset(self).saturating_sub(1)
- ..self.len().min(range.end.to_offset(self) + 1);
+ let range =
+ range.start.to_previous_offset(self)..self.len().min(range.end.to_next_offset(self));
let mut matches =
self.syntax
@@ -5212,7 +5225,7 @@ pub(crate) fn contiguous_ranges(
#[derive(Default, Debug)]
pub struct CharClassifier {
scope: Option<LanguageScope>,
- for_completion: bool,
+ scope_context: Option<CharScopeContext>,
ignore_punctuation: bool,
}
@@ -5220,14 +5233,14 @@ impl CharClassifier {
pub fn new(scope: Option<LanguageScope>) -> Self {
Self {
scope,
- for_completion: false,
+ scope_context: None,
ignore_punctuation: false,
}
}
- pub fn for_completion(self, for_completion: bool) -> Self {
+ pub fn scope_context(self, scope_context: Option<CharScopeContext>) -> Self {
Self {
- for_completion,
+ scope_context,
..self
}
}
@@ -5257,10 +5270,10 @@ impl CharClassifier {
}
if let Some(scope) = &self.scope {
- let characters = if self.for_completion {
- scope.completion_query_characters()
- } else {
- scope.word_characters()
+ let characters = match self.scope_context {
+ Some(CharScopeContext::Completion) => scope.completion_query_characters(),
+ Some(CharScopeContext::LinkedEdit) => scope.linked_edit_characters(),
+ None => scope.word_characters(),
};
if let Some(characters) = characters
&& characters.contains(&c)
@@ -780,6 +780,9 @@ pub struct LanguageConfig {
/// A list of characters that Zed should treat as word characters for completion queries.
#[serde(default)]
pub completion_query_characters: HashSet<char>,
+ /// A list of characters that Zed should treat as word characters for linked edit operations.
+ #[serde(default)]
+ pub linked_edit_characters: HashSet<char>,
/// A list of preferred debuggers for this language.
#[serde(default)]
pub debuggers: IndexSet<SharedString>,
@@ -916,6 +919,8 @@ pub struct LanguageConfigOverride {
#[serde(default)]
pub completion_query_characters: Override<HashSet<char>>,
#[serde(default)]
+ pub linked_edit_characters: Override<HashSet<char>>,
+ #[serde(default)]
pub opt_into_language_servers: Vec<LanguageServerName>,
#[serde(default)]
pub prefer_label_for_snippet: Option<bool>,
@@ -974,6 +979,7 @@ impl Default for LanguageConfig {
hidden: false,
jsx_tag_auto_close: None,
completion_query_characters: Default::default(),
+ linked_edit_characters: Default::default(),
debuggers: Default::default(),
}
}
@@ -2011,6 +2017,15 @@ impl LanguageScope {
)
}
+ /// Returns a list of language-specific characters that are considered part of
+ /// identifiers during linked editing operations.
+ pub fn linked_edit_characters(&self) -> Option<&HashSet<char>> {
+ Override::as_option(
+ self.config_override().map(|o| &o.linked_edit_characters),
+ Some(&self.language.config.linked_edit_characters),
+ )
+ }
+
/// Returns whether to prefer snippet `label` over `new_text` to replace text when
/// completion is accepted.
///
@@ -582,7 +582,7 @@ impl settings::Settings for AllLanguageSettings {
let mut languages = HashMap::default();
for (language_name, settings) in &all_languages.languages.0 {
let mut language_settings = all_languages.defaults.clone();
- settings::merge_from::MergeFrom::merge_from(&mut language_settings, Some(settings));
+ settings::merge_from::MergeFrom::merge_from(&mut language_settings, settings);
languages.insert(
LanguageName(language_name.clone()),
load_from_content(language_settings),
@@ -1,4 +1,4 @@
-use crate::{CharClassifier, CharKind, LanguageScope};
+use crate::{CharClassifier, CharKind, CharScopeContext, LanguageScope};
use anyhow::{Context, anyhow};
use imara_diff::{
Algorithm, UnifiedDiffBuilder, diff,
@@ -181,7 +181,8 @@ fn diff_internal(
}
fn tokenize(text: &str, language_scope: Option<LanguageScope>) -> impl Iterator<Item = &str> {
- let classifier = CharClassifier::new(language_scope).for_completion(true);
+ let classifier =
+ CharClassifier::new(language_scope).scope_context(Some(CharScopeContext::Completion));
let mut chars = text.char_indices();
let mut prev = None;
let mut start_ix = 0;
@@ -612,6 +612,24 @@ impl GoogleEventMapper {
convert_usage(&self.usage),
)))
}
+
+ if let Some(prompt_feedback) = event.prompt_feedback
+ && let Some(block_reason) = prompt_feedback.block_reason.as_deref()
+ {
+ self.stop_reason = match block_reason {
+ "SAFETY" | "OTHER" | "BLOCKLIST" | "PROHIBITED_CONTENT" | "IMAGE_SAFETY" => {
+ StopReason::Refusal
+ }
+ _ => {
+ log::error!("Unexpected Google block_reason: {block_reason}");
+ StopReason::Refusal
+ }
+ };
+ events.push(Ok(LanguageModelCompletionEvent::Stop(self.stop_reason)));
+
+ return events;
+ }
+
if let Some(candidates) = event.candidates {
for candidate in candidates {
if let Some(finish_reason) = candidate.finish_reason.as_deref() {
@@ -30,6 +30,9 @@ close_tag_node_name = "jsx_closing_element"
jsx_element_node_name = "jsx_element"
tag_name_node_name = "identifier"
+[overrides.default]
+linked_edit_characters = ["."]
+
[overrides.element]
line_comments = { remove = true }
block_comment = { start = "{/* ", prefix = "", end = "*/}", tab_size = 0 }
@@ -116,4 +116,26 @@
)
) @item
+; Arrow functions in variable declarations (anywhere in the tree, including nested in functions)
+(lexical_declaration
+ ["let" "const"] @context
+ (variable_declarator
+ name: (_) @name
+ value: (arrow_function)) @item)
+
+; Async arrow functions in variable declarations
+(lexical_declaration
+ ["let" "const"] @context
+ (variable_declarator
+ name: (_) @name
+ value: (arrow_function
+ "async" @context)) @item)
+
+; Named function expressions in variable declarations
+(lexical_declaration
+ ["let" "const"] @context
+ (variable_declarator
+ name: (_) @name
+ value: (function_expression)) @item)
+
(comment) @annotation
@@ -181,7 +181,7 @@ impl JsonLspAdapter {
#[allow(unused_mut)]
let mut schemas = serde_json::json!([
{
- "fileMatch": ["tsconfig.json"],
+ "fileMatch": ["tsconfig*.json"],
"schema":tsconfig_schema
},
{
@@ -160,6 +160,11 @@
"$ref": "#/definitions/packageExportsEntryOrFallback",
"description": "The module path that is resolved when this specifier is imported as an ECMAScript module using an `import` declaration or the dynamic `import(...)` function."
},
+ "module-sync": {
+ "$ref": "#/definitions/packageExportsEntryOrFallback",
+ "$comment": "https://nodejs.org/api/packages.html#conditional-exports#:~:text=%22module-sync%22",
+ "description": "The same as `import`, but can be used with require(esm) in Node 20+. This requires the files to not use any top-level awaits."
+ },
"node": {
"$ref": "#/definitions/packageExportsEntryOrFallback",
"description": "The module path that is resolved when this environment is Node.js."
@@ -304,6 +309,33 @@
"required": [
"url"
]
+ },
+ "devEngineDependency": {
+ "description": "Specifies requirements for development environment components such as operating systems, runtimes, or package managers. Used to ensure consistent development environments across the team.",
+ "type": "object",
+ "required": [
+ "name"
+ ],
+ "properties": {
+ "name": {
+ "type": "string",
+ "description": "The name of the dependency, with allowed values depending on the parent field"
+ },
+ "version": {
+ "type": "string",
+ "description": "The version range for the dependency"
+ },
+ "onFail": {
+ "type": "string",
+ "enum": [
+ "ignore",
+ "warn",
+ "error",
+ "download"
+ ],
+ "description": "What action to take if validation fails"
+ }
+ }
}
},
"type": "object",
@@ -755,7 +787,7 @@
]
},
"resolutions": {
- "description": "Resolutions is used to support selective version resolutions using yarn, which lets you define custom package versions or ranges inside your dependencies. For npm, use overrides instead. See: https://classic.yarnpkg.com/en/docs/selective-version-resolutions",
+ "description": "Resolutions is used to support selective version resolutions using yarn, which lets you define custom package versions or ranges inside your dependencies. For npm, use overrides instead. See: https://yarnpkg.com/configuration/manifest#resolutions",
"type": "object"
},
"overrides": {
@@ -810,6 +842,82 @@
"type": "string"
}
},
+ "devEngines": {
+ "description": "Define the runtime and package manager for developing the current project.",
+ "type": "object",
+ "properties": {
+ "os": {
+ "oneOf": [
+ {
+ "$ref": "#/definitions/devEngineDependency"
+ },
+ {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/devEngineDependency"
+ }
+ }
+ ],
+ "description": "Specifies which operating systems are supported for development"
+ },
+ "cpu": {
+ "oneOf": [
+ {
+ "$ref": "#/definitions/devEngineDependency"
+ },
+ {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/devEngineDependency"
+ }
+ }
+ ],
+ "description": "Specifies which CPU architectures are supported for development"
+ },
+ "libc": {
+ "oneOf": [
+ {
+ "$ref": "#/definitions/devEngineDependency"
+ },
+ {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/devEngineDependency"
+ }
+ }
+ ],
+ "description": "Specifies which C standard libraries are supported for development"
+ },
+ "runtime": {
+ "oneOf": [
+ {
+ "$ref": "#/definitions/devEngineDependency"
+ },
+ {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/devEngineDependency"
+ }
+ }
+ ],
+ "description": "Specifies which JavaScript runtimes (like Node.js, Deno, Bun) are supported for development. Values should use WinterCG Runtime Keys (see https://runtime-keys.proposal.wintercg.org/)"
+ },
+ "packageManager": {
+ "oneOf": [
+ {
+ "$ref": "#/definitions/devEngineDependency"
+ },
+ {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/devEngineDependency"
+ }
+ }
+ ],
+ "description": "Specifies which package managers are supported for development"
+ }
+ }
+ },
"preferGlobal": {
"type": "boolean",
"description": "DEPRECATED: This option used to trigger an npm warning, but it will no longer warn. It is purely there for informational purposes. It is now recommended that you install any binaries as local devDependencies wherever possible."
@@ -973,6 +1081,7 @@
"additionalProperties": false
},
"peerDependencyRules": {
+ "type": "object",
"properties": {
"ignoreMissing": {
"description": "pnpm will not print warnings about missing peer dependencies from this list.",
@@ -1032,6 +1141,10 @@
"description": "When true, installation won't fail if some of the patches from the \"patchedDependencies\" field were not applied.",
"type": "boolean"
},
+ "allowUnusedPatches": {
+ "description": "When true, installation won't fail if some of the patches from the \"patchedDependencies\" field were not applied.",
+ "type": "boolean"
+ },
"updateConfig": {
"type": "object",
"properties": {
@@ -1122,6 +1235,41 @@
}
},
"additionalProperties": false
+ },
+ "stackblitz": {
+ "description": "Defines the StackBlitz configuration for the project.",
+ "type": "object",
+ "properties": {
+ "installDependencies": {
+ "description": "StackBlitz automatically installs npm dependencies when opening a project.",
+ "type": "boolean"
+ },
+ "startCommand": {
+ "description": "A terminal command to be executed when opening the project, after installing npm dependencies.",
+ "type": [
+ "string",
+ "boolean"
+ ]
+ },
+ "compileTrigger": {
+ "description": "The compileTrigger option controls how file changes in the editor are written to the WebContainers in-memory filesystem. ",
+ "oneOf": [
+ {
+ "type": "string",
+ "enum": [
+ "auto",
+ "keystroke",
+ "save"
+ ]
+ }
+ ]
+ },
+ "env": {
+ "description": "A map of default environment variables that will be set in each top-level shell process.",
+ "type": "object"
+ }
+ },
+ "additionalProperties": false
}
},
"anyOf": [
@@ -1,5 +1,6 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
+ "$comment": "Note that this schema uses 'null' in various places. The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058)",
"allowTrailingCommas": true,
"allOf": [
{
@@ -49,7 +50,6 @@
"filesDefinition": {
"properties": {
"files": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. When a 'files' property is specified, only those files and those specified by 'include' are included.",
"type": ["array", "null"],
"uniqueItems": true,
@@ -62,7 +62,6 @@
"excludeDefinition": {
"properties": {
"exclude": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specifies a list of files to be excluded from compilation. The 'exclude' property only affects the files included via the 'include' property and not the 'files' property. Glob patterns require TypeScript version 2.0 or later.",
"type": ["array", "null"],
"uniqueItems": true,
@@ -75,7 +74,6 @@
"includeDefinition": {
"properties": {
"include": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specifies a list of glob patterns that match files to be included in compilation. If no 'files' or 'include' property is present in a tsconfig.json, the compiler defaults to including all files in the containing directory and subdirectories except those specified by 'exclude'. Requires TypeScript version 2.0 or later.",
"type": ["array", "null"],
"uniqueItems": true,
@@ -118,41 +116,35 @@
"buildOptions": {
"properties": {
"dry": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "~",
"type": ["boolean", "null"],
"default": false
},
"force": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Build all projects, including those that appear to be up to date",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Build all projects, including those that appear to be up to date\n\nSee more: https://www.typescriptlang.org/tsconfig#force"
},
"verbose": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable verbose logging",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Enable verbose logging\n\nSee more: https://www.typescriptlang.org/tsconfig#verbose"
},
"incremental": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Save .tsbuildinfo files to allow for incremental compilation of projects.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Save .tsbuildinfo files to allow for incremental compilation of projects.\n\nSee more: https://www.typescriptlang.org/tsconfig#incremental"
},
"assumeChangesOnlyAffectDirectDependencies": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Have recompiles in projects that use `incremental` and `watch` mode assume that changes within a file will only affect files directly depending on it.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Have recompiles in projects that use `incremental` and `watch` mode assume that changes within a file will only affect files directly depending on it.\n\nSee more: https://www.typescriptlang.org/tsconfig#assumeChangesOnlyAffectDirectDependencies"
},
"traceResolution": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Log paths used during the `moduleResolution` process.",
"type": ["boolean", "null"],
"default": false,
@@ -165,7 +157,6 @@
"watchOptionsDefinition": {
"properties": {
"watchOptions": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"type": ["object", "null"],
"description": "Settings for the watch mode in TypeScript.",
"properties": {
@@ -174,31 +165,26 @@
"type": ["string", "null"]
},
"watchFile": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify how the TypeScript watch mode works.",
"type": ["string", "null"],
"markdownDescription": "Specify how the TypeScript watch mode works.\n\nSee more: https://www.typescriptlang.org/tsconfig#watchFile"
},
"watchDirectory": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify how directories are watched on systems that lack recursive file-watching functionality.",
"type": ["string", "null"],
"markdownDescription": "Specify how directories are watched on systems that lack recursive file-watching functionality.\n\nSee more: https://www.typescriptlang.org/tsconfig#watchDirectory"
},
"fallbackPolling": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify what approach the watcher should use if the system runs out of native file watchers.",
"type": ["string", "null"],
"markdownDescription": "Specify what approach the watcher should use if the system runs out of native file watchers.\n\nSee more: https://www.typescriptlang.org/tsconfig#fallbackPolling"
},
"synchronousWatchDirectory": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Synchronously call callbacks and update the state of directory watchers on platforms that don`t support recursive watching natively.",
"type": ["boolean", "null"],
"markdownDescription": "Synchronously call callbacks and update the state of directory watchers on platforms that don`t support recursive watching natively.\n\nSee more: https://www.typescriptlang.org/tsconfig#synchronousWatchDirectory"
},
"excludeFiles": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Remove a list of files from the watch mode's processing.",
"type": ["array", "null"],
"uniqueItems": true,
@@ -208,7 +194,6 @@
"markdownDescription": "Remove a list of files from the watch mode's processing.\n\nSee more: https://www.typescriptlang.org/tsconfig#excludeFiles"
},
"excludeDirectories": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Remove a list of directories from the watch process.",
"type": ["array", "null"],
"uniqueItems": true,
@@ -224,37 +209,31 @@
"compilerOptionsDefinition": {
"properties": {
"compilerOptions": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"type": ["object", "null"],
"description": "Instructs the TypeScript compiler how to compile .ts files.",
"properties": {
"allowArbitraryExtensions": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable importing files with any extension, provided a declaration file is present.",
"type": ["boolean", "null"],
"markdownDescription": "Enable importing files with any extension, provided a declaration file is present.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowArbitraryExtensions"
},
"allowImportingTsExtensions": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
- "description": "Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set.",
+ "description": "Allow imports to include TypeScript file extensions. Requires either '--noEmit' or '--emitDeclarationOnly' to be set.",
"type": ["boolean", "null"],
- "markdownDescription": "Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowImportingTsExtensions"
+ "markdownDescription": "Allow imports to include TypeScript file extensions. Requires either '--noEmit' or '--emitDeclarationOnly' to be set.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowImportingTsExtensions"
},
"charset": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "No longer supported. In early versions, manually set the text encoding for reading files.",
"type": ["string", "null"],
"markdownDescription": "No longer supported. In early versions, manually set the text encoding for reading files.\n\nSee more: https://www.typescriptlang.org/tsconfig#charset"
},
"composite": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable constraints that allow a TypeScript project to be used with project references.",
"type": ["boolean", "null"],
"default": true,
"markdownDescription": "Enable constraints that allow a TypeScript project to be used with project references.\n\nSee more: https://www.typescriptlang.org/tsconfig#composite"
},
"customConditions": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Conditions to set in addition to the resolver-specific defaults when resolving imports.",
"type": ["array", "null"],
"uniqueItems": true,
@@ -264,52 +243,50 @@
"markdownDescription": "Conditions to set in addition to the resolver-specific defaults when resolving imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#customConditions"
},
"declaration": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Generate .d.ts files from TypeScript and JavaScript files in your project.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Generate .d.ts files from TypeScript and JavaScript files in your project.\n\nSee more: https://www.typescriptlang.org/tsconfig#declaration"
},
"declarationDir": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify the output directory for generated declaration files.",
"type": ["string", "null"],
"markdownDescription": "Specify the output directory for generated declaration files.\n\nSee more: https://www.typescriptlang.org/tsconfig#declarationDir"
},
"diagnostics": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Output compiler performance information after building.",
"type": ["boolean", "null"],
"markdownDescription": "Output compiler performance information after building.\n\nSee more: https://www.typescriptlang.org/tsconfig#diagnostics"
},
"disableReferencedProjectLoad": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Reduce the number of projects loaded automatically by TypeScript.",
"type": ["boolean", "null"],
"markdownDescription": "Reduce the number of projects loaded automatically by TypeScript.\n\nSee more: https://www.typescriptlang.org/tsconfig#disableReferencedProjectLoad"
},
"noPropertyAccessFromIndexSignature": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enforces using indexed accessors for keys declared using an indexed type",
"type": ["boolean", "null"],
"markdownDescription": "Enforces using indexed accessors for keys declared using an indexed type\n\nSee more: https://www.typescriptlang.org/tsconfig#noPropertyAccessFromIndexSignature"
},
"emitBOM": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files.\n\nSee more: https://www.typescriptlang.org/tsconfig#emitBOM"
},
"emitDeclarationOnly": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Only output d.ts files and not JavaScript files.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Only output d.ts files and not JavaScript files.\n\nSee more: https://www.typescriptlang.org/tsconfig#emitDeclarationOnly"
},
+ "erasableSyntaxOnly": {
+ "description": "Do not allow runtime constructs that are not part of ECMAScript.",
+ "type": ["boolean", "null"],
+ "default": false,
+ "markdownDescription": "Do not allow runtime constructs that are not part of ECMAScript.\n\nSee more: https://www.typescriptlang.org/tsconfig#erasableSyntaxOnly"
+ },
"exactOptionalPropertyTypes": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Differentiate between undefined and not present when type checking",
"type": ["boolean", "null"],
"default": false,
@@ -320,21 +297,18 @@
"type": ["boolean", "null"]
},
"tsBuildInfoFile": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify the folder for .tsbuildinfo incremental compilation files.",
"default": ".tsbuildinfo",
"type": ["string", "null"],
"markdownDescription": "Specify the folder for .tsbuildinfo incremental compilation files.\n\nSee more: https://www.typescriptlang.org/tsconfig#tsBuildInfoFile"
},
"inlineSourceMap": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Include sourcemap files inside the emitted JavaScript.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Include sourcemap files inside the emitted JavaScript.\n\nSee more: https://www.typescriptlang.org/tsconfig#inlineSourceMap"
},
"inlineSources": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Include source code in the sourcemaps inside the emitted JavaScript.",
"type": ["boolean", "null"],
"default": false,
@@ -351,76 +325,70 @@
]
},
"reactNamespace": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit.",
"type": ["string", "null"],
"default": "React",
"markdownDescription": "Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit.\n\nSee more: https://www.typescriptlang.org/tsconfig#reactNamespace"
},
"jsxFactory": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'",
"type": ["string", "null"],
"default": "React.createElement",
"markdownDescription": "Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'\n\nSee more: https://www.typescriptlang.org/tsconfig#jsxFactory"
},
"jsxFragmentFactory": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'.",
"type": ["string", "null"],
"default": "React.Fragment",
"markdownDescription": "Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'.\n\nSee more: https://www.typescriptlang.org/tsconfig#jsxFragmentFactory"
},
"jsxImportSource": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx`.",
"type": ["string", "null"],
"default": "react",
"markdownDescription": "Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx`.\n\nSee more: https://www.typescriptlang.org/tsconfig#jsxImportSource"
},
"listFiles": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Print all of the files read during the compilation.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Print all of the files read during the compilation.\n\nSee more: https://www.typescriptlang.org/tsconfig#listFiles"
},
"mapRoot": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify the location where debugger should locate map files instead of generated locations.",
"type": ["string", "null"],
"markdownDescription": "Specify the location where debugger should locate map files instead of generated locations.\n\nSee more: https://www.typescriptlang.org/tsconfig#mapRoot"
},
"module": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify what module code is generated.",
"type": ["string", "null"],
"anyOf": [
{
"enum": [
- "CommonJS",
- "AMD",
- "System",
- "UMD",
- "ES6",
- "ES2015",
- "ES2020",
- "ESNext",
- "None",
- "ES2022",
- "Node16",
- "NodeNext",
- "Preserve"
+ "commonjs",
+ "amd",
+ "system",
+ "umd",
+ "es6",
+ "es2015",
+ "es2020",
+ "esnext",
+ "none",
+ "es2022",
+ "node16",
+ "node18",
+ "node20",
+ "nodenext",
+ "preserve"
]
},
{
- "pattern": "^([Cc][Oo][Mm][Mm][Oo][Nn][Jj][Ss]|[AaUu][Mm][Dd]|[Ss][Yy][Ss][Tt][Ee][Mm]|[Ee][Ss]([356]|20(1[567]|2[02])|[Nn][Ee][Xx][Tt])|[Nn][Oo][dD][Ee]16|[Nn][Oo][Dd][Ee][Nn][Ee][Xx][Tt]|[Nn][Oo][Nn][Ee]|[Pp][Rr][Ee][Ss][Ee][Rr][Vv][Ee])$"
+ "pattern": "^([Cc][Oo][Mm][Mm][Oo][Nn][Jj][Ss]|[AaUu][Mm][Dd]|[Ss][Yy][Ss][Tt][Ee][Mm]|[Ee][Ss]([356]|20(1[567]|2[02])|[Nn][Ee][Xx][Tt])|[Nn][Oo][dD][Ee]1[68]|[Nn][Oo][Dd][Ee][Nn][Ee][Xx][Tt]|[Nn][Oo][Nn][Ee]|[Pp][Rr][Ee][Ss][Ee][Rr][Vv][Ee])$"
}
],
"markdownDescription": "Specify what module code is generated.\n\nSee more: https://www.typescriptlang.org/tsconfig#module"
},
"moduleResolution": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify how TypeScript looks up a file from a given module specifier.",
"type": ["string", "null"],
"anyOf": [
@@ -449,7 +417,6 @@
"markdownDescription": "Specify how TypeScript looks up a file from a given module specifier.\n\nSee more: https://www.typescriptlang.org/tsconfig#moduleResolution"
},
"newLine": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Set the newline character for emitting files.",
"type": ["string", "null"],
"default": "lf",
@@ -464,208 +431,191 @@
"markdownDescription": "Set the newline character for emitting files.\n\nSee more: https://www.typescriptlang.org/tsconfig#newLine"
},
"noEmit": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable emitting file from a compilation.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Disable emitting file from a compilation.\n\nSee more: https://www.typescriptlang.org/tsconfig#noEmit"
},
"noEmitHelpers": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable generating custom helper functions like `__extends` in compiled output.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Disable generating custom helper functions like `__extends` in compiled output.\n\nSee more: https://www.typescriptlang.org/tsconfig#noEmitHelpers"
},
"noEmitOnError": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable emitting files if any type checking errors are reported.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Disable emitting files if any type checking errors are reported.\n\nSee more: https://www.typescriptlang.org/tsconfig#noEmitOnError"
},
"noImplicitAny": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable error reporting for expressions and declarations with an implied `any` type..",
"type": ["boolean", "null"],
"markdownDescription": "Enable error reporting for expressions and declarations with an implied `any` type..\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitAny"
},
"noImplicitThis": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable error reporting when `this` is given the type `any`.",
"type": ["boolean", "null"],
"markdownDescription": "Enable error reporting when `this` is given the type `any`.\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitThis"
},
"noUnusedLocals": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable error reporting when a local variable isn't read.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Enable error reporting when a local variable isn't read.\n\nSee more: https://www.typescriptlang.org/tsconfig#noUnusedLocals"
},
"noUnusedParameters": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Raise an error when a function parameter isn't read",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Raise an error when a function parameter isn't read\n\nSee more: https://www.typescriptlang.org/tsconfig#noUnusedParameters"
},
"noLib": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable including any library files, including the default lib.d.ts.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Disable including any library files, including the default lib.d.ts.\n\nSee more: https://www.typescriptlang.org/tsconfig#noLib"
},
"noResolve": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project.\n\nSee more: https://www.typescriptlang.org/tsconfig#noResolve"
},
"noStrictGenericChecks": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable strict checking of generic signatures in function types.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Disable strict checking of generic signatures in function types.\n\nSee more: https://www.typescriptlang.org/tsconfig#noStrictGenericChecks"
},
+ "out": {
+ "description": "DEPRECATED. Specify an output for the build. It is recommended to use `outFile` instead.",
+ "type": ["string", "null"],
+ "markdownDescription": "Specify an output for the build. It is recommended to use `outFile` instead.\n\nSee more: https://www.typescriptlang.org/tsconfig/#out"
+ },
"skipDefaultLibCheck": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Skip type checking .d.ts files that are included with TypeScript.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Skip type checking .d.ts files that are included with TypeScript.\n\nSee more: https://www.typescriptlang.org/tsconfig#skipDefaultLibCheck"
},
"skipLibCheck": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Skip type checking all .d.ts files.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Skip type checking all .d.ts files.\n\nSee more: https://www.typescriptlang.org/tsconfig#skipLibCheck"
},
"outFile": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output.",
"type": ["string", "null"],
"markdownDescription": "Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output.\n\nSee more: https://www.typescriptlang.org/tsconfig#outFile"
},
"outDir": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify an output folder for all emitted files.",
"type": ["string", "null"],
"markdownDescription": "Specify an output folder for all emitted files.\n\nSee more: https://www.typescriptlang.org/tsconfig#outDir"
},
"preserveConstEnums": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable erasing `const enum` declarations in generated code.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Disable erasing `const enum` declarations in generated code.\n\nSee more: https://www.typescriptlang.org/tsconfig#preserveConstEnums"
},
"preserveSymlinks": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable resolving symlinks to their realpath. This correlates to the same flag in node.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Disable resolving symlinks to their realpath. This correlates to the same flag in node.\n\nSee more: https://www.typescriptlang.org/tsconfig#preserveSymlinks"
},
"preserveValueImports": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Preserve unused imported values in the JavaScript output that would otherwise be removed",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Preserve unused imported values in the JavaScript output that would otherwise be removed\n\nSee more: https://www.typescriptlang.org/tsconfig#preserveValueImports"
},
"preserveWatchOutput": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable wiping the console in watch mode",
"type": ["boolean", "null"],
"markdownDescription": "Disable wiping the console in watch mode\n\nSee more: https://www.typescriptlang.org/tsconfig#preserveWatchOutput"
},
"pretty": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable color and formatting in output to make compiler errors easier to read",
"type": ["boolean", "null"],
"default": true,
"markdownDescription": "Enable color and formatting in output to make compiler errors easier to read\n\nSee more: https://www.typescriptlang.org/tsconfig#pretty"
},
"removeComments": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable emitting comments.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Disable emitting comments.\n\nSee more: https://www.typescriptlang.org/tsconfig#removeComments"
},
+ "rewriteRelativeImportExtensions": {
+ "description": "Rewrite '.ts', '.tsx', '.mts', and '.cts' file extensions in relative import paths to their JavaScript equivalent in output files.",
+ "type": ["boolean", "null"],
+ "default": false,
+ "markdownDescription": "Rewrite '.ts', '.tsx', '.mts', and '.cts' file extensions in relative import paths to their JavaScript equivalent in output files.\n\nSee more: https://www.typescriptlang.org/tsconfig#rewriteRelativeImportExtensions"
+ },
"rootDir": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify the root folder within your source files.",
"type": ["string", "null"],
"markdownDescription": "Specify the root folder within your source files.\n\nSee more: https://www.typescriptlang.org/tsconfig#rootDir"
},
"isolatedModules": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Ensure that each file can be safely transpiled without relying on other imports.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Ensure that each file can be safely transpiled without relying on other imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#isolatedModules"
},
"sourceMap": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Create source map files for emitted JavaScript files.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Create source map files for emitted JavaScript files.\n\nSee more: https://www.typescriptlang.org/tsconfig#sourceMap"
},
"sourceRoot": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify the root path for debuggers to find the reference source code.",
"type": ["string", "null"],
"markdownDescription": "Specify the root path for debuggers to find the reference source code.\n\nSee more: https://www.typescriptlang.org/tsconfig#sourceRoot"
},
"suppressExcessPropertyErrors": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable reporting of excess property errors during the creation of object literals.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Disable reporting of excess property errors during the creation of object literals.\n\nSee more: https://www.typescriptlang.org/tsconfig#suppressExcessPropertyErrors"
},
"suppressImplicitAnyIndexErrors": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Suppress `noImplicitAny` errors when indexing objects that lack index signatures.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Suppress `noImplicitAny` errors when indexing objects that lack index signatures.\n\nSee more: https://www.typescriptlang.org/tsconfig#suppressImplicitAnyIndexErrors"
},
"stripInternal": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable emitting declarations that have `@internal` in their JSDoc comments.",
"type": ["boolean", "null"],
"markdownDescription": "Disable emitting declarations that have `@internal` in their JSDoc comments.\n\nSee more: https://www.typescriptlang.org/tsconfig#stripInternal"
},
"target": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Set the JavaScript language version for emitted JavaScript and include compatible library declarations.",
"type": ["string", "null"],
- "default": "ES3",
+ "default": "es3",
"anyOf": [
{
"enum": [
- "ES3",
- "ES5",
- "ES6",
- "ES2015",
- "ES2016",
- "ES2017",
- "ES2018",
- "ES2019",
- "ES2020",
- "ES2021",
- "ES2022",
- "ES2023",
- "ES2024",
- "ESNext"
+ "es3",
+ "es5",
+ "es6",
+ "es2015",
+ "es2016",
+ "es2017",
+ "es2018",
+ "es2019",
+ "es2020",
+ "es2021",
+ "es2022",
+ "es2023",
+ "es2024",
+ "esnext"
]
},
{
@@ -675,7 +625,6 @@
"markdownDescription": "Set the JavaScript language version for emitted JavaScript and include compatible library declarations.\n\nSee more: https://www.typescriptlang.org/tsconfig#target"
},
"useUnknownInCatchVariables": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Default catch clause variables as `unknown` instead of `any`.",
"type": ["boolean", "null"],
"default": false,
@@ -720,86 +669,72 @@
"default": "useFsEvents"
},
"experimentalDecorators": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable experimental support for TC39 stage 2 draft decorators.",
"type": ["boolean", "null"],
"markdownDescription": "Enable experimental support for TC39 stage 2 draft decorators.\n\nSee more: https://www.typescriptlang.org/tsconfig#experimentalDecorators"
},
"emitDecoratorMetadata": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Emit design-type metadata for decorated declarations in source files.",
"type": ["boolean", "null"],
"markdownDescription": "Emit design-type metadata for decorated declarations in source files.\n\nSee more: https://www.typescriptlang.org/tsconfig#emitDecoratorMetadata"
},
"allowUnusedLabels": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable error reporting for unused labels.",
"type": ["boolean", "null"],
"markdownDescription": "Disable error reporting for unused labels.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowUnusedLabels"
},
"noImplicitReturns": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable error reporting for codepaths that do not explicitly return in a function.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Enable error reporting for codepaths that do not explicitly return in a function.\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitReturns"
},
"noUncheckedIndexedAccess": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Add `undefined` to a type when accessed using an index.",
"type": ["boolean", "null"],
"markdownDescription": "Add `undefined` to a type when accessed using an index.\n\nSee more: https://www.typescriptlang.org/tsconfig#noUncheckedIndexedAccess"
},
"noFallthroughCasesInSwitch": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable error reporting for fallthrough cases in switch statements.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Enable error reporting for fallthrough cases in switch statements.\n\nSee more: https://www.typescriptlang.org/tsconfig#noFallthroughCasesInSwitch"
},
"noImplicitOverride": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Ensure overriding members in derived classes are marked with an override modifier.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Ensure overriding members in derived classes are marked with an override modifier.\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitOverride"
},
"allowUnreachableCode": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable error reporting for unreachable code.",
"type": ["boolean", "null"],
"markdownDescription": "Disable error reporting for unreachable code.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowUnreachableCode"
},
"forceConsistentCasingInFileNames": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Ensure that casing is correct in imports.",
"type": ["boolean", "null"],
"default": true,
"markdownDescription": "Ensure that casing is correct in imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#forceConsistentCasingInFileNames"
},
"generateCpuProfile": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Emit a v8 CPU profile of the compiler run for debugging.",
"type": ["string", "null"],
"default": "profile.cpuprofile",
"markdownDescription": "Emit a v8 CPU profile of the compiler run for debugging.\n\nSee more: https://www.typescriptlang.org/tsconfig#generateCpuProfile"
},
"baseUrl": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify the base directory to resolve non-relative module names.",
"type": ["string", "null"],
"markdownDescription": "Specify the base directory to resolve non-relative module names.\n\nSee more: https://www.typescriptlang.org/tsconfig#baseUrl"
},
"paths": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify a set of entries that re-map imports to additional lookup locations.",
"type": ["object", "null"],
"additionalProperties": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"type": ["array", "null"],
"uniqueItems": true,
"items": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"type": ["string", "null"],
"description": "Path mapping to be computed relative to baseUrl option."
}
@@ -807,11 +742,9 @@
"markdownDescription": "Specify a set of entries that re-map imports to additional lookup locations.\n\nSee more: https://www.typescriptlang.org/tsconfig#paths"
},
"plugins": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify a list of language service plugins to include.",
"type": ["array", "null"],
"items": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"type": ["object", "null"],
"properties": {
"name": {
@@ -823,7 +756,6 @@
"markdownDescription": "Specify a list of language service plugins to include.\n\nSee more: https://www.typescriptlang.org/tsconfig#plugins"
},
"rootDirs": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Allow multiple folders to be treated as one when resolving modules.",
"type": ["array", "null"],
"uniqueItems": true,
@@ -833,7 +765,6 @@
"markdownDescription": "Allow multiple folders to be treated as one when resolving modules.\n\nSee more: https://www.typescriptlang.org/tsconfig#rootDirs"
},
"typeRoots": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify multiple folders that act like `./node_modules/@types`.",
"type": ["array", "null"],
"uniqueItems": true,
@@ -843,7 +774,6 @@
"markdownDescription": "Specify multiple folders that act like `./node_modules/@types`.\n\nSee more: https://www.typescriptlang.org/tsconfig#typeRoots"
},
"types": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify type package names to be included without being referenced in a source file.",
"type": ["array", "null"],
"uniqueItems": true,
@@ -853,59 +783,50 @@
"markdownDescription": "Specify type package names to be included without being referenced in a source file.\n\nSee more: https://www.typescriptlang.org/tsconfig#types"
},
"traceResolution": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable tracing of the name resolution process. Requires TypeScript version 2.0 or later.",
"type": ["boolean", "null"],
"default": false
},
"allowJs": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowJs"
},
"noErrorTruncation": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable truncating types in error messages.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Disable truncating types in error messages.\n\nSee more: https://www.typescriptlang.org/tsconfig#noErrorTruncation"
},
"allowSyntheticDefaultImports": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Allow 'import x from y' when a module doesn't have a default export.",
"type": ["boolean", "null"],
"markdownDescription": "Allow 'import x from y' when a module doesn't have a default export.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowSyntheticDefaultImports"
},
"noImplicitUseStrict": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable adding 'use strict' directives in emitted JavaScript files.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Disable adding 'use strict' directives in emitted JavaScript files.\n\nSee more: https://www.typescriptlang.org/tsconfig#noImplicitUseStrict"
},
"listEmittedFiles": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Print the names of emitted files after a compilation.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Print the names of emitted files after a compilation.\n\nSee more: https://www.typescriptlang.org/tsconfig#listEmittedFiles"
},
"disableSizeLimit": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Remove the 20mb cap on total source code size for JavaScript files in the TypeScript language server.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Remove the 20mb cap on total source code size for JavaScript files in the TypeScript language server.\n\nSee more: https://www.typescriptlang.org/tsconfig#disableSizeLimit"
},
"lib": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify a set of bundled library declaration files that describe the target runtime environment.",
"type": ["array", "null"],
"uniqueItems": true,
"items": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"type": ["string", "null"],
"anyOf": [
{
@@ -954,6 +875,7 @@
"ESNext.BigInt",
"ESNext.Collection",
"ESNext.Intl",
+ "ESNext.Iterator",
"ESNext.Object",
"ESNext.Promise",
"ESNext.Regexp",
@@ -1001,7 +923,9 @@
"ES2017.Date",
"ES2023.Collection",
"ESNext.Decorators",
- "ESNext.Disposable"
+ "ESNext.Disposable",
+ "ESNext.Error",
+ "ESNext.Sharedmemory"
]
},
{
@@ -1056,26 +980,29 @@
},
"markdownDescription": "Specify a set of bundled library declaration files that describe the target runtime environment.\n\nSee more: https://www.typescriptlang.org/tsconfig#lib"
},
+ "libReplacement": {
+ "description": "Enable lib replacement.",
+ "type": ["boolean", "null"],
+ "default": true,
+ "markdownDescription": "Enable lib replacement.\n\nSee more: https://www.typescriptlang.org/tsconfig#libReplacement"
+ },
"moduleDetection": {
"description": "Specify how TypeScript determine a file as module.",
"enum": ["auto", "legacy", "force"]
},
"strictNullChecks": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "When type checking, take into account `null` and `undefined`.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "When type checking, take into account `null` and `undefined`.\n\nSee more: https://www.typescriptlang.org/tsconfig#strictNullChecks"
},
"maxNodeModuleJsDepth": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`.",
"type": ["number", "null"],
"default": 0,
"markdownDescription": "Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`.\n\nSee more: https://www.typescriptlang.org/tsconfig#maxNodeModuleJsDepth"
},
"importHelpers": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Allow importing helper functions from tslib once per project, instead of including them per-file.",
"type": ["boolean", "null"],
"default": false,
@@ -1087,104 +1014,89 @@
"enum": ["remove", "preserve", "error"]
},
"alwaysStrict": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Ensure 'use strict' is always emitted.",
"type": ["boolean", "null"],
"markdownDescription": "Ensure 'use strict' is always emitted.\n\nSee more: https://www.typescriptlang.org/tsconfig#alwaysStrict"
},
"strict": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable all strict type checking options.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Enable all strict type checking options.\n\nSee more: https://www.typescriptlang.org/tsconfig#strict"
},
"strictBindCallApply": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Check that the arguments for `bind`, `call`, and `apply` methods match the original function.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Check that the arguments for `bind`, `call`, and `apply` methods match the original function.\n\nSee more: https://www.typescriptlang.org/tsconfig#strictBindCallApply"
},
"downlevelIteration": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Emit more compliant, but verbose and less performant JavaScript for iteration.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Emit more compliant, but verbose and less performant JavaScript for iteration.\n\nSee more: https://www.typescriptlang.org/tsconfig#downlevelIteration"
},
"checkJs": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable error reporting in type-checked JavaScript files.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Enable error reporting in type-checked JavaScript files.\n\nSee more: https://www.typescriptlang.org/tsconfig#checkJs"
},
"strictFunctionTypes": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "When assigning functions, check to ensure parameters and the return values are subtype-compatible.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "When assigning functions, check to ensure parameters and the return values are subtype-compatible.\n\nSee more: https://www.typescriptlang.org/tsconfig#strictFunctionTypes"
},
"strictPropertyInitialization": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Check for class properties that are declared but not set in the constructor.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Check for class properties that are declared but not set in the constructor.\n\nSee more: https://www.typescriptlang.org/tsconfig#strictPropertyInitialization"
},
"esModuleInterop": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility.\n\nSee more: https://www.typescriptlang.org/tsconfig#esModuleInterop"
},
"allowUmdGlobalAccess": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Allow accessing UMD globals from modules.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Allow accessing UMD globals from modules.\n\nSee more: https://www.typescriptlang.org/tsconfig#allowUmdGlobalAccess"
},
"keyofStringsOnly": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Make keyof only return strings instead of string, numbers or symbols. Legacy option.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Make keyof only return strings instead of string, numbers or symbols. Legacy option.\n\nSee more: https://www.typescriptlang.org/tsconfig#keyofStringsOnly"
},
"useDefineForClassFields": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Emit ECMAScript-standard-compliant class fields.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Emit ECMAScript-standard-compliant class fields.\n\nSee more: https://www.typescriptlang.org/tsconfig#useDefineForClassFields"
},
"declarationMap": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Create sourcemaps for d.ts files.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Create sourcemaps for d.ts files.\n\nSee more: https://www.typescriptlang.org/tsconfig#declarationMap"
},
"resolveJsonModule": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable importing .json files",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Enable importing .json files\n\nSee more: https://www.typescriptlang.org/tsconfig#resolveJsonModule"
},
"resolvePackageJsonExports": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Use the package.json 'exports' field when resolving package imports.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Use the package.json 'exports' field when resolving package imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#resolvePackageJsonExports"
},
"resolvePackageJsonImports": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Use the package.json 'imports' field when resolving imports.",
"type": ["boolean", "null"],
"default": false,
@@ -1195,7 +1107,6 @@
"type": ["boolean", "null"]
},
"extendedDiagnostics": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Output more detailed compiler performance information after building.",
"type": ["boolean", "null"],
"default": false,
@@ -1206,46 +1117,39 @@
"type": ["boolean", "null"]
},
"disableSourceOfProjectReferenceRedirect": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable preferring source files instead of declaration files when referencing composite projects",
"type": ["boolean", "null"],
"markdownDescription": "Disable preferring source files instead of declaration files when referencing composite projects\n\nSee more: https://www.typescriptlang.org/tsconfig#disableSourceOfProjectReferenceRedirect"
},
"disableSolutionSearching": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Opt a project out of multi-project reference checking when editing.",
"type": ["boolean", "null"],
"markdownDescription": "Opt a project out of multi-project reference checking when editing.\n\nSee more: https://www.typescriptlang.org/tsconfig#disableSolutionSearching"
},
"verbatimModuleSyntax": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting.",
"type": ["boolean", "null"],
"markdownDescription": "Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting.\n\nSee more: https://www.typescriptlang.org/tsconfig#verbatimModuleSyntax"
},
"noCheck": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Disable full type checking (only critical parse and emit errors will be reported)",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Disable full type checking (only critical parse and emit errors will be reported)\n\nSee more: https://www.typescriptlang.org/tsconfig#noCheck"
},
"isolatedDeclarations": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Require sufficient annotation on exports so other tools can trivially generate declaration files.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Require sufficient annotation on exports so other tools can trivially generate declaration files.\n\nSee more: https://www.typescriptlang.org/tsconfig#isolatedDeclarations"
},
"noUncheckedSideEffectImports": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Check side effect imports.",
"type": ["boolean", "null"],
"default": false,
"markdownDescription": "Check side effect imports.\n\nSee more: https://www.typescriptlang.org/tsconfig#noUncheckedSideEffectImports"
},
"strictBuiltinIteratorReturn": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Built-in iterators are instantiated with a 'TReturn' type of 'undefined' instead of 'any'.",
"type": ["boolean", "null"],
"default": false,
@@ -1258,18 +1162,15 @@
"typeAcquisitionDefinition": {
"properties": {
"typeAcquisition": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"type": ["object", "null"],
"description": "Auto type (.d.ts) acquisition options for this project. Requires TypeScript version 2.1 or later.",
"properties": {
"enable": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Enable auto type acquisition",
"type": ["boolean", "null"],
"default": false
},
"include": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specifies a list of type declarations to be included in auto type acquisition. Ex. [\"jquery\", \"lodash\"]",
"type": ["array", "null"],
"uniqueItems": true,
@@ -1278,7 +1179,6 @@
}
},
"exclude": {
- "$comment": "The value of 'null' is UNDOCUMENTED (https://github.com/microsoft/TypeScript/pull/18058).",
"description": "Specifies a list of type declarations to be excluded from auto type acquisition. Ex. [\"jquery\", \"lodash\"]",
"type": ["array", "null"],
"uniqueItems": true,
@@ -94,7 +94,7 @@ pub fn init(languages: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, node: NodeRuntime
let ty_lsp_adapter = Arc::new(python::TyLspAdapter::new(fs.clone()));
let python_context_provider = Arc::new(python::PythonContextProvider);
let python_lsp_adapter = Arc::new(python::PyrightLspAdapter::new(node.clone()));
- let basedpyright_lsp_adapter = Arc::new(BasedPyrightLspAdapter::new());
+ let basedpyright_lsp_adapter = Arc::new(BasedPyrightLspAdapter::new(node.clone()));
let ruff_lsp_adapter = Arc::new(RuffLspAdapter::new(fs.clone()));
let python_toolchain_provider = Arc::new(python::PythonToolchainProvider);
let rust_context_provider = Arc::new(rust::RustContextProvider);
@@ -29,7 +29,6 @@ use parking_lot::Mutex;
use std::str::FromStr;
use std::{
borrow::Cow,
- ffi::OsString,
fmt::Write,
path::{Path, PathBuf},
sync::Arc,
@@ -65,9 +64,6 @@ impl ManifestProvider for PyprojectTomlManifestProvider {
}
}
-const SERVER_PATH: &str = "node_modules/pyright/langserver.index.js";
-const NODE_MODULE_RELATIVE_SERVER_PATH: &str = "pyright/langserver.index.js";
-
enum TestRunner {
UNITTEST,
PYTEST,
@@ -85,10 +81,6 @@ impl FromStr for TestRunner {
}
}
-fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
- vec![server_path.into(), "--stdio".into()]
-}
-
/// Pyright assigns each completion item a `sortText` of the form `XX.YYYY.name`.
/// Where `XX` is the sorting category, `YYYY` is based on most recent usage,
/// and `name` is the symbol name itself.
@@ -108,7 +100,7 @@ pub struct TyLspAdapter {
#[cfg(target_os = "macos")]
impl TyLspAdapter {
- const GITHUB_ASSET_KIND: AssetKind = AssetKind::Gz;
+ const GITHUB_ASSET_KIND: AssetKind = AssetKind::TarGz;
const ARCH_SERVER_NAME: &str = "apple-darwin";
}
@@ -224,15 +216,20 @@ impl LspInstaller for TyLspAdapter {
digest: expected_digest,
} = latest_version;
let destination_path = container_dir.join(format!("ty-{name}"));
+
+ async_fs::create_dir_all(&destination_path).await?;
+
let server_path = match Self::GITHUB_ASSET_KIND {
- AssetKind::TarGz | AssetKind::Gz => destination_path.clone(), // Tar and gzip extract in place.
- AssetKind::Zip => destination_path.clone().join("ty.exe"), // zip contains a .exe
+ AssetKind::TarGz | AssetKind::Gz => destination_path
+ .join(Self::build_asset_name()?.0)
+ .join("ty"),
+ AssetKind::Zip => destination_path.clone().join("ty.exe"),
};
let binary = LanguageServerBinary {
path: server_path.clone(),
env: None,
- arguments: Default::default(),
+ arguments: vec!["server".into()],
};
let metadata_path = destination_path.with_extension("metadata");
@@ -291,7 +288,7 @@ impl LspInstaller for TyLspAdapter {
Ok(LanguageServerBinary {
path: server_path,
env: None,
- arguments: Default::default(),
+ arguments: vec!["server".into()],
})
}
@@ -313,14 +310,16 @@ impl LspInstaller for TyLspAdapter {
let path = last.context("no cached binary")?;
let path = match TyLspAdapter::GITHUB_ASSET_KIND {
- AssetKind::TarGz | AssetKind::Gz => path, // Tar and gzip extract in place.
- AssetKind::Zip => path.join("ty.exe"), // zip contains a .exe
+ AssetKind::TarGz | AssetKind::Gz => {
+ path.join(Self::build_asset_name()?.0).join("ty")
+ }
+ AssetKind::Zip => path.join("ty.exe"),
};
anyhow::Ok(LanguageServerBinary {
path,
env: None,
- arguments: Default::default(),
+ arguments: vec!["server".into()],
})
})
.await
@@ -334,10 +333,29 @@ pub struct PyrightLspAdapter {
impl PyrightLspAdapter {
const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("pyright");
+ const SERVER_PATH: &str = "node_modules/pyright/langserver.index.js";
+ const NODE_MODULE_RELATIVE_SERVER_PATH: &str = "pyright/langserver.index.js";
pub fn new(node: NodeRuntime) -> Self {
PyrightLspAdapter { node }
}
+
+ async fn get_cached_server_binary(
+ container_dir: PathBuf,
+ node: &NodeRuntime,
+ ) -> Option<LanguageServerBinary> {
+ let server_path = container_dir.join(Self::SERVER_PATH);
+ if server_path.exists() {
+ Some(LanguageServerBinary {
+ path: node.binary_path().await.log_err()?,
+ env: None,
+ arguments: vec![server_path.into(), "--stdio".into()],
+ })
+ } else {
+ log::error!("missing executable in directory {:?}", server_path);
+ None
+ }
+ }
}
#[async_trait(?Send)]
@@ -550,13 +568,13 @@ impl LspInstaller for PyrightLspAdapter {
.await
.log_err()??;
- let path = node_modules_path.join(NODE_MODULE_RELATIVE_SERVER_PATH);
+ let path = node_modules_path.join(Self::NODE_MODULE_RELATIVE_SERVER_PATH);
let env = delegate.shell_env().await;
Some(LanguageServerBinary {
path: node,
env: Some(env),
- arguments: server_binary_arguments(&path),
+ arguments: vec![path.into(), "--stdio".into()],
})
}
}
@@ -567,7 +585,7 @@ impl LspInstaller for PyrightLspAdapter {
container_dir: PathBuf,
delegate: &dyn LspAdapterDelegate,
) -> Result<LanguageServerBinary> {
- let server_path = container_dir.join(SERVER_PATH);
+ let server_path = container_dir.join(Self::SERVER_PATH);
self.node
.npm_install_packages(
@@ -580,7 +598,7 @@ impl LspInstaller for PyrightLspAdapter {
Ok(LanguageServerBinary {
path: self.node.binary_path().await?,
env: Some(env),
- arguments: server_binary_arguments(&server_path),
+ arguments: vec![server_path.into(), "--stdio".into()],
})
}
@@ -590,7 +608,7 @@ impl LspInstaller for PyrightLspAdapter {
container_dir: &PathBuf,
delegate: &dyn LspAdapterDelegate,
) -> Option<LanguageServerBinary> {
- let server_path = container_dir.join(SERVER_PATH);
+ let server_path = container_dir.join(Self::SERVER_PATH);
let should_install_language_server = self
.node
@@ -609,7 +627,7 @@ impl LspInstaller for PyrightLspAdapter {
Some(LanguageServerBinary {
path: self.node.binary_path().await.ok()?,
env: Some(env),
- arguments: server_binary_arguments(&server_path),
+ arguments: vec![server_path.into(), "--stdio".into()],
})
}
}
@@ -619,29 +637,12 @@ impl LspInstaller for PyrightLspAdapter {
container_dir: PathBuf,
delegate: &dyn LspAdapterDelegate,
) -> Option<LanguageServerBinary> {
- let mut binary = get_cached_server_binary(container_dir, &self.node).await?;
+ let mut binary = Self::get_cached_server_binary(container_dir, &self.node).await?;
binary.env = Some(delegate.shell_env().await);
Some(binary)
}
}
-async fn get_cached_server_binary(
- container_dir: PathBuf,
- node: &NodeRuntime,
-) -> Option<LanguageServerBinary> {
- let server_path = container_dir.join(SERVER_PATH);
- if server_path.exists() {
- Some(LanguageServerBinary {
- path: node.binary_path().await.log_err()?,
- env: None,
- arguments: server_binary_arguments(&server_path),
- })
- } else {
- log::error!("missing executable in directory {:?}", server_path);
- None
- }
-}
-
pub(crate) struct PythonContextProvider;
const PYTHON_TEST_TARGET_TASK_VARIABLE: VariableName =
@@ -1606,64 +1607,34 @@ impl LspInstaller for PyLspAdapter {
}
pub(crate) struct BasedPyrightLspAdapter {
- python_venv_base: OnceCell<Result<Arc<Path>, String>>,
+ node: NodeRuntime,
}
impl BasedPyrightLspAdapter {
const SERVER_NAME: LanguageServerName = LanguageServerName::new_static("basedpyright");
const BINARY_NAME: &'static str = "basedpyright-langserver";
+ const SERVER_PATH: &str = "node_modules/basedpyright/langserver.index.js";
+ const NODE_MODULE_RELATIVE_SERVER_PATH: &str = "basedpyright/langserver.index.js";
- pub(crate) fn new() -> Self {
- Self {
- python_venv_base: OnceCell::new(),
- }
+ pub(crate) fn new(node: NodeRuntime) -> Self {
+ BasedPyrightLspAdapter { node }
}
- async fn ensure_venv(delegate: &dyn LspAdapterDelegate) -> Result<Arc<Path>> {
- let python_path = Self::find_base_python(delegate)
- .await
- .context("Could not find Python installation for basedpyright")?;
- let work_dir = delegate
- .language_server_download_dir(&Self::SERVER_NAME)
- .await
- .context("Could not get working directory for basedpyright")?;
- let mut path = PathBuf::from(work_dir.as_ref());
- path.push("basedpyright-venv");
- if !path.exists() {
- util::command::new_smol_command(python_path)
- .arg("-m")
- .arg("venv")
- .arg("basedpyright-venv")
- .current_dir(work_dir)
- .spawn()
- .context("spawning child")?
- .output()
- .await
- .context("getting child output")?;
- }
-
- Ok(path.into())
- }
-
- // Find "baseline", user python version from which we'll create our own venv.
- async fn find_base_python(delegate: &dyn LspAdapterDelegate) -> Option<PathBuf> {
- for path in ["python3", "python"] {
- if let Some(path) = delegate.which(path.as_ref()).await {
- return Some(path);
- }
- }
- None
- }
-
- async fn base_venv(&self, delegate: &dyn LspAdapterDelegate) -> Result<Arc<Path>, String> {
- self.python_venv_base
- .get_or_init(move || async move {
- Self::ensure_venv(delegate)
- .await
- .map_err(|e| format!("{e}"))
+ async fn get_cached_server_binary(
+ container_dir: PathBuf,
+ node: &NodeRuntime,
+ ) -> Option<LanguageServerBinary> {
+ let server_path = container_dir.join(Self::SERVER_PATH);
+ if server_path.exists() {
+ Some(LanguageServerBinary {
+ path: node.binary_path().await.log_err()?,
+ env: None,
+ arguments: vec![server_path.into(), "--stdio".into()],
})
- .await
- .clone()
+ } else {
+ log::error!("missing executable in directory {:?}", server_path);
+ None
+ }
}
}
@@ -1853,90 +1824,112 @@ impl LspAdapter for BasedPyrightLspAdapter {
}
impl LspInstaller for BasedPyrightLspAdapter {
- type BinaryVersion = ();
+ type BinaryVersion = String;
async fn fetch_latest_server_version(
&self,
_: &dyn LspAdapterDelegate,
_: bool,
_: &mut AsyncApp,
- ) -> Result<()> {
- Ok(())
+ ) -> Result<String> {
+ self.node
+ .npm_package_latest_version(Self::SERVER_NAME.as_ref())
+ .await
}
async fn check_if_user_installed(
&self,
delegate: &dyn LspAdapterDelegate,
- toolchain: Option<Toolchain>,
+ _: Option<Toolchain>,
_: &AsyncApp,
) -> Option<LanguageServerBinary> {
- if let Some(bin) = delegate.which(Self::BINARY_NAME.as_ref()).await {
+ if let Some(path) = delegate.which(Self::BINARY_NAME.as_ref()).await {
let env = delegate.shell_env().await;
Some(LanguageServerBinary {
- path: bin,
+ path,
env: Some(env),
arguments: vec!["--stdio".into()],
})
} else {
- let path = Path::new(toolchain?.path.as_ref())
- .parent()?
- .join(Self::BINARY_NAME);
- delegate
- .which(path.as_os_str())
+ // TODO shouldn't this be self.node.binary_path()?
+ let node = delegate.which("node".as_ref()).await?;
+ let (node_modules_path, _) = delegate
+ .npm_package_installed_version(Self::SERVER_NAME.as_ref())
.await
- .map(|_| LanguageServerBinary {
- path,
- arguments: vec!["--stdio".into()],
- env: None,
- })
+ .log_err()??;
+
+ let path = node_modules_path.join(Self::NODE_MODULE_RELATIVE_SERVER_PATH);
+
+ let env = delegate.shell_env().await;
+ Some(LanguageServerBinary {
+ path: node,
+ env: Some(env),
+ arguments: vec![path.into(), "--stdio".into()],
+ })
}
}
async fn fetch_server_binary(
&self,
- _latest_version: (),
- _container_dir: PathBuf,
+ latest_version: Self::BinaryVersion,
+ container_dir: PathBuf,
delegate: &dyn LspAdapterDelegate,
) -> Result<LanguageServerBinary> {
- let venv = self.base_venv(delegate).await.map_err(|e| anyhow!(e))?;
- let pip_path = venv.join(BINARY_DIR).join("pip3");
- ensure!(
- util::command::new_smol_command(pip_path.as_path())
- .arg("install")
- .arg("basedpyright")
- .arg("--upgrade")
- .output()
- .await
- .context("getting pip install output")?
- .status
- .success(),
- "basedpyright installation failed"
- );
- let path = venv.join(BINARY_DIR).join(Self::BINARY_NAME);
- ensure!(
- delegate.which(path.as_os_str()).await.is_some(),
- "basedpyright installation was incomplete"
- );
+ let server_path = container_dir.join(Self::SERVER_PATH);
+
+ self.node
+ .npm_install_packages(
+ &container_dir,
+ &[(Self::SERVER_NAME.as_ref(), latest_version.as_str())],
+ )
+ .await?;
+
+ let env = delegate.shell_env().await;
Ok(LanguageServerBinary {
- path,
- env: None,
- arguments: vec!["--stdio".into()],
+ path: self.node.binary_path().await?,
+ env: Some(env),
+ arguments: vec![server_path.into(), "--stdio".into()],
})
}
+ async fn check_if_version_installed(
+ &self,
+ version: &Self::BinaryVersion,
+ container_dir: &PathBuf,
+ delegate: &dyn LspAdapterDelegate,
+ ) -> Option<LanguageServerBinary> {
+ let server_path = container_dir.join(Self::SERVER_PATH);
+
+ let should_install_language_server = self
+ .node
+ .should_install_npm_package(
+ Self::SERVER_NAME.as_ref(),
+ &server_path,
+ container_dir,
+ VersionStrategy::Latest(version),
+ )
+ .await;
+
+ if should_install_language_server {
+ None
+ } else {
+ let env = delegate.shell_env().await;
+ Some(LanguageServerBinary {
+ path: self.node.binary_path().await.ok()?,
+ env: Some(env),
+ arguments: vec![server_path.into(), "--stdio".into()],
+ })
+ }
+ }
+
async fn cached_server_binary(
&self,
- _container_dir: PathBuf,
+ container_dir: PathBuf,
delegate: &dyn LspAdapterDelegate,
) -> Option<LanguageServerBinary> {
- let venv = self.base_venv(delegate).await.ok()?;
- let path = venv.join(BINARY_DIR).join(Self::BINARY_NAME);
- delegate.which(path.as_os_str()).await?;
- Some(LanguageServerBinary {
- path,
- env: None,
- arguments: vec!["--stdio".into()],
- })
+ let mut binary = Self::get_cached_server_binary(container_dir, &self.node).await?;
+ binary.env = Some(delegate.shell_env().await);
+ Some(binary)
}
}
@@ -29,6 +29,9 @@ jsx_element_node_name = "jsx_element"
tag_name_node_name = "identifier"
tag_name_node_name_alternates = ["member_expression"]
+[overrides.default]
+linked_edit_characters = ["."]
+
[overrides.element]
line_comments = { remove = true }
block_comment = { start = "{/*", prefix = "", end = "*/}", tab_size = 0 }
@@ -124,4 +124,26 @@
)
) @item
+; Arrow functions in variable declarations (anywhere in the tree, including nested in functions)
+(lexical_declaration
+ ["let" "const"] @context
+ (variable_declarator
+ name: (_) @name
+ value: (arrow_function)) @item)
+
+; Async arrow functions in variable declarations
+(lexical_declaration
+ ["let" "const"] @context
+ (variable_declarator
+ name: (_) @name
+ value: (arrow_function
+ "async" @context)) @item)
+
+; Named function expressions in variable declarations
+(lexical_declaration
+ ["let" "const"] @context
+ (variable_declarator
+ name: (_) @name
+ value: (function_expression)) @item)
+
(comment) @annotation
@@ -124,4 +124,26 @@
)
) @item
+; Arrow functions in variable declarations (anywhere in the tree, including nested in functions)
+(lexical_declaration
+ ["let" "const"] @context
+ (variable_declarator
+ name: (_) @name
+ value: (arrow_function)) @item)
+
+; Async arrow functions in variable declarations
+(lexical_declaration
+ ["let" "const"] @context
+ (variable_declarator
+ name: (_) @name
+ value: (arrow_function
+ "async" @context)) @item)
+
+; Named function expressions in variable declarations
+(lexical_declaration
+ ["let" "const"] @context
+ (variable_declarator
+ name: (_) @name
+ value: (function_expression)) @item)
+
(comment) @annotation
@@ -41,6 +41,7 @@ serde_urlencoded.workspace = true
settings.workspace = true
smallvec.workspace = true
tokio-tungstenite.workspace = true
+ui.workspace = true
util.workspace = true
workspace-hack.workspace = true
@@ -97,8 +97,10 @@ impl Render for RemoteVideoTrackView {
self.previous_rendered_frame = Some(current_rendered_frame)
}
self.current_rendered_frame = Some(latest_frame.clone());
- return gpui::img(latest_frame.clone())
+ use gpui::ParentElement;
+ return ui::h_flex()
.size_full()
+ .child(gpui::img(latest_frame.clone()).size_full())
.into_any_element();
}
@@ -20,6 +20,7 @@ test-support = [
[dependencies]
base64.workspace = true
+collections.workspace = true
futures.workspace = true
gpui.workspace = true
language.workspace = true
@@ -9,8 +9,6 @@ use log::Level;
pub use path_range::{LineCol, PathWithRange};
use std::borrow::Cow;
-use std::collections::HashMap;
-use std::collections::HashSet;
use std::iter;
use std::mem;
use std::ops::Range;
@@ -19,6 +17,7 @@ use std::rc::Rc;
use std::sync::Arc;
use std::time::Duration;
+use collections::{HashMap, HashSet};
use gpui::{
AnyElement, App, BorderStyle, Bounds, ClipboardItem, CursorStyle, DispatchPhase, Edges, Entity,
FocusHandle, Focusable, FontStyle, FontWeight, GlobalElementId, Hitbox, Hsla, Image,
@@ -176,7 +175,7 @@ impl Markdown {
options: Options {
parse_links_only: false,
},
- copied_code_blocks: HashSet::new(),
+ copied_code_blocks: HashSet::default(),
};
this.parse(cx);
this
@@ -199,7 +198,7 @@ impl Markdown {
options: Options {
parse_links_only: true,
},
- copied_code_blocks: HashSet::new(),
+ copied_code_blocks: HashSet::default(),
};
this.parse(cx);
this
@@ -4,7 +4,9 @@ pub use pulldown_cmark::TagEnd as MarkdownTagEnd;
use pulldown_cmark::{
Alignment, CowStr, HeadingLevel, LinkType, MetadataBlockKind, Options, Parser,
};
-use std::{collections::HashSet, ops::Range, path::Path, sync::Arc};
+use std::{ops::Range, path::Path, sync::Arc};
+
+use collections::HashSet;
use crate::path_range::PathWithRange;
@@ -26,8 +28,8 @@ pub fn parse_markdown(
HashSet<Arc<Path>>,
) {
let mut events = Vec::new();
- let mut language_names = HashSet::new();
- let mut language_paths = HashSet::new();
+ let mut language_names = HashSet::default();
+ let mut language_paths = HashSet::default();
let mut within_link = false;
let mut within_metadata = false;
let mut parser = Parser::new_ext(text, PARSE_OPTIONS)
@@ -579,8 +581,8 @@ mod tests {
(30..37, Text),
(30..37, End(MarkdownTagEnd::Paragraph))
],
- HashSet::new(),
- HashSet::new()
+ HashSet::default(),
+ HashSet::default()
)
)
}
@@ -613,8 +615,8 @@ mod tests {
(46..51, Text),
(0..51, End(MarkdownTagEnd::Paragraph))
],
- HashSet::new(),
- HashSet::new()
+ HashSet::default(),
+ HashSet::default()
)
);
}
@@ -670,8 +672,8 @@ mod tests {
(43..53, SubstitutedText("–––––".into())),
(0..53, End(MarkdownTagEnd::Paragraph))
],
- HashSet::new(),
- HashSet::new()
+ HashSet::default(),
+ HashSet::default()
)
)
}
@@ -695,8 +697,12 @@ mod tests {
(8..34, Text),
(0..37, End(MarkdownTagEnd::CodeBlock)),
],
- HashSet::from(["rust".into()]),
- HashSet::new()
+ {
+ let mut h = HashSet::default();
+ h.insert("rust".into());
+ h
+ },
+ HashSet::default()
)
);
assert_eq!(
@@ -716,8 +722,8 @@ mod tests {
(4..16, Text),
(4..16, End(MarkdownTagEnd::CodeBlock))
],
- HashSet::new(),
- HashSet::new()
+ HashSet::default(),
+ HashSet::default()
)
);
}
@@ -17,10 +17,10 @@ use gpui::{App, AppContext as _, Context, Entity, EntityId, EventEmitter, Task};
use itertools::Itertools;
use language::{
AutoindentMode, Buffer, BufferChunks, BufferRow, BufferSnapshot, Capability, CharClassifier,
- CharKind, Chunk, CursorShape, DiagnosticEntry, DiskState, File, IndentGuideSettings,
- IndentSize, Language, LanguageScope, OffsetRangeExt, OffsetUtf16, Outline, OutlineItem, Point,
- PointUtf16, Selection, TextDimension, TextObject, ToOffset as _, ToPoint as _, TransactionId,
- TreeSitterOptions, Unclipped,
+ CharKind, CharScopeContext, Chunk, CursorShape, DiagnosticEntry, DiskState, File,
+ IndentGuideSettings, IndentSize, Language, LanguageScope, OffsetRangeExt, OffsetUtf16, Outline,
+ OutlineItem, Point, PointUtf16, Selection, TextDimension, TextObject, ToOffset as _,
+ ToPoint as _, TransactionId, TreeSitterOptions, Unclipped,
language_settings::{LanguageSettings, language_settings},
};
@@ -4204,11 +4204,15 @@ impl MultiBufferSnapshot {
self.diffs.values().any(|diff| !diff.is_empty())
}
- pub fn is_inside_word<T: ToOffset>(&self, position: T, for_completion: bool) -> bool {
+ pub fn is_inside_word<T: ToOffset>(
+ &self,
+ position: T,
+ scope_context: Option<CharScopeContext>,
+ ) -> bool {
let position = position.to_offset(self);
let classifier = self
.char_classifier_at(position)
- .for_completion(for_completion);
+ .scope_context(scope_context);
let next_char_kind = self.chars_at(position).next().map(|c| classifier.kind(c));
let prev_char_kind = self
.reversed_chars_at(position)
@@ -4220,16 +4224,14 @@ impl MultiBufferSnapshot {
pub fn surrounding_word<T: ToOffset>(
&self,
start: T,
- for_completion: bool,
+ scope_context: Option<CharScopeContext>,
) -> (Range<usize>, Option<CharKind>) {
let mut start = start.to_offset(self);
let mut end = start;
let mut next_chars = self.chars_at(start).peekable();
let mut prev_chars = self.reversed_chars_at(start).peekable();
- let classifier = self
- .char_classifier_at(start)
- .for_completion(for_completion);
+ let classifier = self.char_classifier_at(start).scope_context(scope_context);
let word_kind = cmp::max(
prev_chars.peek().copied().map(|c| classifier.kind(c)),
@@ -4258,12 +4260,10 @@ impl MultiBufferSnapshot {
pub fn char_kind_before<T: ToOffset>(
&self,
start: T,
- for_completion: bool,
+ scope_context: Option<CharScopeContext>,
) -> Option<CharKind> {
let start = start.to_offset(self);
- let classifier = self
- .char_classifier_at(start)
- .for_completion(for_completion);
+ let classifier = self.char_classifier_at(start).scope_context(scope_context);
self.reversed_chars_at(start)
.next()
.map(|ch| classifier.kind(ch))
@@ -5259,7 +5259,8 @@ impl MultiBufferSnapshot {
} else {
Anchor::max()
};
- // TODO this is a hack, remove it
+
+ // TODO this is a hack, because all APIs should be able to handle ExcerptId::min and max.
if let Some((excerpt_id, _, _)) = self.as_singleton() {
anchor.excerpt_id = *excerpt_id;
}
@@ -22,6 +22,7 @@ gpui.workspace = true
menu.workspace = true
schemars.workspace = true
serde.workspace = true
+theme.workspace = true
ui.workspace = true
workspace.workspace = true
workspace-hack.workspace = true
@@ -10,36 +10,36 @@ pub struct HighlightedMatchWithPaths {
pub struct HighlightedMatch {
pub text: String,
pub highlight_positions: Vec<usize>,
- pub char_count: usize,
pub color: Color,
}
impl HighlightedMatch {
pub fn join(components: impl Iterator<Item = Self>, separator: &str) -> Self {
- let mut char_count = 0;
- let separator_char_count = separator.chars().count();
+ // Track a running byte offset and insert separators between parts.
+ let mut first = true;
+ let mut byte_offset = 0;
let mut text = String::new();
let mut highlight_positions = Vec::new();
for component in components {
- if char_count != 0 {
+ if !first {
text.push_str(separator);
- char_count += separator_char_count;
+ byte_offset += separator.len();
}
+ first = false;
highlight_positions.extend(
component
.highlight_positions
.iter()
- .map(|position| position + char_count),
+ .map(|position| position + byte_offset),
);
text.push_str(&component.text);
- char_count += component.text.chars().count();
+ byte_offset += component.text.len();
}
Self {
text,
highlight_positions,
- char_count,
color: Color::Default,
}
}
@@ -73,3 +73,36 @@ impl RenderOnce for HighlightedMatchWithPaths {
})
}
}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn join_offsets_positions_by_bytes_not_chars() {
+ // "αβγ" is 3 Unicode scalar values, 6 bytes in UTF-8.
+ let left_text = "αβγ".to_string();
+ let right_text = "label".to_string();
+ let left = HighlightedMatch {
+ text: left_text,
+ highlight_positions: vec![],
+ color: Color::Default,
+ };
+ let right = HighlightedMatch {
+ text: right_text,
+ highlight_positions: vec![0, 1],
+ color: Color::Default,
+ };
+ let joined = HighlightedMatch::join([left, right].into_iter(), "");
+
+ assert!(
+ joined
+ .highlight_positions
+ .iter()
+ .all(|&p| joined.text.is_char_boundary(p)),
+ "join produced non-boundary positions {:?} for text {:?}",
+ joined.highlight_positions,
+ joined.text
+ );
+ }
+}
@@ -18,11 +18,12 @@ use head::Head;
use schemars::JsonSchema;
use serde::Deserialize;
use std::{ops::Range, sync::Arc, time::Duration};
+use theme::ThemeSettings;
use ui::{
- Color, Divider, Label, ListItem, ListItemSpacing, ScrollAxes, Scrollbars, WithScrollbar,
- prelude::*, v_flex,
+ Color, Divider, DocumentationAside, DocumentationEdge, DocumentationSide, Label, ListItem,
+ ListItemSpacing, ScrollAxes, Scrollbars, WithScrollbar, prelude::*, utils::WithRemSize, v_flex,
};
-use workspace::ModalView;
+use workspace::{ModalView, item::Settings};
enum ElementContainer {
List(ListState),
@@ -222,6 +223,14 @@ pub trait PickerDelegate: Sized + 'static {
) -> Option<AnyElement> {
None
}
+
+ fn documentation_aside(
+ &self,
+ _window: &mut Window,
+ _cx: &mut Context<Picker<Self>>,
+ ) -> Option<DocumentationAside> {
+ None
+ }
}
impl<D: PickerDelegate> Focusable for Picker<D> {
@@ -781,8 +790,15 @@ impl<D: PickerDelegate> ModalView for Picker<D> {}
impl<D: PickerDelegate> Render for Picker<D> {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+ let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
+ let window_size = window.viewport_size();
+ let rem_size = window.rem_size();
+ let is_wide_window = window_size.width / rem_size > rems_from_px(800.).0;
+
+ let aside = self.delegate.documentation_aside(window, cx);
+
let editor_position = self.delegate.editor_position();
- v_flex()
+ let menu = v_flex()
.key_context("Picker")
.size_full()
.when_some(self.width, |el, width| el.w(width))
@@ -865,6 +881,47 @@ impl<D: PickerDelegate> Render for Picker<D> {
}
}
Head::Empty(empty_head) => Some(div().child(empty_head.clone())),
- })
+ });
+
+ let Some(aside) = aside else {
+ return menu;
+ };
+
+ let render_aside = |aside: DocumentationAside, cx: &mut Context<Self>| {
+ WithRemSize::new(ui_font_size)
+ .occlude()
+ .elevation_2(cx)
+ .w_full()
+ .p_2()
+ .overflow_hidden()
+ .when(is_wide_window, |this| this.max_w_96())
+ .when(!is_wide_window, |this| this.max_w_48())
+ .child((aside.render)(cx))
+ };
+
+ if is_wide_window {
+ div().relative().child(menu).child(
+ h_flex()
+ .absolute()
+ .when(aside.side == DocumentationSide::Left, |this| {
+ this.right_full().mr_1()
+ })
+ .when(aside.side == DocumentationSide::Right, |this| {
+ this.left_full().ml_1()
+ })
+ .when(aside.edge == DocumentationEdge::Top, |this| this.top_0())
+ .when(aside.edge == DocumentationEdge::Bottom, |this| {
+ this.bottom_0()
+ })
+ .child(render_aside(aside, cx)),
+ )
+ } else {
+ v_flex()
+ .w_full()
+ .gap_1()
+ .justify_end()
+ .child(render_aside(aside, cx))
+ .child(menu)
+ }
}
}
@@ -282,16 +282,17 @@ impl ContextServerStore {
self.servers.get(id).map(|state| state.configuration())
}
- pub fn all_server_ids(&self) -> Vec<ContextServerId> {
- self.servers.keys().cloned().collect()
- }
-
- pub fn all_registry_descriptor_ids(&self, cx: &App) -> Vec<ContextServerId> {
- self.registry
- .read(cx)
- .context_server_descriptors()
- .into_iter()
- .map(|(id, _)| ContextServerId(id))
+ pub fn server_ids(&self, cx: &App) -> HashSet<ContextServerId> {
+ self.servers
+ .keys()
+ .cloned()
+ .chain(
+ self.registry
+ .read(cx)
+ .context_server_descriptors()
+ .into_iter()
+ .map(|(id, _)| ContextServerId(id)),
+ )
.collect()
}
@@ -344,8 +344,8 @@ mod tests {
assert_eq!(conflicts_in_range.len(), 1);
// Test with a range that doesn't include any conflicts
- let range = buffer.anchor_after(first_conflict_end.to_offset(&buffer) + 1)
- ..buffer.anchor_before(second_conflict_start.to_offset(&buffer) - 1);
+ let range = buffer.anchor_after(first_conflict_end.to_next_offset(&buffer))
+ ..buffer.anchor_before(second_conflict_start.to_previous_offset(&buffer));
let conflicts_in_range = conflict_snapshot.conflicts_in_range(range, &snapshot);
assert_eq!(conflicts_in_range.len(), 0);
}
@@ -16,8 +16,8 @@ use collections::{HashMap, HashSet};
use futures::future;
use gpui::{App, AsyncApp, Entity, Task};
use language::{
- Anchor, Bias, Buffer, BufferSnapshot, CachedLspAdapter, CharKind, OffsetRangeExt, PointUtf16,
- ToOffset, ToPointUtf16, Transaction, Unclipped,
+ Anchor, Bias, Buffer, BufferSnapshot, CachedLspAdapter, CharKind, CharScopeContext,
+ OffsetRangeExt, PointUtf16, ToOffset, ToPointUtf16, Transaction, Unclipped,
language_settings::{InlayHintKind, LanguageSettings, language_settings},
point_from_lsp, point_to_lsp,
proto::{deserialize_anchor, deserialize_version, serialize_anchor, serialize_version},
@@ -350,7 +350,7 @@ impl LspCommand for PrepareRename {
}
Some(lsp::PrepareRenameResponse::DefaultBehavior { .. }) => {
let snapshot = buffer.snapshot();
- let (range, _) = snapshot.surrounding_word(self.position, false);
+ let (range, _) = snapshot.surrounding_word(self.position, None);
let range = snapshot.anchor_after(range.start)..snapshot.anchor_before(range.end);
Ok(PrepareRenameResponse::Success(range))
}
@@ -2293,7 +2293,10 @@ impl LspCommand for GetCompletions {
range_for_token
.get_or_insert_with(|| {
let offset = self.position.to_offset(&snapshot);
- let (range, kind) = snapshot.surrounding_word(offset, true);
+ let (range, kind) = snapshot.surrounding_word(
+ offset,
+ Some(CharScopeContext::Completion),
+ );
let range = if kind == Some(CharKind::Word) {
range
} else {
@@ -770,12 +770,9 @@ impl SettingsObserver {
envelope: TypedEnvelope<proto::UpdateUserSettings>,
cx: AsyncApp,
) -> anyhow::Result<()> {
- let new_settings = serde_json::from_str(&envelope.payload.contents).with_context(|| {
- format!("deserializing {} user settings", envelope.payload.contents)
- })?;
cx.update_global(|settings_store: &mut SettingsStore, cx| {
settings_store
- .set_raw_user_settings(new_settings, cx)
+ .set_user_settings(&envelope.payload.contents, cx)
.context("setting new user settings")?;
anyhow::Ok(())
})??;
@@ -463,8 +463,7 @@ impl PickerDelegate for RecentProjectsDelegate {
.map(|path| {
let highlighted_text =
highlights_for_path(path.as_ref(), &hit.positions, path_start_offset);
-
- path_start_offset += highlighted_text.1.char_count;
+ path_start_offset += highlighted_text.1.text.len();
highlighted_text
})
.unzip();
@@ -590,34 +589,33 @@ fn highlights_for_path(
path_start_offset: usize,
) -> (Option<HighlightedMatch>, HighlightedMatch) {
let path_string = path.to_string_lossy();
- let path_char_count = path_string.chars().count();
+ let path_text = path_string.to_string();
+ let path_byte_len = path_text.len();
// Get the subset of match highlight positions that line up with the given path.
// Also adjusts them to start at the path start
let path_positions = match_positions
.iter()
.copied()
.skip_while(|position| *position < path_start_offset)
- .take_while(|position| *position < path_start_offset + path_char_count)
+ .take_while(|position| *position < path_start_offset + path_byte_len)
.map(|position| position - path_start_offset)
.collect::<Vec<_>>();
// Again subset the highlight positions to just those that line up with the file_name
// again adjusted to the start of the file_name
let file_name_text_and_positions = path.file_name().map(|file_name| {
- let text = file_name.to_string_lossy();
- let char_count = text.chars().count();
- let file_name_start = path_char_count - char_count;
+ let file_name_text = file_name.to_string_lossy().to_string();
+ let file_name_start_byte = path_byte_len - file_name_text.len();
let highlight_positions = path_positions
.iter()
.copied()
- .skip_while(|position| *position < file_name_start)
- .take_while(|position| *position < file_name_start + char_count)
- .map(|position| position - file_name_start)
+ .skip_while(|position| *position < file_name_start_byte)
+ .take_while(|position| *position < file_name_start_byte + file_name_text.len())
+ .map(|position| position - file_name_start_byte)
.collect::<Vec<_>>();
HighlightedMatch {
- text: text.to_string(),
+ text: file_name_text,
highlight_positions,
- char_count,
color: Color::Default,
}
});
@@ -625,9 +623,8 @@ fn highlights_for_path(
(
file_name_text_and_positions,
HighlightedMatch {
- text: path_string.to_string(),
+ text: path_text,
highlight_positions: path_positions,
- char_count: path_char_count,
color: Color::Default,
},
)
@@ -1797,8 +1797,8 @@ async fn test_remote_external_agent_server(
pretty_assertions::assert_eq!(names, ["gemini", "claude"]);
server_cx.update_global::<SettingsStore, _>(|settings_store, cx| {
settings_store
- .set_raw_server_settings(
- Some(json!({
+ .set_server_settings(
+ &json!({
"agent_servers": {
"foo": {
"command": "foo-cli",
@@ -1808,7 +1808,8 @@ async fn test_remote_external_agent_server(
}
}
}
- })),
+ })
+ .to_string(),
cx,
)
.unwrap();
@@ -30,6 +30,76 @@ impl Rope {
Self::default()
}
+ pub fn is_char_boundary(&self, offset: usize) -> bool {
+ if self.chunks.is_empty() {
+ return offset == 0;
+ }
+ let mut cursor = self.chunks.cursor::<usize>(&());
+ cursor.seek(&offset, Bias::Left);
+ let chunk_offset = offset - cursor.start();
+ cursor
+ .item()
+ .map(|chunk| chunk.text.is_char_boundary(chunk_offset))
+ .unwrap_or(false)
+ }
+
+ pub fn floor_char_boundary(&self, index: usize) -> usize {
+ if index >= self.len() {
+ self.len()
+ } else {
+ #[inline]
+ pub(crate) const fn is_utf8_char_boundary(u8: u8) -> bool {
+ // This is bit magic equivalent to: b < 128 || b >= 192
+ (u8 as i8) >= -0x40
+ }
+
+ let mut cursor = self.chunks.cursor::<usize>(&());
+ cursor.seek(&index, Bias::Left);
+ let chunk_offset = index - cursor.start();
+ let lower_idx = cursor.item().map(|chunk| {
+ let lower_bound = chunk_offset.saturating_sub(3);
+ chunk
+ .text
+ .as_bytes()
+ .get(lower_bound..=chunk_offset)
+ .map(|it| {
+ let new_idx = it
+ .iter()
+ .rposition(|&b| is_utf8_char_boundary(b))
+ .unwrap_or(0);
+ lower_bound + new_idx
+ })
+ .unwrap_or(chunk.text.len())
+ });
+ lower_idx.map_or_else(|| self.len(), |idx| cursor.start() + idx)
+ }
+ }
+
+ pub fn ceil_char_boundary(&self, index: usize) -> usize {
+ if index > self.len() {
+ self.len()
+ } else {
+ #[inline]
+ pub(crate) const fn is_utf8_char_boundary(u8: u8) -> bool {
+ // This is bit magic equivalent to: b < 128 || b >= 192
+ (u8 as i8) >= -0x40
+ }
+
+ let mut cursor = self.chunks.cursor::<usize>(&());
+ cursor.seek(&index, Bias::Left);
+ let chunk_offset = index - cursor.start();
+ let upper_idx = cursor.item().map(|chunk| {
+ let upper_bound = Ord::min(chunk_offset + 4, chunk.text.len());
+ chunk.text.as_bytes()[chunk_offset..upper_bound]
+ .iter()
+ .position(|&b| is_utf8_char_boundary(b))
+ .map_or(upper_bound, |pos| pos + chunk_offset)
+ });
+
+ upper_idx.map_or_else(|| self.len(), |idx| cursor.start() + idx)
+ }
+ }
+
pub fn append(&mut self, rope: Rope) {
if let Some(chunk) = rope.chunks.first()
&& (self
@@ -389,26 +459,10 @@ impl Rope {
})
}
- pub fn clip_offset(&self, mut offset: usize, bias: Bias) -> usize {
- let mut cursor = self.chunks.cursor::<usize>(&());
- cursor.seek(&offset, Bias::Left);
- if let Some(chunk) = cursor.item() {
- let mut ix = offset - cursor.start();
- while !chunk.text.is_char_boundary(ix) {
- match bias {
- Bias::Left => {
- ix -= 1;
- offset -= 1;
- }
- Bias::Right => {
- ix += 1;
- offset += 1;
- }
- }
- }
- offset
- } else {
- self.summary().len
+ pub fn clip_offset(&self, offset: usize, bias: Bias) -> usize {
+ match bias {
+ Bias::Left => self.floor_char_boundary(offset),
+ Bias::Right => self.ceil_char_boundary(offset),
}
}
@@ -2069,6 +2123,103 @@ mod tests {
assert!(!rope.reversed_chunks_in_range(0..0).equals_str("foo"));
}
+ #[test]
+ fn test_is_char_boundary() {
+ let fixture = "地";
+ let rope = Rope::from("地");
+ for b in 0..=fixture.len() {
+ assert_eq!(rope.is_char_boundary(b), fixture.is_char_boundary(b));
+ }
+ let fixture = "";
+ let rope = Rope::from("");
+ for b in 0..=fixture.len() {
+ assert_eq!(rope.is_char_boundary(b), fixture.is_char_boundary(b));
+ }
+ let fixture = "🔴🟠🟡🟢🔵🟣⚫️⚪️🟤\n🏳️⚧️🏁🏳️🌈🏴☠️⛳️📬📭🏴🏳️🚩";
+ let rope = Rope::from("🔴🟠🟡🟢🔵🟣⚫️⚪️🟤\n🏳️⚧️🏁🏳️🌈🏴☠️⛳️📬📭🏴🏳️🚩");
+ for b in 0..=fixture.len() {
+ assert_eq!(rope.is_char_boundary(b), fixture.is_char_boundary(b));
+ }
+ }
+
+ #[test]
+ fn test_floor_char_boundary() {
+ // polyfill of str::floor_char_boundary
+ fn floor_char_boundary(str: &str, index: usize) -> usize {
+ if index >= str.len() {
+ str.len()
+ } else {
+ let lower_bound = index.saturating_sub(3);
+ let new_index = str.as_bytes()[lower_bound..=index]
+ .iter()
+ .rposition(|b| (*b as i8) >= -0x40);
+
+ lower_bound + new_index.unwrap()
+ }
+ }
+
+ let fixture = "地";
+ let rope = Rope::from("地");
+ for b in 0..=fixture.len() {
+ assert_eq!(
+ rope.floor_char_boundary(b),
+ floor_char_boundary(&fixture, b)
+ );
+ }
+
+ let fixture = "";
+ let rope = Rope::from("");
+ for b in 0..=fixture.len() {
+ assert_eq!(
+ rope.floor_char_boundary(b),
+ floor_char_boundary(&fixture, b)
+ );
+ }
+
+ let fixture = "🔴🟠🟡🟢🔵🟣⚫️⚪️🟤\n🏳️⚧️🏁🏳️🌈🏴☠️⛳️📬📭🏴🏳️🚩";
+ let rope = Rope::from("🔴🟠🟡🟢🔵🟣⚫️⚪️🟤\n🏳️⚧️🏁🏳️🌈🏴☠️⛳️📬📭🏴🏳️🚩");
+ for b in 0..=fixture.len() {
+ assert_eq!(
+ rope.floor_char_boundary(b),
+ floor_char_boundary(&fixture, b)
+ );
+ }
+ }
+
+ #[test]
+ fn test_ceil_char_boundary() {
+ // polyfill of str::ceil_char_boundary
+ fn ceil_char_boundary(str: &str, index: usize) -> usize {
+ if index > str.len() {
+ str.len()
+ } else {
+ let upper_bound = Ord::min(index + 4, str.len());
+ str.as_bytes()[index..upper_bound]
+ .iter()
+ .position(|b| (*b as i8) >= -0x40)
+ .map_or(upper_bound, |pos| pos + index)
+ }
+ }
+
+ let fixture = "地";
+ let rope = Rope::from("地");
+ for b in 0..=fixture.len() {
+ assert_eq!(rope.ceil_char_boundary(b), ceil_char_boundary(&fixture, b));
+ }
+
+ let fixture = "";
+ let rope = Rope::from("");
+ for b in 0..=fixture.len() {
+ assert_eq!(rope.ceil_char_boundary(b), ceil_char_boundary(&fixture, b));
+ }
+
+ let fixture = "🔴🟠🟡🟢🔵🟣⚫️⚪️🟤\n🏳️⚧️🏁🏳️🌈🏴☠️⛳️📬📭🏴🏳️🚩";
+ let rope = Rope::from("🔴🟠🟡🟢🔵🟣⚫️⚪️🟤\n🏳️⚧️🏁🏳️🌈🏴☠️⛳️📬📭🏴🏳️🚩");
+ for b in 0..=fixture.len() {
+ assert_eq!(rope.ceil_char_boundary(b), ceil_char_boundary(&fixture, b));
+ }
+ }
+
fn clip_offset(text: &str, mut offset: usize, bias: Bias) -> usize {
while !text.is_char_boundary(offset) {
match bias {
@@ -28,7 +28,7 @@ use schemars::JsonSchema;
use serde::Deserialize;
use settings::Settings;
use std::sync::Arc;
-use zed_actions::outline::ToggleOutline;
+use zed_actions::{outline::ToggleOutline, workspace::CopyPath, workspace::CopyRelativePath};
use ui::{
BASE_REM_SIZE_IN_PX, IconButton, IconButtonShape, IconName, Tooltip, h_flex, prelude::*,
@@ -425,6 +425,16 @@ impl Render for BufferSearchBar {
active_searchable_item.relay_action(Box::new(ToggleOutline), window, cx);
}
}))
+ .on_action(cx.listener(|this, _: &CopyPath, window, cx| {
+ if let Some(active_searchable_item) = &mut this.active_searchable_item {
+ active_searchable_item.relay_action(Box::new(CopyPath), window, cx);
+ }
+ }))
+ .on_action(cx.listener(|this, _: &CopyRelativePath, window, cx| {
+ if let Some(active_searchable_item) = &mut this.active_searchable_item {
+ active_searchable_item.relay_action(Box::new(CopyRelativePath), window, cx);
+ }
+ }))
.when(replacement, |this| {
this.on_action(cx.listener(Self::toggle_replace))
.when(in_replace, |this| {
@@ -1,29 +1,37 @@
-use std::rc::Rc;
-
/// Trait for recursively merging settings structures.
///
-/// This trait allows settings objects to be merged from optional sources,
-/// where `None` values are ignored and `Some` values override existing values.
+/// When Zed starts it loads settinsg from `default.json` to initialize
+/// everything. These may be further refined by loading the user's settings,
+/// and any settings profiles; and then further refined by loading any
+/// local project settings.
+///
+/// The default behaviour of merging is:
+/// * For objects with named keys (HashMap, structs, etc.). The values are merged deeply
+/// (so if the default settings has languages.JSON.prettier.allowed = true, and the user's settings has
+/// languages.JSON.tab_size = 4; the merged settings file will have both settings).
+/// * For options, a None value is ignored, but Some values are merged recursively.
+/// * For other types (including Vec), a merge overwrites the current value.
///
-/// HashMaps, structs and similar types are merged by combining their contents key-wise,
-/// but all other types (including Vecs) are last-write-wins.
-/// (Though see also ExtendingVec and SaturatingBool)
+/// If you want to break the rules you can (e.g. ExtendingVec, or SaturatingBool).
#[allow(unused)]
pub trait MergeFrom {
+ /// Merge from a source of the same type.
+ fn merge_from(&mut self, other: &Self);
+
/// Merge from an optional source of the same type.
- /// If `other` is `None`, no changes are made.
- /// If `other` is `Some(value)`, fields from `value` are merged into `self`.
- fn merge_from(&mut self, other: Option<&Self>);
+ fn merge_from_option(&mut self, other: Option<&Self>) {
+ if let Some(other) = other {
+ self.merge_from(other);
+ }
+ }
}
macro_rules! merge_from_overwrites {
($($type:ty),+) => {
$(
impl MergeFrom for $type {
- fn merge_from(&mut self, other: Option<&Self>) {
- if let Some(value) = other {
- *self = value.clone();
- }
+ fn merge_from(&mut self, other: &Self) {
+ *self = other.clone();
}
}
)+
@@ -51,25 +59,41 @@ merge_from_overwrites!(
gpui::FontFeatures
);
-impl<T: Clone> MergeFrom for Vec<T> {
- fn merge_from(&mut self, other: Option<&Self>) {
- if let Some(other) = other {
- *self = other.clone()
+impl<T: Clone + MergeFrom> MergeFrom for Option<T> {
+ fn merge_from(&mut self, other: &Self) {
+ let Some(other) = other else {
+ return;
+ };
+ if let Some(this) = self {
+ this.merge_from(other);
+ } else {
+ self.replace(other.clone());
}
}
}
+impl<T: Clone> MergeFrom for Vec<T> {
+ fn merge_from(&mut self, other: &Self) {
+ *self = other.clone()
+ }
+}
+
+impl<T: MergeFrom> MergeFrom for Box<T> {
+ fn merge_from(&mut self, other: &Self) {
+ self.as_mut().merge_from(other.as_ref())
+ }
+}
+
// Implementations for collections that extend/merge their contents
impl<K, V> MergeFrom for collections::HashMap<K, V>
where
K: Clone + std::hash::Hash + Eq,
V: Clone + MergeFrom,
{
- fn merge_from(&mut self, other: Option<&Self>) {
- let Some(other) = other else { return };
+ fn merge_from(&mut self, other: &Self) {
for (k, v) in other {
if let Some(existing) = self.get_mut(k) {
- existing.merge_from(Some(v));
+ existing.merge_from(v);
} else {
self.insert(k.clone(), v.clone());
}
@@ -82,11 +106,10 @@ where
K: Clone + std::hash::Hash + Eq + Ord,
V: Clone + MergeFrom,
{
- fn merge_from(&mut self, other: Option<&Self>) {
- let Some(other) = other else { return };
+ fn merge_from(&mut self, other: &Self) {
for (k, v) in other {
if let Some(existing) = self.get_mut(k) {
- existing.merge_from(Some(v));
+ existing.merge_from(v);
} else {
self.insert(k.clone(), v.clone());
}
@@ -100,11 +123,10 @@ where
// Q: ?Sized + std::hash::Hash + collections::Equivalent<K> + Eq,
V: Clone + MergeFrom,
{
- fn merge_from(&mut self, other: Option<&Self>) {
- let Some(other) = other else { return };
+ fn merge_from(&mut self, other: &Self) {
for (k, v) in other {
if let Some(existing) = self.get_mut(k) {
- existing.merge_from(Some(v));
+ existing.merge_from(v);
} else {
self.insert(k.clone(), v.clone());
}
@@ -116,8 +138,7 @@ impl<T> MergeFrom for collections::BTreeSet<T>
where
T: Clone + Ord,
{
- fn merge_from(&mut self, other: Option<&Self>) {
- let Some(other) = other else { return };
+ fn merge_from(&mut self, other: &Self) {
for item in other {
self.insert(item.clone());
}
@@ -128,8 +149,7 @@ impl<T> MergeFrom for collections::HashSet<T>
where
T: Clone + std::hash::Hash + Eq,
{
- fn merge_from(&mut self, other: Option<&Self>) {
- let Some(other) = other else { return };
+ fn merge_from(&mut self, other: &Self) {
for item in other {
self.insert(item.clone());
}
@@ -137,13 +157,12 @@ where
}
impl MergeFrom for serde_json::Value {
- fn merge_from(&mut self, other: Option<&Self>) {
- let Some(other) = other else { return };
+ fn merge_from(&mut self, other: &Self) {
match (self, other) {
(serde_json::Value::Object(this), serde_json::Value::Object(other)) => {
for (k, v) in other {
if let Some(existing) = this.get_mut(k) {
- existing.merge_from(other.get(k));
+ existing.merge_from(v);
} else {
this.insert(k.clone(), v.clone());
}
@@ -153,12 +172,3 @@ impl MergeFrom for serde_json::Value {
}
}
}
-
-impl<T: MergeFrom + Clone> MergeFrom for Rc<T> {
- fn merge_from(&mut self, other: Option<&Self>) {
- let Some(other) = other else { return };
- let mut this: T = self.as_ref().clone();
- this.merge_from(Some(other.as_ref()));
- *self = Rc::new(this)
- }
-}
@@ -16,7 +16,7 @@ pub use terminal::*;
pub use theme::*;
pub use workspace::*;
-use collections::HashMap;
+use collections::{HashMap, IndexMap};
use gpui::{App, SharedString};
use release_channel::ReleaseChannel;
use schemars::JsonSchema;
@@ -166,13 +166,6 @@ impl SettingsContent {
}
}
-#[skip_serializing_none]
-#[derive(Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom)]
-pub struct ServerSettingsContent {
- #[serde(flatten)]
- pub project: ProjectSettingsContent,
-}
-
#[skip_serializing_none]
#[derive(Debug, Default, PartialEq, Clone, Serialize, Deserialize, JsonSchema, MergeFrom)]
pub struct UserSettingsContent {
@@ -189,7 +182,7 @@ pub struct UserSettingsContent {
pub linux: Option<Box<SettingsContent>>,
#[serde(default)]
- pub profiles: HashMap<String, SettingsContent>,
+ pub profiles: IndexMap<String, SettingsContent>,
}
pub struct ExtensionsSettingsContent {
@@ -827,6 +820,14 @@ pub struct ReplSettingsContent {
}
#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
+/// An ExtendingVec in the settings can only accumulate new values.
+///
+/// This is useful for things like private files where you only want
+/// to allow new values to be added.
+///
+/// Consider using a HashMap<String, bool> instead of this type
+/// (like auto_install_extensions) so that user settings files can both add
+/// and remove values from the set.
pub struct ExtendingVec<T>(pub Vec<T>);
impl<T> Into<Vec<T>> for ExtendingVec<T> {
@@ -841,13 +842,15 @@ impl<T> From<Vec<T>> for ExtendingVec<T> {
}
impl<T: Clone> merge_from::MergeFrom for ExtendingVec<T> {
- fn merge_from(&mut self, other: Option<&Self>) {
- if let Some(other) = other {
- self.0.extend_from_slice(other.0.as_slice());
- }
+ fn merge_from(&mut self, other: &Self) {
+ self.0.extend_from_slice(other.0.as_slice());
}
}
+/// A SaturatingBool in the settings can only ever be set to true,
+/// later attempts to set it to false will be ignored.
+///
+/// Used by `disable_ai`.
#[derive(Debug, Default, Copy, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
pub struct SaturatingBool(pub bool);
@@ -858,9 +861,7 @@ impl From<bool> for SaturatingBool {
}
impl merge_from::MergeFrom for SaturatingBool {
- fn merge_from(&mut self, other: Option<&Self>) {
- if let Some(other) = other {
- self.0 |= other.0
- }
+ fn merge_from(&mut self, other: &Self) {
+ self.0 |= other.0
}
}
@@ -34,37 +34,27 @@ pub struct AllLanguageSettingsContent {
pub file_types: HashMap<Arc<str>, ExtendingVec<String>>,
}
-fn merge_option<T: merge_from::MergeFrom + Clone>(this: &mut Option<T>, other: Option<&T>) {
- let Some(other) = other else { return };
- if let Some(this) = this {
- this.merge_from(Some(other));
- } else {
- this.replace(other.clone());
- }
-}
-
impl merge_from::MergeFrom for AllLanguageSettingsContent {
- fn merge_from(&mut self, other: Option<&Self>) {
- let Some(other) = other else { return };
- self.file_types.merge_from(Some(&other.file_types));
- merge_option(&mut self.features, other.features.as_ref());
- merge_option(&mut self.edit_predictions, other.edit_predictions.as_ref());
+ fn merge_from(&mut self, other: &Self) {
+ self.file_types.merge_from(&other.file_types);
+ self.features.merge_from(&other.features);
+ self.edit_predictions.merge_from(&other.edit_predictions);
// A user's global settings override the default global settings and
// all default language-specific settings.
//
- self.defaults.merge_from(Some(&other.defaults));
+ self.defaults.merge_from(&other.defaults);
for language_settings in self.languages.0.values_mut() {
- language_settings.merge_from(Some(&other.defaults));
+ language_settings.merge_from(&other.defaults);
}
// A user's language-specific settings override default language-specific settings.
for (language_name, user_language_settings) in &other.languages.0 {
if let Some(existing) = self.languages.0.get_mut(language_name) {
- existing.merge_from(Some(&user_language_settings));
+ existing.merge_from(&user_language_settings);
} else {
let mut new_settings = self.defaults.clone();
- new_settings.merge_from(Some(&user_language_settings));
+ new_settings.merge_from(&user_language_settings);
self.languages.0.insert(language_name.clone(), new_settings);
}
@@ -36,8 +36,7 @@ use crate::{
merge_from::MergeFrom,
parse_json_with_comments, replace_value_in_json_text,
settings_content::{
- ExtensionsSettingsContent, ProjectSettingsContent, ServerSettingsContent, SettingsContent,
- UserSettingsContent,
+ ExtensionsSettingsContent, ProjectSettingsContent, SettingsContent, UserSettingsContent,
},
update_value_in_json_text,
};
@@ -327,33 +326,6 @@ impl SettingsStore {
self.user_settings.as_ref()
}
- /// Replaces current settings with the values from the given JSON.
- pub fn set_raw_user_settings(
- &mut self,
- new_settings: UserSettingsContent,
- cx: &mut App,
- ) -> Result<()> {
- self.user_settings = Some(new_settings);
- self.recompute_values(None, cx)?;
- Ok(())
- }
-
- /// Replaces current settings with the values from the given JSON.
- pub fn set_raw_server_settings(
- &mut self,
- new_settings: Option<Value>,
- cx: &mut App,
- ) -> Result<()> {
- // Rewrite the server settings into a content type
- self.server_settings = new_settings
- .map(|settings| settings.to_string())
- .and_then(|str| parse_json_with_comments::<SettingsContent>(&str).ok())
- .map(Box::new);
-
- self.recompute_values(None, cx)?;
- Ok(())
- }
-
/// Get the configured settings profile names.
pub fn configured_settings_profiles(&self) -> impl Iterator<Item = &str> {
self.user_settings
@@ -361,11 +333,6 @@ impl SettingsStore {
.flat_map(|settings| settings.profiles.keys().map(|k| k.as_str()))
}
- /// Access the raw JSON value of the default settings.
- pub fn raw_default_settings(&self) -> &SettingsContent {
- &self.default_settings
- }
-
#[cfg(any(test, feature = "test-support"))]
pub fn test(cx: &mut App) -> Self {
Self::new(cx, &crate::test_settings())
@@ -621,19 +588,14 @@ impl SettingsStore {
server_settings_content: &str,
cx: &mut App,
) -> Result<()> {
- let settings: Option<ServerSettingsContent> = if server_settings_content.is_empty() {
+ let settings: Option<SettingsContent> = if server_settings_content.is_empty() {
None
} else {
parse_json_with_comments(server_settings_content)?
};
// Rewrite the server settings into a content type
- self.server_settings = settings.map(|settings| {
- Box::new(SettingsContent {
- project: settings.project,
- ..Default::default()
- })
- });
+ self.server_settings = settings.map(|settings| Box::new(settings));
self.recompute_values(None, cx)?;
Ok(())
@@ -870,15 +832,15 @@ impl SettingsStore {
if changed_local_path.is_none() {
let mut merged = self.default_settings.as_ref().clone();
- merged.merge_from(self.extension_settings.as_deref());
- merged.merge_from(self.global_settings.as_deref());
+ merged.merge_from_option(self.extension_settings.as_deref());
+ merged.merge_from_option(self.global_settings.as_deref());
if let Some(user_settings) = self.user_settings.as_ref() {
- merged.merge_from(Some(&user_settings.content));
- merged.merge_from(user_settings.for_release_channel());
- merged.merge_from(user_settings.for_os());
- merged.merge_from(user_settings.for_profile(cx));
+ merged.merge_from(&user_settings.content);
+ merged.merge_from_option(user_settings.for_release_channel());
+ merged.merge_from_option(user_settings.for_os());
+ merged.merge_from_option(user_settings.for_profile(cx));
}
- merged.merge_from(self.server_settings.as_deref());
+ merged.merge_from_option(self.server_settings.as_deref());
self.merged_settings = Rc::new(merged);
for setting_value in self.setting_values.values_mut() {
@@ -906,7 +868,7 @@ impl SettingsStore {
} else {
self.merged_settings.as_ref().clone()
};
- merged_local_settings.merge_from(Some(local_settings));
+ merged_local_settings.merge_from(local_settings);
project_settings_stack.push(merged_local_settings);
@@ -1,13 +1,11 @@
use proc_macro::TokenStream;
use quote::quote;
-use syn::{Data, DeriveInput, Fields, Type, parse_macro_input};
+use syn::{Data, DeriveInput, Fields, parse_macro_input};
/// Derives the `MergeFrom` trait for a struct.
///
/// This macro automatically implements `MergeFrom` by calling `merge_from`
-/// on all fields in the struct. For `Option<T>` fields, it merges by taking
-/// the `other` value when `self` is `None`. For other types, it recursively
-/// calls `merge_from` on the field.
+/// on all fields in the struct.
///
/// # Example
///
@@ -30,61 +28,25 @@ pub fn derive_merge_from(input: TokenStream) -> TokenStream {
Fields::Named(fields) => {
let field_merges = fields.named.iter().map(|field| {
let field_name = &field.ident;
- let field_type = &field.ty;
-
- if is_option_type(field_type) {
- // For Option<T> fields, merge by taking the other value if self is None
- quote! {
- if let Some(other_value) = other.#field_name.as_ref() {
- if self.#field_name.is_none() {
- self.#field_name = Some(other_value.clone());
- } else if let Some(self_value) = self.#field_name.as_mut() {
- self_value.merge_from(Some(other_value));
- }
- }
- }
- } else {
- // For non-Option fields, recursively call merge_from
- quote! {
- self.#field_name.merge_from(Some(&other.#field_name));
- }
+ quote! {
+ self.#field_name.merge_from(&other.#field_name);
}
});
quote! {
- if let Some(other) = other {
- #(#field_merges)*
- }
+ #(#field_merges)*
}
}
Fields::Unnamed(fields) => {
- let field_merges = fields.unnamed.iter().enumerate().map(|(i, field)| {
+ let field_merges = fields.unnamed.iter().enumerate().map(|(i, _)| {
let field_index = syn::Index::from(i);
- let field_type = &field.ty;
-
- if is_option_type(field_type) {
- // For Option<T> fields, merge by taking the other value if self is None
- quote! {
- if let Some(other_value) = other.#field_index.as_ref() {
- if self.#field_index.is_none() {
- self.#field_index = Some(other_value.clone());
- } else if let Some(self_value) = self.#field_index.as_mut() {
- self_value.merge_from(Some(other_value));
- }
- }
- }
- } else {
- // For non-Option fields, recursively call merge_from
- quote! {
- self.#field_index.merge_from(Some(&other.#field_index));
- }
+ quote! {
+ self.#field_index.merge_from(&other.#field_index);
}
});
quote! {
- if let Some(other) = other {
- #(#field_merges)*
- }
+ #(#field_merges)*
}
}
Fields::Unit => {
@@ -95,9 +57,7 @@ pub fn derive_merge_from(input: TokenStream) -> TokenStream {
},
Data::Enum(_) => {
quote! {
- if let Some(other) = other {
- *self = other.clone();
- }
+ *self = other.clone();
}
}
Data::Union(_) => {
@@ -107,7 +67,7 @@ pub fn derive_merge_from(input: TokenStream) -> TokenStream {
let expanded = quote! {
impl #impl_generics crate::merge_from::MergeFrom for #name #ty_generics #where_clause {
- fn merge_from(&mut self, other: ::core::option::Option<&Self>) {
+ fn merge_from(&mut self, other: &Self) {
use crate::merge_from::MergeFrom as _;
#merge_body
}
@@ -116,17 +76,3 @@ pub fn derive_merge_from(input: TokenStream) -> TokenStream {
TokenStream::from(expanded)
}
-
-/// Check if a type is `Option<T>`
-fn is_option_type(ty: &Type) -> bool {
- match ty {
- Type::Path(type_path) => {
- if let Some(segment) = type_path.path.segments.last() {
- segment.ident == "Option"
- } else {
- false
- }
- }
- _ => false,
- }
-}
@@ -578,4 +578,42 @@ mod tests {
assert_eq!(ThemeSettings::get_global(cx).buffer_font_size(cx).0, 10.0);
});
}
+
+ #[gpui::test]
+ async fn test_settings_profile_selector_is_in_user_configuration_order(
+ cx: &mut TestAppContext,
+ ) {
+ // Must be unique names (HashMap)
+ let profiles_json = json!({
+ "z": {},
+ "e": {},
+ "d": {},
+ " ": {},
+ "r": {},
+ "u": {},
+ "l": {},
+ "3": {},
+ "s": {},
+ "!": {},
+ });
+ let (workspace, cx) = init_test(profiles_json.clone(), cx).await;
+
+ cx.dispatch_action(settings_profile_selector::Toggle);
+ let picker = active_settings_profile_picker(&workspace, cx);
+
+ picker.read_with(cx, |picker, _| {
+ assert_eq!(picker.delegate.matches.len(), 11);
+ assert_eq!(picker.delegate.matches[0].string, display_name(&None));
+ assert_eq!(picker.delegate.matches[1].string, "z");
+ assert_eq!(picker.delegate.matches[2].string, "e");
+ assert_eq!(picker.delegate.matches[3].string, "d");
+ assert_eq!(picker.delegate.matches[4].string, " ");
+ assert_eq!(picker.delegate.matches[5].string, "r");
+ assert_eq!(picker.delegate.matches[6].string, "u");
+ assert_eq!(picker.delegate.matches[7].string, "l");
+ assert_eq!(picker.delegate.matches[8].string, "3");
+ assert_eq!(picker.delegate.matches[9].string, "s");
+ assert_eq!(picker.delegate.matches[10].string, "!");
+ });
+ }
}
@@ -482,7 +482,6 @@ impl PickerDelegate for TasksModalDelegate {
let highlighted_location = HighlightedMatch {
text: hit.string.clone(),
highlight_positions: hit.positions.clone(),
- char_count: hit.string.chars().count(),
color: Color::Default,
};
let icon = match source_kind {
@@ -427,6 +427,8 @@ impl TerminalBuilder {
working_directory: working_directory.clone(),
drain_on_exit: true,
env: env.clone().into_iter().collect(),
+ #[cfg(windows)]
+ escape_args: true,
}
};
@@ -261,8 +261,8 @@ mod tests {
use super::*;
use alacritty_terminal::{
event::VoidListener,
- index::{Boundary, Column, Line, Point as AlacPoint},
- term::{Config, cell::Flags, search::Match, test::TermSize},
+ index::{Boundary, Point as AlacPoint},
+ term::{Config, cell::Flags, test::TermSize},
vte::ansi::Handler,
};
use std::{cell::RefCell, ops::RangeInclusive, path::PathBuf};
@@ -468,17 +468,6 @@ mod tests {
)
} };
- ($($columns:literal),+; $($lines:expr),+; $hyperlink_kind:ident) => { {
- use crate::terminal_hyperlinks::tests::line_cells_count;
-
- let test_lines = vec![$($lines),+];
- let total_cells = test_lines.iter().copied().map(line_cells_count).sum();
-
- test_hyperlink!(
- [ $($columns),+ ]; total_cells; test_lines.iter().copied(); $hyperlink_kind
- )
- } };
-
([ $($columns:expr),+ ]; $total_cells:expr; $lines:expr; $hyperlink_kind:ident) => { {
use crate::terminal_hyperlinks::tests::{ test_hyperlink, HyperlinkKind };
@@ -504,9 +493,6 @@ mod tests {
///
macro_rules! test_path {
($($lines:literal),+) => { test_hyperlink!($($lines),+; Path) };
- ($($columns:literal),+; $($lines:literal),+) => {
- test_hyperlink!($($columns),+; $($lines),+; Path)
- };
}
#[test]
@@ -572,39 +558,52 @@ mod tests {
test_path!("‹«/test/co👉ol.rs»(«1»,«618»)›::");
}
+ #[test]
+ fn quotes_and_brackets() {
+ test_path!("\"‹«/test/co👉ol.rs»:«4»›\"");
+ test_path!("'‹«/test/co👉ol.rs»:«4»›'");
+ test_path!("`‹«/test/co👉ol.rs»:«4»›`");
+
+ test_path!("[‹«/test/co👉ol.rs»:«4»›]");
+ test_path!("(‹«/test/co👉ol.rs»:«4»›)");
+ test_path!("{‹«/test/co👉ol.rs»:«4»›}");
+ test_path!("<‹«/test/co👉ol.rs»:«4»›>");
+
+ test_path!("[\"‹«/test/co👉ol.rs»:«4»›\"]");
+ test_path!("'(‹«/test/co👉ol.rs»:«4»›)'");
+ }
+
#[test]
fn word_wide_chars() {
// Rust paths
- test_path!(4, 6, 12; "‹«/👉例/cool.rs»›");
- test_path!(4, 6, 12; "‹«/例👈/cool.rs»›");
- test_path!(4, 8, 16; "‹«/例/cool.rs»:«👉4»›");
- test_path!(4, 8, 16; "‹«/例/cool.rs»:«4»:«👉2»›");
+ test_path!("‹«/👉例/cool.rs»›");
+ test_path!("‹«/例👈/cool.rs»›");
+ test_path!("‹«/例/cool.rs»:«👉4»›");
+ test_path!("‹«/例/cool.rs»:«4»:«👉2»›");
// Cargo output
- test_path!(4, 27, 30; " Compiling Cool (‹«/👉例/Cool»›)");
- test_path!(4, 27, 30; " Compiling Cool (‹«/例👈/Cool»›)");
+ test_path!(" Compiling Cool (‹«/👉例/Cool»›)");
+ test_path!(" Compiling Cool (‹«/例👈/Cool»›)");
// Python
- test_path!(4, 11; "‹«👉例wesome.py»›");
- test_path!(4, 11; "‹«例👈wesome.py»›");
- test_path!(6, 17, 40; " ‹File \"«/👉例wesome.py»\", line «42»›: Wat?");
- test_path!(6, 17, 40; " ‹File \"«/例👈wesome.py»\", line «42»›: Wat?");
+ test_path!("‹«👉例wesome.py»›");
+ test_path!("‹«例👈wesome.py»›");
+ test_path!(" ‹File \"«/👉例wesome.py»\", line «42»›: Wat?");
+ test_path!(" ‹File \"«/例👈wesome.py»\", line «42»›: Wat?");
}
#[test]
fn non_word_wide_chars() {
// Mojo diagnostic message
- test_path!(4, 18, 38; " ‹File \"«/awe👉some.🔥»\", line «42»›: Wat?");
- test_path!(4, 18, 38; " ‹File \"«/awesome👉.🔥»\", line «42»›: Wat?");
- test_path!(4, 18, 38; " ‹File \"«/awesome.👉🔥»\", line «42»›: Wat?");
- test_path!(4, 18, 38; " ‹File \"«/awesome.🔥👈»\", line «42»›: Wat?");
+ test_path!(" ‹File \"«/awe👉some.🔥»\", line «42»›: Wat?");
+ test_path!(" ‹File \"«/awesome👉.🔥»\", line «42»›: Wat?");
+ test_path!(" ‹File \"«/awesome.👉🔥»\", line «42»›: Wat?");
+ test_path!(" ‹File \"«/awesome.🔥👈»\", line «42»›: Wat?");
}
/// These likely rise to the level of being worth fixing.
mod issues {
#[test]
- #[cfg_attr(not(target_os = "windows"), should_panic(expected = "Path = «例»"))]
- #[cfg_attr(target_os = "windows", should_panic(expected = r#"Path = «C:\\例»"#))]
// <https://github.com/alacritty/alacritty/issues/8586>
fn issue_alacritty_8586() {
// Rust paths
@@ -689,21 +688,13 @@ mod tests {
/// Minor issues arguably not important enough to fix/workaround...
mod nits {
#[test]
- #[cfg_attr(
- not(target_os = "windows"),
- should_panic(expected = "Path = «/test/cool.rs(4»")
- )]
- #[cfg_attr(
- target_os = "windows",
- should_panic(expected = r#"Path = «C:\\test\\cool.rs(4»"#)
- )]
fn alacritty_bugs_with_two_columns() {
- test_path!(2; "‹«/👉test/cool.rs»(«4»)›");
- test_path!(2; "‹«/test/cool.rs»(«👉4»)›");
- test_path!(2; "‹«/test/cool.rs»(«4»,«👉2»)›");
+ test_path!("‹«/👉test/cool.rs»(«4»)›");
+ test_path!("‹«/test/cool.rs»(«👉4»)›");
+ test_path!("‹«/test/cool.rs»(«4»,«👉2»)›");
// Python
- test_path!(2; "‹«awe👉some.py»›");
+ test_path!("‹«awe👉some.py»›");
}
#[test]
@@ -791,9 +782,6 @@ mod tests {
///
macro_rules! test_file_iri {
($file_iri:literal) => { { test_hyperlink!(concat!("‹«👉", $file_iri, "»›"); FileIri) } };
- ($($columns:literal),+; $file_iri:literal) => { {
- test_hyperlink!($($columns),+; concat!("‹«👉", $file_iri, "»›"); FileIri)
- } };
}
#[cfg(not(target_os = "windows"))]
@@ -865,9 +853,6 @@ mod tests {
///
macro_rules! test_iri {
($iri:literal) => { { test_hyperlink!(concat!("‹«👉", $iri, "»›"); Iri) } };
- ($($columns:literal),+; $iri:literal) => { {
- test_hyperlink!($($columns),+; concat!("‹«👉", $iri, "»›"); Iri)
- } };
}
#[test]
@@ -898,26 +883,26 @@ mod tests {
#[test]
fn wide_chars() {
// In the order they appear in URL_REGEX, except 'file://' which is treated as a path
- test_iri!(4, 20; "ipfs://例🏃🦀/cool.ipfs");
- test_iri!(4, 20; "ipns://例🏃🦀/cool.ipns");
- test_iri!(6, 20; "magnet://例🏃🦀/cool.git");
- test_iri!(4, 20; "mailto:someone@somewhere.here");
- test_iri!(4, 20; "gemini://somewhere.here");
- test_iri!(4, 20; "gopher://somewhere.here");
- test_iri!(4, 20; "http://例🏃🦀/cool/index.html");
- test_iri!(4, 20; "http://10.10.10.10:1111/cool.html");
- test_iri!(4, 20; "http://例🏃🦀/cool/index.html?amazing=1");
- test_iri!(4, 20; "http://例🏃🦀/cool/index.html#right%20here");
- test_iri!(4, 20; "http://例🏃🦀/cool/index.html?amazing=1#right%20here");
- test_iri!(4, 20; "https://例🏃🦀/cool/index.html");
- test_iri!(4, 20; "https://10.10.10.10:1111/cool.html");
- test_iri!(4, 20; "https://例🏃🦀/cool/index.html?amazing=1");
- test_iri!(4, 20; "https://例🏃🦀/cool/index.html#right%20here");
- test_iri!(4, 20; "https://例🏃🦀/cool/index.html?amazing=1#right%20here");
- test_iri!(4, 20; "news://例🏃🦀/cool.news");
- test_iri!(5, 20; "git://例/cool.git");
- test_iri!(5, 20; "ssh://user@somewhere.over.here:12345/例🏃🦀/cool.git");
- test_iri!(7, 20; "ftp://例🏃🦀/cool.ftp");
+ test_iri!("ipfs://例🏃🦀/cool.ipfs");
+ test_iri!("ipns://例🏃🦀/cool.ipns");
+ test_iri!("magnet://例🏃🦀/cool.git");
+ test_iri!("mailto:someone@somewhere.here");
+ test_iri!("gemini://somewhere.here");
+ test_iri!("gopher://somewhere.here");
+ test_iri!("http://例🏃🦀/cool/index.html");
+ test_iri!("http://10.10.10.10:1111/cool.html");
+ test_iri!("http://例🏃🦀/cool/index.html?amazing=1");
+ test_iri!("http://例🏃🦀/cool/index.html#right%20here");
+ test_iri!("http://例🏃🦀/cool/index.html?amazing=1#right%20here");
+ test_iri!("https://例🏃🦀/cool/index.html");
+ test_iri!("https://10.10.10.10:1111/cool.html");
+ test_iri!("https://例🏃🦀/cool/index.html?amazing=1");
+ test_iri!("https://例🏃🦀/cool/index.html#right%20here");
+ test_iri!("https://例🏃🦀/cool/index.html?amazing=1#right%20here");
+ test_iri!("news://例🏃🦀/cool.news");
+ test_iri!("git://例/cool.git");
+ test_iri!("ssh://user@somewhere.over.here:12345/例🏃🦀/cool.git");
+ test_iri!("ftp://例🏃🦀/cool.ftp");
}
// There are likely more tests needed for IRI vs URI
@@ -1006,6 +991,22 @@ mod tests {
point
}
+ fn end_point_from_prev_input_point(
+ term: &Term<VoidListener>,
+ prev_input_point: AlacPoint,
+ ) -> AlacPoint {
+ if term
+ .grid()
+ .index(prev_input_point)
+ .flags
+ .contains(Flags::WIDE_CHAR)
+ {
+ prev_input_point.add(term, Boundary::Grid, 1)
+ } else {
+ prev_input_point
+ }
+ }
+
let mut hovered_grid_point: Option<AlacPoint> = None;
let mut hyperlink_match = AlacPoint::default()..=AlacPoint::default();
let mut iri_or_path = String::default();
@@ -1040,7 +1041,10 @@ mod tests {
panic!("Should have been handled by char input")
}
CapturesState::Path(start_point) => {
- iri_or_path = term.bounds_to_string(start_point, prev_input_point);
+ iri_or_path = term.bounds_to_string(
+ start_point,
+ end_point_from_prev_input_point(&term, prev_input_point),
+ );
CapturesState::RowScan
}
CapturesState::RowScan => CapturesState::Row(String::new()),
@@ -1065,7 +1069,8 @@ mod tests {
panic!("Should have been handled by char input")
}
MatchState::Match(start_point) => {
- hyperlink_match = start_point..=prev_input_point;
+ hyperlink_match = start_point
+ ..=end_point_from_prev_input_point(&term, prev_input_point);
MatchState::Done
}
MatchState::Done => {
@@ -2128,7 +2128,7 @@ impl BufferSnapshot {
let row_end_offset = if row >= self.max_point().row {
self.len()
} else {
- Point::new(row + 1, 0).to_offset(self) - 1
+ Point::new(row + 1, 0).to_previous_offset(self)
};
(row_end_offset - row_start_offset) as u32
}
@@ -2400,6 +2400,17 @@ impl BufferSnapshot {
} else if bias == Bias::Right && offset == self.len() {
Anchor::MAX
} else {
+ if !self.visible_text.is_char_boundary(offset) {
+ // find the character
+ let char_start = self.visible_text.floor_char_boundary(offset);
+ // `char_start` must be less than len and a char boundary
+ let ch = self.visible_text.chars_at(char_start).next().unwrap();
+ let char_range = char_start..char_start + ch.len_utf8();
+ panic!(
+ "byte index {} is not a char boundary; it is inside {:?} (bytes {:?})",
+ offset, ch, char_range,
+ );
+ }
let mut fragment_cursor = self.fragments.cursor::<usize>(&None);
fragment_cursor.seek(&offset, bias);
let fragment = fragment_cursor.item().unwrap();
@@ -3065,6 +3076,18 @@ impl operation_queue::Operation for Operation {
pub trait ToOffset {
fn to_offset(&self, snapshot: &BufferSnapshot) -> usize;
+ /// Turns this point into the next offset in the buffer that comes after this, respecting utf8 boundaries.
+ fn to_next_offset(&self, snapshot: &BufferSnapshot) -> usize {
+ snapshot
+ .visible_text
+ .ceil_char_boundary(self.to_offset(snapshot) + 1)
+ }
+ /// Turns this point into the previous offset in the buffer that comes before this, respecting utf8 boundaries.
+ fn to_previous_offset(&self, snapshot: &BufferSnapshot) -> usize {
+ snapshot
+ .visible_text
+ .floor_char_boundary(self.to_offset(snapshot).saturating_sub(1))
+ }
}
impl ToOffset for Point {
@@ -804,11 +804,11 @@ impl settings::Settings for ThemeSettings {
.or(themes.get(&zed_default_dark().name))
.unwrap(),
theme_selection: Some(theme_selection),
- experimental_theme_overrides: None,
- theme_overrides: HashMap::default(),
+ experimental_theme_overrides: content.experimental_theme_overrides.clone(),
+ theme_overrides: content.theme_overrides.clone(),
active_icon_theme: themes
.get_icon_theme(icon_theme_selection.icon_theme(*system_appearance))
- .ok()
+ .or_else(|_| themes.default_icon_theme())
.unwrap(),
icon_theme_selection: Some(icon_theme_selection),
ui_density: content.ui_density.unwrap_or_default().into(),
@@ -180,9 +180,9 @@ pub enum DocumentationEdge {
#[derive(Clone)]
pub struct DocumentationAside {
- side: DocumentationSide,
- edge: DocumentationEdge,
- render: Rc<dyn Fn(&mut App) -> AnyElement>,
+ pub side: DocumentationSide,
+ pub edge: DocumentationEdge,
+ pub render: Rc<dyn Fn(&mut App) -> AnyElement>,
}
impl DocumentationAside {
@@ -17,5 +17,9 @@ doctest = false
convert_case.workspace = true
quote.workspace = true
syn.workspace = true
-workspace-hack.workspace = true
+perf.workspace = true
proc-macro2.workspace = true
+workspace-hack.workspace = true
+
+[features]
+perf-enabled = []
@@ -1,10 +1,13 @@
+#![allow(clippy::test_attr_in_doctest)]
+
use convert_case::{Case, Casing};
+use perf::*;
use proc_macro::TokenStream;
use proc_macro2::TokenStream as TokenStream2;
-use quote::{format_ident, quote};
+use quote::{ToTokens, format_ident, quote};
use syn::{
- Data, DeriveInput, Expr, ExprArray, ExprLit, Fields, Lit, LitStr, MetaNameValue, Token,
- parse_macro_input, punctuated::Punctuated,
+ Data, DeriveInput, Expr, ExprArray, ExprLit, Fields, ItemFn, Lit, LitStr, MetaNameValue, Token,
+ parse_macro_input, parse_quote, punctuated::Punctuated,
};
/// A macro used in tests for cross-platform path string literals in tests. On Windows it replaces
@@ -98,6 +101,197 @@ pub fn line_endings(input: TokenStream) -> TokenStream {
})
}
+/// Inner data for the perf macro.
+#[derive(Default)]
+struct PerfArgs {
+ /// How many times to loop a test before rerunning the test binary. If left
+ /// empty, the test harness will auto-determine this value.
+ iterations: Option<syn::Expr>,
+ /// How much this test's results should be weighed when comparing across runs.
+ /// If unspecified, defaults to `WEIGHT_DEFAULT` (50).
+ weight: Option<syn::Expr>,
+ /// How relevant a benchmark is to overall performance. See docs on the enum
+ /// for details. If unspecified, `Average` is selected.
+ importance: Importance,
+}
+
+#[warn(clippy::all, clippy::pedantic)]
+impl PerfArgs {
+ /// Parses attribute arguments into a `PerfArgs`.
+ fn parse_into(&mut self, meta: syn::meta::ParseNestedMeta) -> syn::Result<()> {
+ if meta.path.is_ident("iterations") {
+ self.iterations = Some(meta.value()?.parse()?);
+ } else if meta.path.is_ident("weight") {
+ self.weight = Some(meta.value()?.parse()?);
+ } else if meta.path.is_ident("critical") {
+ self.importance = Importance::Critical;
+ } else if meta.path.is_ident("important") {
+ self.importance = Importance::Important;
+ } else if meta.path.is_ident("average") {
+ // This shouldn't be specified manually, but oh well.
+ self.importance = Importance::Average;
+ } else if meta.path.is_ident("iffy") {
+ self.importance = Importance::Iffy;
+ } else if meta.path.is_ident("fluff") {
+ self.importance = Importance::Fluff;
+ } else {
+ return Err(syn::Error::new_spanned(meta.path, "unexpected identifier"));
+ }
+ Ok(())
+ }
+}
+
+/// Marks a test as perf-sensitive, to be triaged when checking the performance
+/// of a build. This also automatically applies `#[test]`.
+///
+///
+/// # Usage
+/// Applying this attribute to a test marks it as average importance by default.
+/// There are 4 levels of importance (`Critical`, `Important`, `Average`, `Fluff`);
+/// see the documentation on `Importance` for details. Add the importance as a
+/// parameter to override the default (e.g. `#[perf(important)]`).
+///
+/// Each test also has a weight factor. This is irrelevant on its own, but is considered
+/// when comparing results across different runs. By default, this is set to 50;
+/// pass `weight = n` as a parameter to override this. Note that this value is only
+/// relevant within its importance category.
+///
+/// By default, the number of iterations when profiling this test is auto-determined.
+/// If this needs to be overwritten, pass the desired iteration count as a parameter
+/// (`#[perf(iterations = n)]`). Note that the actual profiler may still run the test
+/// an arbitrary number times; this flag just sets the number of executions before the
+/// process is restarted and global state is reset.
+///
+/// This attribute should probably not be applied to tests that do any significant
+/// disk IO, as locks on files may not be released in time when repeating a test many
+/// times. This might lead to spurious failures.
+///
+/// # Examples
+/// ```rust
+/// use util_macros::perf;
+///
+/// #[perf]
+/// fn generic_test() {
+/// // Test goes here.
+/// }
+///
+/// #[perf(fluff, weight = 30)]
+/// fn cold_path_test() {
+/// // Test goes here.
+/// }
+/// ```
+///
+/// This also works with `#[gpui::test]`s, though in most cases it shouldn't
+/// be used with automatic iterations.
+/// ```rust,ignore
+/// use util_macros::perf;
+///
+/// #[perf(iterations = 1, critical)]
+/// #[gpui::test]
+/// fn oneshot_test(_cx: &mut gpui::TestAppContext) {
+/// // Test goes here.
+/// }
+/// ```
+#[proc_macro_attribute]
+#[warn(clippy::all, clippy::pedantic)]
+pub fn perf(our_attr: TokenStream, input: TokenStream) -> TokenStream {
+ let mut args = PerfArgs::default();
+ let parser = syn::meta::parser(|meta| PerfArgs::parse_into(&mut args, meta));
+ parse_macro_input!(our_attr with parser);
+
+ let ItemFn {
+ attrs: mut attrs_main,
+ vis,
+ sig: mut sig_main,
+ block,
+ } = parse_macro_input!(input as ItemFn);
+ attrs_main.push(parse_quote!(#[test]));
+ attrs_main.push(parse_quote!(#[allow(non_snake_case)]));
+
+ let fns = if cfg!(perf_enabled) {
+ #[allow(clippy::wildcard_imports, reason = "We control the other side")]
+ use consts::*;
+
+ // Make the ident obvious when calling, for the test parser.
+ // Also set up values for the second metadata-returning "test".
+ let mut new_ident_main = sig_main.ident.to_string();
+ let mut new_ident_meta = new_ident_main.clone();
+ new_ident_main.push_str(SUF_NORMAL);
+ new_ident_meta.push_str(SUF_MDATA);
+
+ let new_ident_main = syn::Ident::new(&new_ident_main, sig_main.ident.span());
+ sig_main.ident = new_ident_main;
+
+ // We don't want any nonsense if the original test had a weird signature.
+ let new_ident_meta = syn::Ident::new(&new_ident_meta, sig_main.ident.span());
+ let sig_meta = parse_quote!(fn #new_ident_meta());
+ let attrs_meta = parse_quote!(#[test] #[allow(non_snake_case)]);
+
+ // Make the test loop as the harness instructs it to.
+ let block_main = {
+ // The perf harness will pass us the value in an env var. Even if we
+ // have a preset value, just do this to keep the code paths unified.
+ parse_quote!({
+ let iter_count = std::env::var(#ITER_ENV_VAR).unwrap().parse::<usize>().unwrap();
+ for _ in 0..iter_count {
+ #block
+ }
+ })
+ };
+ let importance = format!("{}", args.importance);
+ let block_meta = {
+ // This function's job is to just print some relevant info to stdout,
+ // based on the params this attr is passed. It's not an actual test.
+ // Since we use a custom attr set on our metadata fn, it shouldn't
+ // cause problems with xfail tests.
+ let q_iter = if let Some(iter) = args.iterations {
+ quote! {
+ println!("{} {} {}", #MDATA_LINE_PREF, #ITER_COUNT_LINE_NAME, #iter);
+ }
+ } else {
+ quote! {}
+ };
+ let weight = args
+ .weight
+ .unwrap_or_else(|| parse_quote! { #WEIGHT_DEFAULT });
+ parse_quote!({
+ #q_iter
+ println!("{} {} {}", #MDATA_LINE_PREF, #WEIGHT_LINE_NAME, #weight);
+ println!("{} {} {}", #MDATA_LINE_PREF, #IMPORTANCE_LINE_NAME, #importance);
+ println!("{} {} {}", #MDATA_LINE_PREF, #VERSION_LINE_NAME, #MDATA_VER);
+ })
+ };
+
+ vec![
+ // The real test.
+ ItemFn {
+ attrs: attrs_main,
+ vis: vis.clone(),
+ sig: sig_main,
+ block: block_main,
+ },
+ // The fake test.
+ ItemFn {
+ attrs: attrs_meta,
+ vis,
+ sig: sig_meta,
+ block: block_meta,
+ },
+ ]
+ } else {
+ vec![ItemFn {
+ attrs: attrs_main,
+ vis,
+ sig: sig_main,
+ block,
+ }]
+ };
+
+ fns.into_iter()
+ .flat_map(|f| TokenStream::from(f.into_token_stream()))
+ .collect()
+}
+
#[proc_macro_derive(FieldAccessByEnum, attributes(field_access_by_enum))]
pub fn derive_field_access_by_enum(input: TokenStream) -> TokenStream {
let input = parse_macro_input!(input as DeriveInput);
@@ -46,6 +46,7 @@ theme.workspace = true
tokio = { version = "1.15", features = ["full"], optional = true }
ui.workspace = true
util.workspace = true
+util_macros.workspace = true
vim_mode_setting.workspace = true
workspace.workspace = true
zed_actions.workspace = true
@@ -1,5 +1,6 @@
mod boundary;
mod object;
+mod paste;
mod select;
use editor::display_map::DisplaySnapshot;
@@ -40,6 +41,7 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
Vim::action(editor, cx, Vim::helix_append);
Vim::action(editor, cx, Vim::helix_yank);
Vim::action(editor, cx, Vim::helix_goto_last_modification);
+ Vim::action(editor, cx, Vim::helix_paste);
}
impl Vim {
@@ -0,0 +1,447 @@
+use editor::{ToOffset, movement};
+use gpui::{Action, Context, Window};
+use schemars::JsonSchema;
+use serde::Deserialize;
+
+use crate::{Vim, state::Mode};
+
+/// Pastes text from the specified register at the cursor position.
+#[derive(Clone, Deserialize, JsonSchema, PartialEq, Action)]
+#[action(namespace = vim)]
+#[serde(deny_unknown_fields)]
+pub struct HelixPaste {
+ #[serde(default)]
+ before: bool,
+}
+
+impl Vim {
+ pub fn helix_paste(
+ &mut self,
+ action: &HelixPaste,
+ window: &mut Window,
+ cx: &mut Context<Self>,
+ ) {
+ self.record_current_action(cx);
+ self.store_visual_marks(window, cx);
+ let count = Vim::take_count(cx).unwrap_or(1);
+ // TODO: vim paste calls take_forced_motion here, but I don't know what that does
+ // (none of the other helix_ methods call it)
+
+ self.update_editor(cx, |vim, editor, cx| {
+ editor.transact(window, cx, |editor, window, cx| {
+ editor.set_clip_at_line_ends(false, cx);
+
+ let selected_register = vim.selected_register.take();
+
+ let Some((text, clipboard_selections)) = Vim::update_globals(cx, |globals, cx| {
+ globals.read_register(selected_register, Some(editor), cx)
+ })
+ .and_then(|reg| {
+ (!reg.text.is_empty())
+ .then_some(reg.text)
+ .zip(reg.clipboard_selections)
+ }) else {
+ return;
+ };
+
+ let (display_map, current_selections) = editor.selections.all_adjusted_display(cx);
+
+ // The clipboard can have multiple selections, and there can
+ // be multiple selections. Helix zips them together, so the first
+ // clipboard entry gets pasted at the first selection, the second
+ // entry gets pasted at the second selection, and so on. If there
+ // are more clipboard selections than selections, the extra ones
+ // don't get pasted anywhere. If there are more selections than
+ // clipboard selections, the last clipboard selection gets
+ // pasted at all remaining selections.
+
+ let mut edits = Vec::new();
+ let mut new_selections = Vec::new();
+ let mut start_offset = 0;
+
+ let mut replacement_texts: Vec<String> = Vec::new();
+
+ for ix in 0..current_selections.len() {
+ let to_insert = if let Some(clip_sel) = clipboard_selections.get(ix) {
+ let end_offset = start_offset + clip_sel.len;
+ let text = text[start_offset..end_offset].to_string();
+ start_offset = end_offset + 1;
+ text
+ } else if let Some(last_text) = replacement_texts.last() {
+ // We have more current selections than clipboard selections: repeat the last one.
+ last_text.to_owned()
+ } else {
+ text.to_string()
+ };
+ replacement_texts.push(to_insert);
+ }
+
+ let line_mode = replacement_texts.iter().any(|text| text.ends_with('\n'));
+
+ for (to_insert, sel) in replacement_texts.into_iter().zip(current_selections) {
+ // Helix doesn't care about the head/tail of the selection.
+ // Pasting before means pasting before the whole selection.
+ let display_point = if line_mode {
+ if action.before {
+ movement::line_beginning(&display_map, sel.start, false)
+ } else if sel.start.column() > 0
+ && sel.end.column() == 0
+ && sel.start != sel.end
+ {
+ sel.end
+ } else {
+ let point = movement::line_end(&display_map, sel.end, false);
+ if sel.end.column() == 0 && point.column() > 0 {
+ // If the selection ends at the beginning of the next line, and the current line
+ // under the cursor is not empty, we paste at the selection's end.
+ sel.end
+ } else {
+ // If however the current line under the cursor is empty, we need to move
+ // to the beginning of the next line to avoid pasting above the end of current selection.
+ movement::right(&display_map, point)
+ }
+ }
+ } else if action.before {
+ sel.start
+ } else if sel.start == sel.end {
+ // Helix and Zed differ in how they understand
+ // single-point cursors. In Helix, a single-point cursor
+ // is "on top" of some character, and pasting after that
+ // cursor means that the pasted content should go after
+ // that character. (If the cursor is at the end of a
+ // line, the pasted content goes on the next line.)
+ movement::right(&display_map, sel.end)
+ } else {
+ sel.end
+ };
+ let point = display_point.to_point(&display_map);
+ let anchor = if action.before {
+ display_map.buffer_snapshot.anchor_after(point)
+ } else {
+ display_map.buffer_snapshot.anchor_before(point)
+ };
+ edits.push((point..point, to_insert.repeat(count)));
+ new_selections.push((anchor, to_insert.len() * count));
+ }
+
+ editor.edit(edits, cx);
+
+ editor.change_selections(Default::default(), window, cx, |s| {
+ let snapshot = s.buffer().clone();
+ s.select_ranges(new_selections.into_iter().map(|(anchor, len)| {
+ let offset = anchor.to_offset(&snapshot);
+ if action.before {
+ offset.saturating_sub(len)..offset
+ } else if line_mode {
+ // In line mode, we always move the cursor to the end of the inserted text.
+ // Otherwise, while it looks fine visually, inserting/appending ends up
+ // in the next logical line which is not desirable.
+ debug_assert!(len > 0);
+ offset..(offset + len - 1)
+ } else {
+ offset..(offset + len)
+ }
+ }));
+ })
+ });
+ });
+
+ self.switch_mode(Mode::HelixNormal, true, window, cx);
+ }
+}
+
+#[cfg(test)]
+mod test {
+ use indoc::indoc;
+
+ use crate::{state::Mode, test::VimTestContext};
+
+ #[gpui::test]
+ async fn test_paste(cx: &mut gpui::TestAppContext) {
+ let mut cx = VimTestContext::new(cx, true).await;
+ cx.enable_helix();
+ cx.set_state(
+ indoc! {"
+ The «quiˇ»ck brown
+ fox jumps over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+
+ cx.simulate_keystrokes("y w p");
+
+ cx.assert_state(
+ indoc! {"
+ The quick «quiˇ»brown
+ fox jumps over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+
+ // Pasting before the selection:
+ cx.set_state(
+ indoc! {"
+ The quick brown
+ fox «jumpsˇ» over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ cx.simulate_keystrokes("shift-p");
+ cx.assert_state(
+ indoc! {"
+ The quick brown
+ fox «quiˇ»jumps over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ }
+
+ #[gpui::test]
+ async fn test_point_selection_paste(cx: &mut gpui::TestAppContext) {
+ let mut cx = VimTestContext::new(cx, true).await;
+ cx.enable_helix();
+ cx.set_state(
+ indoc! {"
+ The quiˇck brown
+ fox jumps over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+
+ cx.simulate_keystrokes("y");
+
+ // Pasting before the selection:
+ cx.set_state(
+ indoc! {"
+ The quick brown
+ fox jumpsˇ over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ cx.simulate_keystrokes("shift-p");
+ cx.assert_state(
+ indoc! {"
+ The quick brown
+ fox jumps«cˇ» over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+
+ // Pasting after the selection:
+ cx.set_state(
+ indoc! {"
+ The quick brown
+ fox jumpsˇ over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ cx.simulate_keystrokes("p");
+ cx.assert_state(
+ indoc! {"
+ The quick brown
+ fox jumps «cˇ»over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+
+ // Pasting after the selection at the end of a line:
+ cx.set_state(
+ indoc! {"
+ The quick brown
+ fox jumps overˇ
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ cx.simulate_keystrokes("p");
+ cx.assert_state(
+ indoc! {"
+ The quick brown
+ fox jumps over
+ «cˇ»the lazy dog."},
+ Mode::HelixNormal,
+ );
+ }
+
+ #[gpui::test]
+ async fn test_multi_cursor_paste(cx: &mut gpui::TestAppContext) {
+ let mut cx = VimTestContext::new(cx, true).await;
+ cx.enable_helix();
+ // Select two blocks of text.
+ cx.set_state(
+ indoc! {"
+ The «quiˇ»ck brown
+ fox ju«mpsˇ» over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ cx.simulate_keystrokes("y");
+
+ // Only one cursor: only the first block gets pasted.
+ cx.set_state(
+ indoc! {"
+ ˇThe quick brown
+ fox jumps over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ cx.simulate_keystrokes("shift-p");
+ cx.assert_state(
+ indoc! {"
+ «quiˇ»The quick brown
+ fox jumps over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+
+ // Two cursors: both get pasted.
+ cx.set_state(
+ indoc! {"
+ ˇThe ˇquick brown
+ fox jumps over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ cx.simulate_keystrokes("shift-p");
+ cx.assert_state(
+ indoc! {"
+ «quiˇ»The «mpsˇ»quick brown
+ fox jumps over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+
+ // Three cursors: the second yanked block is duplicated.
+ cx.set_state(
+ indoc! {"
+ ˇThe ˇquick brown
+ fox jumpsˇ over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ cx.simulate_keystrokes("shift-p");
+ cx.assert_state(
+ indoc! {"
+ «quiˇ»The «mpsˇ»quick brown
+ fox jumps«mpsˇ» over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+
+ // Again with three cursors. All three should be pasted twice.
+ cx.set_state(
+ indoc! {"
+ ˇThe ˇquick brown
+ fox jumpsˇ over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ cx.simulate_keystrokes("2 shift-p");
+ cx.assert_state(
+ indoc! {"
+ «quiquiˇ»The «mpsmpsˇ»quick brown
+ fox jumps«mpsmpsˇ» over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ }
+
+ #[gpui::test]
+ async fn test_line_mode_paste(cx: &mut gpui::TestAppContext) {
+ let mut cx = VimTestContext::new(cx, true).await;
+ cx.enable_helix();
+ cx.set_state(
+ indoc! {"
+ The quick brow«n
+ ˇ»fox jumps over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+
+ cx.simulate_keystrokes("y shift-p");
+
+ cx.assert_state(
+ indoc! {"
+ «n
+ ˇ»The quick brown
+ fox jumps over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+
+ // In line mode, if we're in the middle of a line then pasting before pastes on
+ // the line before.
+ cx.set_state(
+ indoc! {"
+ The quick brown
+ fox jumpsˇ over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ cx.simulate_keystrokes("shift-p");
+ cx.assert_state(
+ indoc! {"
+ The quick brown
+ «n
+ ˇ»fox jumps over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+
+ // In line mode, if we're in the middle of a line then pasting after pastes on
+ // the line after.
+ cx.set_state(
+ indoc! {"
+ The quick brown
+ fox jumpsˇ over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ cx.simulate_keystrokes("p");
+ cx.assert_state(
+ indoc! {"
+ The quick brown
+ fox jumps over
+ «nˇ»
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+
+ // If we're currently at the end of a line, "the line after"
+ // means right after the cursor.
+ cx.set_state(
+ indoc! {"
+ The quick brown
+ fox jumps over
+ ˇthe lazy dog."},
+ Mode::HelixNormal,
+ );
+ cx.simulate_keystrokes("p");
+ cx.assert_state(
+ indoc! {"
+ The quick brown
+ fox jumps over
+ «nˇ»
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+
+ cx.set_state(
+ indoc! {"
+
+ The quick brown
+ fox jumps overˇ
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ cx.simulate_keystrokes("x y up up p");
+ cx.assert_state(
+ indoc! {"
+
+ «fox jumps overˇ»
+ The quick brown
+ fox jumps over
+ the lazy dog."},
+ Mode::HelixNormal,
+ );
+ }
+}
@@ -28,7 +28,7 @@ use editor::Editor;
use editor::{Anchor, SelectionEffects};
use editor::{Bias, ToPoint};
use editor::{display_map::ToDisplayPoint, movement};
-use gpui::{Context, Window, actions};
+use gpui::{Action, Context, Window, actions};
use language::{Point, SelectionGoal};
use log::error;
use multi_buffer::MultiBufferRow;
@@ -94,6 +94,10 @@ actions!(
Redo,
/// Undoes all changes to the most recently changed line.
UndoLastLine,
+ /// Go to tab page (with count support).
+ GoToTab,
+ /// Go to previous tab page (with count support).
+ GoToPreviousTab,
]
);
@@ -116,6 +120,8 @@ pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
Vim::action(editor, cx, Vim::toggle_comments);
Vim::action(editor, cx, Vim::paste);
Vim::action(editor, cx, Vim::show_location);
+ Vim::action(editor, cx, Vim::go_to_tab);
+ Vim::action(editor, cx, Vim::go_to_previous_tab);
Vim::action(editor, cx, |vim, _: &DeleteLeft, window, cx| {
vim.record_current_action(cx);
@@ -984,6 +990,54 @@ impl Vim {
self.switch_mode(Mode::Insert, true, window, cx);
}
}
+
+ fn go_to_tab(&mut self, _: &GoToTab, window: &mut Window, cx: &mut Context<Self>) {
+ let count = Vim::take_count(cx);
+ Vim::take_forced_motion(cx);
+
+ if let Some(tab_index) = count {
+ // <count>gt goes to tab <count> (1-based).
+ let zero_based_index = tab_index.saturating_sub(1);
+ window.dispatch_action(
+ workspace::pane::ActivateItem(zero_based_index).boxed_clone(),
+ cx,
+ );
+ } else {
+ // If no count is provided, go to the next tab.
+ window.dispatch_action(workspace::pane::ActivateNextItem.boxed_clone(), cx);
+ }
+ }
+
+ fn go_to_previous_tab(
+ &mut self,
+ _: &GoToPreviousTab,
+ window: &mut Window,
+ cx: &mut Context<Self>,
+ ) {
+ let count = Vim::take_count(cx);
+ Vim::take_forced_motion(cx);
+
+ if let Some(count) = count {
+ // gT with count goes back that many tabs with wraparound (not the same as gt!).
+ if let Some(workspace) = self.workspace(window) {
+ let pane = workspace.read(cx).active_pane().read(cx);
+ let item_count = pane.items().count();
+ if item_count > 0 {
+ let current_index = pane.active_item_index();
+ let target_index = (current_index as isize - count as isize)
+ .rem_euclid(item_count as isize)
+ as usize;
+ window.dispatch_action(
+ workspace::pane::ActivateItem(target_index).boxed_clone(),
+ cx,
+ );
+ }
+ }
+ } else {
+ // No count provided, go to the previous tab.
+ window.dispatch_action(workspace::pane::ActivatePreviousItem.boxed_clone(), cx);
+ }
+ }
}
#[cfg(test)]
mod test {
@@ -2119,4 +2173,80 @@ mod test {
Mode::Normal,
);
}
+
+ #[gpui::test]
+ async fn test_go_to_tab_with_count(cx: &mut gpui::TestAppContext) {
+ let mut cx = VimTestContext::new(cx, true).await;
+
+ // Open 4 tabs.
+ cx.simulate_keystrokes(": tabnew");
+ cx.simulate_keystrokes("enter");
+ cx.simulate_keystrokes(": tabnew");
+ cx.simulate_keystrokes("enter");
+ cx.simulate_keystrokes(": tabnew");
+ cx.simulate_keystrokes("enter");
+ cx.workspace(|workspace, _, cx| {
+ assert_eq!(workspace.items(cx).count(), 4);
+ assert_eq!(workspace.active_pane().read(cx).active_item_index(), 3);
+ });
+
+ cx.simulate_keystrokes("1 g t");
+ cx.workspace(|workspace, _, cx| {
+ assert_eq!(workspace.active_pane().read(cx).active_item_index(), 0);
+ });
+
+ cx.simulate_keystrokes("3 g t");
+ cx.workspace(|workspace, _, cx| {
+ assert_eq!(workspace.active_pane().read(cx).active_item_index(), 2);
+ });
+
+ cx.simulate_keystrokes("4 g t");
+ cx.workspace(|workspace, _, cx| {
+ assert_eq!(workspace.active_pane().read(cx).active_item_index(), 3);
+ });
+
+ cx.simulate_keystrokes("1 g t");
+ cx.simulate_keystrokes("g t");
+ cx.workspace(|workspace, _, cx| {
+ assert_eq!(workspace.active_pane().read(cx).active_item_index(), 1);
+ });
+ }
+
+ #[gpui::test]
+ async fn test_go_to_previous_tab_with_count(cx: &mut gpui::TestAppContext) {
+ let mut cx = VimTestContext::new(cx, true).await;
+
+ // Open 4 tabs.
+ cx.simulate_keystrokes(": tabnew");
+ cx.simulate_keystrokes("enter");
+ cx.simulate_keystrokes(": tabnew");
+ cx.simulate_keystrokes("enter");
+ cx.simulate_keystrokes(": tabnew");
+ cx.simulate_keystrokes("enter");
+ cx.workspace(|workspace, _, cx| {
+ assert_eq!(workspace.items(cx).count(), 4);
+ assert_eq!(workspace.active_pane().read(cx).active_item_index(), 3);
+ });
+
+ cx.simulate_keystrokes("2 g shift-t");
+ cx.workspace(|workspace, _, cx| {
+ assert_eq!(workspace.active_pane().read(cx).active_item_index(), 1);
+ });
+
+ cx.simulate_keystrokes("g shift-t");
+ cx.workspace(|workspace, _, cx| {
+ assert_eq!(workspace.active_pane().read(cx).active_item_index(), 0);
+ });
+
+ // Wraparound: gT from first tab should go to last.
+ cx.simulate_keystrokes("g shift-t");
+ cx.workspace(|workspace, _, cx| {
+ assert_eq!(workspace.active_pane().read(cx).active_item_index(), 3);
+ });
+
+ cx.simulate_keystrokes("6 g shift-t");
+ cx.workspace(|workspace, _, cx| {
+ assert_eq!(workspace.active_pane().read(cx).active_item_index(), 1);
+ });
+ }
}
@@ -241,21 +241,15 @@ impl Vim {
},
};
- // Determines whether space should be added/removed after
+ // Determines whether space should be added after
// and before the surround pairs.
- // For example, using `cs{[` will add a space before and
- // after the pair, while using `cs{]` will not, notice the
- // use of the closing bracket instead of the opening bracket
- // on the target object.
- // In the case of quotes, the opening and closing is the
- // same, so no space will ever be added or removed.
- let surround = match target {
- Object::Quotes
- | Object::BackQuotes
- | Object::AnyQuotes
- | Object::MiniQuotes
- | Object::DoubleQuotes => true,
- _ => pair.end != surround_alias((*text).as_ref()),
+ // Space is only added in the following cases:
+ // - new surround is not quote and is opening bracket (({[<)
+ // - new surround is quote and original was also quote
+ let surround = if pair.start != pair.end {
+ pair.end != surround_alias((*text).as_ref())
+ } else {
+ will_replace_pair.start == will_replace_pair.end
};
let (display_map, selections) = editor.selections.all_adjusted_display(cx);
@@ -608,13 +602,6 @@ fn all_support_surround_pair() -> Vec<BracketPair> {
surround: true,
newline: false,
},
- BracketPair {
- start: "{".into(),
- end: "}".into(),
- close: true,
- surround: true,
- newline: false,
- },
BracketPair {
start: "<".into(),
end: ">".into(),
@@ -1241,6 +1228,15 @@ mod test {
"},
Mode::Normal,
);
+
+ // test quote to bracket spacing.
+ cx.set_state(indoc! {"'ˇfoobar'"}, Mode::Normal);
+ cx.simulate_keystrokes("c s ' {");
+ cx.assert_state(indoc! {"ˇ{ foobar }"}, Mode::Normal);
+
+ cx.set_state(indoc! {"'ˇfoobar'"}, Mode::Normal);
+ cx.simulate_keystrokes("c s ' }");
+ cx.assert_state(indoc! {"ˇ{foobar}"}, Mode::Normal);
}
#[gpui::test]
@@ -25,6 +25,9 @@ use search::BufferSearchBar;
use crate::{PushSneak, PushSneakBackward, insert::NormalBefore, motion, state::Mode};
+use util_macros::perf;
+
+#[perf]
#[gpui::test]
async fn test_initially_disabled(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, false).await;
@@ -44,6 +47,7 @@ async fn test_neovim(cx: &mut gpui::TestAppContext) {
cx.assert_editor_state("ˇtest");
}
+#[perf]
#[gpui::test]
async fn test_toggle_through_settings(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -80,6 +84,7 @@ async fn test_toggle_through_settings(cx: &mut gpui::TestAppContext) {
assert_eq!(cx.mode(), Mode::Normal);
}
+#[perf]
#[gpui::test]
async fn test_cancel_selection(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -104,6 +109,7 @@ async fn test_cancel_selection(cx: &mut gpui::TestAppContext) {
cx.assert_editor_state("The quick brown fox juˇmps over the lazy dog");
}
+#[perf]
#[gpui::test]
async fn test_buffer_search(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -132,6 +138,7 @@ async fn test_buffer_search(cx: &mut gpui::TestAppContext) {
})
}
+#[perf]
#[gpui::test]
async fn test_count_down(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -143,6 +150,7 @@ async fn test_count_down(cx: &mut gpui::TestAppContext) {
cx.assert_editor_state("aa\nbb\ncc\ndd\neˇe");
}
+#[perf]
#[gpui::test]
async fn test_end_of_document_710(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -157,6 +165,7 @@ async fn test_end_of_document_710(cx: &mut gpui::TestAppContext) {
cx.assert_editor_state("aˇa\nbb\ncc");
}
+#[perf]
#[gpui::test]
async fn test_end_of_line_with_times(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -175,6 +184,7 @@ async fn test_end_of_line_with_times(cx: &mut gpui::TestAppContext) {
cx.assert_editor_state("aa\nbb\ncˇc");
}
+#[perf]
#[gpui::test]
async fn test_indent_outdent(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -241,6 +251,7 @@ async fn test_escape_command_palette(cx: &mut gpui::TestAppContext) {
cx.assert_state("aˇbc\n", Mode::Insert);
}
+#[perf]
#[gpui::test]
async fn test_escape_cancels(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -251,6 +262,7 @@ async fn test_escape_cancels(cx: &mut gpui::TestAppContext) {
cx.assert_state("aˇbc", Mode::Normal);
}
+#[perf]
#[gpui::test]
async fn test_selection_on_search(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -289,6 +301,7 @@ async fn test_selection_on_search(cx: &mut gpui::TestAppContext) {
cx.assert_state(indoc! {"aa\nbb\nˇcc\ncc\ncc\n"}, Mode::Normal);
}
+#[perf]
#[gpui::test]
async fn test_word_characters(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new_typescript(cx).await;
@@ -315,6 +328,7 @@ async fn test_word_characters(cx: &mut gpui::TestAppContext) {
)
}
+#[perf]
#[gpui::test]
async fn test_kebab_case(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new_html(cx).await;
@@ -821,6 +835,7 @@ async fn test_paragraphs_dont_wrap(cx: &mut gpui::TestAppContext) {
two"});
}
+#[perf]
#[gpui::test]
async fn test_select_all_issue_2170(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -881,6 +896,7 @@ fn assert_pending_input(cx: &mut VimTestContext, expected: &str) {
});
}
+#[perf]
#[gpui::test]
async fn test_jk_multi(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -972,6 +988,7 @@ async fn test_comma_w(cx: &mut gpui::TestAppContext) {
.assert_eq("hellˇo hello\nhello hello");
}
+#[perf]
#[gpui::test]
async fn test_completion_menu_scroll_aside(cx: &mut TestAppContext) {
let mut cx = VimTestContext::new_typescript(cx).await;
@@ -1053,6 +1070,7 @@ async fn test_completion_menu_scroll_aside(cx: &mut TestAppContext) {
});
}
+#[perf]
#[gpui::test]
async fn test_rename(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new_typescript(cx).await;
@@ -1088,6 +1106,7 @@ async fn test_rename(cx: &mut gpui::TestAppContext) {
cx.assert_state("const afterˇ = 2; console.log(after)", Mode::Normal)
}
+#[perf(iterations = 1)]
#[gpui::test]
async fn test_remap(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -1210,6 +1229,7 @@ async fn test_undo(cx: &mut gpui::TestAppContext) {
3"});
}
+#[perf]
#[gpui::test]
async fn test_mouse_selection(cx: &mut TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -1385,6 +1405,7 @@ async fn test_dw_eol(cx: &mut gpui::TestAppContext) {
.assert_eq("twelve ˇtwelve char\ntwelve char");
}
+#[perf]
#[gpui::test]
async fn test_toggle_comments(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -1476,6 +1497,7 @@ async fn test_find_multibyte(cx: &mut gpui::TestAppContext) {
.assert_eq(r#"<label for="guests">ˇo</label>"#);
}
+#[perf]
#[gpui::test]
async fn test_sneak(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -1695,6 +1717,7 @@ async fn test_ctrl_w_override(cx: &mut gpui::TestAppContext) {
cx.shared_state().await.assert_eq("ˇ");
}
+#[perf]
#[gpui::test]
async fn test_visual_indent_count(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -1850,6 +1873,7 @@ async fn test_ctrl_o_dot(cx: &mut gpui::TestAppContext) {
cx.shared_state().await.assert_eq("hellˇllo world.");
}
+#[perf(iterations = 1)]
#[gpui::test]
async fn test_folded_multibuffer_excerpts(cx: &mut gpui::TestAppContext) {
VimTestContext::init(cx);
@@ -2150,6 +2174,7 @@ async fn test_paragraph_multi_delete(cx: &mut gpui::TestAppContext) {
cx.shared_state().await.assert_eq(indoc! {"ˇ"});
}
+#[perf]
#[gpui::test]
async fn test_multi_cursor_replay(cx: &mut gpui::TestAppContext) {
let mut cx = VimTestContext::new(cx, true).await;
@@ -30,7 +30,9 @@ use gpui::{
Render, Subscription, Task, WeakEntity, Window, actions,
};
use insert::{NormalBefore, TemporaryNormal};
-use language::{CharKind, CursorShape, Point, Selection, SelectionGoal, TransactionId};
+use language::{
+ CharKind, CharScopeContext, CursorShape, Point, Selection, SelectionGoal, TransactionId,
+};
pub use mode_indicator::ModeIndicator;
use motion::Motion;
use normal::search::SearchSubmit;
@@ -1347,7 +1349,8 @@ impl Vim {
let selection = editor.selections.newest::<usize>(cx);
let snapshot = &editor.snapshot(window, cx).buffer_snapshot;
- let (range, kind) = snapshot.surrounding_word(selection.start, true);
+ let (range, kind) =
+ snapshot.surrounding_word(selection.start, Some(CharScopeContext::Completion));
if kind == Some(CharKind::Word) {
let text: String = snapshot.text_for_range(range).collect();
if !text.trim().is_empty() {
@@ -216,7 +216,7 @@ impl ComponentPreview {
}
fn scope_ordered_entries(&self) -> Vec<PreviewEntry> {
- use std::collections::HashMap;
+ use collections::HashMap;
let mut scope_groups: HashMap<
ComponentScope,
@@ -15,7 +15,6 @@ use gpui::{
FocusHandle, Focusable, InteractiveElement, ParentElement, Render, Styled, Subscription,
WeakEntity, Window, anchored, deferred, point,
};
-use project::DisableAiSettings;
use project::project_settings::DiagnosticSeverity;
use search::{BufferSearchBar, buffer_search};
use settings::{Settings, SettingsStore};
@@ -48,20 +47,15 @@ impl QuickActionBar {
workspace: &Workspace,
cx: &mut Context<Self>,
) -> Self {
- let mut was_ai_disabled = DisableAiSettings::get_global(cx).disable_ai;
- let mut was_agent_enabled = AgentSettings::get_global(cx).enabled;
+ let mut was_agent_enabled = AgentSettings::get_global(cx).enabled(cx);
let mut was_agent_button = AgentSettings::get_global(cx).button;
let ai_settings_subscription = cx.observe_global::<SettingsStore>(move |_, cx| {
- let is_ai_disabled = DisableAiSettings::get_global(cx).disable_ai;
let agent_settings = AgentSettings::get_global(cx);
+ let is_agent_enabled = agent_settings.enabled(cx);
- if was_ai_disabled != is_ai_disabled
- || was_agent_enabled != agent_settings.enabled
- || was_agent_button != agent_settings.button
- {
- was_ai_disabled = is_ai_disabled;
- was_agent_enabled = agent_settings.enabled;
+ if was_agent_enabled != is_agent_enabled || was_agent_button != agent_settings.button {
+ was_agent_enabled = is_agent_enabled;
was_agent_button = agent_settings.button;
cx.notify();
}
@@ -597,9 +591,7 @@ impl Render for QuickActionBar {
.children(self.render_preview_button(self.workspace.clone(), cx))
.children(search_button)
.when(
- AgentSettings::get_global(cx).enabled
- && AgentSettings::get_global(cx).button
- && !DisableAiSettings::get_global(cx).disable_ai,
+ AgentSettings::get_global(cx).enabled(cx) && AgentSettings::get_global(cx).button,
|bar| bar.child(assistant_button),
)
.children(code_actions_dropdown)
@@ -48,17 +48,17 @@ You can install these dependencies natively or run them under Docker.
- Follow the steps in the [collab README](https://github.com/zed-industries/zed/blob/main/crates/collab/README.md) to configure the Postgres database for integration tests
-Alternatively, if you have [Docker](https://www.docker.com/) installed you can bring up all the `collab` dependencies using Docker Compose:
+Alternatively, if you have [Docker](https://www.docker.com/) installed you can bring up all the `collab` dependencies using Docker Compose.
### Linux
1. Install [Postgres](https://www.postgresql.org/download/linux/)
```sh
- sudo apt-get install postgresql postgresql # Ubuntu/Debian
- sudo pacman -S postgresql # Arch Linux
- sudo dnf install postgresql postgresql-server # RHEL/Fedora
- sudo zypper install postgresql postgresql-server # OpenSUSE
+ sudo apt-get install postgresql # Ubuntu/Debian
+ sudo pacman -S postgresql # Arch Linux
+ sudo dnf install postgresql postgresql-server # RHEL/Fedora
+ sudo zypper install postgresql postgresql-server # OpenSUSE
```
2. Install [Livekit](https://github.com/livekit/livekit-cli)
@@ -65,7 +65,7 @@ Put another way, it is supposed to answer the question: "Given a program, a list
Zed offers an automatic way to create debug scenarios with _debug locators_.
A locator locates the debug target and figures out how to spawn a debug session for it. Thanks to locators, we can automatically convert existing user tasks (e.g. `cargo run`) and convert them into debug scenarios (e.g. `cargo build` followed by spawning a debugger with `target/debug/my_program` as the program to debug).
-> Your extension can define it's own debug locators even if it does not expose a debug adapter. We strongly recommend doing so when your extension already exposes language tasks, as it allows users to spawn a debug session without having to manually configure the debug adapter.
+> Your extension can define its own debug locators even if it does not expose a debug adapter. We strongly recommend doing so when your extension already exposes language tasks, as it allows users to spawn a debug session without having to manually configure the debug adapter.
Locators can (but don't have to) be agnostic to the debug adapter they are used with. They are simply responsible for locating the debug target and figuring out how to spawn a debug session for it. This allows for a more flexible and extensible debugging experience.
@@ -4,3 +4,28 @@ Fish language support in Zed is provided by the community-maintained [Fish exten
Report issues to: [https://github.com/hasit/zed-fish/issues](https://github.com/hasit/zed-fish/issues)
- Tree-sitter: [ram02z/tree-sitter-fish](https://github.com/ram02z/tree-sitter-fish)
+
+### Formatting
+
+Zed supports auto-formatting fish code using external tools like [`fish_indent`](https://fishshell.com/docs/current/cmds/fish_indent.html), which is included with fish.
+
+1. Ensure `fish_indent` is available in your path and check the version:
+
+```sh
+which fish_indent
+fish_indent --version
+```
+
+2. Configure Zed to automatically format fish code with `fish_indent`:
+
+```json
+ "languages": {
+ "Fish": {
+ "formatter": {
+ "external": {
+ "command": "fish_indent"
+ }
+ }
+ }
+ },
+```
@@ -11,6 +11,12 @@ Report issues to: [https://github.com/zed-extensions/kotlin/issues](https://gith
Workspace configuration options can be passed to the language server via lsp
settings in `settings.json`.
+The full list of lsp `settings` can be found
+[here](https://github.com/fwcd/kotlin-language-server/blob/main/server/src/main/kotlin/org/javacs/kt/Configuration.kt)
+under `class Configuration` and initialization_options under `class InitializationOptions`.
+
+### JVM Target
+
The following example changes the JVM target from `default` (which is 1.8) to
`17`:
@@ -30,5 +36,20 @@ The following example changes the JVM target from `default` (which is 1.8) to
}
```
-The full list of workspace configuration options can be found
-[here](https://github.com/fwcd/kotlin-language-server/blob/main/server/src/main/kotlin/org/javacs/kt/Configuration.kt).
+### JAVA_HOME
+
+To use a specific java installation, just specify the `JAVA_HOME` environment variable with:
+
+```json
+{
+ "lsp": {
+ "kotlin-language-server": {
+ "binary": {
+ "env": {
+ "JAVA_HOME": "/Users/whatever/Applications/Work/Android Studio.app/Contents/jbr/Contents/Home"
+ }
+ }
+ }
+ }
+}
+```
@@ -198,7 +198,7 @@ You can disable format-on-save for Python files in your `settings.json`:
{
"languages": {
"Python": {
- "format_on_save": false
+ "format_on_save": "off"
}
}
}
@@ -9,6 +9,7 @@ Ruby support is available through the [Ruby extension](https://github.com/zed-ex
- [ruby-lsp](https://github.com/Shopify/ruby-lsp)
- [solargraph](https://github.com/castwide/solargraph)
- [rubocop](https://github.com/rubocop/rubocop)
+ - [Herb](https://herb-tools.dev)
- Debug Adapter: [`rdbg`](https://github.com/ruby/debug)
The Ruby extension also provides support for ERB files.
@@ -27,6 +28,7 @@ In addition to these two language servers, Zed also supports:
- [rubocop](https://github.com/rubocop/rubocop) which is a static code analyzer and linter for Ruby. Under the hood, it's also used by Zed as a language server, but its functionality is complimentary to that of solargraph and ruby-lsp.
- [sorbet](https://sorbet.org/) which is a static type checker for Ruby with a custom gradual type system.
- [steep](https://github.com/soutaro/steep) which is a static type checker for Ruby that leverages Ruby Signature (RBS).
+- [Herb](https://herb-tools.dev) which is a language server for ERB files.
When configuring a language server, it helps to open the LSP Logs window using the 'dev: Open Language Server Logs' command. You can then choose the corresponding language instance to see any logged information.
@@ -238,6 +240,10 @@ To enable Steep, add `\"steep\"` to the `language_servers` list for Ruby in your
}
```
+## Setting up Herb
+
+`Herb` is enabled by default for the `HTML/ERB` language.
+
## Using the Tailwind CSS Language Server with Ruby
It's possible to use the [Tailwind CSS Language Server](https://github.com/tailwindlabs/tailwindcss-intellisense/tree/HEAD/packages/tailwindcss-language-server#readme) in Ruby and ERB files.
@@ -227,7 +227,7 @@ TBD: Centered layout related settings
"git": {
"inline_blame": {
"enabled": true, // Show/hide inline blame
- "delay": 0, // Show after delay (ms)
+ "delay_ms": 0, // Show after delay (ms)
"min_column": 0, // Minimum column to inline display blame
"padding": 7, // Padding between code and inline blame (em)
"show_commit_summary": false // Show/hide commit summary
@@ -104,7 +104,7 @@ Prepared new Zed versions locally. You will need to push the branches and open a
${prev_minor_branch_name} \\
${bump_main_branch_name}
- echo -e "Release Notes:\n\n-N/A" | gh pr create \\
+ echo -e "Release Notes:\n\n- N/A" | gh pr create \\
--title "Bump Zed to v${major}.${next_minor}" \\
--body-file "-" \\
--base main \\
@@ -0,0 +1,31 @@
+[package]
+name = "perf"
+version = "0.1.0"
+description = "A tool for measuring Zed test performance, with too many Clippy lints"
+publish.workspace = true
+edition.workspace = true
+
+[lib]
+
+# Some personal lint preferences :3
+[lints.rust]
+missing_docs = "warn"
+
+[lints.clippy]
+needless_continue = "allow" # For a convenience macro
+all = "warn"
+pedantic = "warn"
+style = "warn"
+missing_docs_in_private_items = "warn"
+as_underscore = "deny"
+allow_attributes = "deny"
+allow_attributes_without_reason = "deny" # This covers `expect` also, since we deny `allow`
+let_underscore_must_use = "forbid"
+undocumented_unsafe_blocks = "forbid"
+missing_safety_doc = "forbid"
+
+[dependencies]
+collections.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+workspace-hack.workspace = true
@@ -0,0 +1 @@
+../../LICENSE-APACHE
@@ -0,0 +1,443 @@
+//! Some constants and datatypes used in the Zed perf profiler. Should only be
+//! consumed by the crate providing the matching macros.
+
+use collections::HashMap;
+use serde::{Deserialize, Serialize};
+use std::{num::NonZero, time::Duration};
+
+pub mod consts {
+ //! Preset idenitifiers and constants so that the profiler and proc macro agree
+ //! on their communication protocol.
+
+ /// The suffix on the actual test function.
+ pub const SUF_NORMAL: &str = "__ZED_PERF_FN";
+ /// The suffix on an extra function which prints metadata about a test to stdout.
+ pub const SUF_MDATA: &str = "__ZED_PERF_MDATA";
+ /// The env var in which we pass the iteration count to our tests.
+ pub const ITER_ENV_VAR: &str = "ZED_PERF_ITER";
+ /// The prefix printed on all benchmark test metadata lines, to distinguish it from
+ /// possible output by the test harness itself.
+ pub const MDATA_LINE_PREF: &str = "ZED_MDATA_";
+ /// The version number for the data returned from the test metadata function.
+ /// Increment on non-backwards-compatible changes.
+ pub const MDATA_VER: u32 = 0;
+ /// The default weight, if none is specified.
+ pub const WEIGHT_DEFAULT: u8 = 50;
+ /// How long a test must have run to be assumed to be reliable-ish.
+ pub const NOISE_CUTOFF: std::time::Duration = std::time::Duration::from_millis(250);
+
+ /// Identifier for the iteration count of a test metadata.
+ pub const ITER_COUNT_LINE_NAME: &str = "iter_count";
+ /// Identifier for the weight of a test metadata.
+ pub const WEIGHT_LINE_NAME: &str = "weight";
+ /// Identifier for importance in test metadata.
+ pub const IMPORTANCE_LINE_NAME: &str = "importance";
+ /// Identifier for the test metadata version.
+ pub const VERSION_LINE_NAME: &str = "version";
+
+ /// Where to save json run information.
+ pub const RUNS_DIR: &str = ".perf-runs";
+}
+
+/// How relevant a benchmark is.
+#[derive(Clone, Debug, Default, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
+pub enum Importance {
+ /// Regressions shouldn't be accepted without good reason.
+ Critical = 4,
+ /// Regressions should be paid extra attention.
+ Important = 3,
+ /// No extra attention should be paid to regressions, but they might still
+ /// be indicative of something happening.
+ #[default]
+ Average = 2,
+ /// Unclear if regressions are likely to be meaningful, but still worth keeping
+ /// an eye on. Lowest level that's checked by default by the profiler.
+ Iffy = 1,
+ /// Regressions are likely to be spurious or don't affect core functionality.
+ /// Only relevant if a lot of them happen, or as supplemental evidence for a
+ /// higher-importance benchmark regressing. Not checked by default.
+ Fluff = 0,
+}
+
+impl std::fmt::Display for Importance {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ Importance::Critical => f.write_str("critical"),
+ Importance::Important => f.write_str("important"),
+ Importance::Average => f.write_str("average"),
+ Importance::Iffy => f.write_str("iffy"),
+ Importance::Fluff => f.write_str("fluff"),
+ }
+ }
+}
+
+/// Why or when did this test fail?
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum FailKind {
+ /// Failed while triaging it to determine the iteration count.
+ Triage,
+ /// Failed while profiling it.
+ Profile,
+ /// Failed due to an incompatible version for the test.
+ VersionMismatch,
+ /// Could not parse metadata for a test.
+ BadMetadata,
+ /// Skipped due to filters applied on the perf run.
+ Skipped,
+}
+
+impl std::fmt::Display for FailKind {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ FailKind::Triage => f.write_str("errored in triage"),
+ FailKind::Profile => f.write_str("errored while profiling"),
+ FailKind::VersionMismatch => f.write_str("test version mismatch"),
+ FailKind::BadMetadata => f.write_str("bad test metadata"),
+ FailKind::Skipped => f.write_str("skipped"),
+ }
+ }
+}
+
+/// Information about a given perf test.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct TestMdata {
+ /// A version number for when the test was generated. If this is greater
+ /// than the version this test handler expects, one of the following will
+ /// happen in an unspecified manner:
+ /// - The test is skipped silently.
+ /// - The handler exits with an error message indicating the version mismatch
+ /// or inability to parse the metadata.
+ ///
+ /// INVARIANT: If `version` <= `MDATA_VER`, this tool *must* be able to
+ /// correctly parse the output of this test.
+ pub version: u32,
+ /// How many iterations to pass this test if this is preset, or how many
+ /// iterations a test ended up running afterwards if determined at runtime.
+ pub iterations: Option<NonZero<usize>>,
+ /// The importance of this particular test. See the docs on `Importance` for
+ /// details.
+ pub importance: Importance,
+ /// The weight of this particular test within its importance category. Used
+ /// when comparing across runs.
+ pub weight: u8,
+}
+
+/// The actual timings of a test, as measured by Hyperfine.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct Timings {
+ /// Mean runtime for `self.iter_total` runs of this test.
+ pub mean: Duration,
+ /// Standard deviation for the above.
+ pub stddev: Duration,
+}
+
+impl Timings {
+ /// How many iterations does this test seem to do per second?
+ #[expect(
+ clippy::cast_precision_loss,
+ reason = "We only care about a couple sig figs anyways"
+ )]
+ #[must_use]
+ pub fn iters_per_sec(&self, total_iters: NonZero<usize>) -> f64 {
+ (1000. / self.mean.as_millis() as f64) * total_iters.get() as f64
+ }
+}
+
+/// Aggregate results, meant to be used for a given importance category. Each
+/// test name corresponds to its benchmark results, iteration count, and weight.
+type CategoryInfo = HashMap<String, (Timings, NonZero<usize>, u8)>;
+
+/// Aggregate output of all tests run by this handler.
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+pub struct Output {
+ /// A list of test outputs. Format is `(test_name, mdata, timings)`.
+ /// The latter being `Ok(_)` indicates the test succeeded.
+ ///
+ /// INVARIANT: If the test succeeded, the second field is `Some(mdata)` and
+ /// `mdata.iterations` is `Some(_)`.
+ tests: Vec<(String, Option<TestMdata>, Result<Timings, FailKind>)>,
+}
+
+impl Output {
+ /// Instantiates an empty "output". Useful for merging.
+ #[must_use]
+ pub fn blank() -> Self {
+ Output { tests: Vec::new() }
+ }
+
+ /// Reports a success and adds it to this run's `Output`.
+ pub fn success(
+ &mut self,
+ name: impl AsRef<str>,
+ mut mdata: TestMdata,
+ iters: NonZero<usize>,
+ timings: Timings,
+ ) {
+ mdata.iterations = Some(iters);
+ self.tests
+ .push((name.as_ref().to_string(), Some(mdata), Ok(timings)));
+ }
+
+ /// Reports a failure and adds it to this run's `Output`. If this test was tried
+ /// with some number of iterations (i.e. this was not a version mismatch or skipped
+ /// test), it should be reported also.
+ ///
+ /// Using the `fail!()` macro is usually more convenient.
+ pub fn failure(
+ &mut self,
+ name: impl AsRef<str>,
+ mut mdata: Option<TestMdata>,
+ attempted_iters: Option<NonZero<usize>>,
+ kind: FailKind,
+ ) {
+ if let Some(ref mut mdata) = mdata {
+ mdata.iterations = attempted_iters;
+ }
+ self.tests
+ .push((name.as_ref().to_string(), mdata, Err(kind)));
+ }
+
+ /// True if no tests executed this run.
+ #[must_use]
+ pub fn is_empty(&self) -> bool {
+ self.tests.is_empty()
+ }
+
+ /// Sorts the runs in the output in the order that we want them printed.
+ pub fn sort(&mut self) {
+ self.tests.sort_unstable_by(|a, b| match (a, b) {
+ // Tests where we got no metadata go at the end.
+ ((_, Some(_), _), (_, None, _)) => std::cmp::Ordering::Greater,
+ ((_, None, _), (_, Some(_), _)) => std::cmp::Ordering::Less,
+ // Then sort by importance, then weight.
+ ((_, Some(a_mdata), _), (_, Some(b_mdata), _)) => {
+ let c = a_mdata.importance.cmp(&b_mdata.importance);
+ if matches!(c, std::cmp::Ordering::Equal) {
+ a_mdata.weight.cmp(&b_mdata.weight)
+ } else {
+ c
+ }
+ }
+ // Lastly by name.
+ ((a_name, ..), (b_name, ..)) => a_name.cmp(b_name),
+ });
+ }
+
+ /// Merges the output of two runs, appending a prefix to the results of the new run.
+ /// To be used in conjunction with `Output::blank()`, or else only some tests will have
+ /// a prefix set.
+ pub fn merge<'a>(&mut self, other: Self, pref_other: impl Into<Option<&'a str>>) {
+ let pref = if let Some(pref) = pref_other.into() {
+ "crates/".to_string() + pref + "::"
+ } else {
+ String::new()
+ };
+ self.tests = std::mem::take(&mut self.tests)
+ .into_iter()
+ .chain(
+ other
+ .tests
+ .into_iter()
+ .map(|(name, md, tm)| (pref.clone() + &name, md, tm)),
+ )
+ .collect();
+ }
+
+ /// Evaluates the performance of `self` against `baseline`. The latter is taken
+ /// as the comparison point, i.e. a positive resulting `PerfReport` means that
+ /// `self` performed better.
+ ///
+ /// # Panics
+ /// `self` and `baseline` are assumed to have the iterations field on all
+ /// `TestMdata`s set to `Some(_)` if the `TestMdata` is present itself.
+ #[must_use]
+ pub fn compare_perf(self, baseline: Self) -> PerfReport {
+ let self_categories = self.collapse();
+ let mut other_categories = baseline.collapse();
+
+ let deltas = self_categories
+ .into_iter()
+ .filter_map(|(cat, self_data)| {
+ // Only compare categories where both meow
+ // runs have data. /
+ let mut other_data = other_categories.remove(&cat)?;
+ let mut max = 0.;
+ let mut min = 0.;
+
+ // Running totals for averaging out tests.
+ let mut r_total_numerator = 0.;
+ let mut r_total_denominator = 0;
+ // Yeah this is O(n^2), but realistically it'll hardly be a bottleneck.
+ for (name, (s_timings, s_iters, weight)) in self_data {
+ // Only use the new weights if they conflict.
+ let Some((o_timings, o_iters, _)) = other_data.remove(&name) else {
+ continue;
+ };
+ let shift =
+ (s_timings.iters_per_sec(s_iters) / o_timings.iters_per_sec(o_iters)) - 1.;
+ if shift > max {
+ max = shift;
+ }
+ if shift < min {
+ min = shift;
+ }
+ r_total_numerator += shift * f64::from(weight);
+ r_total_denominator += u32::from(weight);
+ }
+ let mean = r_total_numerator / f64::from(r_total_denominator);
+ // TODO: also aggregate standard deviation? That's harder to keep
+ // meaningful, though, since we dk which tests are correlated.
+ Some((cat, PerfDelta { max, mean, min }))
+ })
+ .collect();
+
+ PerfReport { deltas }
+ }
+
+ /// Collapses the `PerfReport` into a `HashMap` over `Importance`, with
+ /// each importance category having its tests contained.
+ fn collapse(self) -> HashMap<Importance, CategoryInfo> {
+ let mut categories = HashMap::<Importance, HashMap<String, _>>::default();
+ for entry in self.tests {
+ if let Some(mdata) = entry.1
+ && let Ok(timings) = entry.2
+ {
+ if let Some(handle) = categories.get_mut(&mdata.importance) {
+ handle.insert(entry.0, (timings, mdata.iterations.unwrap(), mdata.weight));
+ } else {
+ let mut new = HashMap::default();
+ new.insert(entry.0, (timings, mdata.iterations.unwrap(), mdata.weight));
+ categories.insert(mdata.importance, new);
+ }
+ }
+ }
+
+ categories
+ }
+}
+
+impl std::fmt::Display for Output {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ // Don't print the header for an empty run.
+ if self.tests.is_empty() {
+ return Ok(());
+ }
+
+ // We want to print important tests at the top, then alphabetical.
+ let mut sorted = self.clone();
+ sorted.sort();
+ // Markdown header for making a nice little table :>
+ writeln!(
+ f,
+ "| Command | Iter/sec | Mean [ms] | SD [ms] | Iterations | Importance (weight) |",
+ )?;
+ writeln!(f, "|:---|---:|---:|---:|---:|---:|")?;
+ for (name, metadata, timings) in &sorted.tests {
+ match metadata {
+ Some(metadata) => match timings {
+ // Happy path.
+ Ok(timings) => {
+ // If the test succeeded, then metadata.iterations is Some(_).
+ writeln!(
+ f,
+ "| {} | {:.2} | {} | {:.2} | {} | {} ({}) |",
+ name,
+ timings.iters_per_sec(metadata.iterations.unwrap()),
+ {
+ // Very small mean runtimes will give inaccurate
+ // results. Should probably also penalise weight.
+ let mean = timings.mean.as_secs_f64() * 1000.;
+ if mean < consts::NOISE_CUTOFF.as_secs_f64() * 1000. / 8. {
+ format!("{mean:.2} (unreliable)")
+ } else {
+ format!("{mean:.2}")
+ }
+ },
+ timings.stddev.as_secs_f64() * 1000.,
+ metadata.iterations.unwrap(),
+ metadata.importance,
+ metadata.weight,
+ )?;
+ }
+ // We have (some) metadata, but the test errored.
+ Err(err) => writeln!(
+ f,
+ "| ({}) {} | N/A | N/A | N/A | {} | {} ({}) |",
+ err,
+ name,
+ metadata
+ .iterations
+ .map_or_else(|| "N/A".to_owned(), |i| format!("{i}")),
+ metadata.importance,
+ metadata.weight
+ )?,
+ },
+ // No metadata, couldn't even parse the test output.
+ None => writeln!(
+ f,
+ "| ({}) {} | N/A | N/A | N/A | N/A | N/A |",
+ timings.as_ref().unwrap_err(),
+ name
+ )?,
+ }
+ }
+ writeln!(f)?;
+ Ok(())
+ }
+}
+
+/// The difference in performance between two runs within a given importance
+/// category.
+struct PerfDelta {
+ /// The biggest improvement / least bad regression.
+ max: f64,
+ /// The weighted average change in test times.
+ mean: f64,
+ /// The worst regression / smallest improvement.
+ min: f64,
+}
+
+/// Shim type for reporting all performance deltas across importance categories.
+pub struct PerfReport {
+ /// Inner (group, diff) pairing.
+ deltas: HashMap<Importance, PerfDelta>,
+}
+
+impl std::fmt::Display for PerfReport {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ if self.deltas.is_empty() {
+ return write!(f, "(no matching tests)");
+ }
+ let sorted = self.deltas.iter().collect::<Vec<_>>();
+ writeln!(f, "| Category | Max | Mean | Min |")?;
+ // We don't want to print too many newlines at the end, so handle newlines
+ // a little jankily like this.
+ write!(f, "|:---|---:|---:|---:|")?;
+ for (cat, delta) in sorted.into_iter().rev() {
+ const SIGN_POS: &str = "↑";
+ const SIGN_NEG: &str = "↓";
+ const SIGN_NEUTRAL: &str = "±";
+
+ let prettify = |time: f64| {
+ let sign = if time > 0.05 {
+ SIGN_POS
+ } else if time < 0.05 && time > -0.05 {
+ SIGN_NEUTRAL
+ } else {
+ SIGN_NEG
+ };
+ format!("{} {:.1}%", sign, time.abs() * 100.)
+ };
+
+ // Pretty-print these instead of just using the float display impl.
+ write!(
+ f,
+ "\n| {cat} | {} | {} | {} |",
+ prettify(delta.max),
+ prettify(delta.mean),
+ prettify(delta.min)
+ )?;
+ }
+ Ok(())
+ }
+}
@@ -0,0 +1,513 @@
+//! Perf profiler for Zed tests. Outputs timings of tests marked with the `#[perf]`
+//! attribute to stdout in Markdown. See the documentation of `util_macros::perf`
+//! for usage details on the actual attribute.
+//!
+//! # Setup
+//! Make sure `hyperfine` is installed and in the shell path.
+//!
+//! # Usage
+//! Calling this tool rebuilds the targeted crate(s) with some cfg flags set for the
+//! perf proc macro *and* enables optimisations (`release-fast` profile), so expect
+//! it to take a little while.
+//!
+//! To test an individual crate, run:
+//! ```sh
+//! cargo perf-test -p $CRATE
+//! ```
+//!
+//! To test everything (which will be **VERY SLOW**), run:
+//! ```sh
+//! cargo perf-test --workspace
+//! ```
+//!
+//! Some command-line parameters are also recognised by this profiler. To filter
+//! out all tests below a certain importance (e.g. `important`), run:
+//! ```sh
+//! cargo perf-test $WHATEVER -- --important
+//! ```
+//!
+//! Similarly, to skip outputting progress to the command line, pass `-- --quiet`.
+//! These flags can be combined.
+//!
+//! ## Comparing runs
+//! Passing `--json=ident` will save per-crate run files in `.perf-runs`, e.g.
+//! `cargo perf-test -p gpui -- --json=blah` will result in `.perf-runs/blah.gpui.json`
+//! being created (unless no tests were run). These results can be automatically
+//! compared. To do so, run `cargo perf-compare new-ident old-ident`.
+//!
+//! NB: All files matching `.perf-runs/ident.*.json` will be considered when
+//! doing this comparison, so ensure there aren't leftover files in your `.perf-runs`
+//! directory that might match that!
+//!
+//! # Notes
+//! This should probably not be called manually unless you're working on the profiler
+//! itself; use the `cargo perf-test` alias (after building this crate) instead.
+
+use perf::{FailKind, Importance, Output, TestMdata, Timings, consts};
+
+use std::{
+ fs::OpenOptions,
+ io::Write,
+ num::NonZero,
+ path::{Path, PathBuf},
+ process::{Command, Stdio},
+ sync::atomic::{AtomicBool, Ordering},
+ time::{Duration, Instant},
+};
+
+/// How many iterations to attempt the first time a test is run.
+const DEFAULT_ITER_COUNT: NonZero<usize> = NonZero::new(3).unwrap();
+/// Multiplier for the iteration count when a test doesn't pass the noise cutoff.
+const ITER_COUNT_MUL: NonZero<usize> = NonZero::new(4).unwrap();
+
+/// Do we keep stderr empty while running the tests?
+static QUIET: AtomicBool = AtomicBool::new(false);
+
+/// Report a failure into the output and skip an iteration.
+macro_rules! fail {
+ ($output:ident, $name:expr, $kind:expr) => {{
+ $output.failure($name, None, None, $kind);
+ continue;
+ }};
+ ($output:ident, $name:expr, $mdata:expr, $kind:expr) => {{
+ $output.failure($name, Some($mdata), None, $kind);
+ continue;
+ }};
+ ($output:ident, $name:expr, $mdata:expr, $count:expr, $kind:expr) => {{
+ $output.failure($name, Some($mdata), Some($count), $kind);
+ continue;
+ }};
+}
+
+/// How does this perf run return its output?
+enum OutputKind<'a> {
+ /// Print markdown to the terminal.
+ Markdown,
+ /// Save JSON to a file.
+ Json(&'a Path),
+}
+
+impl OutputKind<'_> {
+ /// Logs the output of a run as per the `OutputKind`.
+ fn log(&self, output: &Output, t_bin: &str) {
+ match self {
+ OutputKind::Markdown => print!("{output}"),
+ OutputKind::Json(ident) => {
+ let wspace_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
+ let runs_dir = PathBuf::from(&wspace_dir).join(consts::RUNS_DIR);
+ std::fs::create_dir_all(&runs_dir).unwrap();
+ assert!(
+ !ident.to_string_lossy().is_empty(),
+ "FATAL: Empty filename specified!"
+ );
+ // Get the test binary's crate's name; a path like
+ // target/release-fast/deps/gpui-061ff76c9b7af5d7
+ // would be reduced to just "gpui".
+ let test_bin_stripped = Path::new(t_bin)
+ .file_name()
+ .unwrap()
+ .to_str()
+ .unwrap()
+ .rsplit_once('-')
+ .unwrap()
+ .0;
+ let mut file_path = runs_dir.join(ident);
+ file_path
+ .as_mut_os_string()
+ .push(format!(".{test_bin_stripped}.json"));
+ let mut out_file = OpenOptions::new()
+ .write(true)
+ .create(true)
+ .truncate(true)
+ .open(&file_path)
+ .unwrap();
+ out_file
+ .write_all(&serde_json::to_vec(&output).unwrap())
+ .unwrap();
+ if !QUIET.load(Ordering::Relaxed) {
+ eprintln!("JSON output written to {}", file_path.display());
+ }
+ }
+ }
+ }
+}
+
+/// Runs a given metadata-returning function from a test handler, parsing its
+/// output into a `TestMdata`.
+fn parse_mdata(t_bin: &str, mdata_fn: &str) -> Result<TestMdata, FailKind> {
+ let mut cmd = Command::new(t_bin);
+ cmd.args([mdata_fn, "--exact", "--nocapture"]);
+ let out = cmd
+ .output()
+ .expect("FATAL: Could not run test binary {t_bin}");
+ assert!(out.status.success());
+ let stdout = String::from_utf8_lossy(&out.stdout);
+ let mut version = None;
+ let mut iterations = None;
+ let mut importance = Importance::default();
+ let mut weight = consts::WEIGHT_DEFAULT;
+ for line in stdout
+ .lines()
+ .filter_map(|l| l.strip_prefix(consts::MDATA_LINE_PREF))
+ {
+ let mut items = line.split_whitespace();
+ // For v0, we know the ident always comes first, then one field.
+ match items.next().ok_or(FailKind::BadMetadata)? {
+ consts::VERSION_LINE_NAME => {
+ let v = items
+ .next()
+ .ok_or(FailKind::BadMetadata)?
+ .parse::<u32>()
+ .map_err(|_| FailKind::BadMetadata)?;
+ if v > consts::MDATA_VER {
+ return Err(FailKind::VersionMismatch);
+ }
+ version = Some(v);
+ }
+ consts::ITER_COUNT_LINE_NAME => {
+ // This should never be zero!
+ iterations = Some(
+ items
+ .next()
+ .ok_or(FailKind::BadMetadata)?
+ .parse::<usize>()
+ .map_err(|_| FailKind::BadMetadata)?
+ .try_into()
+ .map_err(|_| FailKind::BadMetadata)?,
+ );
+ }
+ consts::IMPORTANCE_LINE_NAME => {
+ importance = match items.next().ok_or(FailKind::BadMetadata)? {
+ "critical" => Importance::Critical,
+ "important" => Importance::Important,
+ "average" => Importance::Average,
+ "iffy" => Importance::Iffy,
+ "fluff" => Importance::Fluff,
+ _ => return Err(FailKind::BadMetadata),
+ };
+ }
+ consts::WEIGHT_LINE_NAME => {
+ weight = items
+ .next()
+ .ok_or(FailKind::BadMetadata)?
+ .parse::<u8>()
+ .map_err(|_| FailKind::BadMetadata)?;
+ }
+ _ => unreachable!(),
+ }
+ }
+
+ Ok(TestMdata {
+ version: version.ok_or(FailKind::BadMetadata)?,
+ // Iterations may be determined by us and thus left unspecified.
+ iterations,
+ // In principle this should always be set, but just for the sake of
+ // stability allow the potentially-breaking change of not reporting the
+ // importance without erroring. Maybe we want to change this.
+ importance,
+ // Same with weight.
+ weight,
+ })
+}
+
+/// Compares the perf results of two profiles as per the arguments passed in.
+fn compare_profiles(args: &[String]) {
+ let ident_new = args.first().expect("FATAL: missing identifier for new run");
+ let ident_old = args.get(1).expect("FATAL: missing identifier for old run");
+ // TODO: move this to a constant also tbh
+ let wspace_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
+ let runs_dir = PathBuf::from(&wspace_dir).join(consts::RUNS_DIR);
+
+ // Use the blank outputs initially, so we can merge into these with prefixes.
+ let mut outputs_new = Output::blank();
+ let mut outputs_old = Output::blank();
+
+ for e in runs_dir.read_dir().unwrap() {
+ let Ok(entry) = e else {
+ continue;
+ };
+ let Ok(metadata) = entry.metadata() else {
+ continue;
+ };
+ if metadata.is_file() {
+ let Ok(name) = entry.file_name().into_string() else {
+ continue;
+ };
+
+ // A little helper to avoid code duplication. Reads the `output` from
+ // a json file, then merges it into what we have so far.
+ let read_into = |output: &mut Output| {
+ let mut elems = name.split('.').skip(1);
+ let prefix = elems.next().unwrap();
+ assert_eq!("json", elems.next().unwrap());
+ assert!(elems.next().is_none());
+ let handle = OpenOptions::new().read(true).open(entry.path()).unwrap();
+ let o_other: Output = serde_json::from_reader(handle).unwrap();
+ output.merge(o_other, prefix);
+ };
+
+ if name.starts_with(ident_old) {
+ read_into(&mut outputs_old);
+ } else if name.starts_with(ident_new) {
+ read_into(&mut outputs_new);
+ }
+ }
+ }
+
+ let res = outputs_new.compare_perf(outputs_old);
+ println!("{res}");
+}
+
+/// Runs a test binary, filtering out tests which aren't marked for perf triage
+/// and giving back the list of tests we care about.
+///
+/// The output of this is an iterator over `test_fn_name, test_mdata_name`.
+fn get_tests(t_bin: &str) -> impl ExactSizeIterator<Item = (String, String)> {
+ let mut cmd = Command::new(t_bin);
+ // --format=json is nightly-only :(
+ cmd.args(["--list", "--format=terse"]);
+ let out = cmd
+ .output()
+ .expect("FATAL: Could not run test binary {t_bin}");
+ assert!(
+ out.status.success(),
+ "FATAL: Cannot do perf check - test binary {t_bin} returned an error"
+ );
+ if !QUIET.load(Ordering::Relaxed) {
+ eprintln!("Test binary ran successfully; starting profile...");
+ }
+ // Parse the test harness output to look for tests we care about.
+ let stdout = String::from_utf8_lossy(&out.stdout);
+ let mut test_list: Vec<_> = stdout
+ .lines()
+ .filter_map(|line| {
+ // This should split only in two; e.g.,
+ // "app::test::test_arena: test" => "app::test::test_arena:", "test"
+ let line: Vec<_> = line.split_whitespace().collect();
+ match line[..] {
+ // Final byte of t_name is ":", which we need to ignore.
+ [t_name, kind] => (kind == "test").then(|| &t_name[..t_name.len() - 1]),
+ _ => None,
+ }
+ })
+ // Exclude tests that aren't marked for perf triage based on suffix.
+ .filter(|t_name| {
+ t_name.ends_with(consts::SUF_NORMAL) || t_name.ends_with(consts::SUF_MDATA)
+ })
+ .collect();
+
+ // Pulling itertools just for .dedup() would be quite a big dependency that's
+ // not used elsewhere, so do this on a vec instead.
+ test_list.sort_unstable();
+ test_list.dedup();
+
+ // Tests should come in pairs with their mdata fn!
+ assert!(
+ test_list.len().is_multiple_of(2),
+ "Malformed tests in test binary {t_bin}"
+ );
+
+ let out = test_list
+ .chunks_exact_mut(2)
+ .map(|pair| {
+ // Be resilient against changes to these constants.
+ if consts::SUF_NORMAL < consts::SUF_MDATA {
+ (pair[0].to_owned(), pair[1].to_owned())
+ } else {
+ (pair[1].to_owned(), pair[0].to_owned())
+ }
+ })
+ .collect::<Vec<_>>();
+ out.into_iter()
+}
+
+/// Triage a test to determine the correct number of iterations that it should run.
+/// Specifically, repeatedly runs the given test until its execution time exceeds
+/// `thresh`, calling `step(iterations)` after every failed run to determine the new
+/// iteration count. Returns `None` if the test errored or `step` returned `None`,
+/// else `Some(iterations)`.
+///
+/// # Panics
+/// This will panic if `step(usize)` is not monotonically increasing.
+fn triage_test(
+ t_bin: &str,
+ t_name: &str,
+ thresh: Duration,
+ mut step: impl FnMut(NonZero<usize>) -> Option<NonZero<usize>>,
+) -> Option<NonZero<usize>> {
+ let mut iter_count = DEFAULT_ITER_COUNT;
+ loop {
+ let mut cmd = Command::new(t_bin);
+ cmd.args([t_name, "--exact"]);
+ cmd.env(consts::ITER_ENV_VAR, format!("{iter_count}"));
+ // Don't let the child muck up our stdin/out/err.
+ cmd.stdin(Stdio::null());
+ cmd.stdout(Stdio::null());
+ cmd.stderr(Stdio::null());
+ let pre = Instant::now();
+ // Discard the output beyond ensuring success.
+ let out = cmd.spawn().unwrap().wait();
+ let post = Instant::now();
+ if !out.unwrap().success() {
+ break None;
+ }
+ if post - pre > thresh {
+ break Some(iter_count);
+ }
+ let new = step(iter_count)?;
+ assert!(
+ new > iter_count,
+ "FATAL: step must be monotonically increasing"
+ );
+ iter_count = new;
+ }
+}
+
+/// Profiles a given test with hyperfine, returning the mean and standard deviation
+/// for its runtime. If the test errors, returns `None` instead.
+fn hyp_profile(t_bin: &str, t_name: &str, iterations: NonZero<usize>) -> Option<Timings> {
+ let mut perf_cmd = Command::new("hyperfine");
+ // Warm up the cache and print markdown output to stdout, which we parse.
+ perf_cmd.args([
+ "--style",
+ "none",
+ "--warmup",
+ "1",
+ "--export-markdown",
+ "-",
+ &format!("{t_bin} {t_name}"),
+ ]);
+ perf_cmd.env(consts::ITER_ENV_VAR, format!("{iterations}"));
+ let p_out = perf_cmd.output().unwrap();
+ if !p_out.status.success() {
+ return None;
+ }
+
+ let cmd_output = String::from_utf8_lossy(&p_out.stdout);
+ // Can't use .last() since we have a trailing newline. Sigh.
+ let results_line = cmd_output.lines().nth(3).unwrap();
+ // Grab the values out of the pretty-print.
+ // TODO: Parse json instead.
+ let mut res_iter = results_line.split_whitespace();
+ // Durations are given in milliseconds, so account for that.
+ let mean = Duration::from_secs_f64(res_iter.nth(4).unwrap().parse::<f64>().unwrap() / 1000.);
+ let stddev = Duration::from_secs_f64(res_iter.nth(1).unwrap().parse::<f64>().unwrap() / 1000.);
+
+ Some(Timings { mean, stddev })
+}
+
+fn main() {
+ let args = std::env::args().collect::<Vec<_>>();
+ // We get passed the test we need to run as the 1st argument after our own name.
+ let t_bin = args
+ .get(1)
+ .expect("FATAL: No test binary or command; this shouldn't be manually invoked!");
+
+ // We're being asked to compare two results, not run the profiler.
+ if t_bin == "compare" {
+ compare_profiles(&args[2..]);
+ return;
+ }
+
+ // Minimum test importance we care about this run.
+ let mut thresh = Importance::Iffy;
+ // Where to print the output of this run.
+ let mut out_kind = OutputKind::Markdown;
+
+ for arg in args.iter().skip(2) {
+ match arg.as_str() {
+ "--critical" => thresh = Importance::Critical,
+ "--important" => thresh = Importance::Important,
+ "--average" => thresh = Importance::Average,
+ "--iffy" => thresh = Importance::Iffy,
+ "--fluff" => thresh = Importance::Fluff,
+ "--quiet" => QUIET.store(true, Ordering::Relaxed),
+ s if s.starts_with("--json") => {
+ out_kind = OutputKind::Json(Path::new(
+ s.strip_prefix("--json=")
+ .expect("FATAL: Invalid json parameter; pass --json=ident"),
+ ));
+ }
+ _ => (),
+ }
+ }
+ if !QUIET.load(Ordering::Relaxed) {
+ eprintln!("Starting perf check");
+ }
+
+ let mut output = Output::default();
+
+ // Spawn and profile an instance of each perf-sensitive test, via hyperfine.
+ // Each test is a pair of (test, metadata-returning-fn), so grab both. We also
+ // know the list is sorted.
+ let i = get_tests(t_bin);
+ let len = i.len();
+ for (idx, (ref t_name, ref t_mdata)) in i.enumerate() {
+ if !QUIET.load(Ordering::Relaxed) {
+ eprint!("\rProfiling test {}/{}", idx + 1, len);
+ }
+ // Pretty-printable stripped name for the test.
+ let t_name_pretty = t_name.replace(consts::SUF_NORMAL, "");
+
+ // Get the metadata this test reports for us.
+ let t_mdata = match parse_mdata(t_bin, t_mdata) {
+ Ok(mdata) => mdata,
+ Err(err) => fail!(output, t_name_pretty, err),
+ };
+
+ if t_mdata.importance < thresh {
+ fail!(output, t_name_pretty, t_mdata, FailKind::Skipped);
+ }
+
+ // Time test execution to see how many iterations we need to do in order
+ // to account for random noise. This is skipped for tests with fixed
+ // iteration counts.
+ let final_iter_count = t_mdata.iterations.or_else(|| {
+ triage_test(t_bin, t_name, consts::NOISE_CUTOFF, |c| {
+ if let Some(c) = c.checked_mul(ITER_COUNT_MUL) {
+ Some(c)
+ } else {
+ // This should almost never happen, but maybe..?
+ eprintln!(
+ "WARNING: Ran nearly usize::MAX iterations of test {t_name_pretty}; skipping"
+ );
+ None
+ }
+ })
+ });
+
+ // Don't profile failing tests.
+ let Some(final_iter_count) = final_iter_count else {
+ fail!(output, t_name_pretty, t_mdata, FailKind::Triage);
+ };
+
+ // Now profile!
+ if let Some(timings) = hyp_profile(t_bin, t_name, final_iter_count) {
+ output.success(t_name_pretty, t_mdata, final_iter_count, timings);
+ } else {
+ fail!(
+ output,
+ t_name_pretty,
+ t_mdata,
+ final_iter_count,
+ FailKind::Profile
+ );
+ }
+ }
+ if !QUIET.load(Ordering::Relaxed) {
+ if output.is_empty() {
+ eprintln!("Nothing to do.");
+ } else {
+ // If stdout and stderr are on the same terminal, move us after the
+ // output from above.
+ eprintln!();
+ }
+ }
+
+ // No need making an empty json file on every empty test bin.
+ if output.is_empty() {
+ return;
+ }
+
+ out_kind.log(&output, t_bin);
+}
@@ -316,8 +316,8 @@ objc2-metal = { version = "0.3" }
object = { version = "0.36", default-features = false, features = ["archive", "read_core", "unaligned", "write"] }
prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["prost-derive"] }
ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "process"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["event", "pipe", "process", "termios", "time"] }
scopeguard = { version = "1" }
security-framework = { version = "3", features = ["OSX_10_14"] }
security-framework-sys = { version = "2", features = ["OSX_10_14"] }
@@ -347,8 +347,8 @@ object = { version = "0.36", default-features = false, features = ["archive", "r
proc-macro2 = { version = "1", default-features = false, features = ["span-locations"] }
prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["prost-derive"] }
ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "process"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["event", "pipe", "process", "termios", "time"] }
scopeguard = { version = "1" }
security-framework = { version = "3", features = ["OSX_10_14"] }
security-framework-sys = { version = "2", features = ["OSX_10_14"] }
@@ -377,8 +377,8 @@ objc2-metal = { version = "0.3" }
object = { version = "0.36", default-features = false, features = ["archive", "read_core", "unaligned", "write"] }
prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["prost-derive"] }
ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "process"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["event", "pipe", "process", "termios", "time"] }
scopeguard = { version = "1" }
security-framework = { version = "3", features = ["OSX_10_14"] }
security-framework-sys = { version = "2", features = ["OSX_10_14"] }
@@ -408,8 +408,8 @@ object = { version = "0.36", default-features = false, features = ["archive", "r
proc-macro2 = { version = "1", default-features = false, features = ["span-locations"] }
prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["prost-derive"] }
ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "process"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["event", "pipe", "process", "termios", "time"] }
scopeguard = { version = "1" }
security-framework = { version = "3", features = ["OSX_10_14"] }
security-framework-sys = { version = "2", features = ["OSX_10_14"] }
@@ -448,8 +448,8 @@ prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["pro
quote = { version = "1" }
rand-274715c4dabd11b0 = { package = "rand", version = "0.9" }
ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "shm", "system"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["event", "pipe", "process", "pty", "stdio", "termios", "time"] }
scopeguard = { version = "1" }
syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
sync_wrapper = { version = "1", default-features = false, features = ["futures"] }
@@ -488,8 +488,8 @@ proc-macro2 = { version = "1", default-features = false, features = ["span-locat
prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["prost-derive"] }
rand-274715c4dabd11b0 = { package = "rand", version = "0.9" }
ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "shm", "system"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["event", "pipe", "process", "pty", "stdio", "termios", "time"] }
scopeguard = { version = "1" }
sync_wrapper = { version = "1", default-features = false, features = ["futures"] }
tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "ring"] }
@@ -528,8 +528,8 @@ prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["pro
quote = { version = "1" }
rand-274715c4dabd11b0 = { package = "rand", version = "0.9" }
ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "shm", "system"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["event", "pipe", "process", "pty", "stdio", "termios", "time"] }
scopeguard = { version = "1" }
syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
sync_wrapper = { version = "1", default-features = false, features = ["futures"] }
@@ -568,8 +568,8 @@ proc-macro2 = { version = "1", default-features = false, features = ["span-locat
prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["prost-derive"] }
rand-274715c4dabd11b0 = { package = "rand", version = "0.9" }
ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "shm", "system"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["event", "pipe", "process", "pty", "stdio", "termios", "time"] }
scopeguard = { version = "1" }
sync_wrapper = { version = "1", default-features = false, features = ["futures"] }
tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "ring"] }
@@ -600,10 +600,10 @@ tower = { version = "0.5", default-features = false, features = ["timeout", "uti
winapi = { version = "0.3", default-features = false, features = ["cfg", "commapi", "consoleapi", "evntrace", "fileapi", "handleapi", "impl-debug", "impl-default", "in6addr", "inaddr", "ioapiset", "knownfolders", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "objbase", "processenv", "processthreadsapi", "shlobj", "std", "synchapi", "sysinfoapi", "timezoneapi", "winbase", "windef", "winerror", "winioctl", "winnt", "winreg", "winsock2", "winuser"] }
windows-core = { version = "0.61" }
windows-numerics = { version = "0.2" }
-windows-sys-4db8c43aad08e7ae = { package = "windows-sys", version = "0.60", features = ["Win32_Globalization", "Win32_System_Com", "Win32_UI_Shell"] }
windows-sys-73dcd821b1037cfd = { package = "windows-sys", version = "0.59", features = ["Wdk_Foundation", "Wdk_Storage_FileSystem", "Win32_NetworkManagement_IpHelper", "Win32_Networking_WinSock", "Win32_Security_Authentication_Identity", "Win32_Security_Credentials", "Win32_Security_Cryptography", "Win32_Storage_FileSystem", "Win32_System_Com", "Win32_System_Console", "Win32_System_Diagnostics_Debug", "Win32_System_IO", "Win32_System_Ioctl", "Win32_System_Kernel", "Win32_System_LibraryLoader", "Win32_System_Memory", "Win32_System_Performance", "Win32_System_Pipes", "Win32_System_Registry", "Win32_System_SystemInformation", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_System_Time", "Win32_System_WindowsProgramming", "Win32_UI_Input_KeyboardAndMouse", "Win32_UI_Shell", "Win32_UI_WindowsAndMessaging"] }
windows-sys-b21d60becc0929df = { package = "windows-sys", version = "0.52", features = ["Wdk_Foundation", "Wdk_Storage_FileSystem", "Wdk_System_IO", "Win32_Foundation", "Win32_Networking_WinSock", "Win32_Security_Authorization", "Win32_Storage_FileSystem", "Win32_System_Console", "Win32_System_IO", "Win32_System_Memory", "Win32_System_Pipes", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_System_WindowsProgramming"] }
windows-sys-c8eced492e86ede7 = { package = "windows-sys", version = "0.48", features = ["Win32_Foundation", "Win32_Globalization", "Win32_Networking_WinSock", "Win32_Security", "Win32_Storage_FileSystem", "Win32_System_Com", "Win32_System_Diagnostics_Debug", "Win32_System_IO", "Win32_System_Pipes", "Win32_System_Registry", "Win32_System_Threading", "Win32_System_Time", "Win32_System_WindowsProgramming", "Win32_UI_Shell"] }
+windows-sys-d4189bed749088b6 = { package = "windows-sys", version = "0.61", features = ["Wdk_Foundation", "Wdk_Storage_FileSystem", "Win32_Globalization", "Win32_Networking_WinSock", "Win32_Security", "Win32_Storage_FileSystem", "Win32_System_Com", "Win32_System_IO", "Win32_System_LibraryLoader", "Win32_System_Threading", "Win32_System_WindowsProgramming", "Win32_UI_Shell"] }
[target.x86_64-pc-windows-msvc.build-dependencies]
codespan-reporting = { version = "0.12" }
@@ -627,10 +627,10 @@ tower = { version = "0.5", default-features = false, features = ["timeout", "uti
winapi = { version = "0.3", default-features = false, features = ["cfg", "commapi", "consoleapi", "evntrace", "fileapi", "handleapi", "impl-debug", "impl-default", "in6addr", "inaddr", "ioapiset", "knownfolders", "minwinbase", "minwindef", "namedpipeapi", "ntsecapi", "objbase", "processenv", "processthreadsapi", "shlobj", "std", "synchapi", "sysinfoapi", "timezoneapi", "winbase", "windef", "winerror", "winioctl", "winnt", "winreg", "winsock2", "winuser"] }
windows-core = { version = "0.61" }
windows-numerics = { version = "0.2" }
-windows-sys-4db8c43aad08e7ae = { package = "windows-sys", version = "0.60", features = ["Win32_Globalization", "Win32_System_Com", "Win32_UI_Shell"] }
windows-sys-73dcd821b1037cfd = { package = "windows-sys", version = "0.59", features = ["Wdk_Foundation", "Wdk_Storage_FileSystem", "Win32_NetworkManagement_IpHelper", "Win32_Networking_WinSock", "Win32_Security_Authentication_Identity", "Win32_Security_Credentials", "Win32_Security_Cryptography", "Win32_Storage_FileSystem", "Win32_System_Com", "Win32_System_Console", "Win32_System_Diagnostics_Debug", "Win32_System_IO", "Win32_System_Ioctl", "Win32_System_Kernel", "Win32_System_LibraryLoader", "Win32_System_Memory", "Win32_System_Performance", "Win32_System_Pipes", "Win32_System_Registry", "Win32_System_SystemInformation", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_System_Time", "Win32_System_WindowsProgramming", "Win32_UI_Input_KeyboardAndMouse", "Win32_UI_Shell", "Win32_UI_WindowsAndMessaging"] }
windows-sys-b21d60becc0929df = { package = "windows-sys", version = "0.52", features = ["Wdk_Foundation", "Wdk_Storage_FileSystem", "Wdk_System_IO", "Win32_Foundation", "Win32_Networking_WinSock", "Win32_Security_Authorization", "Win32_Storage_FileSystem", "Win32_System_Console", "Win32_System_IO", "Win32_System_Memory", "Win32_System_Pipes", "Win32_System_SystemServices", "Win32_System_Threading", "Win32_System_WindowsProgramming"] }
windows-sys-c8eced492e86ede7 = { package = "windows-sys", version = "0.48", features = ["Win32_Foundation", "Win32_Globalization", "Win32_Networking_WinSock", "Win32_Security", "Win32_Storage_FileSystem", "Win32_System_Com", "Win32_System_Diagnostics_Debug", "Win32_System_IO", "Win32_System_Pipes", "Win32_System_Registry", "Win32_System_Threading", "Win32_System_Time", "Win32_System_WindowsProgramming", "Win32_UI_Shell"] }
+windows-sys-d4189bed749088b6 = { package = "windows-sys", version = "0.61", features = ["Wdk_Foundation", "Wdk_Storage_FileSystem", "Win32_Globalization", "Win32_Networking_WinSock", "Win32_Security", "Win32_Storage_FileSystem", "Win32_System_Com", "Win32_System_IO", "Win32_System_LibraryLoader", "Win32_System_Threading", "Win32_System_WindowsProgramming", "Win32_UI_Shell"] }
[target.x86_64-unknown-linux-musl.dependencies]
aes = { version = "0.8", default-features = false, features = ["zeroize"] }
@@ -661,8 +661,8 @@ prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["pro
quote = { version = "1" }
rand-274715c4dabd11b0 = { package = "rand", version = "0.9" }
ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "shm", "system"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["event", "pipe", "process", "pty", "stdio", "termios", "time"] }
scopeguard = { version = "1" }
syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
sync_wrapper = { version = "1", default-features = false, features = ["futures"] }
@@ -701,8 +701,8 @@ proc-macro2 = { version = "1", default-features = false, features = ["span-locat
prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["prost-derive"] }
rand-274715c4dabd11b0 = { package = "rand", version = "0.9" }
ring = { version = "0.17", features = ["std"] }
-rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "pty", "shm", "stdio", "system", "termios", "time"] }
-rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["process", "termios", "time"] }
+rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["event", "mm", "net", "param", "pipe", "process", "shm", "system"] }
+rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", default-features = false, features = ["event", "pipe", "process", "pty", "stdio", "termios", "time"] }
scopeguard = { version = "1" }
sync_wrapper = { version = "1", default-features = false, features = ["futures"] }
tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "ring"] }