Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #65

Browse source 
65: simplify r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2018-09-08 16:24:24 +00:00
commit 4f64709666
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -47,7 +47,11 @@ doesn't hurt too much :-)
* **Go to symbol in file** * **Go to symbol in file**
* **Go to symbol in workspace** (no support for Cargo deps yet) * **Go to symbol in workspace**
- `#Foo` searches for `Foo` type in the current workspace
- `#foo#` searches for `foo` function in the current workspace
- `#Foo*` searches for `Foo` type among dependencies, excluding `stdlib`
- Sorry for a weired UI, neither LSP, not VSCode have any sane API for filtering! :)
* code actions: * code actions:
- Flip `,` in comma separated lists - Flip `,` in comma separated lists

2
crates/libsyntax2/src/parser_api.rs
View file

@ -118,7 +118,7 @@ impl<'t> Parser<'t> {
pub(crate) fn err_recover(&mut self, message: &str, recovery: TokenSet) { pub(crate) fn err_recover(&mut self, message: &str, recovery: TokenSet) {
if self.at(SyntaxKind::L_CURLY) if self.at(SyntaxKind::L_CURLY)
|| self.at(SyntaxKind::R_CURLY) || self.at(SyntaxKind::R_CURLY)
|| recovery.contains(self.current()) { || self.at_ts(recovery) {
self.error(message); self.error(message);
} else { } else {
let m = self.start(); let m = self.start();