2 files changed, 5 insertions, 2 deletions

diff --git a/crates/ra_hir_expand/src/name.rs b/crates/ra_hir_expand/src/name.rs
index e62693b68..b3fa1efba 100644
--- a/crates/ra_hir_expand/src/name.rs
+++ b/crates/ra_hir_expand/src/name.rs
@@ -93,7 +93,10 @@ impl AsName for ast::FieldKind {
     fn as_name(&self) -> Name {
         match self {
             ast::FieldKind::Name(nr) => nr.as_name(),
-            ast::FieldKind::Index(idx) => Name::new_tuple_field(idx.text().parse().unwrap()),
+            ast::FieldKind::Index(idx) => {
+                let idx = idx.text().parse::<usize>().unwrap_or(0);
+                Name::new_tuple_field(idx)
+            }
         }
     }
 }
diff --git a/xtask/src/install.rs b/xtask/src/install.rs
index c5bb7351a..fa82633de 100644
--- a/xtask/src/install.rs
+++ b/xtask/src/install.rs
@@ -91,7 +91,7 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
     }
     .run()?;
 
-    let code_binary = ["code", "code-insiders", "codium"].iter().find(|bin| {
+    let code_binary = ["code", "code-insiders", "codium", "code-oss"].iter().find(|bin| {
         Cmd {
             unix: &format!("{} --version", bin),
             windows: &format!("cmd.exe /c {}.cmd --version", bin),