zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-30 22:34:41 +03:00
Code Issues Packages Projects Releases Wiki Activity
10,963 Commits 709 Branches 773 Tags 217 MiB
4658bc610c
Commit Graph

779 Commits

Author SHA1 Message Date
Antonio Scandurra
6f0efec146 Merge remote-tracking branch 'origin/main' into save-conversations 2023-06-23 09:09:42 +02:00
Piotr Osiewicz
10cc0d567f Reintroduce package-lock.json 2023-06-22 18:26:18 +02:00
Piotr Osiewicz
af252888c4 Merge branch 'main' into sergey/z-2308-create-a-proof-of-concept-of-exporting-a-type-from-rust-and 2023-06-22 17:58:56 +02:00
Piotr Osiewicz
76366422a6 Merge branch 'main' into collab-titlebar-2 2023-06-22 13:48:16 +02:00
Nathan Sobo
a49189a704 Add Zoom button to assistant panel 2023-06-21 19:50:22 -06:00
Nathan Sobo
a75341db97 Move model and remaining tokens to assistant toolbar 2023-06-21 19:01:30 -06:00
Nate Butler
6ab0143469
Split Interactive into Interactive and Toggleable (#2628) 
This is a part of the intensity driven theme rewrite. 

It introduces the `toggle` and `interactive` helper functions to build
Toggle<T> and Interactive<T> styles for interactive elements in the
theme.

This PR also removes the `theme_testbench` crate and related actions.

Huge thanks to @osiewicz and @mikayla-maki for pushing this forward 🙏🏽

Release Notes:

- Updated the style of many interactive elements.
 2023-06-21 15:03:08 -04:00
Nate Butler
9d9bbfdabf Format 2023-06-21 13:58:54 -04:00
Nate Butler
a845e82173 Update settings.json 2023-06-21 13:58:42 -04:00
Nate Butler
ed8bdd186e Update toggle active styles 2023-06-21 13:56:27 -04:00
Nate Butler
127f4aa506 Fix status bar buttons 2023-06-21 13:14:39 -04:00
Nate Butler
a3e65528ba Update syntax colors 2023-06-21 12:21:01 -04:00
Nate Butler
eeb155a951 Remove unused light variable 2023-06-21 12:20:47 -04:00
Nathan Sobo
d78fbbc63e Add title to assistant panel and move + to right 2023-06-21 09:54:49 -06:00
Sergey Onufrienko
6e4439b4ca
feat: move gen to styles and add scripts 2023-06-21 16:13:41 +02:00
Antonio Scandurra
a011ced698 Allow loading a previously-saved conversation 2023-06-21 16:06:09 +02:00
Nathan Sobo
0932149c48 Fix filename 2023-06-20 20:21:43 -06:00
Nathan Sobo
3a61fd503f WIP: Trying to display the toolbar but tired. May be worth discarding this. 2023-06-20 20:11:37 -06:00
Mikayla Maki
b1b4b563c2
Add zed typescript settings 
Remove 2 space indent
 2023-06-20 16:05:23 -07:00
Piotr Osiewicz
60b4054b0a
Fix up toggles 2023-06-20 16:05:23 -07:00
Nate Butler
ae53c3e623
WIP: Start updating style trees to new toggle() format. 2023-06-20 16:05:23 -07:00
Nate Butler
61535ed41f
Update toggle, add tests 2023-06-20 16:05:23 -07:00
Nate Butler
040881df3f
Update toggle 2023-06-20 16:05:23 -07:00
Nate Butler
5c034ab63c
Format 2023-06-20 16:05:23 -07:00
Nate Butler
1f3feacb21
Add path aliases 2023-06-20 16:05:23 -07:00
Nate Butler
5369f2c25a
Set up vitest and add tests for interactive 2023-06-20 16:05:23 -07:00
Piotr Osiewicz
4bd89c4c8c
further style adjustments; cargo-run works 2023-06-20 16:05:23 -07:00
Piotr Osiewicz
63630949ba
Fix up uses of interactive 2023-06-20 16:05:23 -07:00
Nate Butler
247f618d4f
Update the interactive function 2023-06-20 16:05:23 -07:00
Nate Butler
16564707df
Use TS-flavored doc comments 2023-06-20 16:05:23 -07:00
Piotr Osiewicz
31c1177737
Adjust some of the styles to the new Toggleable format 2023-06-20 16:05:23 -07:00
Piotr Osiewicz
198a446b03
Implement Toggleable<T> and Interactive<T> properly 2023-06-20 16:05:23 -07:00
Piotr Osiewicz
c47d1e9f51
Add toggle.ts and interactive.ts 2023-06-20 16:05:23 -07:00
Nate Butler
ffd1190cca Update rose pine theme family 2023-06-16 23:02:32 -04:00
Piotr Osiewicz
83c1bb07bb
Add background to user avatar 2023-06-15 22:05:43 -07:00
Mikayla Maki
aac71fdcfe
Remove border from sign in button 
Co-authored-by: Piotr <piotr@zed.dev>
 2023-06-15 22:05:43 -07:00
Piotr Osiewicz
86247bf657 editor: Highlight search results 
Z-1292
 2023-06-15 09:44:44 +02:00
Max Brunsfeld
56b749788f Improve the look of the syntax tree view UI 2023-06-12 15:14:57 -07:00
Nate Butler
85b049f250
Build tokens for each theme (#2590) 
This PR adds the ability to export tokens for each theme. 

You can export tokens by:

1. `cd styles`
2. `npm run build-tokens`
3. Tokens will be output in the target folder (`styles/target`)

The tokens match the ColorScheme object. In the future we may also
export tokens for our styleTrees.

Release Notes:

- N/A (No public facing changes)

---
TODO:

- [x] Generate Token Studio theme index file
- [x] ColorScheme
    - [x] name:
    - [x] isLight
    - [x] lowest
    - [x] middle
    - [x] highest
    - [x] popoverShadow
    - [x] modalShadow
    - [x] players
    - [x] syntax
 2023-06-08 16:40:46 -04:00
Nate Butler
ddcbc774ab $tokens.json => $themes.json 2023-06-08 16:36:15 -04:00
Nate Butler
e4cbc29f98 Update buildTokens to export $metadata.json and $themes.json 2023-06-08 16:19:28 -04:00
Nate Butler
3719c206c9 Only export color tokens for syntax 2023-06-08 15:14:59 -04:00
Nate Butler
91e1bb8fd4 WIP syntax tokens 2023-06-08 15:12:11 -04:00
Nate Butler
999b2365a8 Export additional tokens, standardize naming convention 2023-06-08 12:21:51 -04:00
Max Brunsfeld
908de23b72 Tweak LSP log menu styling 2023-06-08 08:58:57 -07:00
Max Brunsfeld
afaff7f9a9 Merge branch 'main' into lsp-log-messages 2023-06-08 08:49:08 -07:00
Max Brunsfeld
817644eb20 Style new lsp log menu, add a test for it 2023-06-08 08:43:25 -07:00
Nate Butler
e2f46d5448 Build layer tokens for each theme 2023-06-08 11:15:59 -04:00
Nate Butler
1e43fec1c5 Update buildLicenses to only include the theme url if there is one 2023-06-08 01:23:19 -04:00
Nate Butler
e996a66596 Update TSCondif 
Based on #2558. Also fixes errors resulting from the stricter options.
 2023-06-08 01:15:57 -04:00
Nate Butler
c8a9d73ea6 Add foundation for exporting tokens 2023-06-08 00:37:00 -04:00
Nate Butler
29de420b59 Organize misc files into theme, themes and styleTrees 2023-06-07 12:50:37 -04:00
Nate Butler
6269cec4f1 Minor updates 2023-06-07 12:40:49 -04:00
Sergii Onufriienko
b1f009cdce
Merge branch 'main' into sergey/z-1768-update-createcolorscheme-to-accept-a-theme-in-the 2023-06-07 16:12:13 +01:00
Sergey Onufrienko
4c405e65a3
feat: use theme index to build licenses 2023-06-07 16:10:16 +01:00
Sergey Onufrienko
0ad76ac92c
feat: use theme index to build themes 2023-06-07 16:10:02 +01:00
Sergey Onufrienko
02c1efc60d
feat: re-export chroma 2023-06-07 16:09:24 +01:00
Sergey Onufrienko
f5d1f314e0
feat: add themes index 2023-06-07 16:08:58 +01:00
Sergey Onufrienko
d2b8501347
feat: change themes to return ThemeConfig 2023-06-07 16:08:48 +01:00
Antonio Scandurra
7a78e64831 Merge remote-tracking branch 'origin/main' into assistant-2 2023-06-06 19:18:22 +02:00
Antonio Scandurra
ef7ec265c8 Cycle message roles on click 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-06-06 18:45:08 +02:00
Nate Butler
7b066df7e6
Tighten up spacing in the project panel (#2574) 
Following https://github.com/zed-industries/zed/pull/2559 the project
panel entries become pretty wide again. This PR tries to mitigate that
and just make some general improvements to visual density in the project
panel.

- Reduces padding around items
- Removes top margin
- Slightly reduces the height of each item
- Fixes an issue where ignored files had the wrong color chevron

Release Notes:

- Improved density of the project panel and tidied up some visual
issues.
 2023-06-06 11:31:53 -04:00
Piotr Osiewicz
a0e2e5db7d
project panel/styles: Align child's chevron with parent path (#2559) 
Z-1012

Release notes:
- Adjust indent of files in subdirectories.
 2023-06-06 16:55:38 +02:00
Antonio Scandurra
2b1aeb07bc Show error message when requests to OpenAI fail 
Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-06-06 16:53:56 +02:00
Antonio Scandurra
69b8267b6b Show the current model and allow clicking on it to change it 2023-06-06 13:13:44 +02:00
Joseph Lyons
7c60f636d5 Fix typos 2023-06-02 22:02:19 -04:00
Antonio Scandurra
f00f16fe37 Show remaining tokens 2023-06-02 17:27:21 +02:00
Sergey Onufrienko
f97999d97f
feat: update themes to use ThemeConfig 2023-06-02 14:11:11 +02:00
Sergey Onufrienko
5fbbc1936f
fix: typescript errors 2023-06-02 14:10:44 +02:00
Sergey Onufrienko
b38f760fcd
feat: add index export 2023-06-02 14:10:19 +02:00
Sergey Onufrienko
d3ed958308
chore: make SyntaxHighlightStyle.color optional 2023-06-02 14:10:02 +02:00
Sergey Onufrienko
6b00db75ad
feat: update and refactor colorScheme 2023-06-02 14:08:35 +02:00
Sergey Onufrienko
56ecfaf2f0
feat: add themeConfig types 2023-06-02 14:07:43 +02:00
Antonio Scandurra
a81d164ea6 Allow saving the OpenAI API key in the assistant panel 2023-06-02 11:38:02 +02:00
Antonio Scandurra
20e65a533c Merge remote-tracking branch 'origin/main' into assistant-2 2023-06-02 09:32:11 +02:00
Max Brunsfeld
62660f2766
Fix more issues with panels and zoom (#2545) 
Release Notes:

* Fixed the behavior of panel buttons when their panel is open. Show the
key binding for closing the containing dock (preview only).
* Improved the styling of zoomed panels and panes, giving them a
stronger border, and color the zoom button with an "active" style
(preview only).
* Improved the stability of panels' zoom state. Close their dock instead
of resetting their zoom state when dismissing panels to reveal other
items (preview only).
 2023-05-31 13:17:12 -07:00
Max Brunsfeld
3f6aa94a5f Use active color for zoom button in a zoomed pane 2023-05-31 12:51:57 -07:00
Nate Butler
1f72f9e18b Add un-hooked up zoomIcon styles 2023-05-31 12:45:55 -07:00
Nate Butler
a10933c063 Update pane/panel zoom styling 2023-05-31 12:45:55 -07:00
Sergii Onufriienko
c6672dbac2
Update theme license logic (#2541) 
Use new theme file structure
```
themes/
  [theme_name]
    [theme_name]-common.ts
    [theme_name]-light.ts
    [theme_name]-dark.ts
    LICENSE
```

Release Notes: 
- N/A
 2023-05-31 18:36:13 +01:00
Mikayla Maki
685e8d7007
Seperate pane and panel styling 
co-authored-by: max <max@zed.dev>
 2023-05-30 16:23:16 -07:00
Sergey Onufrienko
51c7078f47
chore: remove license_text 2023-05-30 18:16:50 +02:00
Sergey Onufrienko
4568f80f2e
feat: read from LICENSE file 2023-05-30 18:12:31 +02:00
Sergey Onufrienko
14efc18eca
refactor: add license file and check it exists 2023-05-30 18:11:54 +02:00
Sergey Onufrienko
05d1dd6b11
refactor: move common to theme folder 2023-05-30 16:53:12 +02:00
Sergey Onufrienko
ac63043c27
chore: move similar themes to one folder 2023-05-30 16:52:28 +02:00
Sergey Onufrienko
0d62e76cd6
refactor: colorSchemes 2023-05-30 15:52:32 +02:00
Sergey Onufrienko
2269c19169
chore: add LICENSE files 2023-05-30 14:06:19 +02:00
Antonio Scandurra
890c42a75a Show time in assistant messages 2023-05-29 16:23:16 +02:00
Antonio Scandurra
52e8bf2928 Show custom header for assistant messages 2023-05-29 15:57:55 +02:00
Sergey Onufrienko
cf75b090d3
feat: organize themes by folders with LICENSE 2023-05-29 15:45:13 +02:00
Nathan Sobo
3904971bd8 Hide assistant gutter 2023-05-26 15:38:03 -06:00
Nate Butler
793486b2e8
Update Diff Modified Color (#2526) 
For some reason the yellow I used for the modified color in light themes
was really light
.
Release Notes:

* Improved the contrast of diff modified color in the editor in light
themes.
 2023-05-24 23:50:37 -04:00
Antonio Scandurra
19b817e48a Improve styling of bottom and right docks 2023-05-23 09:02:45 +02:00
Antonio Scandurra
208ff2fba7 Merge remote-tracking branch 'origin/main' into panels 2023-05-23 08:24:28 +02:00
Mikayla Maki
5c31c84c90
Fixed contrast in project panel and scrollbar 
co-authored-by: nate <nate@zed.dev>
 2023-05-22 15:51:31 -07:00
Mikayla Maki
2d1c4a1971
Revert "Touch up git in project panel and scroll bar styling" 2023-05-22 15:31:14 -07:00
Mikayla Maki
5dfb0e3691
remove border from thumb 2023-05-22 14:56:55 -07:00
Nate Butler
11eb9b17c9 Update project panel & scroll bar git colors 2023-05-22 17:47:52 -04:00
Mikayla Maki
a355b4c135
Add conflict styles to project panel 2023-05-22 10:09:55 -07:00
Mikayla Maki
af73c1af06
Add seperate scrollbar styling 2023-05-22 10:03:02 -07:00
Mikayla Maki
2200a22c07
Wire project panel themes into rust 2023-05-22 09:55:59 -07:00
Nate Butler
b80cb73745 Add git to project panel in theme, use different values for dark and light 2023-05-22 12:09:54 -04:00
Nathan Sobo
ba50b35de6 wip 2023-05-13 14:34:09 -06:00
Antonio Scandurra
cdcb7c8084 Merge branch 'main' into panels 2023-05-10 15:23:37 +02:00
Kirill Bulatov
eec60556ab Highlight include/exclude inputs when errors happen there 2023-05-10 11:11:31 +03:00
Kirill Bulatov
13296d502c Extra rows approach draft 
co-authored-by: Max <max@zed.dev>
 2023-05-10 11:11:31 +03:00
Kirill Bulatov
b5abac6af6 Draft search include/exclude logic 2023-05-10 11:11:31 +03:00
Antonio Scandurra
6ddc610fa2 WIP: Start on TerminalPanel 2023-05-09 10:18:11 +02:00
Nathan Sobo
1ddbda5095 Rename DockItem to Panel 2023-05-09 10:18:11 +02:00
Nathan Sobo
03f8c1206a Rename Sidebar to Dock 2023-05-09 10:18:10 +02:00
Mikayla Maki
8bde496e74
Add branch name in title UI 
co-authored-by: Petros <petros@zed.dev>
 2023-05-08 14:33:59 -07:00
Nate Butler
ab6b3adb2b Add a theme entry for whitespace, use it to style whitespaces 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Kirill Bulatov <mail4score@gmail.com>
 2023-05-08 19:36:51 +03:00
Julia
f7de0ad8ae Show diagnostic source in diagnostic multibuffer headers 2023-05-01 16:48:27 -04:00
Julia
40ab5c1fb9 Remove underline from diagnostic source 2023-05-01 13:15:41 -04:00
Julia
678c188de0 Re-allow diagnostics hovers to soft wrap 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-04-27 14:35:34 -04:00
Julia
3f7533a0b4 Show source of diagnostic hovers 2023-04-27 14:35:34 -04:00
Mikayla Maki
2882e0fa5b Remove new CTA in copilot sign in UI 
Add a trim_end to copilot suggestions
 2023-04-19 16:39:55 -07:00
Mikayla Maki
745e5e3a09 Add italic styles to copilot suggestions 2023-04-19 15:23:19 -07:00
Antonio Scandurra
8610f3acf3 Introduce a button to disable copilot integration 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-04-19 20:25:59 +02:00
Nate Butler
957ab65422 Mix neutral and blue to make a predictive color that is unique 2023-04-18 14:47:52 -04:00
Nate Butler
ae0647c3a9 Update predictive color 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-04-18 14:29:08 -04:00
Nate Butler
7ba094e10e add license_checksum 2023-04-11 12:56:18 -04:00
Nate Butler
20ec9f6daf Add meta fields to ayu 2023-04-11 12:37:20 -04:00
Nate Butler
65c2fb1cc6 Fix paths after publishing 2023-04-11 12:25:02 -04:00
Nate Butler
de60657d53 Ignore the target folder 2023-04-11 12:23:54 -04:00
Nate Butler
975f5d5fa8 Format 2023-04-11 12:23:21 -04:00
Nate Butler
527f0310e2 Update + publish the Ayu theme 2023-04-11 12:22:49 -04:00
Julia
4b39df4a6b
Merge pull request #2304 from zed-industries/bump-diff-width 
Increase git diff gutter width slightly
 2023-04-06 10:58:55 -04:00
Mikayla Maki
afc9b832c8 Finish device code flow for copilot 2023-03-30 16:50:33 -07:00
Mikayla Maki
f5d4bcd934 Added erorr states and first-pass error handling to the copilot status bar item. 
Added correct icons
Added a new 'Toast' action which allows other crates to easily pop toasts with an optional click action
 2023-03-30 14:10:57 -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
ae3b3ea458 Merge branch 'main' into copilot 2023-03-29 16:57:38 -07:00
Julia
737e2e1b3c Open symbol outline when clicking on editor breadcrumbs 2023-03-29 15:46:43 -04:00
Mikayla Maki
9d8d2bb8f4 Add rough versions of all 3 modals 2023-03-28 18:00:09 -07:00
Mikayla Maki
0ef9cefe0f Finish shape of copilot auth UI 2023-03-28 09:42:01 -07:00
Mikayla Maki
6ff09865eb Create copilot auth popup UI 2023-03-28 09:42:01 -07:00
Nate Butler
ef6c28326d Update editor.ts 2023-03-28 09:42:01 -07:00
Nate Butler
2fede1c01f Use syntax.predictive.color to style suggestions 2023-03-28 09:42:01 -07:00
Antonio Scandurra
6715e5247c Rework SuggestionMap to take highlight style when retrieving chunks 2023-03-28 09:42:01 -07:00
Mikayla Maki
15e29d44b9 Add basic copilot modal 2023-03-28 09:42:00 -07:00
Mikayla Maki
b57d5174aa Add copilot theme, start sketching out the auth modal 2023-03-28 09:42:00 -07:00
Petros Amoiridis
b153bf7118
Add a hovered style to lspStatus background 2023-03-27 14:26:56 +03:00
Petros Amoiridis
374b284a3d
Run prettier on TS files 2023-03-27 14:26:05 +03:00
Mikayla Maki
5cad3d3a67
Merge pull request #2317 from zed-industries/fix-titlebar-right-spacing 
Fix misaligned UI in the right titlebar
 2023-03-23 13:16:40 -07:00
Mikayla Maki
bb5c2833a3 Aligned title bar items to the center and fixed left spacing on the sign in button 
co-authored-by: max <max@zed.dev>
 2023-03-23 13:08:31 -07:00
Petros Amoiridis
d5bb2d13b8
Introduce terminal button count 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-03-22 16:13:58 +02:00
Petros Amoiridis
98ae69a61f
Merge pull request #2282 from zed-industries/petros/z-283-make-pop-up-positioning-consistent 
Consistent pop-up menu positions
 2023-03-20 17:55:40 +02:00
Julia
368a6405a1 Increase git diff gutter width slightly 2023-03-17 15:28:38 -04:00
Antonio Scandurra
f9d793cb4a Honor more OpenType features 2023-03-17 13:40:00 +01:00