mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 19:02:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
3614 commits 774 branches 798 tags 279 MiB
Commit graph

3614 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Max Brunsfeld
664f17f92b Avoid maintaining indent size as state on buffers 
Indent size is still hard-coded, but it's now controlled by the
editor and not the buffer.

Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-06 10:22:29 -07:00
Nathan Sobo
e21f90fec5
Merge pull request #747 from zed-industries/styles-in-typescript 
Style the Zed app using Typescript styleTrees and Design Tokens
 2022-04-06 10:39:10 -06:00
Nate Butler
b1eda1ac39 Add border to top of status bar 2022-04-06 12:25:15 -04:00
Nate Butler
e584e892f4 Update light theme 2022-04-06 12:25:02 -04:00
Nate Butler
d3cfd1c974 Use standard text sizes for signInPrompt 2022-04-06 12:14:05 -04:00
Nathan Sobo
c289cdcac8 💄 2022-04-06 09:28:56 -06:00
Nathan Sobo
36fede7522 💄 token-building script and output destinations 
Just some organization here.
 2022-04-06 09:26:51 -06:00
Nate Butler
f29b8c795e Remove message.txt 2022-04-06 11:00:25 -04:00
Nate Butler
e201826d00 Update Light & Dark themes 2022-04-06 01:46:10 -04:00
Nathan Sobo
0cbcc81ed9
Merge pull request #742 from zed-industries/better-atlas-panics 
Report more information when we panic due to an atlas allocation failure
 2022-04-05 17:08:04 -06:00
Nate Butler
2a2c4071f4 Update light syntax theme and highlights, player selections 2022-04-05 18:49:17 -04:00
Nate Butler
35f56708f5 Update light theme, change player 3 color 
- Changed player 3 color to be less similar to player 1
 2022-04-05 18:23:01 -04:00
Nathan Sobo
aeb0b42c7a Report more information when we panic due to an allocation failure 2022-04-05 13:53:13 -06:00
Nathan Sobo
133d9f947b
Merge pull request #740 from zed-industries/prompt-only-on-last-dirty-item 
Show unsaved/conflict prompt only when closing the last tab for an item
 2022-04-05 13:12:08 -06:00
Nathan Sobo
4f4364d510 Ensure we drop the last pane item 
Previously, we weren't updating the toolbar's active item when emptying out a pane. This enhances an integration test to ensure that we don't hold references to any editors or buffers once we close everything.
 2022-04-05 13:05:14 -06:00
Nathan Sobo
41a27e6925 💄 2022-04-05 12:09:40 -06:00
Nathan Sobo
e2bf89b1e8 Don't require a path in TestAppContext::dispatch_action 
Instead, derive it from the presenter. This makes tests easier to write and more reliable since we'll be accurately simulating the actual relationship between parent and child views.
 2022-04-05 12:08:25 -06:00
Nathan Sobo
3da8f7f944 Fix dispatch path in test 2022-04-05 11:55:29 -06:00
Antonio Scandurra
c3b947ca26 Show unsaved/conflict prompt only when closing the last tab for an item 
Also, ensure we show the correct prompt when files have conflicts.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-04-05 19:38:27 +02:00
Nate Butler
d21dea6112 Squashed commit of the following: 
commit 66d4cbae2ca6d7dd660688d7eb702ae55bf3e0ca
Author: Nate Butler <iamnbutler@gmail.com>
Date:   Tue Apr 5 13:33:33 2022 -0400

    WIP: Improve legibility of contactsPanel and fix errors

    Co-Authored-By: Keith Simmons <keith@the-simmons.net>

commit 000319c583801c5ba4ed7884bbf3da2a591e3f26
Author: Nate Butler <iamnbutler@gmail.com>
Date:   Tue Apr 5 13:13:32 2022 -0400

    WIP
 2022-04-05 13:34:06 -04:00
Antonio Scandurra
cac0dddb1b Restructure item closing to take the Workspace instead of the Pane 2022-04-05 19:12:17 +02:00
Antonio Scandurra
939def42e3 v0.24.1 2022-04-05 16:23:27 +02:00
Antonio Scandurra
3ee84449ff
Merge pull request #737 from zed-industries/lsp-renames 
Improve handling of renames with respect to language servers
 2022-04-05 16:22:17 +02:00
