mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 13:24:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
8217 commits 486 branches 806 tags 269 MiB
Commit graph

8217 commits

This branch
This branch
All branches
Author SHA1 Message Date
Antonio Scandurra
b2c733baab WIP: Allow specifying font features in the editor 
This just lays the foundation for threading through a `fonts::Features`
struct, but it's not used yet.
 2023-03-17 09:51:36 +01:00
Julia
3464961aa4
Merge pull request #2298 from zed-industries/fix-deadlock 
Fix deadlock while initializing JSON language server
 2023-03-16 17:41:54 -04:00
Julia
757f05042d Fix deadlock while initializing JSON language server 
As it turns out both parking-lot and std's `RwLock` disallows taking
multiple read locks on the same thread

Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-03-16 17:32:51 -04:00
Max Brunsfeld
9633732db7 collab 0.8.1 2023-03-16 14:21:35 -07:00
Max Brunsfeld
e34d80cff4
Merge pull request #2296 from zed-industries/tx-serialization-retry-delay 
Introduce a delay before retrying a transaction after a serialization failure
 2023-03-16 14:16:20 -07:00
Mikayla Maki
f2492666d4
Merge pull request #2297 from zed-industries/fix-random-panics 
WIP: Fix random panics
 2023-03-16 13:20:54 -07:00
Joseph T. Lyons
b3b20e4c46
Merge pull request #2295 from zed-industries/swap-atom-keybinding-for-CollapseSelectedEntry 
Swap atom keybinding for CollapseSelectedEntry
 2023-03-16 16:12:28 -04:00
Max Brunsfeld
b9bc66aa9b Log the delay when retrying a transaction 2023-03-16 13:07:38 -07:00
Max Brunsfeld
35280f7d80 Introduce a delay before retrying a transaction after a serialization failure 
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2023-03-16 13:07:38 -07:00
Mikayla Maki
6571555c4d Fix unwrap in git2 library causing panics in Zed 2023-03-16 13:06:23 -07:00
Joseph Lyons
a252c2a15b Swap atom keybinding for CollapseSelectedEntry 
This is a temporary solution to this bug:

https://linear.app/zed-industries/issue/Z-340/the-project-panel-shouldnt-be-listening-to-key-commands-when-editing-a
 2023-03-16 15:59:14 -04:00
Mikayla Maki
c3325430ca Fix divide by 0 in terminal 
Fix fail to remove contact in contact list
 2023-03-16 12:31:50 -07:00
Julia
1fbdea6a03
Merge pull request #2294 from zed-industries/remove-flag-old-npm-does-not-like 
Remove CLI flag which old versions of NPM do not like
 2023-03-16 13:11:45 -04:00
Julia
24dba2157f Remove CLI flag which old versions of NPM do not like 
TODO: Bundle or version restrict Node
 2023-03-16 13:07:09 -04:00
Antonio Scandurra
356b8c6980
Merge pull request #2293 from zed-industries/yaml-hover-bug 
Fix hover popover rendering lots of `&emsp` for YAML
 2023-03-16 16:15:14 +01:00
Antonio Scandurra
9498f02f2c Retrieve workspace configuration before initializing language server 2023-03-16 15:01:31 +01:00
Antonio Scandurra
f5a4c6a7c1 Provide editor.tabSize in workspace configuration for YAML 
This fixes a bug that caused the hover popover to display lots of
`&emsp;` occurrences.
 2023-03-16 10:46:55 +01:00
Antonio Scandurra
88e664bfd9 Add test for language registration and loading 2023-03-16 10:46:55 +01:00
Antonio Scandurra
8a685fa52a Use LanguageRegistry::workspace_configuration everywhere 2023-03-16 10:46:55 +01:00
Antonio Scandurra
4d52fc0d12 Remove available language only when it has loaded 
This also ensures that, if you load the same language more than once,
a future that resolves to the language (or an error) is returned at
all times. Previously, we would only return it the first time the language
was loaded.
 2023-03-16 10:46:55 +01:00
Antonio Scandurra
a8ac08f5bd Coalesce multiple RwLocks into one LanguageRegistryState struct 2023-03-16 10:46:55 +01:00
Antonio Scandurra
e30ea43a14 Include loaded languages when computing lsp workspace configuration 2023-03-16 10:46:55 +01:00
Antonio Scandurra
60d3fb48e2 Start computing workspace configuration more dynamically 2023-03-16 10:46:55 +01:00
Max Brunsfeld
ed9927b495
Merge pull request #2292 from zed-industries/restart-app 
Make 'restart' action more reliable
 2023-03-15 18:01:22 -07:00
