mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-09 20:04:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
7758 commits 556 branches 843 tags 276 MiB
Commit graph

5165 commits

Author SHA1 Message Date
Joseph T. Lyons
37c052f53d
Include is_staff boolean in in-app feedback 2023-02-08 10:14:18 -05:00
Joseph T. Lyons
582f5d0114
Merge pull request #2130 from zed-industries/inform-user-that-telemetry-can-be-disabled 
Inform user that telemetry can be disabled
 2023-02-07 21:15:16 -05:00
Joseph T. Lyons
fd016b9bcd
Merge pull request #2133 from zed-industries/feedback-submit-button 
Implement a button for submitting feedback
 2023-02-07 21:13:42 -05:00
Joseph Lyons
317eb7535c Fix variable names 2023-02-07 21:08:07 -05:00
Kay Simmons
55589533e2 Update yaml-tree-sitter git hash 
Update yaml-tree-sitter git hash
 2023-02-07 15:51:45 -08:00
Kay Simmons
9a8585ce0c
Merge pull request #2144 from zed-industries/yaml-lsp 
Add yaml language server
 2023-02-07 15:44:10 -08:00
Kay Simmons
aa0a18968a removed unused import 2023-02-07 15:40:29 -08:00
Kay Simmons
0777f459ba Add yaml language server 2023-02-07 15:34:27 -08:00
Mikayla Maki
87cf8ac60e Fixed strange y results from faulty conversion to screen coordinates 
co-authored-by: Nathan <nathan@zed.dev>
 2023-02-07 15:26:03 -08:00
Joseph Lyons
20377ea4e9 Update links to community repository 2023-02-07 18:19:27 -05:00
Mikayla Maki
db2aaa4367 Fixed bug in setting cursor style 2023-02-07 14:35:46 -08:00
Kay Simmons
099b79910f
Merge pull request #2137 from zed-industries/yaml 
yaml highlighting
 2023-02-07 14:32:02 -08:00
Kay Simmons
fe25994fb3 fix highlights, indents, and tab size for yaml 2023-02-07 14:20:23 -08:00
Joseph Lyons
7cef4a5d40 Allocate theme struct directly into the heap 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-02-07 13:39:48 -05:00
Petros Amoiridis
e15ffc8560
Make truncate_and_trailoff a bit more clear 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-02-07 20:06:20 +02:00
Joseph Lyons
58987275fc Merge branch 'main' into feedback-submit-button 2023-02-07 12:55:53 -05:00
Petros Amoiridis
9bff82f161
Use truncate_and_trailoff function 
A function that already works with unicode characters.
 2023-02-07 19:25:57 +02:00
Petros Amoiridis
be0241bab1
Add test for string with unicode characters 2023-02-07 19:25:07 +02:00
Kay Simmons
de0b136be2 wip yaml highlighting 2023-02-07 01:00:50 -08:00
Kay Simmons
4e80ae13ec
Merge pull request #2136 from zed-industries/fix-recent-projects-panic 
Fix Recent Project Panic
 2023-02-07 00:38:18 -08:00
Kay Simmons
b020955ac4 show notification if no recent projects 2023-02-07 00:10:11 -08:00
Max Brunsfeld
f065399799 Fix crash when unplugging display containing a zed window 
Co-authored-by: Kay Simmons <kay@zed.dev>
 2023-02-06 16:44:06 -08:00
Mikayla Maki
926b59b15d Fixed a bug where the command palette wouldn't check the keymap context when showing available actions 
Fixed a bug where context menus wouldn't show action keystrokes
WIP Fixing a bug where tooltips won't show action keystrokes

Co-Authored-By: Max <max@zed.dev>
 2023-02-06 15:42:14 -08:00
Kay Simmons
2d6219ebe2
Merge pull request #2131 from zed-industries/lua 
Add lua syntax highlighting and lsp support
 2023-02-06 15:40:03 -08:00
Joseph Lyons
d4d9a142fc Implement a button for submitting feedback 
Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com>
 2023-02-06 17:41:36 -05:00
Kay Simmons
035901127a remove unused version regex 2023-02-05 23:25:20 -08:00
Kay Simmons
4642817e72 Add lua syntax highlighting and lsp support 2023-02-05 23:21:29 -08:00
Joseph Lyons
83e21387af Inform user that telemetry can be disabled 2023-02-04 22:18:07 -05:00
Kay Simmons
3e92e4d110 fix unsaved change 2023-02-03 12:47:20 -08:00
Kay Simmons
303216291b Move sharing status indicator out of the call crate and into collab_ui in order so that the model doesn't depend on the view 2023-02-03 11:17:50 -08:00
Kay Simmons
8be9d21340
Merge pull request #2128 from zed-industries/feedback/922-unify-find-all-references-label 
Make app menu and context menu labels consistent
 2023-02-03 10:29:43 -08:00
