aboutsummaryrefslogtreecommitdiff
path: root/crates/ide/src/syntax_highlighting/highlight.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-01-18 19:40:11 +0000
committerGitHub <[email protected]>2021-01-18 19:40:11 +0000
commit342bf41022fa78856a48560b521ea32aa76f6f06 (patch)
tree733a17f4ffc78490928717433c8434545afd157c /crates/ide/src/syntax_highlighting/highlight.rs
parentcb0d77ab3cbed674fdab9baf5c834f89b67a628d (diff)
parentf01cfe911410a2f35f95ec1e7befb51d51a5343e (diff)
parentb26002410b5acda8d0e1322071881cdb8a2b6724 (diff)
Merge #7297 #7338
7297: Propose trait associated items and autoimport traits on completion r=matklad a=SomeoneToIgnore ![trait_imports](https://user-images.githubusercontent.com/2690773/104819998-6faeb480-583a-11eb-8b45-b7351b51b90e.gif) Closes #7248 7338: Parse `impl const Trait` r=Veykril a=Veykril Closes #7313 bors r+ Co-authored-by: Kirill Bulatov <[email protected]> Co-authored-by: Lukas Wirth <[email protected]>