Max Brunsfeld
667f476f7f
Remove unused watched_json file
2023-05-17 16:02:08 -07:00
Max Brunsfeld
42eca3048f
Move font size adjustment code to the theme crate
2023-05-17 15:56:32 -07:00
Max Brunsfeld
258723566f
Rename settings::register_setting -> settings::register
2023-05-17 15:06:11 -07:00
Max Brunsfeld
2d5f03e148
Remove optional path argument when getting settings
2023-05-17 15:05:20 -07:00
Max Brunsfeld
1f0e79ee9d
Merge branch 'main' into setting-store
2023-05-17 14:56:35 -07:00
Max Brunsfeld
67a25126d4
Define theme/ui text style settings in theme crate
2023-05-17 14:44:59 -07:00
Mikayla Maki
5ef03992c5
Merge pull request #2483 from zed-industries/add-scrollbar-settings
...
Add scrollbars setting
2023-05-17 14:44:08 -07:00
Mikayla Maki
f4e99ecde4
Add never option to scrollbar settings
2023-05-17 14:19:35 -07:00
Mikayla Maki
88bc55ddf5
Add a dependency on rustfmt to the CI tests
2023-05-17 14:17:10 -07:00
Mikayla Maki
6cf439e734
fmt
2023-05-17 14:12:04 -07:00
Mikayla Maki
ae3394f4de
Add scrollbars setting
2023-05-17 14:09:26 -07:00
Mikayla Maki
1c9a7a7ad8
Merge pull request #2482 from zed-industries/add-hunks-to-scrollbar
...
Add diff hunks to the scroll bar
2023-05-17 11:51:01 -07:00
Mikayla Maki
aa89632286
Add diff hunks to the scroll bar
2023-05-17 11:40:30 -07:00
Max Brunsfeld
5c729c0e56
Define base keymap setting in welcome crate
2023-05-17 11:23:09 -07:00
Julia
7d11329e80
Merge pull request #2481 from zed-industries/update-font-kit
...
Update font-kit to resolve panics when loading malformed fonts
2023-05-17 13:57:39 -04:00
Julia
9e5983305b
Update font-kit to resolve panics when loading malformed fonts
2023-05-17 13:38:54 -04:00
Max Brunsfeld
89204e85c0
Merge branch 'main' into setting-store
2023-05-17 09:55:24 -07:00
Joseph Lyons
cb0c613da2
v0.88.x dev
2023-05-17 12:39:08 -04:00
Max Brunsfeld
d2ba18eae9
Customize language settings JSON schema in language crate
2023-05-17 09:26:36 -07:00
Max Brunsfeld
6403bb86e1
Define workspace settings in workspace crate
2023-05-16 20:25:18 -07:00
Max Brunsfeld
cbd4771f10
Define project settings in project crate
2023-05-16 17:45:04 -07:00
Max Brunsfeld
65e3713d4d
Define editor settings in editor crate
2023-05-16 17:30:29 -07:00
Max Brunsfeld
39618ae32d
Define language settings in the language crate
2023-05-16 17:29:53 -07:00
Julia
0a0769d4b9
Merge pull request #2479 from zed-industries/dont-use-svg-text-feature
...
Disable usvg's text feature flags to include less dependency code
2023-05-16 18:48:12 -04:00
Julia
d61b12a05b
Disable usvg's text feature flags to include less dependency code
2023-05-16 18:44:16 -04:00
Joseph T. Lyons
362f56d519
Merge pull request #2478 from zed-industries/Fix-telemetry-bugs
...
Send editor event when saving a new file
2023-05-16 18:18:07 -04:00
Joseph Lyons
c27859871f
Send editor event when saving a new file
2023-05-16 18:16:09 -04:00
Joseph T. Lyons
2e27f26339
Merge pull request #2475 from zed-industries/add-copilot-events
...
Add events for copilot suggestion accepting and discarding
2023-05-16 17:25:54 -04:00
Joseph Lyons
ffd503951b
Don't make events for every rejected suggestion
2023-05-16 17:19:05 -04:00
Kirill Bulatov
55950e52c2
Remove extra dbg!
2023-05-16 22:15:56 +03:00
Kirill Bulatov
685f3de796
Merge pull request #2462 from zed-industries/kb/go-to-line-column-numbers
...
Support go to file_query:row:column syntax in Find File, Go To Line dialogs and CLI
Deals slightly differently with zed-industries/community#557
Deals with zed-industries/community#1184
Fixes Go To Line not respecting column number when navigating to a place
Changes a line-row separator from , to : to show it more uniformly with other tools
Adjusts file finder dialogue to allow file_query:row:column syntax and opens the buffer at the lines given
Extends CLI with file_path:row_column syntax and opens these files similarly
2023-05-16 21:24:57 +03:00
Kirill Bulatov
5d4fc99750
Unit test file:row:column parsing
2023-05-16 21:07:48 +03:00
Kirill Bulatov
be7a58b508
Finalize the CLI opening part
2023-05-16 21:07:48 +03:00
Kirill Bulatov
0c6f103899
Return proper items on workspace restoration.
...
co-authored-by: Mikayla <mikayla@zed.dev>
2023-05-16 21:07:48 +03:00
Kirill Bulatov
106064c734
Do not break Zed & Zed CLI compatibility
2023-05-16 21:07:47 +03:00
Kirill Bulatov
628558aa39
Attempt to open rows and columns from CLI input
2023-05-16 21:07:26 +03:00
Kirill Bulatov
d719352152
Unify path:row:column parsing, use it in CLI
2023-05-16 21:07:26 +03:00
Kirill Bulatov
89fe5c6b09
Test caret selection in file finder
...
co-authored-by: Max <max@zed.dev>
2023-05-16 21:07:26 +03:00
Kirill Bulatov
477bc8da05
Make Go To Line to respect column numbers
2023-05-16 21:07:26 +03:00
Kirill Bulatov
e5bca9c871
Simplify file-row-column parsing
2023-05-16 21:07:26 +03:00
Kirill Bulatov
e9606982e6
Use ':' instead of ',' to separate files, rows and columns
2023-05-16 21:07:26 +03:00
Kirill Bulatov
0db7f4202a
Properly place the caret into the window of the file opened
...
co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-05-16 21:07:26 +03:00
Kirill Bulatov
54c1e77aff
Move the caret to the opened file
2023-05-16 21:07:26 +03:00
Kirill Bulatov
3eea2fb5f8
Parse file find queries with extra data
2023-05-16 21:07:26 +03:00
Kirill Bulatov
9de4a1b70f
Merge pull request #2476 from zed-industries/kb/faster-dev-cli
...
Allow CLI to start Zed from local sources
2023-05-16 21:06:40 +03:00
Joseph Lyons
afe75e8cbd
Send copilot events even if file_extension is not known at the time
2023-05-16 14:02:36 -04:00
Joseph Lyons
6976d60bfe
Rework code to contain submitting of copilot events within editor
2023-05-16 13:26:05 -04:00
Julia
16cab5d021
Merge pull request #2477 from zed-industries/fixup-some-more-worktree-bugs
...
Fixup some more worktree bugs
2023-05-16 13:13:22 -04:00
Julia
8b63caa0bd
Fix worktree refresh request causing gitignore to not update
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-05-16 13:01:29 -04:00
Julia
f50240181a
Avoid removing fake fs entry when rename fails later in the process
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-05-16 13:00:39 -04:00