Joseph Lyons
9742bd7fd4 Reduce length of feedback placeholder text 2023-02-03 08:14:14 -05:00
Petros Amoiridis
3014cc5299
Do not capitalize prepositions in title case 
This also match the app menu
 2023-02-03 12:16:09 +02:00
Petros Amoiridis
d6b728409f
Be consistent in the app & context menus 2023-02-03 12:14:13 +02:00
Petros Amoiridis
433f284571
Merge pull request #2126 from zed-industries/731-make-cursor-visible-immediately 
Focus the editor when activating previous pane
 2023-02-03 10:12:34 +02:00
Kay Simmons
7270f950b8
Merge pull request #2115 from zed-industries/call-status-indicator 
Add call status indicator to the status bar
 2023-02-02 17:18:22 -08:00
Kay Simmons
ae15673dfd
Merge pull request #2124 from zed-industries/fix-display-uuid-panic 
Make display uuid optional if the display is disconnected
 2023-02-02 17:17:01 -08:00
Petros Amoiridis
2b0592da21
Guard against tab_bar_context_menu 
We don't want to have the tab_bar_context_menu as the active item of the pane where the split started from

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-02-02 20:15:43 +02:00
Petros Amoiridis
8f61134e7e
Allow comparing ViewHandle to AnyViewHandle 
Since they both have a window_id and a view_id.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-02-02 20:15:40 +02:00
Joseph Lyons
888145ebed Trim leading and trailing whitespace in feedback 2023-02-02 12:43:55 -05:00
Kay Simmons
a50f0181fb Add setting to disable the call icon 2023-02-01 16:21:53 -08:00
Kay Simmons
62d32db66c Make display uuid optional if the display is disconnected 2023-02-01 14:59:43 -08:00
Joseph Lyons
fd2a9b3df9 v0.73.x dev 2023-02-01 13:45:06 -05:00
Kay Simmons
460dc62888 start adding setting for the screen sharing status indicator 2023-01-31 15:17:16 -08:00
Kay Simmons
e35db69dbd Add call status indicator to the status bar 2023-01-31 15:00:49 -08:00
Mikayla Maki
e682e2dd72 Changed SQLez migrations to be executed eagerly 
Added fix for terminal working directory's sometimes getting lost
co-authored-by: Kay <kay@zed.dev>
 2023-01-30 14:38:48 -08:00
Joseph Lyons
248161aa63 Fix version for feedback-related commands 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-01-30 14:13:25 -05:00
Mikayla Maki
57781fd7aa Move StaffMode declaration out of paths 2023-01-27 15:45:33 -08:00
Mikayla Maki
2802e3a1c6 Fixed failling tests 2023-01-27 15:44:17 -08:00
Mikayla Maki
ea39983f78 Removed old experiments settings and staff mode flag, added new StaffMode global that is set based on the webserver's staff bit 2023-01-27 15:43:12 -08:00
Mikayla Maki
ca2e0256e1 Renamed open recent action to match menu 2023-01-27 15:38:48 -08:00
Kay Simmons
ea0dd8972f
Merge pull request #2090 from zed-industries/workspace-window-position-persistence 
Workspace window position persistence
 2023-01-27 15:24:01 -08:00
Kay Simmons
a1308d20ce
Merge pull request #2105 from zed-industries/fix-focus-stealing-when-collaborating 
Limit focus grabbing in followed pane
 2023-01-27 15:23:43 -08:00
Kay Simmons
0f93386071 Add run until parked to test_fs_operations to ensure both update chunks are completed before asserting the changes 2023-01-27 15:07:51 -08:00
Kay Simmons
77a4f907a0 removed invalid focus assertion 2023-01-27 13:43:36 -08:00
Kay Simmons
d6acea525d add test for is_child_focused 2023-01-27 13:00:26 -08:00
Kay Simmons
89a5506f43 Add function which checks if a child of a view is focused and use that to only focus item updates from the leader when that the active item was focused 2023-01-27 12:39:32 -08:00
Antonio Scandurra
5431488a9a collab 0.5.4 2023-01-27 11:07:12 +01:00
Antonio Scandurra
ac7618da17
Merge pull request #2103 from zed-industries/connection-staleness 
Fix connection staleness issues
 2023-01-27 11:01:24 +01:00
