yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,175 Commits 5 Branches 0 Tags
fbda4f862a2fb03b854636b17bd04be3db3d94de
Commit Graph
31406 Commits
Author SHA1 Message Date
Conrad Irwin 6060e59cf7 Implement FileFinder 2023-11-14 13:34:14 -07:00
Mikayla Maki 0ba7639043 Fix some small quit and recursion bugs (#3323) 
Release Notes:

- N/A
 2023-11-14 12:32:41 -08:00
Mikayla 92c4cb8e03 Remove unnescessary unimplemented 2023-11-14 12:12:02 -08:00
Julia 94e9acda9a Avoid user NPM config/cache & put NodeRuntime installation behind a lock 2023-11-14 14:49:31 -05:00
Mikayla 787221d9b8 Fix several shutdown related bugs 2023-11-14 11:42:58 -08:00
Conrad Irwin 8f1a3dd175 Merge branch 'main' into element-types 2023-11-14 12:10:26 -07:00
Marshall Bowers 74e145ffbe Extend Label & Tooltip (#3322) 
This PR extends the `Label` component with additional functionality,
partially for use in the `TextTooltip` component.

- [x] `Label` should take a `size` (`Default` & `Small` for now)
  - These should use `text_ui` and `text_ui_sm`
- [x] Fold `LabelColor` and `IconColor` into one enum
  - `TextColor`
- [x] `TextTooltip`'s keybinding field should take whatever we use for
keybindings instead of a string, and render the keybinding component
- [x] `TextTooltip` should use small `Label`s

Release Notes:

- N/A
 2023-11-14 13:56:05 -05:00
Marshall Bowers beae52db00 Combine LabelColor and IconColor into TextColor 2023-11-14 13:48:01 -05:00
Conrad Irwin 56c202d66a Merge branch 'main' into element-types 2023-11-14 11:45:19 -07:00
Marshall Bowers 48da4158b1 Add LabelSize 2023-11-14 13:43:37 -05:00
Antonio Scandurra 2ece718d63 WIP 2023-11-14 19:42:07 +01:00
Marshall Bowers adf5a403db Rename keybinding method on PaletteItem to key_binding 2023-11-14 13:37:21 -05:00
Marshall Bowers 5b7f60253c Pass KeyBindings to TextTooltips 2023-11-14 13:36:03 -05:00
Mikayla d9bb871ff2 Restore quit action 2023-11-14 10:31:55 -08:00
Conrad Irwin 1a79b76549 Fix panicking unwrap() 2023-11-14 11:27:52 -07:00
Marshall Bowers eb294a585a Merge branch 'main' into extend-label-and-tooltip 2023-11-14 13:14:10 -05:00
Mikayla e34d1ac975 Merge branch 'main' into core-actions 2023-11-14 10:11:39 -08:00
Conrad Irwin 344f78a171 TEMP 2023-11-14 11:03:55 -07:00
Nathan Sobo 5fcd29f74d WIP 2023-11-14 11:00:52 -07:00
Nate Butler bdbb7bcb3b Extend tooltip to take meta + kb 2023-11-14 12:59:53 -05:00
Max Brunsfeld 8a5d22df92 Start work on creating gpui2 version of project panel (#3299) 
I'm gonna land what I have, even though some features aren't ported yet,
since we're working on all of this code so actively.

* [x] get the basic structure compiling
* [x] get the panel laying out correctly
* [ ] rename / new file editor
* [ ] enable the tests
* [ ] drag and drop
* [ ] context menu
 2023-11-14 09:56:46 -08:00
Antonio Scandurra 432282bcf9 Wire up rename editor 2023-11-14 18:50:02 +01:00
Max Brunsfeld ccfc61122f Fix warnings 2023-11-14 09:47:48 -08:00
Max Brunsfeld 9722d725c8 Merge branch 'main' into project-panel2 2023-11-14 09:33:48 -08:00
Piotr OsiewiczandNate c485d3fc01 Finish up touchups for search UI. 
Co-authored-by: Nate <nate@zed.dev>
 2023-11-14 18:18:52 +01:00
Piotr OsiewiczandNate 8da3ab8d82 WIP styling 
Co-authored-by: Nate <nate@zed.dev>
 2023-11-14 17:59:53 +01:00
Nathan Sobo cb7f087439 Remove commented field 2023-11-14 09:33:28 -07:00
Conrad Irwin 4a6e208d26 Not working yet file-finder2 2023-11-14 09:28:18 -07:00
Antonio Scandurra c4a5f47bc3 Merge remote-tracking branch 'origin/main' into editor2-blocks 2023-11-14 17:16:58 +01:00
Antonio Scandurra ca5ef02d08 Add red background to blocks that need styling 2023-11-14 17:15:33 +01:00
Antonio ScandurraandJulia db02124a74 Return the line length when x is past the last glyph 
Co-Authored-By: Julia <julia@zed.dev>
 2023-11-14 17:06:18 +01:00
Piotr Osiewicz e7e3ffe749 WIP 2023-11-14 16:56:31 +01:00
Antonio ScandurraandJulia 05a555e2ef Honor cmd-w to close active item 
Co-Authored-By: Julia <julia@zed.dev>
 2023-11-14 16:38:20 +01:00
Nate Butler 3ceadaa609 Allow a button to take a color (#3315) 
[[PR Description]]
- Allows a button to take a color and resolve it into `IconColor` and
`LabelColor`
- Extend `IconColor` and `LabelColor` to allow them to take a
`Player(i)`
- `impl From<LabelColor> for IconColor`

Release Notes:

- N/A
 2023-11-14 10:36:52 -05:00
Antonio ScandurraandJulia 1d15d76e5e Re-enable find all references 
Co-Authored-By: Julia <julia@zed.dev>
 2023-11-14 16:09:29 +01:00
Antonio ScandurraandJulia d4b9bd4ec8 Render block elements 
Co-Authored-By: Julia <julia@zed.dev>
 2023-11-14 16:03:06 +01:00
Antonio Scandurra 0d6d776a8b WIP 2023-11-14 14:48:59 +01:00
Joseph T. Lyons e90f157320 Add gpt-4-1106-preview model 2023-11-14 08:28:57 -05:00
Nathan Sobo b77d19386a Fix formatting 2023-11-14 01:58:10 -07:00
Nathan Sobo 7d1a6a81df Merge remote-tracking branch 'origin/main' into element-types 2023-11-14 01:55:58 -07:00
Nathan Sobo 4df524687e Rename back to div 2023-11-14 01:41:55 -07:00
Nathan Sobo 1e11a7d172 Remove unnecessary with_element_id calls 2023-11-14 01:38:13 -07:00
Nathan Sobo b7a62fdbc6 Remove div module 2023-11-14 01:25:10 -07:00
Nathan Sobo 20a4aa3a9a No compile errors or warnings 2023-11-14 01:23:09 -07:00
Nathan Sobo 14d5584205 Checkpoint 2023-11-14 01:15:48 -07:00
Mikayla c8fac17d60 Add missing global 2023-11-14 00:09:42 -08:00
Mikayla f966568f8c Implement most core actions 2023-11-14 00:06:33 -08:00
Nathan Sobo d2724a88e4 Checkpoint 2023-11-13 23:15:45 -07:00
Mikayla ef730c486c Sketch in core zed actions code 2023-11-13 22:13:07 -08:00
Nathan Sobo 2a1537855b Checkpoint 2023-11-13 23:03:14 -07:00