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
21,131 Commits 667 Branches 720 Tags 178 MiB
86456ce379
Commit Graph

245 Commits

Author SHA1 Message Date
Max Brunsfeld
8eb1312deb Add copilot menu item for enabling paths by glob 2023-05-03 10:14:01 -07:00
Max Brunsfeld
c485fc86a2 Add copilot.disabled_globs setting 2023-05-01 13:45:47 -07:00
Max Brunsfeld
ebbe52e6b0 🎨 Specify more dependencies at the workspace level 2023-04-24 17:41:55 -07:00
Max Brunsfeld
abdccf7393 Use a workspace dependency for the futures crate 2023-04-24 09:43:31 -07:00
Nathan Sobo
fe492eacbf Refine naming of element-related types and traits 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-04-21 13:06:37 -06:00
Antonio Scandurra
03619dfa55 Rename Drawable::boxed to into_element and make containers generic 
Multi-element are now generic over any drawable child, which can be converted
into an element.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-04-21 12:43:19 -06:00
Antonio Scandurra
c76b9794e4 Merge branch 'main' into window_context_2 2023-04-21 10:58:08 +02:00
Mikayla Maki
1fa52adabd Fix warning 2023-04-20 17:34:47 -07:00
Mikayla Maki
c72b70d4ae Fixed silly custom settings parsing 2023-04-20 17:33:06 -07:00
Mikayla Maki
dfdc826015 Create a new setting to adjust the line height in the terminal 2023-04-20 17:24:27 -07:00
Antonio Scandurra
c52b6328b7 Merge branch 'main' into window_context_2 2023-04-20 16:01:47 +02:00
Antonio Scandurra
1fd07b6fcf Clarify copilot settings 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-04-19 20:07:05 +02:00
Antonio Scandurra
9ef79735dc Move more window-specific methods from AppContext to WindowContext 2023-04-14 10:29:35 +02:00
Nathan Sobo
de9bf6dfbd Merge MutableAppContext into AppContext 
There may have been a good reason for the difference at some point, or I was
still learning Rust. But now it's just &mut AppContext vs &AppContext.
 2023-04-06 15:49:03 -06:00
Mikayla Maki
47de4dcd32 removed copilot from generated schema and command palette 2023-04-03 21:38:26 -07:00
Mikayla Maki
c1445fe015 Add support for the langauge_overrides alias in the settings file updating code 2023-03-31 11:20:46 -07:00
Mikayla Maki
b7461c32dd Improve settings writing for more cases 2023-03-30 10:40:53 -07:00
Mikayla Maki
5b3b74345d Remove some strays 2023-03-29 22:22:02 -07:00
Mikayla Maki
a8033b266d Fix bug with enable setting, clean up sign in UIs 2023-03-29 21:51:07 -07:00
Mikayla Maki
cc7c5b416c Add status bar icon reflecting copilot state to Zed status bar 2023-03-29 21:31:33 -07:00
Mikayla Maki
ebd06b43f5 Add copilot settings 
Add copilot pause / resume
Add copilot statusbar item stub
 2023-03-29 16:40:52 -07:00
Mikayla Maki
d60ef03d66 WIP Add copilot disabled setting 2023-03-28 20:52:50 -07:00
Antonio Scandurra
5471217089 Use the same serde version across the entire workspace 2023-03-28 09:42:00 -07:00
Joseph T. Lyons
e10338ed17
Merge pull request #2313 from zed-industries/unify-spelling-of-key-binding-to-be-two-words 
Unify spelling of `key binding` to be two words
 2023-03-27 15:58:12 -04:00
Joseph Lyons
9d88cd8842 Unify spelling of key binding to be two words 2023-03-22 13:34:12 -04:00
Max Brunsfeld
cbeb6e692d Move postage crate version specification to workspace Cargo.toml 2023-03-21 11:26:13 -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
4d915f4530 Don't make fonts::Features Copy 2023-03-17 13:54:56 +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
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
Max Brunsfeld
1096720b41
Merge pull request #2244 from zed-industries/less-surprising-defaults 
Clean up some default settings
 2023-03-13 11:54:46 -07:00
