yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,505 Commits 5 Branches 0 Tags
f8a570e596d29d243e292e1e7cf7ce3f89bc27ca
Commit Graph
14505 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Scandurra f8a570e596 Fix panic when painting blocks 2023-11-15 20:02:35 +01:00
Antonio ScandurraandNathan Sobo bef24626c8 Don't use Mutex or Arc now that app state is not Send 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-15 18:50:34 +01:00
Antonio ScandurraandNathan Sobo 356b0f81d9 Move render_view into View::render_with 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-15 18:50:09 +01:00
Antonio ScandurraandNathan Sobo da3c097afe Fix clicking on code action and fold indicators 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-15 18:29:53 +01:00
Antonio ScandurraandNathan Sobo 7499613cd9 Handle clicking folded ranges 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-15 18:19:26 +01:00
Antonio ScandurraandNathan Sobo ab975210e3 Return a Fold struct when querying the FoldMap 
This contains a new `id` field that lets us distinguish among folds.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-15 17:09:59 +01:00
Antonio Scandurra e5e36803b6 Render fold indicators in the gutter 2023-11-15 14:07:37 +01:00
Antonio Scandurra 98df662d47 Introduce rename in editor2 (#3331) 
Release Notes:

- N/A
 2023-11-15 11:15:08 +01:00
Antonio Scandurra b68d2d2484 Fix formatting 2023-11-15 11:07:32 +01:00
Antonio Scandurra 7d1999d39f Fix focus management on editor when renaming 2023-11-15 11:05:09 +01:00
Antonio Scandurra 6930a12d24 Extract out a register_actions function 2023-11-15 09:53:32 +01:00
Antonio Scandurra 4cec3b821e Merge remote-tracking branch 'origin/main' into editor2-rename 
# Conflicts:
#	crates/editor2/src/editor.rs
#	crates/editor2/src/element.rs
#	crates/gpui2/src/style.rs
 2023-11-15 09:51:33 +01:00
Antonio Scandurra 23b886b429 Introduce gpui::render_view 2023-11-15 09:45:23 +01:00
Antonio Scandurra b086285a00 Don't return Result from TextStyle::highlight 2023-11-15 09:10:46 +01:00
Nathan Sobo 06fe1aeb06 Fix click events by notifying when we assign pending_mouse_down (#3329) 
We need to notify when we set the pending mouse down so we attach the
mouse up event listener before the mouse button is released.

Release Notes:

- N/A
 2023-11-14 19:55:23 -07:00
Nathan Sobo 7e84b73a3a Document contexts 2023-11-14 19:52:51 -07:00
Nathan Sobo ac0bae0e5e Fix click events by notifying when we assign pending_mouse_down 2023-11-14 19:22:41 -07:00
Max Brunsfeld 85016cea3e Fix uncached raster_bounds computation and font selection (#3328) 
This fixes some slowness we noticed when scrolling an editor in `zed2`.
 2023-11-14 17:27:12 -08:00
Max BrunsfeldNathan SoboMikayla
 		7ecd51e1ae Fix uncached raster_bounds computation and font selection 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-11-14 17:19:10 -08:00
Mikayla Maki d73ac00c64 Simplify element types (#3318) 
This PR does away with the extra type parameters on Div and instead
introduces two wrapper elements, `Stateful` and `Focusable`. All of the
interactivity is stored on `Interactivity` and `InteractiveState`, which
is stored on the base element. The wrappers simply control what methods
are available to call.

Not sure this is fully working, but a smoke test does work.

/cc @as-cii @ConradIrwin 

Release Notes:

- N/A
 2023-11-14 16:03:20 -08:00
Mikayla bcce643172 remove dbg 2023-11-14 15:57:23 -08:00
Mikayla 2636da3680 Merge branch 'element-types' of github.com:zed-industries/zed into element-types 2023-11-14 15:55:53 -08:00
Mikayla 7d62f43366 Merge branch 'main' into element-types 2023-11-14 15:49:10 -08:00
Mikayla Maki 6f46f73f98 Not working yet file-finder2 (#3321) 
Porting file_finder

Release Notes:

- N/A
 2023-11-14 15:22:59 -08:00
Conrad Irwin 37b4e9f922 Abandon ship 2023-11-14 16:17:24 -07:00
Nathan SoboandJulia a413920b00 Return an id from Element::element_id instead of calling cx.with_element_id 
Co-Authored-By: Julia <julia@zed.dev>
 2023-11-14 16:05:28 -07:00
Max Brunsfeld 3b59f4c242 Enable tests in project panel 2 (#3325) 2023-11-14 15:02:51 -08:00
Max Brunsfeld 540ee65438 Implement simulated prompts in TestPlatform 2023-11-14 14:56:50 -08:00
Mikayla 2f92e4ff1b WIP 2023-11-14 14:48:34 -08:00
Max Brunsfeld 2debf7cb9f Project panel: detect filename editor blur via an editor event 2023-11-14 14:02:28 -08:00
Nate Butler 803a0567e4 Set Pane Size (#3327) 
[[PR Description]]

Set the size of panes to their `size`.

Release Notes:

- N/A
 2023-11-14 16:57:09 -05:00
Nate Butler 3c1851a2bd Set Pane Size 2023-11-14 16:47:52 -05:00
Conrad Irwin 07e3bcb6b2 In the middle of stuff 2023-11-14 14:38:23 -07:00
Marshall Bowers 869adec859 Use IconElement in project panel (#3326) 
This PR updates the project panel to use the `IconElement` to render
icons instead of duplicating the styles.

Release Notes:

- N/A
 2023-11-14 15:52:57 -05:00
Max Brunsfeld 991eff1b36 Re-enable all project panel tests 
Some are still failing.
 2023-11-14 12:45:46 -08:00
Marshall Bowers fa558d699d Use IconElement in project panel 2023-11-14 15:44:26 -05:00
Conrad Irwin b6ff6ac017 Merge branch 'main' into file_finder 2023-11-14 13:34:25 -07:00
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 3ee2aa6e9b Avoid user NPM config/cache & put NodeRuntime installation behind a lock (#3324) 
Release Notes:

- Fixed a case where system NPM configuration could effect Node based
language server installation.
 2023-11-14 15:08:48 -05: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
Mikayla Maki dbd5b37d9c WIP: Zed2: Add core mac app actions (#3316) 
Add back cmd-q, cmd-n, etc.

TODO:
- [x] Fix quit checking workspace windows
- [ ] ~~See if GPUI2 has a DebugElements analog~~

Release Notes:

- N/A
 2023-11-14 10:41:03 -08:00