Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Rust] Add + use<> syntax #4139

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[Rust] Add + use<> syntax #4139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
35723d0
Add tests for impl trait with use bound
ehuss Jan 25, 2025
d65dfb9
Add `use` bounds
ehuss Jan 25, 2025
45485e3
[Rust] Add meta.generic scope
deathaxe Feb 26, 2025
2212957
[Rust] Fix type names in generics
deathaxe Feb 26, 2025
ebf925a
[Rust] Refactor using named contexts and add bailout
deathaxe Feb 26, 2025
9a51f02
[Rust] Remove capture group
deathaxe Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 36 additions & 10 deletions Rust/Rust.sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,6 @@ contexts:
types:
# matches stray identifiers as a types because a type is expected
- include: comments
- include: impl-types
- include: return-type
- match: '&'
scope: keyword.operator.rust
Expand All @@ -590,6 +589,7 @@ contexts:
- include: pattern-param
- include: dyn-types
- include: lifetime
- include: impl-trait
- match: (?={{identifier}}::)
push: type-path
- match: (?=::)
Expand Down Expand Up @@ -640,6 +640,7 @@ contexts:
scope: punctuation.accessor.rust
set: [type-path-second, path-after-accessor]
- include: type-names
- include: generic-identifier-names
- include: else-pop

type-path-second:
Expand Down Expand Up @@ -710,15 +711,6 @@ contexts:
- match: '\b(?:r#)?_*{{type_identifier}}'
scope: storage.type.rust

impl-types:
- match: '\bimpl\b'
scope: storage.type.impl.rust
push:
- include: comments
- include: impl-generic
- match: '(?=\S)'
pop: true

dyn-types:
- match: '\bdyn\b(?=\s*(?:\(|{{lifetime}}|{{identifier}}))'
scope: storage.type.trait.rust
Expand Down Expand Up @@ -803,6 +795,40 @@ contexts:
- match: '[-+%/*]'
scope: keyword.operator.arithmetic.rust

impl-trait:
- match: '\bimpl\b'
scope: storage.type.impl.rust
push: impl-trait-types

impl-trait-types:
- match: '\buse\b'
scope: keyword.other.rust
push: impl-trait-use
- include: types
- match: '(?=\S)'
pop: true

impl-trait-use:
- match: '<'
scope: punctuation.definition.generic.begin.rust
set: impl-trait-use-generic-body
- match: '(?=\S)'
pop: true

impl-trait-use-generic-body:
- meta_scope: meta.generic.rust
- match: '>'
scope: punctuation.definition.generic.end.rust
pop: true
- include: lifetime
- match: ','
scope: punctuation.separator.rust
- match: '\bSelf\b'
scope: keyword.other.rust
- include: all-generic-type-names
- match: '(?=\S)'
pop: true

##[ STRUCTS ]###############################################################

struct-identifier:
Expand Down
109 changes: 108 additions & 1 deletion Rust/tests/syntax_test_generics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,115 @@ fn function<const N: u16>() {
// ^^^ storage.type.numeric
let b: Byte<b'a'>;
// ^^^^^^ meta.function meta.block meta.generic
// ^^^^ string.quoted.single.rust
// ^^^^ string.quoted.single
// ^ storage.type.string
// ^ punctuation.definition.string.begin
// ^ punctuation.definition.string.end
}

fn impl_trait_return_use_bound<'a>() -> impl for<'b> Trait1<Item = impl Trait2<'a> + use<'a>> {}
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function meta.function.return-type
// ^^ punctuation.separator
// ^^^^ storage.type.impl
// ^^^ keyword.other
// ^ meta.generic punctuation.definition.generic.begin
// ^ meta.generic punctuation.definition.generic.end
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.generic
// ^ meta.generic punctuation.definition.generic.begin
// ^ meta.generic keyword.operator
// ^^^^ meta.generic storage.type.impl
// ^^^^ meta.generic meta.generic
// ^ punctuation.definition.generic.begin
// ^^ storage.modifier.lifetime
// ^ punctuation.definition.generic.end
// ^ keyword.operator
// ^^^ keyword.other
// ^^^^ meta.generic
// ^ punctuation.definition.generic.begin
// ^^ storage.modifier.lifetime
// ^ punctuation.definition.generic.end
// ^ punctuation.definition.generic.end

