zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-10 14:06:11 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,464 Commits 711 Branches 768 Tags 183 MiB
c9299a49e1
Commit Graph

7464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Lyons
c9299a49e1 Clean out unused code 2023-01-23 18:19:10 -05: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
4bee273511
Merge pull request #2057 from zed-industries/multiple-definitions-multibuffer 
Multiple Definitions Multibuffer
 2023-01-20 13:49:07 -08: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
Mikayla Maki
95e661a78c Switched from active hover to NSViews acceptsFirstMouse API 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-01-20 09:14:38 -08:00
Julia
b54b77b9ec
Merge pull request #2053 from zed-industries/on-move-out 
Hide hovers when mouse leaves area & window focus is lost
 2023-01-20 10:55:26 -05:00
Julia
467e3dc50a Hide editor hover on mouse move out & always notify when hiding hover 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-20 10:16:24 -05:00
Julia
131f3471fc Don't dispatch mousemove without focus & avoid swallowing external moves 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-20 10:11:28 -05:00
Mikayla Maki
88170df7f0 Switched from active hover to NSViews acceptsFirstMouse API 2023-01-19 15:21:26 -08:00
Max Brunsfeld
2967b46a17 Implement scope-specific bracket matching and comment toggling 
Co-authored-by: Julia Risley <julia@zed.dev>
 2023-01-19 15:04:27 -08:00
Mikayla Maki
4eeb1aec50 Adds UI for showing the followed-by status to collaboration 2023-01-19 14:22:12 -08:00
Max Brunsfeld
1851e2e77c Start work on language config overrides 
Co-authored-by: Julia Risley <julia@zed.dev>
 2023-01-19 12:32:08 -08:00
Mikayla Maki
4a46227909 Change incoming call notification to only require one click 2023-01-19 11:43:46 -08:00
Mikayla Maki
86371d9f5e
Merge pull request #2050 from zed-industries/disable-soft-wrap-in-single-line-editors 
Disable soft wrap in single line editors
 2023-01-19 11:26:54 -08:00
Joseph Lyons
38476f5429 Disable soft wrap in single line editors 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-01-19 13:45:05 -05:00
Petros Amoiridis
6c9422808a
Merge pull request #2048 from zed-industries/408-add-date-to-zedlog 
Add date to the log format
 2023-01-19 20:26:01 +02:00
Julia
ad1947fa50 Add in-window on-move-out mouse handler concept 2023-01-19 12:34:13 -05:00
Petros Amoiridis
f088de5947
Add date to the log format 
Co-Authored-By: Mikayla <mikayla@zed.dev>
 2023-01-19 19:05:17 +02:00
Antonio Scandurra
c85ad96b45
Merge pull request #2047 from zed-industries/optimize-large-multi-buffers 
Avoid stalling the UI thread when running large searches
 2023-01-19 17:31:14 +01:00
Antonio Scandurra
1f649e52de Document RopeFingerprint 2023-01-19 17:25:59 +01:00
Antonio Scandurra
0a7111d216 Fix tests 2023-01-19 16:26:27 +01:00
Antonio Scandurra
a58b39f884 Merge branch 'main' into optimize-large-multi-buffers 2023-01-19 16:18:21 +01:00
Antonio Scandurra
c124caeb0d Add test for stream_excerpts_with_context_lines 2023-01-19 15:54:32 +01:00
Antonio Scandurra
5ce065ac92 Introduce MultiBuffer::stream_excerpts_with_context_lines 
This allows us to push excerpts in a streaming fashion without blocking
the main thread.
 2023-01-19 15:42:14 +01:00
Max Brunsfeld
5189dea3d5
Merge pull request #2046 from zed-industries/line-breaks-in-outline-items 
Prevent outline items from accidentally spanning multiple lines
 2023-01-18 16:46:45 -08:00
Max Brunsfeld
d9948bf772 Prevent outline items from accidentally spanning multiple lines 2023-01-18 16:43:18 -08:00
Max Brunsfeld
062e7a03a9 Update comments in Pane::close_items 2023-01-18 15:17:44 -08:00
Max Brunsfeld
17b4bfdf98
Merge pull request #2045 from zed-industries/fewer-unsaved-prompts 
Avoid prompting to save when closing an untitled buffer that is still open elsewhere
 2023-01-18 15:10:19 -08:00
Max Brunsfeld
06c31a0daa Fix workspace tests after changing Item trait 2023-01-18 15:00:40 -08:00