Commit Graph
11830 Commits
Author SHA1 Message Date
Nathan Sobo 5348dfa47a Render borders in gpui2 divs 2023-09-06 14:31:44 -06:00
Nathan Sobo 4f7a2ff0ac Checkpoint 2023-09-06 14:16:15 -06:00
Nate ButlerandNathan Sobo 1343b4bcff Add size rounded prefixes
Co-Authored-By: Nathan Sobo <1789+nathansobo@users.noreply.github.com>
2023-09-06 14:18:29 -04:00
Nathan Sobo d50368c846 Select caret based on expanded boolean 2023-09-06 10:24:22 -06:00
Nathan Sobo 23c1ed8919 Checkpoint 2023-09-05 18:53:25 -06:00
Nate Butler 022f519411 Add list items for scroll testing 2023-09-05 18:52:05 -04:00
Nathan Sobo f7597cbd0e WIP: Icons not yet rendering 2023-09-05 16:40:52 -06:00
Nate Butler 8e1e95cc6c Mark placeholder SVGs 2023-09-05 17:32:59 -04:00
Nate Butler 0fa09f23d9 Ignore cargo-target 2023-09-05 17:27:09 -04:00
Nate Butler dac9f722e0 Add fraction sizes for tailwind lengths 2023-09-05 17:27:00 -04:00
Nathan Sobo 7f52943980 Fix hoverable elements moving on hover 2023-09-05 15:17:09 -06:00
Nate Butler bde13c90cb Continue collab_panel 2023-09-05 17:13:33 -04:00
Nate ButlerandNathan Sobo f2a115d639 Work on sample collab_panel story in the storybook
Co-Authored-By: Nathan Sobo <1789+nathansobo@users.noreply.github.com>
2023-09-05 15:19:44 -04:00
Nathan Sobo 28cff3222a Checkpoint 2023-09-05 12:50:07 -06:00
Nathan Sobo 99cca6a51c Checkpoint 2023-09-05 12:16:21 -06:00
Nathan SoboandNate Butler 91a2f21337 Start sketching a collab panel in storybook
Co-Authored-By: Nate Butler <nate@zed.dev>
2023-09-05 10:02:36 -06:00
Nathan Sobo fad5e69b3c Merge remote-tracking branch 'origin' into storybook 2023-09-01 10:08:48 -06:00
Nathan Sobo 1ea754b53e Fix warnings for a clean build 2023-09-01 10:08:41 -06:00
Antonio Scandurra 33ab715378 Avoid duplicate entries in inline assistant's prompt history (#2926)
Release Notes:

