From 9e1d79744554fc9f84dc70db68a6d9453b8f62c8 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Wed, 6 Dec 2023 16:17:10 +0200 Subject: [PATCH 1/2] Use distinct version for zed2, append git hash to its nightly version --- .github/workflows/release_nightly.yml | 3 ++- Cargo.lock | 2 +- crates/zed2/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml index 38552646c343d5f44975e33146a4cd38dc3ab4d3..0e0fd18e25324984f64405facb2d876f2e68405a 100644 --- a/.github/workflows/release_nightly.yml +++ b/.github/workflows/release_nightly.yml @@ -81,11 +81,12 @@ jobs: - name: Limit target directory size run: script/clear-target-dir-if-larger-than 100 - - name: Set release channel to nightly + - name: Set release channel to nightly, add nightly prefix to the final version run: | set -eu version=$(git rev-parse --short HEAD) echo "Publishing version: ${version} on release channel nightly" + sed -i '' "s/version = \"\(.*\)\"/version = \"\1-nightly\"/" crates/zed2/Cargo.toml echo "nightly" > crates/zed/RELEASE_CHANNEL - name: Generate license file diff --git a/Cargo.lock b/Cargo.lock index 4b5af36a19b8fcf1049e7d762db189a50730359a..6935b2810acc40bbd19d36ca8bde66a5c43806c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11889,7 +11889,7 @@ dependencies = [ [[package]] name = "zed2" -version = "0.109.0" +version = "2.0.0" dependencies = [ "activity_indicator2", "ai2", diff --git a/crates/zed2/Cargo.toml b/crates/zed2/Cargo.toml index 8c0c932f288bbf6a186869257ccdbe99d19bf13a..0fcbcc40fc281b45ad304d48149aec89506c8275 100644 --- a/crates/zed2/Cargo.toml +++ b/crates/zed2/Cargo.toml @@ -2,7 +2,7 @@ description = "The fast, collaborative code editor." edition = "2021" name = "zed2" -version = "0.109.0" +version = "2.0.0" publish = false [lib] From 5644815c4c291ed787729e18860f706b5a39bb8d Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Wed, 6 Dec 2023 22:06:30 +0200 Subject: [PATCH 2/2] Use a better name for zed2 inlay style field --- crates/editor2/src/display_map.rs | 2 +- crates/editor2/src/editor.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/editor2/src/display_map.rs b/crates/editor2/src/display_map.rs index 9cc16933711c221a3605bbeca01ba13931048a7b..60975a7a5caec6552b3154e528b9629e9beb094c 100644 --- a/crates/editor2/src/display_map.rs +++ b/crates/editor2/src/display_map.rs @@ -513,7 +513,7 @@ impl DisplaySnapshot { self.chunks( display_rows, language_aware, - Some(editor_style.hints_style), + Some(editor_style.inlays_style), Some(editor_style.suggestions_style), ) .map(|chunk| { diff --git a/crates/editor2/src/editor.rs b/crates/editor2/src/editor.rs index 3dbdbf5e3c400ce4b99c441d60ed44770a0f9164..94ae8abc71a2d99ff2b5bde104809a824cab3877 100644 --- a/crates/editor2/src/editor.rs +++ b/crates/editor2/src/editor.rs @@ -499,7 +499,7 @@ pub struct EditorStyle { pub scrollbar_width: Pixels, pub syntax: Arc, pub diagnostic_style: DiagnosticStyle, - pub hints_style: HighlightStyle, + pub inlays_style: HighlightStyle, pub suggestions_style: HighlightStyle, } @@ -7643,7 +7643,7 @@ impl Editor { .diagnostic_style .clone(), // todo!("what about the rest of the highlight style parts for inlays and suggestions?") - hints_style: HighlightStyle { + inlays_style: HighlightStyle { color: Some(cx.theme().status().hint), font_weight: Some(FontWeight::BOLD), fade_out: Some(0.6), @@ -9318,7 +9318,7 @@ impl Render for Editor { diagnostic_style: cx.theme().diagnostic_style(), // TODO kb find `HighlightStyle` usages // todo!("what about the rest of the highlight style parts?") - hints_style: HighlightStyle { + inlays_style: HighlightStyle { color: Some(cx.theme().status().hint), font_weight: Some(FontWeight::BOLD), fade_out: Some(0.6),