Kay Simmons
1593b1e13d window position restoration working 2023-01-26 16:35:00 -08:00
Max Brunsfeld
1b45911857 Omit hidden worktrees when showing projects in collaboration UI 2023-01-26 14:47:37 -08:00
Max Brunsfeld
4918ad5789
Merge pull request #2099 from zed-industries/empty-go-to-def-multibuffer 
Avoid opening a definitions tab if there are no definitions found
 2023-01-26 10:35:35 -08:00
Max Brunsfeld
9f86748aff Avoid opening a definitions tab if there are no definitions found 2023-01-26 10:30:01 -08:00
Petros Amoiridis
489be5e77b
Merge pull request #2077 from zed-industries/2064-remove-contacts 
Remove contact from contact list
 2023-01-26 20:04:15 +02:00
Max Brunsfeld
1c572fd86e Add 'view dependency licenses' item to Help appication menu 2023-01-26 09:53:46 -08:00
Petros Amoiridis
73af155dd6
Refactor Database::remove_contact 
Refactor it to avoid sending irrelevant messages to update the UI.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-26 19:01:51 +02:00
Antonio Scandurra
eca6115e4b Ensure proto::UpdateWorktree::removed_entries doesn't exceed chunk size 
This was causing the database to panic because we were trying to remove too
many entries at once.
 2023-01-26 17:26:31 +01:00
Antonio Scandurra
74aeec360d Cancel pending call when participant leaves room after a reconnection 
Previously, if a user temporarily disconnected while there was a pending
call, we would fail to cancel such pending call when the caller left the
room. This was due to the caller reconnecting and having a different connection
id than the one originally used to initiate the call.
 2023-01-26 16:44:55 +01:00
Petros Amoiridis
2f26fcd889
Merge branch 'main' into 2064-remove-contacts 2023-01-26 16:34:17 +02:00
Joseph T. Lyons
a4d9d6c750
Merge pull request #2095 from zed-industries/fix-crash-when-opening-feedback-while-in-call 
Fix crash when opening feedback while in call
 2023-01-25 21:16:12 -05:00
Max Brunsfeld
a2a3ebc42f
Merge pull request #2096 from zed-industries/lazy-load-languages 
Load languages lazily in the background
 2023-01-25 18:09:45 -08:00
Max Brunsfeld
ddf4e1a316 Load languages lazily in the background 2023-01-25 17:47:46 -08:00
Kay Simmons
a369fb8033 better but still broken 2023-01-25 17:05:57 -08:00
Joseph Lyons
9ff34bcb6a Remove no-longer-needed method 2023-01-25 20:03:44 -05:00
Julia
3819a67185 Add "Close Window" global action which does not need a focused workspace 2023-01-25 18:51:25 -05:00
Joseph Lyons
6e7101ca6b Fix crash when opening feedback while in call 2023-01-25 17:48:01 -05:00
Julia
2df2d09e3c
Merge pull request #2091 from zed-industries/style 
Style
 2023-01-25 15:22:52 -05:00
Joseph Lyons
4c3244b982 v0.72.x dev 2023-01-25 15:20:41 -05:00
Julia
a79b4e312b Style 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-01-25 15:09:57 -05:00
Kay Simmons
5eac797a93 mostly working now 2023-01-25 11:36:38 -08:00
Kay Simmons
a581d0c5b8 wip 2023-01-25 11:32:19 -08:00
Kay Simmons
15799f7af6 wip 2023-01-25 11:32:19 -08:00
Joseph T. Lyons
81ed961659
Merge pull request #2088 from zed-industries/add-cursor-position-to-feedback-editor 
Add cursor position to feedback editor
 2023-01-25 14:29:24 -05:00
Max Brunsfeld
9db55b3029
Merge pull request #2087 from zed-industries/buffer-language-registry 
Assign the language registry to all buffers in the project
 2023-01-25 11:25:40 -08:00
Joseph Lyons
328b779185 Clean up construction of FeedbackEditor 2023-01-25 14:20:58 -05:00
Joseph Lyons
7f3d937938 Count chars 2023-01-25 14:20:40 -05:00
Joseph Lyons
f68f9f37ab Add cursor position to feedback editor 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-01-25 14:20:23 -05:00
Joseph Lyons
44c7f162b6 Merge branch 'main' into add-cursor-position-to-feedback-editor 2023-01-25 14:01:45 -05:00
Max Brunsfeld
7003a475a7 Assign the language registry to all buffers in the project 2023-01-25 10:44:15 -08:00
Julia
3d8dbee76a Clean up some debug printing 2023-01-25 13:37:04 -05:00
Petros Amoiridis
160870c9de
Improve user notification 
The message is not really true. When one declines, the other person can notice that the contact request  is not pending any more. They will know. Switching to not alerted is closer to what is really happening.
 2023-01-25 19:46:51 +02:00
