zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity
8,350 Commits 667 Branches 720 Tags 178 MiB
b15632bd45
Commit Graph

8350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mikayla Maki
436c59d8ef Do UTF8-aware truncation on long item names in editor item 2023-03-18 15:44:23 -07:00
Mikayla Maki
5356ec4730
Merge pull request #2287 from zed-industries/fix-fold-range-finding 
Fix code folds with wraps
 2023-03-17 17:18:56 -07:00
Mikayla Maki
5a3d5dff42 Make folds tab aware 2023-03-17 17:14:40 -07:00
Mikayla Maki
c39b4ac229 Fix boundary condition in buffer_line_len when at the end of a file 
co-authored-by: max <max@zed.dev>
 2023-03-17 16:56:44 -07:00
Mikayla Maki
5a1bbb96ba
Merge pull request #2302 from zed-industries/fix-dispatch-path-panic 
Align dispatch_keystroke with other uses of ancestors iterator
 2023-03-17 16:34:00 -07:00
Mikayla Maki
b16e53a577
Merge pull request #2306 from zed-industries/fix-panic-with-multi-line-env 
Parse user enviroment using null terminators instead of newlines
 2023-03-17 16:18:05 -07:00
Mikayla Maki
109e17b4b2 Parse user enviroment using null terminators instead of newlines 2023-03-17 16:14:07 -07:00
Mikayla Maki
eba119b914 Fix fold tests with new representation 
Switch UI code from using display rows to using buffer rows
Make folds only show up on lines with line layouts

co-authored-by: Max <max@zed.dev>
 2023-03-17 16:00:22 -07:00
Max Brunsfeld
fc828971f1 collab 0.8.2 2023-03-17 15:00:31 -07:00
Max Brunsfeld
691383ca68
Merge pull request #2305 from zed-industries/faster-access-token-validation 
Faster access token validation
 2023-03-17 14:56:30 -07:00
Max Brunsfeld
b8e8363a72 Add logging and metric for time spent hashing auth tokens 
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
 2023-03-17 14:32:13 -07:00
Max Brunsfeld
623133ffa0 Reduce scrypt work factor to speed up websocket authentication 
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
 2023-03-17 14:31:39 -07:00
Max Brunsfeld
9633a4b527 Return a 400, not a 500 when token validation fails 
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2023-03-17 13:56:12 -07:00
Mikayla Maki
459e320d79
Merge pull request #2303 from zed-industries/add-unknown-language 
Add an 'Unknown' state for a mouse-driven way to select a file language
 2023-03-17 11:41:40 -07:00
Mikayla Maki
04f52c3d50 Show active buffer language in all cases 2023-03-17 11:34:17 -07:00
Max Brunsfeld
26dae3c04e Lookup access tokens by id when authenticating a connection 
This avoids the cost of hashing an access token multiple times,
to compare it to all known access tokens for a given user.

Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2023-03-17 11:13:50 -07:00
Mikayla Maki
578c69476d Align dispatch_keystroke with other uses of ancestors iterator and filter out non-existant views 2023-03-17 11:07:10 -07:00
Mikayla Maki
1125a168f4
Merge pull request #2301 from zed-industries/fix-file-finder-panic 
Never call set_selected_index with an invalid index
 2023-03-17 10:18:27 -07:00
Antonio Scandurra
d8758658e3
Merge pull request #2300 from zed-industries/ligatures 
Allow customization of OpenType features
 2023-03-17 17:34:17 +01:00
Mikayla Maki
f7f9b8cffe Never call set_selected_index with an invalid index 2023-03-17 09:32:01 -07:00
Antonio Scandurra
1af8f4be19 Deserialize Theme directly into the heap to avoid stack overflow 
Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-03-17 15:58:52 +01:00
Antonio Scandurra
786d95b8c8 Avoid storing fonts::Features in TextStyle 
We were only using it for debugging purposes and that was causing
the `Theme` struct to become too big to hold on the stack.

Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-03-17 15:12:02 +01:00
Antonio Scandurra
4d915f4530 Don't make fonts::Features Copy 2023-03-17 13:54:56 +01:00
Antonio Scandurra
989c9f0196 Mention calt: false in the default settings to disable ligatures 2023-03-17 13:48:34 +01:00
Antonio Scandurra
f9d793cb4a Honor more OpenType features 2023-03-17 13:40:00 +01:00
Petros Amoiridis
3bddf01962
Run prettier to format things 2023-03-17 14:05:49 +02:00
Petros Amoiridis
86ed5b8b83
Position contacts and user menus 
Using the new approach for consistency
 2023-03-17 14:05:46 +02:00
Antonio Scandurra
9181ac9872 Honor the calt font feature 2023-03-17 12:01:27 +01:00
Antonio Scandurra
76167ca65c Allow setting font features on TextStyle 2023-03-17 11:49:22 +01:00
Antonio Scandurra
7d13b00914 Allow setting font features on the terminal as well 2023-03-17 11:42:24 +01:00
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
Joseph Lyons
6eb65eb989 Correct verb tense in default settings 2023-03-17 00:51:03 -04: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
Mikayla Maki
c427a8c584 WIP - DEBUGGING 2023-03-16 08:41:19 -07: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