Julia
5c7c4dd4dd Clean up some default settings 2023-03-13 14:54:28 -04:00
Joseph Lyons
c8696149b8 Add TextMate keymap 2023-03-13 08:27:04 -04:00
Mikayla Maki
350ddf2025 Add keymap picker UI 
Co-authored-by: Max <max@zed.dev>
 2023-03-07 17:29:08 -08:00
Mikayla Maki
ab4b3293d1 Fix project panel button and style it 
Co-authored-by: max <max@zed.dev>
 2023-03-07 14:49:13 -08:00
Mikayla Maki
5892f16602 Add test for base keymap setting 2023-03-07 14:02:42 -08:00
Mikayla Maki
19fc143209 Add base keymap setting 
Format all files

Co-Authored-by: Nathan <nathan@zed.dev>
 2023-03-07 12:19:51 -08:00
Mikayla Maki
86e2101592 Added the ability to nested values to the settings file, while preserving user formatting 
co-authored-by: max <max@zed.dev>
 2023-03-06 14:25:10 -08:00
Mikayla Maki
416c793076 Start on welcome experience settings 2023-03-06 14:25:10 -08:00
Max Brunsfeld
a890b8f3b7 Add a setting for ensuring a single final newline on save 2023-02-28 21:52:00 -08:00
Max Brunsfeld
ff85bc6d42 Add setting for removing trailing whitespace on save 2023-02-28 21:52:00 -08:00
Mikayla Maki
c2de0f6b5e Add auto update setting 2023-02-14 18:05:42 -08:00
Kay Simmons
460dc62888 start adding setting for the screen sharing status indicator 2023-01-31 15:17:16 -08:00
Mikayla Maki
ea39983f78 Removed old experiments settings and staff mode flag, added new StaffMode global that is set based on the webserver's staff bit 2023-01-27 15:43:12 -08:00
Kay Simmons
a581d0c5b8 wip 2023-01-25 11:32:19 -08:00
Kay Simmons
15799f7af6 wip 2023-01-25 11:32:19 -08:00
Mikayla Maki
d060114f00 Added complete scripts for generating third party license files 2023-01-23 12:47:12 -08:00
Max Brunsfeld
2f42af2ac3 Add confirm_quit setting 2023-01-20 13:02:38 -08:00
Mikayla Maki
a3da41bfad Fix test failures due to dependency on Settings global in client for telemetry 
co-authored-by: kay <kay@zed.dev>
 2023-01-10 16:39:03 -08:00
Mikayla Maki
37a4de1a84 Add opt-out for metric reporting 
co-authored-by: kay <kay@zed.dev>
 2023-01-10 15:49:54 -08:00
Mikayla Maki
866f0e1344 Add the ability to opt-out of panic reporting 
Co-authored-by: Kay <kay@zed.dev>
 2023-01-10 15:07:01 -08:00
Kay Simmons
73e7967a12 working f and t bindings 2023-01-06 14:24:20 -08:00
Mikayla Maki
c42da5c9b9 WIP 2022-12-08 20:21:00 -08:00
Mikayla Maki
2733f91d8c Fix bugs resulting from refactoring the terminal into project and workspace halves 2022-12-08 20:21:00 -08:00
Mikayla Maki
4798161118 Distributed database pattern built. 
Co-Authored-By: kay@zed.dev
 2022-12-03 16:06:01 -08:00
Kay Simmons
bb80cee19e
Merge pull request #1814 from zed-industries/golden-ratio 
Active Pane Magnification
 2022-11-18 13:14:03 -08:00
