aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide/src/syntax_highlighting
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-06-24 11:31:20 +0100
committerGitHub <[email protected]>2020-06-24 11:31:20 +0100
commit414b731e7d3ae4d7b939744a83c2530d4836ae05 (patch)
tree68b559beb5a2a4a653ed9596fe5820792c50900a /crates/ra_ide/src/syntax_highlighting
parent5d84e27ba961e03c3f394b9a6ef2a035dcc183be (diff)
parent0a2b6087ec060bbf61330f0eec90cf5ca00c4f90 (diff)
parenta0b76161ab8507fd8abe0c1895aa5dd784978ae2 (diff)
Merge #5024 #5026
5024: Simplify r=matklad a=matklad bors r+ 🤖 5026: Disable file watching when running slow tests r=matklad a=matklad This should rid us of the intermittent test failure https://github.com/rust-analyzer/rust-analyzer/pull/5017#issuecomment-648717983 bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>