yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,748 Commits 5 Branches 0 Tags
8a77d392bcbde9197e8bff2d7be50e656fa26946
Commit Graph
48 Commits
Author SHA1 Message Date
Kirill Bulatov 79146926f0 Properly display deleted diff hunks (#9182) 
Follow-up of https://github.com/zed-industries/zed/pull/9068 

Release Notes:

- Fixed removal diff hunks not being displayed properly in the editor
 2024-03-11 17:53:45 +02:00
Kirill Bulatov d60d8d08da Add editor::RevertSelectedHunks to revert git diff hunks in the editor (#9068) 
https://github.com/zed-industries/zed/assets/2690773/653b5658-e3f3-4aee-9a9d-0f2153b4141b

Release Notes:

- Added `editor::RevertSelectedHunks` (`cmd-alt-z` by default) for
reverting git hunks from the editor
 2024-03-09 01:37:24 +02:00
Marshall Bowers ca6e1659eb Move Clippy configuration to the workspace level (#8891) 
This PR moves the Clippy configuration up to the workspace level.

We're using the [`lints`
table](https://doc.rust-lang.org/cargo/reference/workspaces.html#the-lints-table)
to configure the Clippy ruleset in the workspace's `Cargo.toml`.

Each crate in the workspace now has the following in their own
`Cargo.toml` to inherit the lints from the workspace:

```toml
[lints]
workspace = true
```

This allows for configuring rust-analyzer to show Clippy lints in the
editor by using the following configuration in your Zed `settings.json`:

```json
{
  "lsp": {
    "rust-analyzer": {
      "initialization_options": {
        "check": {
          "command": "clippy"
        }
      }
    }
  }
```

Release Notes:

- N/A
 2024-03-05 12:01:17 -05:00
Marshall Bowers 2f3f7cccdd Enable clippy::needless_lifetimes (#8777) 
This PR enables the
[`clippy::needless_lifetimes`](https://rust-lang.github.io/rust-clippy/master/index.html#/needless_lifetimes)
rule and fixes the outstanding violations.

Release Notes:

- N/A
 2024-03-03 11:52:58 -05:00
Dzmitry Malyshau cc18ac5721 Clean up many small dependencies (part 3) (#8425) 
Follow-up to #8353

Release Notes:
- N/A
 2024-02-26 11:08:57 +02:00
Piotr Osiewicz 50829b7b48 chore: Move workspace dependencies to workspace.dependencies (#7454) 
We should prefer referring to local deps via `.workspace = true` from
now on.

Release Notes:

- N/A
 2024-02-06 20:41:36 +01:00
Marshall Bowers f0c0bf5039 Sort dependencies in Cargo.toml files (#7126) 
This PR sorts the dependency lists in our `Cargo.toml` files so that
they are in alphabetical order.

This should make them easier to visually scan when looking for a
dependency.

Apologies in advance for any merge conflicts 🙈 

Release Notes:

- N/A
 2024-01-30 21:41:29 -05:00
Marshall Bowers dbd0a760e6 Clean up Cargo.toml files (#7044) 
This PR cleans up some inconsistencies in the `Cargo.toml` files that
were driving me crazy.

Release Notes:

- N/A
 2024-01-29 23:47:20 -05:00
Piotr Osiewicz 204fbd7a79 text: Wrap BufferId into a newtype 2024-01-29 20:00:47 +01:00
Piotr Osiewicz 4ef5a925ad Licenses: change license fields in Cargo.toml to AGPL-3.0-or-later. (#5535) 
Release Notes:
- N/A
 2024-01-27 13:51:16 +01:00
Piotr Osiewicz 5cb6fc5776 chore: Change AGPL-licensed crates to GPL (except for collab) (#4231) 
- [x] Fill in GPL license text.
- [x] live_kit_client depends on live_kit_server as non-dev dependency,
even though it seems to only be used for tests. Is that an issue?

Release Notes:
- N/A
 2024-01-24 00:26:58 +01:00
Piotr Osiewicz 1e1b434acc Remove license-file from Cargo.toml as it is apparently redundant (#4218) 
Release Notes:

- N/A
 2024-01-23 17:40:30 +01:00
Piotr OsiewiczandDavid 3fe512e1aa chore: Add crate licenses. (#4158) 
- GPUI and all dependencies: Apache 2
- Everything else: AGPL

Here's a script that I've generated for it:
https://gist.github.com/osiewicz/6afdd6626e517da24a2092807e6f0b6e

Release Notes:
- N/A

---------

Co-authored-by: David <david@zed.dev>
 2024-01-23 16:56:22 +01:00
Piotr Osiewicz a8f1c15a1e chore: Fix clippy::needless_borrow up to an editor 2024-01-21 15:03:24 +01:00
KCaverly 4c41833cfb move git2 to workspace dependency globally 2023-09-19 16:13:47 -04:00
Julia a3bc3f85a9 Clean up final remaining code paths calling old diff update method 2023-05-25 14:41:09 -04:00
Mikayla Makiandmax b9fb1b649a Make scrollbar content detection cheaper 
Remove scrollbars from multibuffers

co-authored-by: max <max@zed.dev>
 2023-05-22 10:55:44 -07:00
Mikayla Maki b72cdb7362 Refactored apart the forward and the backwards iterator for diff hunks 2023-05-19 18:09:47 -07:00
Mikayla Makiandmax c9a3283048 refine batched anchor conversions 
co-authored-by: max <max@zed.dev>
 2023-05-19 16:52:57 -07:00
Mikayla Maki 3c35f275b4 Batch anchor conversions in git hunk iterator 2023-05-19 16:23:45 -07:00
Max Brunsfeld d1f33d7052 🎨 Specify more dependencies at the workspace level 2023-04-24 17:41:55 -07:00
Max Brunsfeld a17f009b00 Use a workspace dependency for the futures crate 2023-04-24 09:43:31 -07:00
Mikayla Maki fc7532d74d Added complete scripts for generating third party license files 2023-01-23 12:47:12 -08:00
JuliaandMax Brunsfeld 48c0db49da Rewrite multi-buffer aware git hunks in range to be more correct 
Less ad-hoc state tracking, rely more on values provided by the
underlying data

Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-12-15 17:09:09 -05:00
Julia c0c47139aa Get tests building again 2022-12-15 00:17:28 -05:00
Julia 4c2ee3d972 Cleanup 2022-12-13 12:35:58 -05:00
Julia d100acd3b1 Initial hacky displaying of git gutter in multi-buffers 2022-12-13 12:35:58 -05:00
Julia bc601527b8 Layout git gutters inclusively 2022-10-31 14:35:42 -04:00
JuliaandKay Simmons 412c77460e Add action to go to next/previous git diff in editor 
Co-Authored-By: Kay Simmons <kay@zed.dev>
 2022-10-28 15:08:13 -04:00
Julia a2e05e3a47 Merge pull request #1768 from zed-industries/git-gutter-meets-code-folding 
Git gutter meets code folding (and word wrap fixes)
 2022-10-17 14:51:47 -04:00
Julia 7ab8f55c11 Include deletion hunks in fold regardless of end 2022-10-13 00:42:53 -04:00
Max Brunsfeld a2c9a67558 Re-export basic text types from text and language crates 
Also avoid production dependencies on fs and rope in collab
 2022-10-12 15:48:19 -07:00
Mikayla Maki a9ce687031 Finished refactoring out fs and rope 2022-10-11 15:25:54 -07:00
Mikayla Maki 9bdb8d31c0 Moved fs to it's own crate, build failing due to cyclic dependency on rope 2022-10-11 13:03:36 -07:00
JuliaandJoseph Lyons 9905d9833c Reset buffer git diff when setting diff base to None 
Co-Authored-By: Joseph Lyons <joseph@zed.dev>
 2022-10-07 15:37:37 -04:00
Julia 981253213d Reload git index on file events to catch new contents 2022-10-06 12:01:21 -04:00
Mikayla Maki bb80bd45bf Removed debugs, simplified settings 2022-10-03 17:43:05 -07:00
Mikayla Maki b49d0e782c Fixed a couple bugs in tests and worktree path handling 2022-10-03 17:18:38 -07:00
JuliaandMikayla Maki 0615592f81 Rename head text to indicate that it's not always going to be from head 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-03 15:11:06 -04:00
Mikayla Maki da143ae46a made git diff rendering respect line wrap 2022-10-02 18:00:13 -07:00
Mikayla MakiMaxJulia
 		d2ac8018bb Refactored git repository code to seperate out repository entry tracking data and git2 mocking code. 
Co-authored-by: Max <max@zed.dev>
Co-authored-by: Julia <julia@zed.dev>
 2022-09-30 17:33:34 -07:00
JuliaMax BrunsfeldMikayla Maki
 		c15e29be64 WIP Start refactoring separation of concerns for repo metadata 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-30 18:25:25 -04:00
JuliaMikayla MakiMax Brunsfeld
 		484bdb0fc0 Start a test for remote git data updating 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-09-30 15:51:32 -04:00
Julia af5b1c1e3e Fix some panics in tests 2022-09-30 13:51:54 -04:00
JuliaMax BrunsfeldMikayla Maki
 		19cd0dedb9 Use sumtree instead of iterator linear search for diff hunks in range 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-30 13:32:54 -04:00
Julia d1a7dc02a2 Track index instead of head for diffs 2022-09-29 13:16:02 -04:00
Mikayla Maki ab3f820edc WIP, re-doing fs and fake git repos 2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki 1da2b63b97 Move git related things into specialized git crate 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-29 13:16:02 -04:00