yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,009 Commits 5 Branches 0 Tags
90d94deaa69e510c3016e18734cfd33fa8b06d34
Commit Graph
25009 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Scandurra c2c68cbfe9 Start on implementing filtering support for Cursor::prev 2022-03-15 15:13:23 +01:00
Nathan Sobo 324fa9ef3f Merge pull request #624 from zed-industries/fix-broken-syntax-highlighting 
Make all `HighlightStyle` properties optional
 2022-03-15 06:05:35 -06:00
Antonio Scandurra 6013fb8d0f Make all HighlightStyle properties optional 
Previously, some of those properties such the font weight, style and color
would be mandatory: when the theme didn't specify them, Zed would use a default
value during deserialization. This meant that those default properties would
unconditionally override the base text style, causing a rendering bug when
combining syntax highlights with diagnostic styles.

This commit fixes that by making `HighlightStyle`s more additive: each property
can be set independently and only the properties that theme specifies get
overridden in the base text style.
 2022-03-15 10:39:43 +01:00
Max Brunsfeld 2b57a08580 Merge pull request #622 from zed-industries/guest-settings-file 
Open settings file in new window if current window isn't local
 2022-03-14 17:19:11 -07:00
Max BrunsfeldandKeith Simmons d5a8001155 Open settings file in new window if current window isn't local 
Co-Authored-By: Keith Simmons <keith@zed.dev>
 2022-03-14 17:12:07 -07:00
Max Brunsfeld 34d4176705 v0.20 2022-03-14 15:59:52 -07:00
Max Brunsfeld 7b41e4f33c Bump protocol version number 2022-03-14 15:57:39 -07:00
Max Brunsfeld 7e24f92975 Merge pull request #621 from zed-industries/autoclose-before-punctuation 
Autoclose brackets before a language-specific set of characters
 2022-03-14 15:33:47 -07:00
Max Brunsfeld 77bbf76cbc Autoclose brackets before a language-specific set of characters 
Fixes #588
 2022-03-14 15:17:40 -07:00
Max Brunsfeld cad1725c35 Respect theme's background color when rendering field editors 2022-03-14 14:24:51 -07:00
Max Brunsfeld 3d1d65be15 Merge pull request #619 from zed-industries/project-entry-ids 
Ensure that worktree entry ids are unique across the project
 2022-03-14 12:43:58 -07:00
Max Brunsfeld 76ef5941e5 Ensure that worktrees' entry ids are unique across the project 
Fixes #512
 2022-03-14 12:36:56 -07:00
Max Brunsfeld a8a9f0301b Merge pull request #618 from zed-industries/fix-block-layout-panic 
Fix layout panic on empty editors with blocks
 2022-03-14 12:25:05 -07:00
Max BrunsfeldandAntonio Scandurra f796fa171b Fix layout panic on empty editors with blocks 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-14 12:03:26 -07:00
Antonio Scandurra f1cc0cfbc5 Merge pull request #604 from zed-industries/set-selections-assertion 
Ensure there's at least one selection in `Editor::set_selections`
 2022-03-14 17:00:12 +01:00
Antonio Scandurra e1405addd2 Add more assertions to investigate #503 in the future 2022-03-14 16:53:39 +01:00
Antonio ScandurraandNathan Sobo 68191e9ba7 Ensure there's at least one selection in Editor::set_selections 
This commit introduces an assertion that will cause Zed to panic as
soon as the invariant gets violated. This will be useful to investigate
issue #503.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-14 16:17:14 +01:00
Antonio Scandurra 2c7fc57fac Merge pull request #603 from zed-industries/fix-presenter-panic 
Re-render workspace when removing an inactive pane
 2022-03-14 16:16:52 +01:00
Antonio ScandurraandNathan Sobo dae6a540b5 Hold strong handle in ChildView 
This eliminates a whole class of errors where the `ChildView` could
be referring to a view that doesn't exist anymore. That probably still
indicates that there's an underlying bug, but at least we won't panic.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-14 15:49:11 +01:00
Antonio ScandurraandNathan Sobo 88ac3564de Re-render workspace when removing an inactive pane 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-14 15:49:08 +01:00
Antonio Scandurra 6e1a0bee90 Merge pull request #602 from zed-industries/fix-atlas-panic 
Don't draw scene elements if their size is zero
 2022-03-14 15:38:42 +01:00
Antonio ScandurraandNathan Sobo 351477793b Don't draw scene elements if their size is zero 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-14 15:29:18 +01:00
Max Brunsfeld aec05dac87 Merge pull request #574 from zed-industries/settings-file 
Read settings from a JSON file
 2022-03-13 10:52:47 -07:00
