zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 10:57:22 +03:00
Code Issues Packages Projects Releases Wiki Activity
8,016 Commits 663 Branches 720 Tags 179 MiB
981b3a459f
Commit Graph

8016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia
981b3a459f Sort collaborators in titlebar alphabetically instead of by replica id 2023-03-08 21:38:30 -05:00
Max Brunsfeld
14497027d4 collab 0.6.2 2023-03-08 12:22:16 -08:00
Joseph Lyons
ae510c80db v0.77.x dev 2023-03-08 13:25:32 -05:00
Julia
4179ed66a6
Merge pull request #2251 from zed-industries/clear-follow-state-on-project-close 
Update db followers table when user leaves a project
 2023-03-07 19:09:09 -05:00
Julia
d173b1d412 Update db followers table when user leaves a project 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-03-07 18:56:03 -05:00
Julia
4f4af55329
Merge pull request #2248 from zed-industries/increase-reconnect-timeout 
Increase room reconnect timeout
 2023-03-07 12:30:20 -05:00
Julia
1e5aff9e51 Update collab integration test to new reconnect timeout 2023-03-07 12:23:18 -05:00
Nate Butler
ee154feda4
Merge pull request #2231 from zed-industries/nate/add-gruvbox 
Add Gruvbox Theme
 2023-03-06 18:49:26 -08:00
Max Brunsfeld
7163ba429b
Merge pull request #2250 from zed-industries/syntax-highlighting-tweaks 
Syntax highlighting tweaks
 2023-03-06 16:05:10 -08:00
Max Brunsfeld
c832e4406e Remove more colors from default syntax theme 
These default colors weren't consistent with the rest of the
syntax theme.
 2023-03-06 15:57:04 -08:00
Max Brunsfeld
515724821e Make racket highlight query more consistent with other langs 2023-03-06 15:56:20 -08:00
Max Brunsfeld
0867162c87 Fix lua highlight query 
* Fix regex predicate on constants.
* Remove 'function.call' highlight name. In other languages, we
differentiate calls from definitions with the 'function.definition'
highlight name. We actually don't use this in any themes though.
 2023-03-06 15:54:17 -08:00
Max Brunsfeld
aba2914a31 Fix constant highlighting in JS, TypeScript 
Previously, SCREAMING_SNAKE_CASE identifiers were highlighted as
types due to a mistake in the order of patterns in the highlight
queries.
 2023-03-06 15:38:12 -08:00
Max Brunsfeld
246a6adab7
Merge pull request #2239 from zed-industries/add-constructor-to-syntax-overrides 
Add constructor to syntax overrides
 2023-03-06 15:27:09 -08:00
Julia
620890c411
Merge pull request #2247 from zed-industries/tidy-up-sprite-cache 
Tidy up `SpriteCache::render_glyph`
 2023-03-06 11:29:51 -05:00
Antonio Scandurra
0ec984f924 Tidy up SpriteCache::render_glyph 2023-03-06 17:08:35 +01:00
Max Brunsfeld
01bbf20962
Merge pull request #2235 from zed-industries/no-panic-uploads-in-debug 
Don't upload panic files when running in a PTY
 2023-03-04 09:42:46 -08:00
Mikayla Maki
996294ba67
Merge pull request #2246 from zed-industries/fix-lsp-derive-error 
Make diagnostic processing order independent
 2023-03-04 02:25:47 -08:00
Mikayla Maki
ddf2f2cb0a Update test to use new group ids and new ordering of diagnostics. 2023-03-04 02:21:55 -08:00
Mikayla Maki
bd4d7551a5 Make diagnostic processing order independent 
Co-authored-by: max <max@zed.dev>
 2023-03-03 16:35:12 -08:00
Julia
5097cf5cb7
Merge pull request #2245 from zed-industries/confirm-restart-unsaved 
Confirm restart if prompt-quit is enabled or there are unsaved changes
 2023-03-03 16:10:40 -08:00
Julia
13212d274e Confirm restart if prompt-quit is enabled or there are unsaved changes 2023-03-03 16:06:03 -08:00
Julia
b9110c9268 Increase reconnect timeout 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-03-03 13:10:08 -08:00
Joseph T. Lyons
b9573872e1
Merge pull request #2243 from zed-industries/joseph/z-225-track-open-terminals 
Keep track of open terminals
 2023-03-03 12:55:28 -08:00