fn impl_trait_use<'a, foo>() -> impl Trait1 + use<'a, Self, foo> {}
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function meta.function.return-type
// ^ keyword.operator
// ^^^ keyword.other
// ^ punctuation.definition.generic.begin
// ^^ storage.modifier.lifetime
// ^ punctuation.separator
// ^^^^ keyword.other
// ^ punctuation.separator
// ^^^ storage.type.rust
// ^ punctuation.definition.generic.end

fn impl_trait_return1<'a, 'b>() -> impl Trait<&'a u8, Ty = impl Sized + 'b> {}
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function meta.function.return-type
// ^^ punctuation.separator
// ^^^^ storage.type.impl
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.generic
// ^ punctuation.definition.generic.begin
// ^ keyword.operator
// ^^ storage.modifier.lifetime
// ^^ storage.type
// ^ punctuation.separator
// ^ keyword.operator
// ^^^^ storage.type.impl
// ^^^^^ support.type
// ^ keyword.operator
// ^^ storage.modifier.lifetime
// ^ punctuation.definition.generic.end
fn impl_trait_return2() -> impl Debug + 'a {}
// ^^^^^^^^^^^^^^^^^^ meta.function meta.function.return-type
// ^^^^ storage.type.impl
// ^^^^^ storage.type.rust
// ^ keyword.operator
// ^^ storage.modifier.lifetime

fn impl_trait_param(x: impl FnOnce(&[u8]) -> &[u8]) {}
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function meta.function.parameters
// ^^^^ storage.type.impl
// ^^^^^^ support.type
// ^ meta.group punctuation.section.group.begin
// ^ meta.group keyword.operator
// ^ meta.group punctuation.section.group.begin
// ^^ meta.group storage.type
// ^^ meta.group punctuation.section.group.end
// ^^^^^^^^ meta.function meta.function.parameters meta.function.return-type
// ^^ punctuation.separator
// ^ meta.function.parameters keyword.operator
// ^ meta.function.parameters punctuation.section.group.begin
// ^^ meta.function.parameters storage.type
// ^ meta.function.parameters punctuation.section.group.end


fn impl_trait_with_plus() -> impl Iterator<Item = hir::GenericParam<'hir>> + Captures<'a> + Captures<'s> {}
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function meta.function.return-type
// ^^^^ storage.type.impl
// ^^^^^^^^ support.type
// ^^^^^^^^^^^^^^^^^^^^^^^^^ meta.generic - meta.generic meta.generic
// ^^^^ storage.type.rust
// ^ keyword.operator
// ^^^ variable.other.rust
// ^^ punctuation.accessor.rust
// ^^^^^^^^^^^^ storage.type.rust
// ^^^^^^ meta.generic meta.generic
// ^^^^ storage.modifier.lifetime
// ^ meta.generic - meta.generic meta.generic
// ^ keyword.operator
// ^^^^^^^^ storage.type.rust
// ^^^^ meta.generic
// ^^ storage.modifier.lifetime
// ^ keyword.operator
// ^^^^^^^^ storage.type.rust
// ^^^^ meta.generic
// ^^ storage.modifier.lifetime

fn impl_trait() -> impl Type use < {}
//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function.rust
// ^^^^^^^^^^^^^^^^^^^ meta.function.return-type.rust
// ^^^^ storage.type.impl.rust
// ^^^^ storage.type.rust
// ^^^ keyword.other.rust
// ^^ meta.generic.rust
// ^ punctuation.definition.generic.begin.rust
// ^^ meta.block.rust