Antonio Scandurra
cc45658b2d Clear diagnostics from buffer when unregistering it from language server 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-04-05 16:01:33 +02:00
Antonio Scandurra
7e3cc67e0a Don't reuse old syntax tree when resetting a buffer's language 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-04-05 16:01:05 +02:00
Antonio Scandurra
5c7f2bb029 Close and re-open buffer in language server when it gets renamed 2022-04-05 15:15:43 +02:00
Antonio Scandurra
9188f51993 Add unit test to illustrate how language server renames should work 2022-04-05 14:47:37 +02:00
Antonio Scandurra
e697ffbbf0
Merge pull request #736 from zed-industries/update-followers-when-navigating 
Update followers when navigating back and forth
 2022-04-05 10:57:57 +02:00
Antonio Scandurra
5ef484c9a1 Update followers when navigating back and forth 2022-04-05 10:42:35 +02:00
Nathan Sobo
6daefc467a
Merge pull request #734 from zed-industries/fix-prompt-panic 
Drop borrow to window state before calling beginSheetModalForWindow
 2022-04-04 17:50:09 -06:00
Nathan Sobo
66544d54f2 Drop borrow to window state before calling beginSheetModalForWindow 
Co-Authored-By: Keith Simmons <keith@the-simmons.net>
 2022-04-04 16:18:28 -06:00
Keith Simmons
05a05157fa Move style source files to src and build to dist 
Co-authored-by: Nate Butler <nate@zed.dev>
 2022-04-04 14:43:13 -07:00
Nathan Sobo
b060fb0f67
Merge pull request #732 from zed-industries/fix-impersonation-in-api 
In API, wait to create access token until after we impersonate a user
 2022-04-04 15:16:35 -06:00
Nathan Sobo
6a1be11aa6 Wait to create access token until we impersonate a user 
We need to wait to create the token until we decide on whether we're impersonating a different user, otherwise we'll create the token for the original user and the impersonated user won't be able to authenticate.
 2022-04-04 15:07:55 -06:00
Nate Butler
58dee75ff0 Merge branch 'styles-in-typescript' of https://github.com/zed-industries/zed into styles-in-typescript 2022-04-04 15:15:54 -04:00
Nate Butler
3dc99a8743 Update dark, light themes. 2022-04-04 12:14:00 -07:00
Nate Butler
a3fc719a52 Add a combined tokens.json for Figma Tokens 
- Having individual json files for themes and core is useful for copy+pasting while exploring changes
- Figma github sync requires a single json file to pull down
 2022-04-04 12:14:00 -07:00
Nate Butler
90df8a31e7 Fix incorrect ramp preset values in color.ts 
- Regenerate themes and tokens as well
 2022-04-04 12:14:00 -07:00
Nate Butler
37441bf342 Add basic support for exporting tokens to Figma Tokens. (#724) 
* WIP on figma token export

* WIP Working export

* Tidy up the figma tokens script

* Correctly format theme json structure for Figma Tokens

* Finish up themeTokens imports
 2022-04-04 12:14:00 -07:00
Nate Butler
e0e9a14590 Remove leftover console.log 2022-04-04 12:14:00 -07:00
Nate Butler
631d8d0344 Refined dark theme styles 2022-04-04 12:14:00 -07:00
Nate Butler
c374fd2f54 WIP 2022-04-04 12:14:00 -07:00
Nate Butler
bfde9dca4e Add greg to .zed.toml 2022-04-04 12:14:00 -07:00
Nate Butler
381d50bac6 WIP 2022-04-04 12:14:00 -07:00
Nate Butler
c812adde7f Add "npm run watch" command to live reload changes 2022-04-04 12:14:00 -07:00
Nathan Sobo
391aed3d66 Start loading new theme JSON format instead of TOML 
Replaced remaining extends with javascript object extension.
Moved tokens/core.ts to tokens.ts and massaged the types to make it more
obvious when types don't match up.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-04-04 12:13:59 -07:00
Nathan Sobo
371ea7c552 Update style tree based on changes to _base.toml from main 
Co-Authored-By: Nate Butler <1714999+iamnbutler@users.noreply.github.com>
 2022-04-04 12:13:59 -07:00
Nathan Sobo
d2a070c345 Write theme JSON files from buildThemes script 
Co-Authored-By: Nate Butler <1714999+iamnbutler@users.noreply.github.com>
 2022-04-04 12:13:59 -07:00
Nathan Sobo
70a783c8d1 Fix TS compile error 2022-04-04 12:13:59 -07:00