Joseph Lyons
3ec71a742d Keep track of open terminals 
Co-Authored-By: Petros Amoiridis <petros@hey.com>
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-03-03 12:50:08 -08:00
Mikayla Maki
50682dc685
Merge pull request #2233 from zed-industries/fix-code-folding-initialization 
Initialize code fold indicators on buffer startup
 2023-03-03 12:30:53 -08:00
Julia
2bca64f13b
Merge pull request #2242 from zed-industries/mouse-event-handlers-yes 
Fix surprising mouse propagation & avoid focusing tab while closing
 2023-03-03 12:29:50 -08:00
Mikayla Maki
606d683f29 Add interactable fold markers 
Change fold handlers to be driven by the fold map
Switch to a mouse region based implementation for click regions

Co-authored-by: Max <max@zed.dev>
 2023-03-03 12:26:36 -08:00
Julia
ff2e6bc3bd Fix surprising mouse propagation & avoid focusing tab while closing 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-03-03 12:22:58 -08:00
Joseph T. Lyons
218f2fd0fe
Merge pull request #2241 from zed-industries/joseph/z-223-add-terminal-button-to-status-bar 
Add a terminal button to status bar
 2023-03-03 12:15:59 -08:00
Max Brunsfeld
bb0257bbac
Merge branch 'main' into no-panic-uploads-in-debug 2023-03-03 12:02:44 -08:00
Joseph Lyons
929ebd7175 Add a terminal button to status bar 
Co-Authored-By: Petros Amoiridis <petros@hey.com>
 2023-03-03 12:00:41 -08:00
Max Brunsfeld
124aa74b03
Merge pull request #2234 from zed-industries/error-on-combined-injections-in-injections 
Fix range relativization when combined injections occur inside of other injections
 2023-03-03 11:58:13 -08:00
Petros Amoiridis
a2f75eb031
Merge pull request #2240 from zed-industries/petros/update-setup-instructions 
Add missing steps to the setup instructions
 2023-03-03 11:47:38 -08:00
Petros Amoiridis
6194c5df16
Add missing steps to the setup instructions 2023-03-03 11:36:26 -08:00
Max Brunsfeld
d14b684237
Merge pull request #2236 from zed-industries/avoid-clobbering-panic-file 
Avoid clobbering panic files when they happen at the same time
 2023-03-03 11:15:48 -08:00
Max Brunsfeld
7a8cba0544
Merge pull request #2227 from zed-industries/strip-trailing-whitespace 
Add settings to normalize whitespace on save
 2023-03-03 11:15:32 -08:00
Nate Butler
f1b5bf051a Fornat 2023-03-03 10:58:43 -08:00
Nate Butler
ad4201f768 Hack to fix syntax.constructor causing TS error 2023-03-03 10:58:25 -08:00
Nate Butler
75a9cfdabe Remove leftover log 2023-03-03 10:22:50 -08:00
Julia
3b6f66791f
Merge pull request #2238 from zed-industries/subpixel-variant-incorrectly-wrapping 
Avoid wrapping to the 0th glyph variant when the 4th should be used
 2023-03-03 13:13:34 -05:00
Julia
9311e01271 Avoid wrapping to the 0th glyph variant when the 4th should be used 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-03-03 10:04:44 -08:00
Nate Butler
6d068e926b
Merge pull request #2237 from zed-industries/revert-2232-tab-bar-background-focus-drag 
Revert "Avoid tab bar background activating an item at the end of a tab drag"
 2023-03-03 09:49:55 -08:00
Nate Butler
6854063d0b
Revert "Avoid tab bar background activating an item at the end of a tab drag" 2023-03-03 09:47:58 -08:00
Mikayla Maki
7ca0b38048 Made fold inline styles be driven by the fold map 
co-authored-by: Max <max@zed.dev>
 2023-03-03 09:32:58 -08:00
Max Brunsfeld
a598f0b13c Avoid clobbering panic files when they happen at the same time 
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2023-03-02 20:51:29 -08:00
Max Brunsfeld
eb6088701e Don't upload panic files when running in a PTY 2023-03-02 20:32:49 -08:00
Mikayla Maki
24ba47e75d
Merge pull request #2230 from zed-industries/fix-tab-x 
Fix tab bar x
 2023-03-02 19:48:08 -08:00
Mikayla Maki
3dd5b3f426 Attempted to initialize code-fold indicators, does not work 2023-03-02 19:42:59 -08:00
Mikayla Maki
9f86ca8574
Update tabBar.ts 2023-03-02 15:48:31 -08:00