Max Brunsfeld
d69868fa44 Make restart action more reliable 2023-03-15 17:44:50 -07:00
Julia
1ed3aedb16
Merge pull request #2291 from zed-industries/change-LSHandlerRank 
Change `LSHandlerRank` to `Alternate`
 2023-03-15 19:33:33 -04:00
Julia
905e2586e9 Change LSHandlerRank to Alternate 2023-03-15 19:18:39 -04:00
Max Brunsfeld
51eb53be0d
Merge pull request #2290 from zed-industries/close-remote-projects-when-leaving-call 
Close remote project windows when leaving a call
 2023-03-15 15:34:51 -07:00
Max Brunsfeld
b34477458e Close remote project windows when leaving a call 2023-03-15 15:24:58 -07:00
Nathan Sobo
385dfe1661
Merge pull request #2289 from zed-industries/sort-language-names-case-agnostically 
Sort language names case agnostically
 2023-03-14 20:00:52 -06:00
Joseph Lyons
3c7237e600 Sort language names case agnostically 2023-03-14 21:45:17 -04:00
Nathan Sobo
44a2506c40
Merge pull request #2288 from zed-industries/cut-off-collaborator-avatars 
Fix collaborator avatars being clipped and not centered
 2023-03-14 19:39:01 -06:00
Max Brunsfeld
c4e7611d04 Fix collaborator avatars being clipped and not centered 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Julia Risley <julia@zed.dev>
 2023-03-14 17:59:33 -07:00
Max Brunsfeld
828e9c1bb8 v0.79.x dev 2023-03-14 12:49:33 -07:00
Max Brunsfeld
2042188f5a
Merge pull request #2286 from zed-industries/discoverable-sign-in 
Make sign-in more discoverable
 2023-03-14 11:08:18 -07:00
Max Brunsfeld
0bbb4b22c6 Rename 'Authenticate' action to 'Sign In' 
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2023-03-14 11:01:23 -07:00
Max Brunsfeld
75901f1c33 Show sign in button directly in titlebar when not signed in 
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2023-03-14 10:59:39 -07:00
Antonio Scandurra
a6ebc9bd26 collab 0.8.0 2023-03-14 18:21:16 +01:00
Antonio Scandurra
9e3085b0c4
Merge pull request #2284 from zed-industries/automatic-user-creation 
Create user record automatically when someone logs in on the website
 2023-03-14 18:20:13 +01:00
Mikayla Maki
7af9dda869
Merge pull request #2285 from zed-industries/fix-failed-theme-setting 
Fix failed theme setting
 2023-03-14 10:10:39 -07:00
Mikayla Maki
2a5ac4f203
Merge pull request #2283 from zed-industries/fix-code-fold-indicator-scaling 
Change fold icon width to scale with font size
 2023-03-14 10:07:25 -07:00
Mikayla Maki
d8a3f16891 Refactor load into a seperate function 2023-03-14 09:56:27 -07:00
Mikayla Maki
99257a8213 Fix failed initialization of setting file in welcome experience 2023-03-14 09:46:28 -07:00
Antonio Scandurra
0f429243d7 Fix seed binary 2023-03-14 12:37:56 +01:00
Antonio Scandurra
cba41ef7c5 Create user record automatically when someone logs in on the website 
Now that we are moving out of the private alpha, we should let everyone
in when they try to log into zed.dev.
 2023-03-14 12:25:04 +01:00
Mikayla Maki
2ba38b2fca Change icon width to scale with font size 2023-03-14 00:42:15 -07:00
Petros Amoiridis
e7f78c4f74
Merge pull request #2281 from zed-industries/petros/z-298-the-terminal-button-is-not-shown-for 
Remove check for staffmode
 2023-03-14 00:12:13 -07:00
Petros Amoiridis
8980df1f5d
Remove feature flag 
It wasn't working in production anyway
 2023-03-14 09:05:04 +02:00
Nathan Sobo
2db8ac4a6f
Merge pull request #2280 from zed-industries/terms 
Add terms of use to DMG in the bundle script
 2023-03-13 16:08:07 -06:00
Nathan Sobo
818a514110 Add terms of use to DMG in the bundle script 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-03-13 15:47:59 -06:00