Joseph T Lyons
93e1e30323 Add release channel information to telemetry events 2022-10-27 15:53:14 -04:00
Max Brunsfeld
a4a8596a29 Store current release channel name in a file in the zed crate 2022-10-26 16:19:19 -07:00
K Simmons
e2ba8d6df7 Add active pane magnification setting which grows the active pane making it easier to see it's contents 2022-10-25 17:24:19 -07:00
Nate Butler
bd8509990a Rename One theme and update Zed default theme 2022-10-20 15:31:17 -04:00
K Simmons
54cf6fa838 Pull blink functionality out of editor and into blink manager. Make blink manager subscribe to settings changes in order to start blinking properly when it is re-enabled. 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-17 16:20:51 -07:00
K Simmons
40c3e925ad Add cursor blink setting and replicate cursor shape to remote collaborators 2022-10-17 16:20:47 -07:00
Joseph T Lyons
0717c168d9 Derive Serialize on HourFormat 2022-10-16 12:51:48 -04:00
Joseph T Lyons
6d020a3ee9 Do not derive Default on JournalSettings 2022-10-16 12:51:34 -04:00
Joseph T Lyons
9a381c1803 Merge branch 'main' into settings-for-journal 2022-10-16 12:42:18 -04:00
Mikayla Maki
51c0a140c6
Merge pull request #1743 from zed-industries/new-settings-writing 
Improved settings writing to be strongly typed and based on settings file content diffs
 2022-10-12 17:18:48 -07:00
Mikayla Maki
e73270085b Fixed settings 2022-10-12 17:11:47 -07:00
Mikayla Maki
dd1320e6d1 Improved settings writing to be strongly typed and based on settings file content diffs 
Co-Authored-By: kay@zed.dev
 2022-10-12 17:05:23 -07:00
Max Brunsfeld
6cdf4e98fc Re-export basic text types from text and language crates 
Also avoid production dependencies on fs and rope in collab
 2022-10-12 15:48:19 -07:00
Mikayla Maki
e7b6d1befe Added theme and dock anchor saving :D 2022-10-11 19:18:29 -07:00
Mikayla Maki
5487f99ac7 Moved settings_file.rs into settings crate. Should be ready to start now :D 2022-10-11 16:03:38 -07:00
Mikayla Maki
cc8ae45012 Added theme writing code, really bad race condition 2022-10-11 12:48:30 -07:00
Julia
2f96a09c46 Don't select on copy by default in the terminal 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-10 13:48:56 -04:00
Mikayla Maki
499e95d16a Removed debugs, simplified settings 2022-10-03 17:43:05 -07:00
Julia
6f6d72890a Once again respect user settings for git gutter 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-03 15:42:30 -04:00
Julia
e6487de069 Rename head text to indicate that it's not always going to be from head 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-03 15:11:06 -04:00
Julia
a5c2f22bf7 Move git gutter settings out of editor settings 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-03 14:53:33 -04:00
Joseph T Lyons
3c62de34f7 Change journal location setting name to "path" and default to ~ 2022-09-29 17:12:57 -04:00
Julia
632f47930f Utilize initial file contents as head text by default 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-29 13:16:02 -04:00
Julia
a679557e40 Avoid racing git diffs & allow for "as fast as possible" diff updating 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-29 13:16:02 -04:00
Joseph T Lyons
773423fcf4 Initial work to add settings to journal feature 2022-09-28 16:25:37 -04:00
Julia
879a0d8b12 Backward compat format settings 2022-09-26 11:41:31 -04:00
Julia
f3395cf4fd Add editor action to manually invoke buffer format 2022-09-22 18:21:05 -04:00
Kay Simmons
29f46539f0
Merge pull request #1614 from zed-industries/dock 
Dock
 2022-09-14 12:40:59 -07:00
Mikayla Maki
7c6769b392 WIP began changing key modifiers 2022-09-12 22:40:35 -07:00
K Simmons
df59b28aaf Extract panel resize code from sidebar into Resizable element 
Make resizable work in vertical axis
Make dock resizable
Have dock preserve size based on Anchor position
Make pane buttons work more correctly in pathological cases
Sync status bar dock button with dock visibility/anchor position

Co-Authored-By Mikayla Maki <mikayla@zed.dev>
 2022-09-12 18:32:15 -07:00
