Jakub KonkaandCole Miller
8af3f583c2
Closes #22657 Closes #37863 # Background Several users have noted that the terminal shipped with Zed on Windows is either misbehaving or missing several features including lack of consistent clearing behaviour. After some investigation which included digging into the Microsoft Terminal project and VSCode editor, it turns out that the pseudoconsole provided by Windows OS is severely outdated which manifests itself in problems such as lack of clearing behaviour, etc. Interestingly however, neither MS Terminal nor VSCode exhibit this limitation so the question was why. Enter custom `conpty.dll` and `OpenConsole.exe` runtime. These are updated, developed in MS Terminal tree subprojects that aim to replace native Windows API as well as augment the `conhost.exe` process that runs by default in Windows. They also fix all the woes we had with the terminal on Windows (there is a chance that ctrl-c behaviour is also fixed with these, but still need to double check that this is indeed the case). This PR ensures that Zed also benefits from the update pseudoconsole API. # Proposed approach It is possible to fork MS Terminal and instrument the necessary subprojects for Rust-awareness (using `cc-rs` or otherwise to compile the C++ code and then embed it in Rust-produced binaries for easier inclusion in projects) but it comes at a cost of added complexity, maintenance burden, etc. An alternative approach was proposed by @reflectronic to download the binary from the official Nuget repo and bundle it for release/local use. This PR aims to do just that. There are two bits to this PR: 1. ~~when building Zed locally, and more specifically, when the `zed` crate is being built, we will strive to download and unpack the binaries into `OUT_DIR` provided by `cargo`. We will then set `ZED_CONPTY_INSTALL_PATH=${OUT_DIR}/conpty` and use it at runtime in Zed binary to tweak the loader's search path with that additional path. This effectively ensures that Zed built from source on Windows has full terminal support.~~ EDIT: after several discussions offline, we've decided that keeping it minimal will serve us best, meaning: when developing locally it is up to the developer of Zed to install `conpty.dll` and put it in the loader's search path. 2. when bundling Windows release, we will download and unpack the nuget package into Zed's bundle which will ensure it is installed in the same directory as Zed by the installer. **Note** I realise that 1. may actually not be needed - instead we could leave that bit for the user who wants to run Zed from source to ensure that they have `conpty.dll` in the loader's search path. I'd love to hear opinions on this! Release Notes: - N/A --------- Co-authored-by: Cole Miller <cole@zed.dev>
231 lines
6.5 KiB
TOML
231 lines
6.5 KiB
TOML
[package]
|
|
description = "The fast, collaborative code editor."
|
|
edition.workspace = true
|
|
name = "zed"
|
|
version = "0.207.0"
|
|
publish.workspace = true
|
|
license = "GPL-3.0-or-later"
|
|
authors = ["Zed Team <hi@zed.dev>"]
|
|
|
|
[lints]
|
|
workspace = true
|
|
|
|
[[bin]]
|
|
name = "zed"
|
|
path = "src/zed-main.rs"
|
|
|
|
[lib]
|
|
name = "zed"
|
|
path = "src/main.rs"
|
|
|
|
[dependencies]
|
|
acp_tools.workspace = true
|
|
activity_indicator.workspace = true
|
|
agent.workspace = true
|
|
agent_settings.workspace = true
|
|
agent_ui.workspace = true
|
|
anyhow.workspace = true
|
|
askpass.workspace = true
|
|
assets.workspace = true
|
|
assistant_tools.workspace = true
|
|
audio.workspace = true
|
|
auto_update.workspace = true
|
|
auto_update_ui.workspace = true
|
|
backtrace = "0.3"
|
|
bincode.workspace = true
|
|
breadcrumbs.workspace = true
|
|
call.workspace = true
|
|
channel.workspace = true
|
|
clap.workspace = true
|
|
cli.workspace = true
|
|
client.workspace = true
|
|
collab_ui.workspace = true
|
|
collections.workspace = true
|
|
command_palette.workspace = true
|
|
component.workspace = true
|
|
copilot.workspace = true
|
|
crashes.workspace = true
|
|
dap_adapters.workspace = true
|
|
db.workspace = true
|
|
debug_adapter_extension.workspace = true
|
|
debugger_tools.workspace = true
|
|
debugger_ui.workspace = true
|
|
diagnostics.workspace = true
|
|
editor.workspace = true
|
|
zeta2_tools.workspace = true
|
|
env_logger.workspace = true
|
|
extension.workspace = true
|
|
extension_host.workspace = true
|
|
extensions_ui.workspace = true
|
|
feature_flags.workspace = true
|
|
feedback.workspace = true
|
|
file_finder.workspace = true
|
|
fs.workspace = true
|
|
futures.workspace = true
|
|
git.workspace = true
|
|
git_hosting_providers.workspace = true
|
|
git_ui.workspace = true
|
|
go_to_line.workspace = true
|
|
system_specs.workspace = true
|
|
gpui = { workspace = true, features = [
|
|
"wayland",
|
|
"x11",
|
|
"font-kit",
|
|
"windows-manifest",
|
|
] }
|
|
gpui_tokio.workspace = true
|
|
|
|
edit_prediction_button.workspace = true
|
|
http_client.workspace = true
|
|
image_viewer.workspace = true
|
|
inspector_ui.workspace = true
|
|
install_cli.workspace = true
|
|
journal.workspace = true
|
|
json_schema_store.workspace = true
|
|
keymap_editor.workspace = true
|
|
language.workspace = true
|
|
language_extension.workspace = true
|
|
language_model.workspace = true
|
|
language_models.workspace = true
|
|
language_onboarding.workspace = true
|
|
language_selector.workspace = true
|
|
language_tools.workspace = true
|
|
languages = { workspace = true, features = ["load-grammars"] }
|
|
line_ending_selector.workspace = true
|
|
log.workspace = true
|
|
markdown.workspace = true
|
|
markdown_preview.workspace = true
|
|
menu.workspace = true
|
|
migrator.workspace = true
|
|
mimalloc = { version = "0.1", optional = true }
|
|
nc.workspace = true
|
|
nix = { workspace = true, features = ["pthread", "signal"] }
|
|
node_runtime.workspace = true
|
|
notifications.workspace = true
|
|
onboarding.workspace = true
|
|
outline.workspace = true
|
|
outline_panel.workspace = true
|
|
parking_lot.workspace = true
|
|
paths.workspace = true
|
|
picker.workspace = true
|
|
profiling.workspace = true
|
|
project.workspace = true
|
|
project_panel.workspace = true
|
|
project_symbols.workspace = true
|
|
prompt_store.workspace = true
|
|
proto.workspace = true
|
|
recent_projects.workspace = true
|
|
release_channel.workspace = true
|
|
remote.workspace = true
|
|
repl.workspace = true
|
|
reqwest.workspace = true
|
|
reqwest_client.workspace = true
|
|
rope.workspace = true
|
|
search.workspace = true
|
|
serde.workspace = true
|
|
serde_json.workspace = true
|
|
session.workspace = true
|
|
settings.workspace = true
|
|
settings_profile_selector.workspace = true
|
|
settings_ui.workspace = true
|
|
shellexpand.workspace = true
|
|
smol.workspace = true
|
|
snippet_provider.workspace = true
|
|
snippets_ui.workspace = true
|
|
supermaven.workspace = true
|
|
svg_preview.workspace = true
|
|
sysinfo.workspace = true
|
|
tab_switcher.workspace = true
|
|
task.workspace = true
|
|
tasks_ui.workspace = true
|
|
telemetry.workspace = true
|
|
telemetry_events.workspace = true
|
|
terminal_view.workspace = true
|
|
theme.workspace = true
|
|
theme_extension.workspace = true
|
|
theme_selector.workspace = true
|
|
time.workspace = true
|
|
title_bar.workspace = true
|
|
toolchain_selector.workspace = true
|
|
ui.workspace = true
|
|
ui_input.workspace = true
|
|
ui_prompt.workspace = true
|
|
url.workspace = true
|
|
urlencoding.workspace = true
|
|
util.workspace = true
|
|
uuid.workspace = true
|
|
vim.workspace = true
|
|
vim_mode_setting.workspace = true
|
|
watch.workspace = true
|
|
web_search.workspace = true
|
|
web_search_providers.workspace = true
|
|
workspace-hack.workspace = true
|
|
workspace.workspace = true
|
|
zed_actions.workspace = true
|
|
zed_env_vars.workspace = true
|
|
zeta.workspace = true
|
|
zeta2.workspace = true
|
|
zlog.workspace = true
|
|
zlog_settings.workspace = true
|
|
|
|
[target.'cfg(target_os = "windows")'.dependencies]
|
|
windows.workspace = true
|
|
windows-sys.workspace = true
|
|
|
|
[target.'cfg(target_os = "windows")'.build-dependencies]
|
|
winresource = "0.1"
|
|
|
|
[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
|
|
ashpd.workspace = true
|
|
|
|
[dev-dependencies]
|
|
call = { workspace = true, features = ["test-support"] }
|
|
dap = { workspace = true, features = ["test-support"] }
|
|
editor = { workspace = true, features = ["test-support"] }
|
|
gpui = { workspace = true, features = ["test-support"] }
|
|
image_viewer = { workspace = true, features = ["test-support"] }
|
|
itertools.workspace = true
|
|
language = { workspace = true, features = ["test-support"] }
|
|
pretty_assertions.workspace = true
|
|
project = { workspace = true, features = ["test-support"] }
|
|
terminal_view = { workspace = true, features = ["test-support"] }
|
|
tree-sitter-md.workspace = true
|
|
tree-sitter-rust.workspace = true
|
|
util_macros.workspace = true
|
|
workspace = { workspace = true, features = ["test-support"] }
|
|
|
|
[package.metadata.bundle-dev]
|
|
icon = ["resources/app-icon-dev@2x.png", "resources/app-icon-dev.png"]
|
|
identifier = "dev.zed.Zed-Dev"
|
|
name = "Zed Dev"
|
|
osx_minimum_system_version = "10.15.7"
|
|
osx_info_plist_exts = ["resources/info/*"]
|
|
osx_url_schemes = ["zed"]
|
|
|
|
[package.metadata.bundle-nightly]
|
|
icon = ["resources/app-icon-nightly@2x.png", "resources/app-icon-nightly.png"]
|
|
identifier = "dev.zed.Zed-Nightly"
|
|
name = "Zed Nightly"
|
|
osx_minimum_system_version = "10.15.7"
|
|
osx_info_plist_exts = ["resources/info/*"]
|
|
osx_url_schemes = ["zed"]
|
|
|
|
[package.metadata.bundle-preview]
|
|
icon = ["resources/app-icon-preview@2x.png", "resources/app-icon-preview.png"]
|
|
identifier = "dev.zed.Zed-Preview"
|
|
name = "Zed Preview"
|
|
osx_minimum_system_version = "10.15.7"
|
|
osx_info_plist_exts = ["resources/info/*"]
|
|
osx_url_schemes = ["zed"]
|
|
|
|
[package.metadata.bundle-stable]
|
|
icon = ["resources/app-icon@2x.png", "resources/app-icon.png"]
|
|
identifier = "dev.zed.Zed"
|
|
name = "Zed"
|
|
osx_minimum_system_version = "10.15.7"
|
|
osx_info_plist_exts = ["resources/info/*"]
|
|
osx_url_schemes = ["zed"]
|
|
|
|
[package.metadata.cargo-machete]
|
|
ignored = ["profiling", "zstd"]
|