diff options
| author | Aleksey Kladov <[email protected]> | 2019-01-20 18:05:01 +0000 |
|---|---|---|
| committer | Aleksey Kladov <[email protected]> | 2019-01-20 18:05:01 +0000 |
| commit | 73836cdbbc928f3512156f0bc0166e5a39ad9864 (patch) | |
| tree | 0cdaf64f538467c3f5a974cac51413f495250f06 /crates/ra_ide_api | |
| parent | 171f6e6d00d1fc99395b7b92c8a40b47d6bd6962 (diff) | |
extend selection expands macros and can totally panic
Diffstat (limited to 'crates/ra_ide_api')
| -rw-r--r-- | crates/ra_ide_api/src/extend_selection.rs | 2 | ||||
| -rw-r--r-- | crates/ra_ide_api/src/lib.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_ide_api/src/extend_selection.rs b/crates/ra_ide_api/src/extend_selection.rs index 9f0ab2f1c..718b4def5 100644 --- a/crates/ra_ide_api/src/extend_selection.rs +++ b/crates/ra_ide_api/src/extend_selection.rs | |||
| @@ -51,7 +51,7 @@ mod tests { | |||
| 51 | } | 51 | } |
| 52 | ", | 52 | ", |
| 53 | ); | 53 | ); |
| 54 | let r = analysis.extend_selection(frange); | 54 | let r = analysis.extend_selection(frange).unwrap(); |
| 55 | assert_eq!(r, TextRange::from_to(51.into(), 56.into())); | 55 | assert_eq!(r, TextRange::from_to(51.into(), 56.into())); |
| 56 | } | 56 | } |
| 57 | } | 57 | } |
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs index e41d85e70..919d248e2 100644 --- a/crates/ra_ide_api/src/lib.rs +++ b/crates/ra_ide_api/src/lib.rs | |||
| @@ -310,8 +310,8 @@ impl Analysis { | |||
| 310 | } | 310 | } |
| 311 | 311 | ||
| 312 | /// Selects the next syntactic nodes encopasing the range. | 312 | /// Selects the next syntactic nodes encopasing the range. |
| 313 | pub fn extend_selection(&self, frange: FileRange) -> TextRange { | 313 | pub fn extend_selection(&self, frange: FileRange) -> Cancelable<TextRange> { |
| 314 | extend_selection::extend_selection(&self.db, frange) | 314 | self.with_db(|db| extend_selection::extend_selection(db, frange)) |
| 315 | } | 315 | } |
| 316 | 316 | ||
| 317 | /// Returns position of the mathcing brace (all types of braces are | 317 | /// Returns position of the mathcing brace (all types of braces are |