K Simmons
69ecbb644d DOCK WORKING! 
Update editor element to use mouse regions instead of dispatch event for mouse events
Fix bug in presenter where mouse region handlers were stored on click and called instead of more up to date handlers from subsequent renders
Changed MouseRegion to require discriminants in all cases
Add scroll wheel event to MouseRegion
Polished a bunch of dock inconsistencies

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-11 15:32:20 -07:00
Mikayla Maki
7571899f08 Added internal keymaps as well, just for the hell of it 2022-09-08 16:37:04 -07:00
Mikayla Maki
ec5d8f8c7c Removed github username check, added settings file 2022-09-08 16:27:46 -07:00
Mikayla Maki
2b4db9b16e Added experimental themes flag 2022-09-08 15:47:27 -07:00
Mikayla Maki
a1889ad236 Added internal flag that checks the last logged in user 2022-09-08 13:31:04 -07:00
Mikayla Maki
5a0f106005 restore modal terminal 2022-08-31 13:06:15 -07:00
Mikayla Maki
0a40cc0370 Added experimental keymaps support 2022-08-22 14:49:01 -07:00
Mikayla Maki
b6785c5624
Revert "Basic feature flag implementation" 2022-08-22 13:54:18 -07:00
Mikayla Maki
0450380e97 Fixed name issue 2022-08-22 13:38:23 -07:00
Mikayla Maki
7efeb0662a Changed name to experiments 2022-08-22 13:27:36 -07:00
Mikayla Maki
9b6116e1e2 Basic feature flag implementation 2022-08-22 13:11:23 -07:00
Mikayla Maki
cfbda00cc4 Finished mouse compatability 2022-08-19 13:54:25 -07:00
Mikayla Maki
6652d41864 Fixed cursor blinking, added other cursor shape rendering 2022-08-18 11:28:18 -07:00
Mikayla Maki
acce0042f9 Fixed blink problems 2022-08-17 14:41:28 -07:00
Mikayla Maki
bba51c3ae6 Added cursor blink and settings 2022-08-15 18:05:07 -07:00
ForLoveOfCats
8ba2f77148 One big cleanup pass of clippy lints 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2022-08-10 16:51:01 -07:00
ForLoveOfCats
c21314bfbd Add ability to provide custom LSP server initialization options 2022-08-04 14:47:06 -04:00
Mikayla Maki
40d30a898b Rebasing continues 2022-07-20 10:04:08 -07:00
Mikayla Maki
dc120c1e05 Added settings for common terminal configurations 2022-07-15 18:27:10 -07:00
Keith Simmons
ed1370eafc
Merge pull request #1330 from zed-industries/completions-setting 
Completions Menu Setting
 2022-07-13 15:35:10 -07:00
Max Brunsfeld
4775d839d7 Fix incomplete language names list being used for JSON schema 
For now, since initializing the languages themselves is still async,
create a parallel duplicated code path that is synchronous, and
just provided the language names.
 2022-07-13 15:04:28 -07:00
K Simmons
e7b1060bca fix merge error to use new default settings flow 2022-07-13 14:29:47 -07:00
Keith Simmons
7f3018c3f6 add show_completions_on_input setting to disable popping the completions menu automatically 2022-07-13 14:23:49 -07:00
Max Brunsfeld
277f561b8c Simplify setting merging, fix ignored hard_tabs setting 2022-07-12 17:43:00 -07:00
Max Brunsfeld
0ebf417c2e Pre-populate settings.json when initializing it from Zed 2022-07-12 14:19:36 -07:00
Max Brunsfeld
8464c03e65 Adjust settings schema generation to reflect rename 
Also, simplify that code.
 2022-07-12 12:19:01 -07:00
Max Brunsfeld
c02f4ea8dc Rename LanguageSettings -> EditorSettings 2022-07-12 11:42:43 -07:00
Max Brunsfeld
ec8a493700 Move all default settings from source code into the JSON file 2022-07-12 11:35:19 -07:00
Max Brunsfeld
e51dc25e1d Start moving default settings into a JSON file 
Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2022-07-12 11:00:02 -07:00
Antonio Scandurra
c6254247c3 Allow providing an external format in format_on_save setting 2022-07-07 11:04:03 +02:00
Antonio Scandurra
885172f4dd Honor Autosave setting in Editor 2022-07-05 17:51:01 +02:00
Antonio Scandurra
4b533c339d Introduce a new, language-overridable Autosave setting 2022-07-05 09:25:22 +02:00
Keith Simmons
1eb8351440 add hover popover setting 2022-06-27 16:21:22 -07:00
Keith Simmons
755636d10e Use NonZeroU32 to ensure settings tabsize cannot be zero 2022-06-23 12:55:38 -07:00
Antonio Scandurra
2cb8a3ccfb Don't override top-level settings with language defaults 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-06-23 16:40:57 +02:00
Max Brunsfeld
87ba68e3ea
Merge pull request #1155 from zed-industries/golang 
Add Go support
 2022-06-09 14:18:37 -07:00
