Skip to content

fix .await syntax to actually highlight #533

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

Open
seanmonstar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix .await syntax to actually highlight #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion syntax/rust.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ syn keyword rustKeyword use nextgroup=rustModPath skipwhite skipempty
syn keyword rustKeyword mod trait nextgroup=rustIdentifier skipwhite skipempty
syn keyword rustStorage move mut ref static const
syn match rustDefault /\<default\ze\_s\+\(impl\|fn\|type\|const\)\>/
syn keyword rustAwait await
" Match from the dot so `.await` wins over the generic identifier match.
syn match rustAwait /\.\%(await\>\)/hs=s+1 display
syn match rustKeyword /\<try\>!\@!/ display

syn keyword rustPubScopeCrate crate contained
Expand Down
12 changes: 12 additions & 0 deletions test/coverage.vader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,16 @@ Execute (RustEmitAsm - see that we actually get assembly output):
bd
call delete('test.rs')

Given rust (await syntax highlighting):
async fn main() {
foo.await?;
foo.await.bar();
foo.awaiting();
}

Execute (.await only highlights postfix await):
AssertEqual 'rustAwait', synIDattr(synID(2, 9, 1), 'name')
AssertEqual 'rustAwait', synIDattr(synID(3, 9, 1), 'name')
AssertEqual 'rustFuncCall', synIDattr(synID(4, 9, 1), 'name')

# TODO: a lot more tests