Max Brunsfeld 836480a3e3 Merge branch 'main' into settings-file 2022-03-13 10:43:23 -07:00
Antonio Scandurra b348cc77ee Merge pull request #596 from zed-industries/fix/dropped-subscription-in-callback 
Fix Dropped Subscription in Handler Bug
 2022-03-12 19:14:38 +01:00
Antonio Scandurra cef4f51de2 Merge pull request #597 from zed-industries/select-on-rename 
When renaming, select new name and ghost old names
 2022-03-12 19:12:09 +01:00
Nathan SoboandAntonio Scandurra 7027cec1a9 Hide selections in original editor when renaming 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-12 10:45:11 -07:00
Nathan SoboandAntonio Scandurra a93bdc4538 🙊 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-12 10:44:11 -07:00
Nathan SoboandAntonio Scandurra 795b6344da Improve selection handling when pending rename is taken 
- Set selection to the intuitive cursor position when moving up rather than restoring the full selection of the rename editor.
- When cancelling, restore the original selection.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-12 10:30:57 -07:00
Nathan Sobo ea7f2b309d Merge remote-tracking branch 'origin/main' into select-on-rename 2022-03-12 10:10:23 -07:00
Nathan SoboandAntonio Scandurra f1881795f4 Refresh document highlight after rename, but not during 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-12 10:10:06 -07:00
Antonio Scandurra 682ac9d92c Merge pull request #589 from zed-industries/fold-map-test-failures 
Avoid re-using excerpt IDs in `MultiBuffer`
 2022-03-12 17:59:48 +01:00
Antonio Scandurra c3ac7e639b Account for all excerpts ever inserted when determining new excerpt ID 2022-03-12 17:50:09 +01:00
Antonio Scandurra 4ee1f2dfc4 Fix bug in selection position maintenance while renaming symbol 
We were resolving the selection with the wrong buffer, which now
causes a panic because we don't check the anchor's `buffer_id` anymore.
 2022-03-12 13:03:45 +01:00
Max Brunsfeld 839a7f8782 Start work on relaying settings to language servers 2022-03-11 17:36:27 -08:00
Max Brunsfeld d2a4b6888c Store settings as a global via a gpui app_state 2022-03-11 15:58:58 -08:00
Keith Simmons 3780ef3840 Format including missing formatting changes from previous PR 2022-03-11 15:38:01 -08:00
Keith Simmons 727188bbd2 Add some tests for global events and fix potential bug in subscriptions when subscription is dropped inside of it's own callback 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-03-11 15:34:04 -08:00
Nathan Sobo f2451665af On rename, replace background highlights with transparent text highlights 2022-03-11 15:54:17 -07:00
Nathan Sobo 2c6d8e9d65 Merge branch 'main' into select-on-rename 2022-03-11 15:30:07 -07:00
Max Brunsfeld 906e647702 Allow registering handlers for typed LSP requests 2022-03-11 13:19:10 -08:00
Max Brunsfeld 1f0b778e85 Add a snippet unit test with an escaped curly brace 2022-03-11 13:02:20 -08:00
Keith SimmonsandMax Brunsfeld 1c794540cb Merge pull request #576 from zed-industries/cursor-shape 
Add support for rendering the cursor as a Block and Underscore

Co-authored-by: Max Brunsfeld <max@zed.dev>
 2022-03-11 11:51:24 -08:00
Max Brunsfeld 62c3c6b290 Provide JSON language server with settings schema 2022-03-11 11:46:22 -08:00
Max Brunsfeld 780c0207c2 Add API for handling custom requests from the language server 2022-03-11 11:44:02 -08:00
Keith SimmonsandMax Brunsfeld c6af58835f Merge pull request #586 from zed-industries/global-events 
Global Events

Co-authored-by: Max Brunsfeld <nathan@zed.dev>
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-03-11 11:42:25 -08:00
Keith Simmons 15dea6ede0 Minor renames for clarity 2022-03-11 11:25:36 -08:00
Max Brunsfeld 7f3b4aa41e Merge branch 'main' into settings-file 2022-03-11 10:04:17 -08:00
Max Brunsfeld 4589f2a5ac Handle escaped characters in snippets 2022-03-11 09:57:43 -08:00
Nathan Sobo 88d05db936 Merge pull request #587 from zed-industries/lsp-progress 
Show language server progress in the status bar
 2022-03-11 10:57:24 -07:00