Mikayla Maki
ecb7d1072f Fixes a broken conditional that is only caught on darwin systems 2023-01-25 09:33:07 -08:00
Mikayla Maki
1fc6276eab Remove debug wiring 2023-01-25 09:10:51 -08:00
Mikayla Maki
45e4e3354e Changed the presenter to only send 'set_cursor_style' on the topmost window 
co-authored-by: Antonio <antonio@zed.dev>
 2023-01-25 09:10:35 -08:00
Mikayla Maki
27a80a1c94 WIP 2023-01-25 09:10:35 -08:00
Mikayla Maki
426aeb7c5e WIP - adds platform APIs for checking the top most window 2023-01-25 09:10:35 -08:00
Petros Amoiridis
35524db136
Add a confirmation prompt 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 18:55:08 +02:00
Petros Amoiridis
e928c1c61e
Test removing a contact 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 17:31:42 +02:00
Petros Amoiridis
5d4eb2b7ae
Push responder and requester to remove_contacts 
When we ask the server to remove a contact we need to push the requester and responder ids to `remove_contacts` so that when the UI updates, the correct contacts will disappear from the list.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 13:10:29 +02:00
Petros Amoiridis
db978fcb6c
Add an x mark icon to the list of contacts 
We want to be able to remove contacts from our list. This was not possible. This change add an icon and dispatches the RemoveContact action.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 13:10:29 +02:00
Joseph Lyons
3329b2bbd6 Remove gpui:: prefix from parameters 2023-01-24 19:46:04 -05:00
Joseph T. Lyons
a66a0cfd70
Merge pull request #2075 from zed-industries/add-upper-character-count-limit 
Add upper character count limit
 2023-01-24 19:44:19 -05:00
Julia
0414723a54 Decode URL from openURLs to handle percent encoded paths 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-01-24 18:48:15 -05:00
Joseph Lyons
588419492a Add upper character count limit 2023-01-24 17:38:20 -05:00
Max Brunsfeld
678ee26c5e Merge branch 'main' into markdown-fenced-blocks 2023-01-24 14:13:50 -08:00
Max Brunsfeld
51984f0d39 Fix feedback editor compile error due to LanguageRegistry API change 2023-01-24 14:09:24 -08:00
Julia
4d73d4b1b9 Insert macOS file association metadata during bundle process 2023-01-24 17:07:02 -05:00
Nathan Sobo
e8cea130a4
Merge pull request #2068 from zed-industries/doc-reparse 
Document Buffer::reparse
 2023-01-24 09:09:38 -07:00
Antonio Scandurra
dff08d3cfe Merge branch 'main' into markdown-fenced-blocks 2023-01-24 15:43:35 +01:00
Antonio Scandurra
c48e3f3d05 Reparse unknown injection ranges in buffer when adding a new language 2023-01-24 15:29:59 +01:00
Antonio Scandurra
f3509824e8 WIP: Start on SyntaxMapSnapshot::unknown_injection_languages 2023-01-24 12:55:49 +01:00
Antonio Scandurra
14c72cac58 Store syntax layers even if a language for the injection can't be found 2023-01-24 12:25:12 +01:00
Nathan Sobo
96ffe84edb Document Buffer::reparse 2023-01-23 21:51:10 -07:00
Joseph Lyons
2b3d09f70a Fix CI missing license check 2023-01-23 18:34:10 -05:00
Joseph Lyons
8e8f66a5e1 Merge branch 'main' into in-app-feedback 2023-01-23 18:24:12 -05:00
Joseph Lyons
c9299a49e1 Clean out unused code 2023-01-23 18:19:10 -05:00
Mikayla Maki
0f0d5d5726 Added cargo-about auto-install and CI steps 2023-01-23 12:51:32 -08:00
Mikayla Maki
d060114f00 Added complete scripts for generating third party license files 2023-01-23 12:47:12 -08:00
Mikayla Maki
9d58032064 Add action to open licenses file 2023-01-23 12:45:18 -08:00
Mikayla Maki
4d05d61ed7
Merge pull request #2049 from zed-industries/425-create-file-for-cli 
Create files passed as args to CLI
 2023-01-23 10:44:55 -08:00
