Commit Graph
39175 Commits
Author SHA1 Message Date
Max Brunsfeld 6988762653 Update rust in collab Dockerfiles 2022-07-15 17:15:32 -07:00
Max Brunsfeld 70b87a7e44 Merge pull request #1375 from zed-industries/active-user-counts
Add an admin API for counting users with given amounts of activity
2022-07-15 17:08:31 -07:00
Max Brunsfeld dad538b510 Allow the web client to specify activity bucket durations 2022-07-15 16:46:44 -07:00
Max Brunsfeld e817042e8d Add admin API for counting users with a given amount of activity 2022-07-15 16:46:44 -07:00
Mikayla Maki b4794e6b41 Merge pull request #1373 from zed-industries/copy-test-update
Update terminal testing to match new connection model.
2022-07-15 14:16:20 -07:00
Mikayla Maki 426f044737 Merge branch 'main' into copy-test-update 2022-07-15 13:24:11 -07:00
Mikayla Maki 4ee7f20ecd Merge pull request #1371 from zed-industries/keybindings-grind
Correctly report all keyboard events to the terminal
2022-07-15 12:30:31 -07:00
Mikayla Maki d1c9b13b65 Revamped testing in terminals 2022-07-15 12:15:55 -07:00
Mikayla Maki 0d393b6f53 Updated copy integration test to match retries on terminal integration test 2022-07-15 11:30:14 -07:00
Mikayla Maki 6f66d684ad Merge branch 'main' into keybindings-grind 2022-07-15 11:24:16 -07:00
Mikayla Maki 63caa85399 Finished new keybindings system for now 2022-07-15 11:20:54 -07:00
Mikayla Maki c16b5337b4 Added some simple tests for the new keybindings 2022-07-15 10:36:37 -07:00
Antonio Scandurra 18f838f491 Merge pull request #1368 from zed-industries/redis
Document using Redis and launch it in `Procfile`
2022-07-15 15:27:09 +02:00
Isaac Clayton 920460bb0a Fix typos, minor revisions 2022-07-15 13:16:01 +02:00
Isaac Clayton 1b574a1945 Write initial plan 2022-07-15 12:58:20 +02:00
Antonio Scandurra ecf2d6640e Ignore dump.rdb files 2022-07-15 12:09:37 +02:00
Antonio Scandurra 11936202ce Add instructions to install redis and include it in Procfile 2022-07-15 10:41:07 +02:00
Mikayla Maki 4cf4f17339 Starting on tests 2022-07-15 00:26:04 -07:00
Antonio Scandurra 294bc1d1b7 Merge pull request #1365 from zed-industries/illustrate-buffer-path
Illustrate `format_on_save` external command using prettier
2022-07-15 09:13:13 +02:00
Antonio Scandurra 279bb86c93 Illustrate format_on_save external command using prettier
This gives us a chance to highlight a real-world scenario that a lot
of our users will want to use, as well as showcasing the special
`{buffer_path}` argument.
2022-07-15 09:00:10 +02:00
Antonio Scandurra d4304a1a51 Merge pull request #1356 from zed-industries/differentiate-same-tab-titles
Differentiate among tabs with the same name
2022-07-15 08:30:22 +02:00
Mikayla Maki 768d8481a2 Method rename 2022-07-14 17:25:17 -07:00
Mikayla Maki c198b7a7e0 Clean up prints 2022-07-14 17:23:43 -07:00
Mikayla Maki 6c11b9d0c7 New key mapping system in place and working 2022-07-14 17:21:30 -07:00
Mikayla Maki 2c2ca0aee0 Checkpoint, have caret notation implemented 2022-07-14 16:27:02 -07:00
Mikayla Maki d30fe30105 Merge pull request #1364 from zed-industries/terminal-test
Terminal test
2022-07-14 13:35:16 -07:00
Mikayla Maki 8c019b9afe Merge pull request #1363 from zed-industries/color-issues
Tidied up the terminal theme
2022-07-14 13:31:09 -07:00
Mikayla Maki 954743d693 Remembered how to use a terminal 2022-07-14 13:15:42 -07:00
Mikayla Maki 749269fe5f Increased test duration 2022-07-14 13:15:02 -07:00
Mikayla Maki e18d33af0f Tidied up the terminal theme 2022-07-14 13:10:01 -07:00
Keith Simmons 5beccbb934 Merge pull request #1355 from zed-industries/better-tab-ordering
More intuitive tab ordering
2022-07-14 12:26:46 -07:00
Antonio Scandurra ecece11b4c 🎨 2022-07-14 16:46:45 +02:00
Antonio Scandurra 55363864f9 Add test for tab disambiguation 2022-07-14 16:42:30 +02:00
Isaac Clayton 6596d4e515 Merge pull request #1359 from zed-industries/plugin-json-enable
Plugin json enable
2022-07-14 16:37:53 +02:00
Isaac Clayton 0aaf29b539 Add retries to failing terminal test 2022-07-14 16:05:10 +02:00
Isaac Clayton e16f368596 Merge pull request #1358 from zed-industries/plugin-cross-pre
Remove requirement for target triple in precompiled binary extension
2022-07-14 15:55:11 +02:00
Isaac Clayton c29605bd89 Re-enable JSON plugin 2022-07-14 15:13:12 +02:00
Antonio Scandurra 956d4d94e5 Truncate description in tab title when it is too long 2022-07-14 15:12:16 +02:00
Isaac Clayton d70b490edf Remove triple-based suffix 2022-07-14 15:05:54 +02:00
Isaac Clayton e885f673b0 Update docs 2022-07-14 13:46:41 +02:00
Isaac Clayton 2df3c50407 Precompile plugins depending on target triple 2022-07-14 13:23:04 +02:00
Antonio Scandurra 9de9d517fd Differentiate among tabs with the same name
This commit introduces a new, optional `Item::tab_description` method
that lets implementers define a description for the tab with a certain
`detail`. When two or more tabs match the same description, we will
increase the `detail` until tabs don't match anymore or increasing the
`detail` doesn't disambiguate tabs any further.

As soon as we find a valid `detail` that disambiguates tabs enough, we
will pass it to `Item::tab_content`. In `Editor`, this is implemented by
showing more and more of the path's suffix as `detail` is increased.
2022-07-14 11:54:11 +02:00
Isaac Clayton e04db40d54 Merge fuel-based metering 2022-07-14 08:13:47 +02:00
K Simmons 08f662a49c When tab closed, move to previous tab, and when opening an existing tab, reorder it to be after the current active tab 2022-07-13 20:14:44 -07:00
Max Brunsfeld 8fb9aeca22 0.47.1 2022-07-13 17:31:59 -07:00
Max Brunsfeld bbf28e78a4 Merge pull request #1353 from zed-industries/fix-init-user-settings
Avoid copying all default settings to initial user settings
2022-07-13 17:31:10 -07:00
Max BrunsfeldandNathan Sobo b9eb664c32 Avoid copying all default settings to initial user settings
This would cause top-level default editor settings to override
language-specific default settings.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
2022-07-13 17:07:41 -07:00
Mikayla Maki 93b95bb752 Merge pull request #1352 from zed-industries/modal-context
Fixed modal terminal bindings to not show in command palette
2022-07-13 17:03:33 -07:00
Mikayla Maki 2c0a69dc4c Fixed modal terminal bindings to not show in command palette 2022-07-13 16:39:22 -07:00
Mikayla Maki b9d3da33c6 Basic keybindings infra done 2022-07-13 16:32:25 -07:00