- Improved the inline assistant's prompt history to avoid including the
same entry multiple times. (preview-only)
2023-09-01 09:20:14 +02:00
Antonio Scandurra 48467b59fa Avoid duplicate entries in inline assistant's prompt history 2023-09-01 09:15:29 +02:00
Max Brunsfeld 16a698c3fb Remove the concept of a local clock; use lamport clocks for all per-replica versioning (#2924)
### Background

Currently, our CRDT uses three different types of timestamps:

| clock type | representation | purpose |
|-----|----------------|----------|
| `Local` | replica id + u32 | uniquely identifies operations |
| `Lamport` | replica id + u32 | provides a consistent total ordering
for all operations |
| `Global` | N local clocks | fully defines the partial ordering between
all concurrent operations |

All text operations include *each* type of timestamp. And every
`Fragment` in a buffer's fragment tree contains both a local and a
lamport timestamp.

### Change

An operation can be uniquely identified by its lamport timestamp, so we
don't really need a concept of a local timestamp. In this PR, I've
removed the concept of a local timestamp. Version vectors
(`clock::Global`) now store vectors of *lamport* timestamps.

Eliminating local timestamps reduces the memory footprint of a buffer by
four bytes per fragment, reduces the size of our `UpdateBuffer` RPC
messages, and reduces the amount of data we need to store in our
database for channel buffers. It also makes our CRDT a bit easier to
understand, IMO, because there is now only one scalar value that we
increment per replica.

It's possible I'm missing something here though. @as-cii, @nathansobo
it'd be good to get your 👀
2023-08-31 16:47:08 -07:00
Max Brunsfeld dcc212f176 Renumber protobuf fields, bump protocol version 2023-08-31 16:31:26 -07:00
Max Brunsfeld fe943bc46b Remove local timestamps from CRDT operations
Use lamport timestamps for everything.
2023-08-31 16:23:06 -07:00
Max Brunsfeld 9a976f26b1 Assistant: propagate cancel action if there is no pending inline assist (#2923)
Release Notes:

- Fixed a bug where modals could not be dismissed with `escape` when
certain views were active in the workspace (preview only).
2023-08-31 11:17:09 -07:00
Max Brunsfeld 2492d07a27 Propagate Cancel action if there is no pending inline assist 2023-08-31 11:09:36 -07:00
Kirill Bulatov 58a9278342 Tailwind autocomplete (#2920)
Release Notes:
- Added basic Tailwind CSS autocomplete support
([#746](https://github.com/zed-industries/community/issues/746)).
2023-08-31 16:55:46 +03:00
Kirill Bulatov ce5393437b Fix plugin LSP adapter intefrace 2023-08-31 15:32:24 +03:00
Kirill Bulatov fa9a9b4955 Route completion requests through remote protocol, if needed 2023-08-31 15:22:13 +03:00
Kirill Bulatov 984505c584 Fix wrong assertion in the test 2023-08-31 14:31:43 +03:00
Kirill Bulatov 9993adc3bd Ensure all client LSP queries are forwarded via collab 2023-08-31 14:29:37 +03:00
Kirill Bulatov f5e0c28971 Fix project tests 2023-08-31 13:01:53 +03:00
Kirill Bulatov ef63e7b44b Use ctrl-: instead of ctrl-shift-: for inlay hints toggling (#2921)
The latter is not possible to press in Zed, since `:` is typed as
`shift-;` with typical US keyboard layouts.

In the end, it's the same buttons you have to press to toggle the inlay
hints, but working this time.

Release Notes:

- N/A
2023-08-31 12:10:45 +03:00
Kirill Bulatov 3b38bb55fd Post-rebase fixes 2023-08-31 11:53:46 +03:00
Kirill Bulatov f1f6ff7d0b Log language server stderr output in server logs (#2918)
<img width="1728" alt="Screenshot 2023-08-31 at 01 07 11"
src="https://github.com/zed-industries/zed/assets/2690773/537a18d6-59bf-4a77-896f-fc2cb6dc7fe8">

Line by line, we print stderr to help with debugging and servers that
log into stderr.

Release Notes:

- N/A
2023-08-31 11:13:45 +03:00
Kirill Bulatov 676fc679d3 Fix the tests, by not requiring stderr for fake servers 2023-08-31 11:07:37 +03:00
Kirill Bulatov ce7c0d3426 Use ctrl-: instead of ctrl-shift-: for inlay hints toggling
The latter is not posible to press in Zed, since `:` is typed as
`shift-;` with typical US keyboard layouts.

In the end, it's the same buttons you have to press to toggle the inlay
hints, but working this time.
2023-08-31 10:43:29 +03:00
Julia 3faabbe91a Merge branch 'main' into multi-server-completions-tailwind 2023-08-30 22:58:37 -04:00
JuliaandKirill Bulatov 6414d0eae1 Scope Tailwind in JS/TS to within string
In some situations outside JSX elements Tailwind will never
respond to a completion request, holding up the tsserver completions.

Only submit the request to Tailwind when we wouldn't get tsserver
completions anyway and don't submit to Tailwind when we know we won't
get Tailwind completions

Co-Authored-By: Kirill Bulatov <kirill@zed.dev>
2023-08-30 21:14:39 -04:00
Kirill Bulatov 314721116e Do not write TRACE logs into file for Lua 2023-08-31 01:14:37 +03:00
Kirill Bulatov 6905f4fadf Capture language servers' stderr into server logs 2023-08-31 01:14:37 +03:00
Nathan Sobo e54c98cc37 Split playground into gpui2 and storybook 2023-08-30 16:12:14 -06:00
Max Brunsfeld 52568d3887 Disable save as prompt for channel notes (#2917) 2023-08-30 15:09:53 -07:00
Max Brunsfeld b50ade3139 Disable save as prompt for channel notes 2023-08-30 15:05:47 -07:00
Kirill Bulatov e8092015bb Rewrite inlay hint collab tests to remove races (#2916)
Release Notes:

- N/A
2023-08-31 00:49:50 +03:00
Max Brunsfeld 7e7f2a6bfd Fix collab panel regressions (#2915)
Release Notes:

- Fixed a bug where collaborators' cursors were rendered with the wrong
color when not following them (preview only).
- Fixed an issue where icons were inconsistent sizes in the
collaboration panel (preview only).
2023-08-30 14:41:37 -07:00
Kirill Bulatov c36367d2e4 Rewrite inlay hint collab tests to remove races 2023-08-31 00:37:00 +03:00
Max BrunsfeldandMikayla 3d81860539 Remove unnecessary ConstrainedBoxes in collab panel
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-08-30 14:35:02 -07:00
Max BrunsfeldandMikayla ffcecdcb1d collab panel: Make screen share row line up with shared projects
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-08-30 14:23:12 -07:00
Max BrunsfeldandMikayla 820cb00d62 Fix cursor colors of non-followed collaborators
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-08-30 14:14:18 -07:00
Nathan Sobo 04079268fd Add gpui2 crate 2023-08-30 15:00:11 -06:00