oak-team/oak-gpui
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,257 Commits 1 Branch 0 Tags
fbf7cdf4f2b6845f8ef20963e9874026f86ca249
Commit Graph
3257 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Scandurra fbf7cdf4f2 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 72692f1700 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 3a439f141d 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 d193c9a358 v0.20 2022-03-14 15:59:52 -07:00
Max Brunsfeld 38dcd522de Bump protocol version number 2022-03-14 15:57:39 -07:00
Max Brunsfeld e7835caac4 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 325e6c31ae Autoclose brackets before a language-specific set of characters 
Fixes #588
 2022-03-14 15:17:40 -07:00
Max Brunsfeld 2c25e619b4 Respect theme's background color when rendering field editors 2022-03-14 14:24:51 -07:00
Max Brunsfeld 7bdb91f4ec 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 5822b47b74 Ensure that worktrees' entry ids are unique across the project 
Fixes #512
 2022-03-14 12:36:56 -07:00
Max Brunsfeld 91b33e4432 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 e392368d89 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 40a4c18ee4 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 21eebede37 Add more assertions to investigate #503 in the future 2022-03-14 16:53:39 +01:00
Antonio ScandurraandNathan Sobo a3ea6a34d9 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 be3bfb2699 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 5d5f89231b 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 bae44d8132 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 e62781a57b 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 47b40e3839 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 e7d0bf1c36 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 b33a049958 Merge branch 'main' into settings-file 2022-03-13 10:43:23 -07:00
Antonio Scandurra 1e9b6b050d 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 2cb4d0a35e 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 992fc07133 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 308cead8a8 🙊 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-12 10:44:11 -07:00
Nathan SoboandAntonio Scandurra 9f629fa307 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 33bcd6d904 Merge remote-tracking branch 'origin/main' into select-on-rename 2022-03-12 10:10:23 -07:00
Nathan SoboandAntonio Scandurra 4f086b8d7a 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 965f82ec31 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 dd1711d53f Account for all excerpts ever inserted when determining new excerpt ID 2022-03-12 17:50:09 +01:00
Antonio Scandurra cd4a9f3178 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 20fed599b2 Start work on relaying settings to language servers 2022-03-11 17:36:27 -08:00
Max Brunsfeld 48848de82c Store settings as a global via a gpui app_state 2022-03-11 15:58:58 -08:00
Keith Simmons c50be72214 Format including missing formatting changes from previous PR 2022-03-11 15:38:01 -08:00
Keith Simmons 16afb3d5b1 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 c35a96c425 On rename, replace background highlights with transparent text highlights 2022-03-11 15:54:17 -07:00
Nathan Sobo 951fd1ab36 Merge branch 'main' into select-on-rename 2022-03-11 15:30:07 -07:00
Max Brunsfeld 2103eec463 Allow registering handlers for typed LSP requests 2022-03-11 13:19:10 -08:00
Max Brunsfeld a137abe2de Add a snippet unit test with an escaped curly brace 2022-03-11 13:02:20 -08:00
Keith SimmonsandMax Brunsfeld 87b1cfe34f 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 7a68b2d371 Provide JSON language server with settings schema 2022-03-11 11:46:22 -08:00
Max Brunsfeld 862ec01e7d Add API for handling custom requests from the language server 2022-03-11 11:44:02 -08:00
Keith SimmonsandMax Brunsfeld 17ac240511 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 144591d639 Minor renames for clarity 2022-03-11 11:25:36 -08:00
Max Brunsfeld 6091caee8e Merge branch 'main' into settings-file 2022-03-11 10:04:17 -08:00
Max Brunsfeld 022bb28a59 Handle escaped characters in snippets 2022-03-11 09:57:43 -08:00
Nathan Sobo fd36b25db1 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
Antonio Scandurra 71aa5e5360 💄 2022-03-11 17:13:28 +01:00
Antonio Scandurra a74b602f18 Assume the anchor is valid if we can find an excerpt that contains it 2022-03-11 17:08:12 +01:00