Skip to content

add function pattern syntax #274

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.

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

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 15 additions & 4 deletions RustEnhanced.sublime-syntax
Original file line number Diff line number Diff line change
Expand Up @@ -800,11 +800,22 @@ contexts:
pop: true
- match: \bself\b
scope: variable.parameter.rust
- match: '({{identifier}})\s*(:(?!:))'
captures:
1: variable.parameter.rust
2: punctuation.separator.rust
- include: basic-identifiers
- match: '[\{\(]'
scope: punctuation.definition.block.begin.rust
push:
- match: '[\}\)]'
scope: punctuation.definition.block.end.rust
pop: true
- match: '{{ident}}'
scope: variable.parameter.rust
- include: statements
- include: attribute
- include: type-any-identifier
- match: '{{ident}}'
scope: variable.parameter.rust
- match: ':'
scope: punctuation.separator.rust

fn-return:
- meta_scope: meta.function.rust
Expand Down
41 changes: 41 additions & 0 deletions syntax_test_rust.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1203,3 +1203,44 @@ pub union Foo<'a, Y: Baz>
// that we don't accidentally interpret it as a keyword.
fn union() {}
// ^^^^^ meta.function entity.name.function

fn deconstructor(Foo(a, b): Foo) {
// ^^^
// ^ meta.function.rust meta.function.parameters.rust punctuation.definition.block.begin.rust
// ^ meta.function.rust meta.function.parameters.rust variable.parameter.rust
// ^ meta.function.rust meta.function.parameters.rust variable.parameter.rust
// ^ meta.function.rust meta.function.parameters.rust punctuation.definition.block.end.rust
// ^ meta.function.rust meta.function.parameters.rust punctuation.separator.rust
// ^^^ meta.function.rust meta.function.parameters.rust storage.type.source.rust
unimplemented!();
}

fn deconstructor(Foo{ 0: x, 1: y }: Foo) {
// ^^^ meta.function.rust meta.function.parameters.rust storage.type.source.rust
// ^ meta.function.rust meta.function.parameters.rust punctuation.definition.block.begin.rust
// ^ meta.function.rust meta.function.parameters.rust constant.numeric.integer.decimal.rust
// ^ meta.function.rust meta.function.parameters.rust variable.parameter.rust
// ^ meta.function.rust meta.function.parameters.rust constant.numeric.integer.decimal.rust
// ^ meta.function.rust meta.function.parameters.rust punctuation.separator.rust
// ^ meta.function.rust meta.function.parameters.rust variable.parameter.rust
// ^ meta.function.rust meta.function.parameters.rust punctuation.definition.block.end.rust
// ^ meta.function.rust meta.function.parameters.rust punctuation.separator.rust
// ^^^ meta.function.rust meta.function.parameters.rust storage.type.source.rust
unimplemented!();
}

fn deconstructor(Foo{ a, b, c, d: _, .. }: Foo) {
// ^^^ meta.function.rust meta.function.parameters.rust storage.type.source.rust
// ^ meta.function.rust meta.function.parameters.rust punctuation.definition.block.begin.rust
// ^ meta.function.rust meta.function.parameters.rust variable.parameter.rust
// ^ meta.function.rust meta.function.parameters.rust variable.parameter.rust
// ^ meta.function.rust meta.function.parameters.rust variable.parameter.rust
// ^ meta.function.rust meta.function.parameters.rust variable.parameter.rust
// ^ meta.function.rust meta.function.parameters.rust punctuation.separator.rust
// ^^^ meta.function.rust meta.function.parameters.rust
// ^^ meta.function.rust meta.function.parameters.rust keyword.operator.rust
// ^ meta.function.rust meta.function.parameters.rust punctuation.definition.block.end.rust
// ^ meta.function.rust meta.function.parameters.rust punctuation.separator.rust
// ^^^ meta.function.rust meta.function.parameters.rust storage.type.source.rust
unimplemented!();
}