Compare commits

...
Sign in to create a new pull request.

6 commits

Author SHA1 Message Date
Joseph Lyons
064cf6398d v0.78.x stable 2023-03-22 16:30:12 -04:00
Mikayla Maki
d56140e5f2 Merge pull request #2306 from zed-industries/fix-panic-with-multi-line-env
Parse user enviroment using null terminators instead of newlines
2023-03-22 13:22:13 -07:00
Joseph T. Lyons
93e75f86c3 Merge pull request #2295 from zed-industries/swap-atom-keybinding-for-CollapseSelectedEntry
Swap atom keybinding for CollapseSelectedEntry
2023-03-21 21:18:04 -04:00
Nathan Sobo
e3b714a4ab zed 0.78.1 2023-03-14 19:44:40 -06:00
Nathan Sobo
03d5eebf08 Merge pull request #2288 from zed-industries/cut-off-collaborator-avatars
Fix collaborator avatars being clipped and not centered
2023-03-14 19:44:21 -06:00
Max Brunsfeld
8ea16a11b0 v0.78.x preview 2023-03-14 12:49:21 -07:00
11 changed files with 15 additions and 15 deletions

2
Cargo.lock generated
View file

@ -8409,7 +8409,7 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
[[package]]
name = "zed"
version = "0.78.0"
version = "0.78.1"
dependencies = [
"activity_indicator",
"anyhow",

View file

@ -55,7 +55,7 @@
"bindings": {
"ctrl-[": "project_panel::CollapseSelectedEntry",
"ctrl-b": "project_panel::CollapseSelectedEntry",
"h": "project_panel::CollapseSelectedEntry",
"alt-b": "project_panel::CollapseSelectedEntry",
"ctrl-]": "project_panel::ExpandSelectedEntry",
"ctrl-f": "project_panel::ExpandSelectedEntry",
"ctrl-shift-c": "project_panel::CopyPath"

View file

@ -31,4 +31,4 @@ theme = { path = "../theme" }
tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" }
urlencoding = "2.1.2"
util = { path = "../util" }
workspace = { path = "../workspace" }
workspace = { path = "../workspace" }

View file

@ -15,4 +15,4 @@ thread_local = "1.1.4"
lazy_static = "1.4"
parking_lot = "0.11.1"
futures = "0.3"
uuid = { version = "1.1.2", features = ["v4"] }
uuid = { version = "1.1.2", features = ["v4"] }

View file

@ -15,4 +15,4 @@ quote = "1.0"
proc-macro2 = "1.0"
lazy_static = "1.4"
sqlez = { path = "../sqlez" }
sqlformat = "0.2"
sqlformat = "0.2"

View file

@ -24,4 +24,4 @@ theme = { path = "../theme" }
theme_selector = { path = "../theme_selector" }
util = { path = "../util" }
picker = { path = "../picker" }
workspace = { path = "../workspace" }
workspace = { path = "../workspace" }

View file

@ -57,4 +57,4 @@ gpui = { path = "../gpui", features = ["test-support"] }
project = { path = "../project", features = ["test-support"] }
settings = { path = "../settings", features = ["test-support"] }
fs = { path = "../fs", features = ["test-support"] }
db = { path = "../db", features = ["test-support"] }
db = { path = "../db", features = ["test-support"] }

View file

@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathansobo@gmail.com>"]
description = "The fast, collaborative code editor."
edition = "2021"
name = "zed"
version = "0.78.0"
version = "0.78.1"
publish = false
[lib]

View file

@ -1 +1 @@
dev
stable

View file

@ -437,7 +437,7 @@ async fn load_login_shell_environment() -> Result<()> {
"SHELL environment variable is not assigned so we can't source login environment variables",
)?;
let output = Command::new(&shell)
.args(["-lic", &format!("echo {marker} && /usr/bin/env")])
.args(["-lic", &format!("echo {marker} && /usr/bin/env -0")])
.output()
.await
.context("failed to spawn login shell to source login environment variables")?;
@ -449,7 +449,7 @@ async fn load_login_shell_environment() -> Result<()> {
if let Some(env_output_start) = stdout.find(marker) {
let env_output = &stdout[env_output_start + marker.len()..];
for line in env_output.lines() {
for line in env_output.split_terminator('\0') {
if let Some(separator_index) = line.find('=') {
let key = &line[..separator_index];
let value = &line[separator_index + 1..];

View file

@ -126,9 +126,9 @@ export default function workspace(colorScheme: ColorScheme) {
titlebar: {
itemSpacing,
facePileSpacing: 2,
height: 33, // 32px + 1px for overlaid border
height: 33, // 32px + 1px border. It's important the content area of the titlebar is evenly sized to vertically center avatar images.
background: background(layer),
border: border(layer, { bottom: true, overlay: true }),
border: border(layer, { bottom: true }),
padding: {
left: 80,
right: itemSpacing,
@ -160,8 +160,8 @@ export default function workspace(colorScheme: ColorScheme) {
padding: {
left: 2,
right: 2,
top: 4,
bottom: 4,
top: 2,
bottom: 2,
},
cornerRadius: 6,
},