Antonio Scandurra
55cc8631cc Introduce a new language-overrideable enable_language_server setting 2022-06-09 10:07:31 +02:00
Max Brunsfeld
f62fd3cddd Add support for hard tabs 
* Add a `hard_tabs` setting that causes indentation to be performed
  using a tab instead of multiple spaces.
* Change Buffer's indentation-related APIs to return an `IndentSize`
  struct with a length and a kind, instead of just a single u32.
* Use hard tabs by default in Go.
 2022-06-08 18:30:10 -07:00
Max Brunsfeld
ed14fd6e0d Add setting to make projects online/offline by default 2022-06-03 17:01:15 -07:00
Antonio Scandurra
339069b1d3 Cap MessageStream buffer size to 1MB 
We temporarily let it grow when the message size exceed the limit,
but restore the buffer's capacity shortly after. This ensures that,
for each connection in its entire lifetime, we only ever use 1MB.
 2022-05-31 11:16:32 +02:00
Max Brunsfeld
e1a05d451f Add "Reset Zoom" action and application menu item 2022-05-27 13:06:12 -07:00
Antonio Scandurra
3ac6fc89c1 Pretty-print JSON of server snapshot 2022-05-26 09:34:39 +02:00
Max Brunsfeld
0becbe482a Distinguish between singleton and non-singleton workspace items 
* Prompt to save singleton items before non-singleton ones
* Don't prompt to save multi-buffers if they contain excerpts to items that are open elsewhere and not being closed.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-23 16:03:00 -07:00
Max Brunsfeld
fa358c01cf Add format_on_save setting 
This lets you turn of formatting on save for specific languages.
 2022-04-28 14:31:06 -07:00
Max Brunsfeld
066b4faf61 Restructure KeyMap file, make it easy to edit in Zed 
Add a JSON schema for this file so that autocomplete can be used for the actions.
 2022-04-21 13:35:10 -07:00
Max Brunsfeld
3a28f09979 Allow comments in setting and keymap JSON files 2022-04-21 11:58:18 -07:00
Max Brunsfeld
add0dad6d7 Use '*' to represent the default context in keymap files 
Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-11 17:17:03 -07:00
Max Brunsfeld
ee3eb9658f Use the word 'keymap' more consistently 
Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-11 17:02:16 -07:00
Max Brunsfeld
be11f63f1e Watch ~/.zed/bindings.json file for custom key bindings 
Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-11 16:50:44 -07:00
Max Brunsfeld
92a5c30389 Merge branch 'main' into load-keymaps 2022-04-11 15:55:10 -07:00
Max Brunsfeld
c065f283aa Move assets to their own crate, load keymaps in vim tests 
Also, move assets folder to the top-level.

Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-11 15:54:52 -07:00
Max Brunsfeld
e0096ec1eb Move keymap_file module into settings crate 
Co-authored-by: Keith Simmons <keith@zed.dev
 2022-04-11 15:22:18 -07:00
Nathan Sobo
56fcffb634 Remove unused imports 2022-04-09 07:55:23 -06:00
Keith Simmons
3e40b5bead dynamically inject theme names and language properties into schema 2022-04-07 18:15:02 -07:00
Keith Simmons
035cd37aa8 Add explicit types for LanguageOverrides and Themes to SettingsFileContent in order to improve completions in zed settings file 2022-04-07 16:00:51 -07:00
Keith Simmons
1812480cbb Tab size is pulled properly from settings instead of hardcoded 2022-04-06 10:23:37 -07:00
Max Brunsfeld
866ffdd4ae Move Settings to its own crate 
Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-06 10:23:33 -07:00