mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

Browse Source 
10079: internal: make upstream bug less annoying r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2021-08-30 07:39:34 +00:00 committed by GitHub
commit b3452dd379
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions

5
crates/rust-analyzer/src/handlers.rs

@ -7,7 +7,6 @@ use std::{
process::{self, Stdio},
};
use always_assert::always;
use ide::{
AnnotationConfig, AssistKind, AssistResolveStrategy, FileId, FilePosition, FileRange,
HoverAction, HoverGotoTypeData, Query, RangeInfo, Runnable, RunnableKind, SingleResolve,
@ -268,7 +267,9 @@ pub(crate) fn handle_on_type_formatting(
let char_typed = params.ch.chars().next().unwrap_or('\0');
let text = snap.analysis.file_text(position.file_id)?;
if !always!(text[usize::from(position.offset)..].starts_with(char_typed)) {
if !text[usize::from(position.offset)..].starts_with(char_typed) {
// Add `always!` here once VS Code bug is fixed:
// https://github.com/rust-analyzer/rust-analyzer/issues/10002
return Ok(None);
}