Compare commits

...

6 Commits

Author SHA1 Message Date
Marshall Bowers
26c5f035c6 Ignore errors drafting release notes 2024-04-24 18:31:39 -04:00
Marshall Bowers
fedb2aa949 Try fetch-depth: 25 2024-04-24 18:19:59 -04:00
Marshall Bowers
de4e77c380 Try fetching tags 2024-04-24 18:12:46 -04:00
Zed Bot
99007ab26f Bump to 0.133.1 for @maxdeviant 2024-04-24 14:54:49 -07:00
gcp-cherry-pick-bot[bot]
f9e59f0213 Restore the previous styles for single-line editors (cherry-pick #10951) (#10952)
Cherry-picked Restore the previous styles for single-line editors
(#10951)

This PR fixes a bug introduced in #10870 that caused editors used as
single-line inputs to have the wrong text style.

If this change was intentional for something relating to the new
Assistant panel, we'll need to figure out a way to change it without
breaking these other usages.

### Before

<img width="589" alt="Screenshot 2024-04-24 at 5 35 36 PM"

src="https://github.com/zed-industries/zed/assets/1486634/31624cfd-75d1-4771-9402-c14ef9e9483e">

<img width="326" alt="Screenshot 2024-04-24 at 5 35 46 PM"

src="https://github.com/zed-industries/zed/assets/1486634/1b76a3ef-7205-49ee-b391-7609f90461bd">

### After

<img width="588" alt="Screenshot 2024-04-24 at 5 36 14 PM"

src="https://github.com/zed-industries/zed/assets/1486634/9d550ee2-80c0-4afb-9b45-a2956471c546">

<img width="260" alt="Screenshot 2024-04-24 at 5 36 31 PM"

src="https://github.com/zed-industries/zed/assets/1486634/63240f27-1679-45d5-b39c-016860ff9683">

Release Notes:

- Fixed a bug where some inputs were using the wrong font style
(preview-only).

Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
2024-04-24 17:54:12 -04:00
Joseph T. Lyons
0689ef4369 v0.133.x preview 2024-04-24 12:46:14 -04:00
5 changed files with 23 additions and 5 deletions

View File

@@ -173,6 +173,11 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v4
with:
# We need to fetch more than one commit so that `script/draft-release-notes`
# is able to diff between the current and previous tag.
#
# 25 was chosen arbitrarily.
fetch-depth: 25
clean: false
submodules: "recursive"
@@ -206,7 +211,8 @@ jobs:
exit 1
fi
mkdir -p target/
script/draft-release-notes "$version" "$channel" > target/release-notes.md
# Ignore any errors that occur while drafting release notes to not fail the build.
script/draft-release-notes "$version" "$channel" > target/release-notes.md || true
- name: Generate license file
run: script/generate-licenses

2
Cargo.lock generated
View File

@@ -12607,7 +12607,7 @@ dependencies = [
[[package]]
name = "zed"
version = "0.133.0"
version = "0.133.1"
dependencies = [
"activity_indicator",
"anyhow",

View File

@@ -10323,7 +10323,19 @@ impl Render for Editor {
let settings = ThemeSettings::get_global(cx);
let text_style = match self.mode {
EditorMode::SingleLine | EditorMode::AutoHeight { .. } => cx.text_style(),
EditorMode::SingleLine | EditorMode::AutoHeight { .. } => TextStyle {
color: cx.theme().colors().editor_foreground,
font_family: settings.ui_font.family.clone(),
font_features: settings.ui_font.features,
font_size: rems(0.875).into(),
font_weight: FontWeight::NORMAL,
font_style: FontStyle::Normal,
line_height: relative(settings.buffer_line_height.value()),
background_color: None,
underline: None,
strikethrough: None,
white_space: WhiteSpace::Normal,
},
EditorMode::Full => TextStyle {
color: cx.theme().colors().editor_foreground,
font_family: settings.buffer_font.family.clone(),

View File

@@ -2,7 +2,7 @@
description = "The fast, collaborative code editor."
edition = "2021"
name = "zed"
version = "0.133.0"
version = "0.133.1"
publish = false
license = "GPL-3.0-or-later"
authors = ["Zed Team <hi@zed.dev>"]

View File

@@ -1 +1 @@
dev
preview