Merge #8950

8950: minor: align import style with styleguide r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

2 files changed, 6 insertions, 3 deletions

diff --git a/crates/ide_db/src/ty_filter.rs b/crates/ide_db/src/ty_filter.rs
index 00678bf3e..766d8c628 100644
--- a/crates/ide_db/src/ty_filter.rs
+++ b/crates/ide_db/src/ty_filter.rs
@@ -4,7 +4,7 @@
 
 use std::iter;
 
-use hir::{Adt, Semantics, Type};
+use hir::Semantics;
 use syntax::ast::{self, make};
 
 use crate::RootDatabase;
@@ -20,9 +20,9 @@ impl TryEnum {
     const ALL: [TryEnum; 2] = [TryEnum::Option, TryEnum::Result];
 
     /// Returns `Some(..)` if the provided type is an enum that implements `std::ops::Try`.
-    pub fn from_ty(sema: &Semantics<RootDatabase>, ty: &Type) -> Option<TryEnum> {
+    pub fn from_ty(sema: &Semantics<RootDatabase>, ty: &hir::Type) -> Option<TryEnum> {
         let enum_ = match ty.as_adt() {
-            Some(Adt::Enum(it)) => it,
+            Some(hir::Adt::Enum(it)) => it,
             _ => return None,
         };
         TryEnum::ALL.iter().find_map(|&var| {
diff --git a/editors/code/src/snippets.ts b/editors/code/src/snippets.ts
index 9561aa345..58f7aa128 100644
--- a/editors/code/src/snippets.ts
+++ b/editors/code/src/snippets.ts
@@ -56,6 +56,9 @@ export async function applySnippetTextEdits(editor: vscode.TextEditor, edits: vs
         }
     });
     if (selections.length > 0) editor.selections = selections;
+    if (selections.length === 1) {
+        editor.revealRange(selections[0], vscode.TextEditorRevealType.InCenterIfOutsideViewport);
+    }
 }
 
 function parseSnippet(snip: string): [string, [number, number]] | undefined {