zed 0.144.1

Keymap changes for editor::JoinLines (cherry-pick #14136 ) (#14234 )
Cherry-picked Keymap changes for `editor::JoinLines` (#14136)
2024-07-11 14:20:56 -04:00 · 2024-07-11 14:18:55 -04:00 · 2024-07-11 11:54:28 -06:00 · 2024-07-10 11:54:46 -06:00 · 2024-07-10 10:12:26 -04:00
7 changed files with 10 additions and 12 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -319,7 +319,6 @@ jobs:

      - name: Upload app bundle to release
        uses: softprops/action-gh-release@v1
-        if: ${{ env.RELEASE_CHANNEL == 'preview' }}
        with:
          draft: true
          prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13581,7 +13581,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.144.0"
+version = "0.144.1"
 dependencies = [
 "activity_indicator",
 "anyhow",
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -397,7 +397,7 @@
    "bindings": {
      "ctrl-shift-k": "editor::DeleteLine",
      "ctrl-shift-d": "editor::DuplicateLineDown",
-      "ctrl-j": "editor::JoinLines",
+      "ctrl-shift-j": "editor::JoinLines",
      "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",
      "ctrl-alt-h": "editor::DeleteToPreviousSubwordStart",
      "ctrl-alt-delete": "editor::DeleteToNextSubwordEnd",
--- a/assets/keymaps/macos/sublime_text.json
+++ b/assets/keymaps/macos/sublime_text.json
@@ -27,6 +27,7 @@
      "ctrl-,": "editor::GoToPrevHunk",
      "cmd-k cmd-u": "editor::ConvertToUpperCase",
      "cmd-k cmd-l": "editor::ConvertToLowerCase",
+      "cmd-shift-j": "editor::JoinLines",
      "shift-alt-m": "markdown::OpenPreviewToTheSide",
      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
      "ctrl-delete": "editor::DeleteToNextWordEnd"
--- a/crates/editor/src/mouse_context_menu.rs
+++ b/crates/editor/src/mouse_context_menu.rs
@@ -49,13 +49,11 @@ fn display_ranges<'a>(
        .pending
        .as_ref()
        .map(|pending| &pending.selection);
-    selections.disjoint.iter().chain(pending).map(move |s| {
-        if s.reversed {
-            s.end.to_display_point(&display_map)..s.start.to_display_point(&display_map)
-        } else {
-            s.start.to_display_point(&display_map)..s.end.to_display_point(&display_map)
-        }
-    })
+    selections
+        .disjoint
+        .iter()
+        .chain(pending)
+        .map(move |s| s.start.to_display_point(&display_map)..s.end.to_display_point(&display_map))
 }

 pub fn deploy_context_menu(
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition = "2021"
 name = "zed"
-version = "0.144.0"
+version = "0.144.1"
 publish = false
 license = "GPL-3.0-or-later"
 authors = ["Zed Team <hi@zed.dev>"]
--- a/crates/zed/RELEASE_CHANNEL
+++ b/crates/zed/RELEASE_CHANNEL
@@ -1 +1 @@
-dev
+preview
Author	SHA1	Message	Date
Peter Tripp	fbefe44e81	zed 0.144.1	2024-07-11 14:20:56 -04:00
gcp-cherry-pick-bot[bot]	ba941097f6	Keymap changes for `editor::JoinLines` (cherry-pick #14136 ) (#14234 ) Cherry-picked Keymap changes for `editor::JoinLines` (#14136)	2024-07-11 14:18:55 -04:00
gcp-cherry-pick-bot[bot]	7d36760364	Fix reverse selections always being cleared (cherry-pick #14150 ) (#14231 ) Cherry-picked Fix reverse selections always being cleared (#14150) When I implemented #13701, I kinda messed up with the reversed selections, thinking that their anchors are flipped, so I flipped them again. This caused the reverse selections to always be cleared Release Notes: - Fix reverse selections always being cleared, even if the right click was performed inside Co-authored-by: Stanislav Alekseev <43210583+WeetHet@users.noreply.github.com>	2024-07-11 11:54:28 -06:00
gcp-cherry-pick-bot[bot]	8a0d5ae067	Build x86 linux too :/ (cherry-pick #14068 ) (#14073 ) Cherry-picked Build x86 linux too :/ (#14068) Release Notes: - N/A Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>	2024-07-10 11:54:46 -06:00
Joseph T Lyons	962be2e09c	v0.144.x preview	2024-07-10 10:12:26 -04:00