oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,343 Commits 1 Branch 0 Tags
0e3fd92bd047e2f9a00c2f02e4e09bbdcab48778
Commit Graph
14343 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nate Butler 2347576fb5 Extend theme converter to allow multimatching against vscode colors (#3294) 
[[PR Description]]

Adds the ability to specify a vec of VScode syntax scopes to match
against for a given syntax style.

Example:

```rust
pub fn to_vscode(&self) -> Vec<&'static str> {
        use ZedSyntaxToken::*;

        match self {
            SyntaxAttribute => vec!["entity.other.attribute-name"],
            SyntaxBoolean => vec!["constant.language"],
            SyntaxComment => vec!["comment"],
            SyntaxCommentDoc => vec!["comment.block.documentation"],
            SyntaxConstant => vec!["constant.character"],
            SyntaxConstructor => vec!["entity.name.function.definition.special.constructor"],
            SyntaxEmbedded => vec!["meta.embedded"],
            SyntaxEmphasis => vec!["markup.italic"],
            SyntaxEmphasisStrong => vec![
                "markup.bold",
                "markup.italic markup.bold",
                "markup.bold markup.italic",
            ],
            SyntaxEnum => vec!["support.type.enum"],
            SyntaxFunction => vec![
                "entity.name.function",
                "variable.function",
                "support.function",
            ],
            SyntaxKeyword => vec!["keyword"],
            SyntaxLabel => vec![
                "label",
                "entity.name",
                "entity.name.import",
                "entity.name.package",
            ],
            // .. more styles
}}
```

Useful `settings.json` for testing themes:

```json5
{
  // --- Dark Themes ---
  "theme": "Ayu Dark"
  // "theme": "Ayu Mirage"
  // "theme": "Dracula"
  // "theme": "Gruvbox Dark Hard"
  // "theme": "Gruvbox Dark Medium"
  // "theme": "Gruvbox Dark Soft"
  // "theme": "Night Owl"
  // "theme": "Noctis Obscuro"
  // "theme": "Noctis"
  // "theme": "Nord"
  // "theme": "Palenight (Mild Contrast)"
  // "theme": "Palenight Operator"
  // "theme": "Palenight"
  // "theme": "Rose Pine Moon"
  // "theme": "Rose Pine"
  // "theme": "Solarized Dark"
  // "theme": "Synthwave 84"
  // --- Light Themes ---
  // "theme": "Ayu Light"
  // "theme": "Gruvbox Light Hard"
  // "theme": "Gruvbox Light Medium"
  // "theme": "Gruvbox Light Soft"
  // "theme": "Noctis Lux"
  // "theme": "Rose Pine Dawn"
  // "theme": "Solarized Light"
}
```

Release Notes:

- N/A
 2023-11-09 17:40:10 -05:00
Max Brunsfeld 7586ef1787 Refine search query suggestions (#3293) 
This PR fixes some issues in response to feedback from Dan Abramov and
Jose Valim.

To do:

* [x] fix non-word search suggestions
* [x] add setting for disabling search suggestions

Release Notes:

- Fixed an issue where opening a search without text selected would
populate the search query with non-word characters adjacent to the
cursor.
- Added a setting, `seed_search_query_from_cursor`, which controls
whether the search query is automatically populated from the buffer when
starting a new buffer search or project search.

By default, the search query will always be set to the word under the
cursor. If you want to only populate the search query when text is
selected, you can add the following to your `~/.zed/settings.json`:
  
  ```json
  {
    "seed_search_query_from_cursor": "selection"
  }
  ```

If you don't want the search query to be automatically populated, even
when there is text selected, add the following:
  
  ```json
  {
    "seed_search_query_from_cursor": "never"
  }
  ```
 2023-11-09 14:25:20 -08:00
Max Brunsfeld b6eef26f91 Merge branch 'main' into search-query-suggestion-fixes 2023-11-09 14:18:17 -08:00
Conrad Irwin fa153a0d56 Make command dispatching work 2023-11-09 15:14:23 -07:00
Max Brunsfeld 6b8ce3cc85 Add a setting for when to seed the search query from the text under the cursor 2023-11-09 14:03:14 -08:00
Nate Butler 6b65acaa99 regenerate themes, format 2023-11-09 16:48:35 -05:00
Nate Butler 00b298a50c Fix incorrect Rose Pine Dawn theme name 2023-11-09 16:44:40 -05:00
Nate Butler 024fb4f818 Remove unused import 2023-11-09 16:41:58 -05:00
Nate Butler 4cd37e6e62 Extend theme converter to allow multimatching against vscode colors 2023-11-09 16:38:48 -05:00
Max Brunsfeld 28d3d21108 Generalize Refineable derive macro to derive arbitrary traits on the refinement type 2023-11-09 13:23:31 -08:00
Max Brunsfeld dba41e99dd Avoid suggesting search query if cursor is not on a word 2023-11-09 12:33:30 -08:00
Marshall Bowers 31a6409a4c Refine theme styles (#3291) 
This PR refines a number of styles in the default theme, as well as
updates the theme importer to support importing syntax styles from VS
Code themes.

Release Notes:

- N/A
 2023-11-09 15:32:10 -05:00
Marshall Bowers 7b489f5e2e Allow user-theme related methods to be unused 2023-11-09 15:16:59 -05:00
Nate ButlerandMarshall Bowers 1c6a960bbf Deal with special case where a VSCode theme doesn't have a foreground color 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-09 14:53:04 -05:00
Nate ButlerandMarshall Bowers 54157eb99a Finish passing Syntax from VSCode themes to Zed Themes 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-09 14:41:26 -05:00
Max Brunsfeld c6b76d908f Use normal JS comments within JSX tags and JSX expression blocks (#3290) 
This fix only required changing the `overrides` queries for JavaScript
and TSX. I've made the fix in both the `zed2` and `zed` crates.

Release Notes:

- Fixed an issue in JavaScript and TSX files, where the 'toggle
comments' command used the wrong comment syntax inside of JSX tags and
expressions within JSX.
 2023-11-09 11:15:08 -08:00
Max Brunsfeld e50318e7e1 Duplicate buffer test changes in language2 version 2023-11-09 11:09:49 -08:00
Max BrunsfeldandKirill 4c89b2885e Use normal JS comments within JSX tags and JSX expression blocks 
Co-authored-by: Kirill <kirill@zed.dev>
 2023-11-09 10:58:33 -08:00
Nate ButlerandMarshall Bowers ff053890cf Extend UserSyntax to allow font_style and font_weight to be specified 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-09 13:46:08 -05:00
Conrad Irwin 72de5cb6ce Fix escape in GoToLine with new event emitter (#3289) 
[[PR Description]]

Release Notes:

- N/A
 2023-11-09 11:23:26 -07:00
Marshall Bowers 978cff8095 Use IndexMap for a deterministic order when importing syntax colors 2023-11-09 13:12:36 -05:00
Antonio Scandurra 1a0ddc424b WIP 2023-11-09 19:11:17 +01:00
Marshall Bowers 1f0fccc353 Reorganize theme_importer 2023-11-09 13:07:32 -05:00
Antonio ScandurraNathanMikayla
 		b029083441 Start on rendering context menu in editor2 
Co-Authored-By: Nathan <nathan@zed.dev>
Co-Authored-By: Mikayla <mikayla@zed.dev>
 2023-11-09 19:03:10 +01:00
Marshall Bowers 34e31fd489 Properly emit UserHighlightStyles 2023-11-09 12:59:20 -05:00
Julia 98271fb9bb zed2: Get tsserver running again (#3288) 
Port these changes to the zed2 directory

Release Notes:

- N/A
 2023-11-09 12:55:27 -05:00
Conrad Irwin 3c689ba33e Fix escape in GoToLine with new event emitter 2023-11-09 10:52:17 -07:00
Piotr OsiewiczandConrad a1d9f351db Some more woogaloo around action dispatch 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-09 18:51:41 +01:00
Marshall Bowers ff19a0ca18 Add importing-themes feature flag to theme2 crate 
When this feature is set the `themes` module won't be compiled.
This allows us to run the `theme_importer` even when the `themes` module
has compile errors in it.
 2023-11-09 12:49:16 -05:00
Marshall Bowers 60eae3e50a Emit unique highlights for each syntax token 2023-11-09 12:46:37 -05:00
Antonio ScandurraandNathan 5d15886675 Render code actions indicator 
Co-Authored-By: Nathan <nathan@zed.dev>
 2023-11-09 18:43:26 +01:00
Piotr OsiewiczandConrad 194d615691 Fix up keybindings propagation 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-09 18:33:36 +01:00
Nate ButlerandMarshall Bowers efd1db1b09 WIP – Add Syntax themes to importer 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-09 12:30:53 -05:00
Piotr Osiewicz d184e0d426 Start working on command_palette2 2023-11-09 17:54:05 +01:00
Julia 9cb14c189b zed2: Get tsserver running again 2023-11-09 11:43:40 -05:00
Nate ButlerandMarshall Bowers 4b5ca3e420 Allow imported themes to refine StatusColors 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-09 11:30:59 -05:00
Antonio ScandurraandNathan Sobo cfee1401ed Extract AnyElement::{measure,draw} 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-09 17:30:41 +01:00
Joseph T. Lyons 40f40ab1ec Fix typo in EULA (#3287) 
Release Notes:

- N/A
 2023-11-09 11:25:50 -05:00
Joseph T. Lyons 604682bb91 Fix typo in EULA 2023-11-09 11:08:30 -05:00
Nate Butler 7253160b04 Add more vscode colors 2023-11-09 11:01:18 -05:00
Kirill Bulatov b157453630 Do not use prettier for formatting node_modules/** files (#3286) 
Fixes

> the most annoying thing i'm running into right now is that when i'm
patching something inside node_modules, Zed tries to pretty-format it
according to my prettier config. this messes up the patch because it has
formatting changes now. i need the pretty formatting on save to be off
inside node_modules, that never makes sense

feedback from #influencers 

Do note though, that language servers will still format any file inside
node_modules, but at least it's not prettier now.
VSCode seem to format the node_modules/** files via language servers
too, so that seems ok for now, and the rest could be fixed during

> "project diagnostics" (eslint) seem to be running inside node_modules,
e.g. i'm seeing 3182 "errors" in my project. that doesn't make sense and
probably wastes resources in addition to being annoying

feedback later.

Release Notes:

- Fixed prettier formatting files inside node_modules
 2023-11-09 17:42:58 +02:00
Kirill Bulatov f55d89088b Port changes to gpui2 2023-11-09 17:18:41 +02:00
Julia 27b3378020 Get tsserver running again (#3277) 
Release Notes:

- Fixed a few issues preventing Javascript/Typescript language server
from working with latest upstream changes.
 2023-11-09 10:14:36 -05:00
Kirill Bulatov 2e957bc564 Do not propose prettier formatters for documents in node_modules/ 2023-11-09 14:49:37 +02:00
Kirill Bulatov ce40d5e0c5 Adjust the tests 2023-11-09 14:40:32 +02:00
Kirill Bulatov 8be07eddcc Change locate prettier method signature 2023-11-09 14:23:33 +02:00
Mikayla 656eb9d455 WIP 2023-11-09 00:18:00 -08:00
Mikayla 43eb7f28d1 checkpoint 2023-11-08 23:16:04 -08:00
Nate Butler bdeb32c34b Extend VSCode theme importer 2023-11-09 01:39:31 -05:00
Nate Butler 25c8b19dfb WIP 2023-11-09 01:21:22 -05:00