Antonio Scandurra
8dabdd1baa Ensure injection layer is recomputed when language changes 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-01-23 19:02:06 +01:00
Julia
95b259b841 Avoid stomping on tab close icon's cursor style 2023-01-23 11:43:50 -05:00
Antonio Scandurra
79cf6fb8b6 WIP: Add test for dynamic language injection 2023-01-23 09:45:36 +01:00
Antonio Scandurra
cb610f37f2 WIP: Search language injections also by file extension 
There are still a few things left:

1. Add test to verify we can successfully locate a language by its extension
2. Add test to reproduce bug where changing the fenced code block language
   won't reparse the block with the new language
3. Reparse injections for which we couldn't find a language when the language
   registry changes.
4. Check why the markdown grammar considers the trailing triple backtick as
   `(code_block_content)`, as opposed to being part of the outer markdown.
 2023-01-23 08:56:41 +01:00
Antonio Scandurra
36e4dcef16 Avoid allocating a string to compare language names 2023-01-23 08:56:41 +01:00
Antonio Scandurra
c49dc8d6e5 Rename LanguageRegistry::get_language to language_for_name 2023-01-23 08:56:41 +01:00
Antonio Scandurra
f086fa3f21 Add syntax injections for Markdown fenced code blocks 2023-01-23 08:56:41 +01:00
Joseph Lyons
c118f9aabd Fix new errors after merge 2023-01-23 01:31:02 -05:00
Joseph Lyons
f2a5a4d0fd Merge branch 'main' into in-app-feedback 2023-01-23 01:20:10 -05:00
Joseph Lyons
fb2278dc6d Complete first iteration of in-app feedback 2023-01-23 00:59:46 -05:00
Mikayla Maki
50d37e1ae7
Merge pull request #2060 from zed-industries/fix-ci-fail 
Fix mismatched return types on CI
 2023-01-20 18:28:59 -08:00
Mikayla Maki
8dcaa81aad switch return type of accepts_first_mouse 2023-01-20 18:19:24 -08:00
Max Brunsfeld
e1a58e9381
Merge pull request #2059 from zed-industries/no-indent-adjustment-on-error 
Avoid adjusting indentation of lines inside of newly-created errors
 2023-01-20 17:13:30 -08:00
Max Brunsfeld
56080771e6 Add test for avoiding indent adjustment inside newly-created errors 2023-01-20 17:02:38 -08:00
Mikayla Maki
bb24f1142f Removed dbg 2023-01-20 16:47:23 -08:00
Mikayla Maki
94b2f8e07f
Merge pull request #2054 from zed-industries/notification-mouse-events 
Notification mouse events
 2023-01-20 16:41:27 -08:00
Mikayla Maki
310d867aab Switch PopUp windows to use the NSTrackingArea API and add support for the mouseExited event 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-01-20 16:35:25 -08:00
Max Brunsfeld
9f74d6e4ac Highlight and auto-indent await expressions in rust 2023-01-20 15:56:56 -08:00
Max Brunsfeld
f7ceebfce3 Avoid adjusting indentation of lines inside newly-created errors 2023-01-20 15:56:45 -08:00
Joseph Lyons
083986dfae WIP 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-01-20 18:05:24 -05:00
Max Brunsfeld
df1e1295e3
Merge pull request #2056 from zed-industries/confirm-quit 
Add confirm_quit setting
 2023-01-20 14:11:02 -08:00
Joseph Lyons
c1934d6232 WIP 2023-01-20 16:56:56 -05:00
Kay Simmons
2e37c0ea4a Open multiple definitions in a multibuffer instead of opening the files directly 2023-01-20 13:28:13 -08:00
Max Brunsfeld
2f42af2ac3 Add confirm_quit setting 2023-01-20 13:02:38 -08:00
Max Brunsfeld
be2c601176
Merge pull request #2055 from zed-industries/language-config-overrides 
Language config overrides
 2023-01-20 11:15:26 -08:00
Max Brunsfeld
8dcef46842 Drop 'override.' prefix from capture names in override query 
Co-authored-by: Julia Risley <julia@zed.dev>
 2023-01-20 10:44:33 -08:00
Max Brunsfeld
2aa7a9e95b Add overrides for all languages 
Co-authored-by: Julia Risley <julia@zed.dev>
 2023-01-20 10:39:31 -08:00
Mikayla Maki
8af1294ba5 Changed platform mouse moved handling to only fire on active or popup windows 
co-authored-by: Antonio <antonio@zed.dev>
 2023-01-20 09:37:09 -08:00
Mikayla Maki
5a00729fad
Merge pull request #2051 from zed-industries/show-following-to-followed 
Show following to followed
 2023-01-20 09:23:34 -08:00
Mikayla Maki
97203e1e02 Fix broken merge 2023-01-20 09:19:58 -08:00