13 files changed, 233 insertions, 16 deletions

diff --git a/crates/ra_ide_api/Cargo.toml b/crates/ra_ide_api/Cargo.toml
index 000694620..6bbf9d5dd 100644
--- a/crates/ra_ide_api/Cargo.toml
+++ b/crates/ra_ide_api/Cargo.toml
@@ -4,6 +4,9 @@ name = "ra_ide_api"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 
+[features]
+wasm = []
+
 [dependencies]
 format-buf = "1.0.0"
 itertools = "0.8.0"
diff --git a/crates/ra_ide_api/src/change.rs b/crates/ra_ide_api/src/change.rs
index 0d52f5ffb..cc476a237 100644
--- a/crates/ra_ide_api/src/change.rs
+++ b/crates/ra_ide_api/src/change.rs
@@ -6,6 +6,7 @@ use ra_db::{
 };
 use ra_prof::{memory_usage, profile, Bytes};
 use ra_syntax::SourceFile;
+#[cfg(not(feature = "wasm"))]
 use rayon::prelude::*;
 use relative_path::RelativePathBuf;
 use rustc_hash::FxHashMap;
@@ -143,7 +144,12 @@ impl LibraryData {
         root_id: SourceRootId,
         files: Vec<(FileId, RelativePathBuf, Arc<String>)>,
     ) -> LibraryData {
-        let symbol_index = SymbolIndex::for_files(files.par_iter().map(|(file_id, _, text)| {
+        #[cfg(not(feature = "wasm"))]
+        let iter = files.par_iter();
+        #[cfg(feature = "wasm")]
+        let iter = files.iter();
+
+        let symbol_index = SymbolIndex::for_files(iter.map(|(file_id, _, text)| {
             let parse = SourceFile::parse(text);
             (*file_id, parse)
         }));
@@ -234,8 +240,12 @@ impl RootDatabase {
     }
 
     pub(crate) fn maybe_collect_garbage(&mut self) {
+        if cfg!(feature = "wasm") {
+            return;
+        }
+
         if self.last_gc_check.elapsed() > GC_COOLDOWN {
-            self.last_gc_check = time::Instant::now();
+            self.last_gc_check = crate::wasm_shims::Instant::now();
             let retained_trees = syntax_tree_stats(self).retained;
             if retained_trees > 100 {
                 log::info!("automatic garbadge collection, {} retained trees", retained_trees);
@@ -245,8 +255,12 @@ impl RootDatabase {
     }
 
     pub(crate) fn collect_garbage(&mut self) {
+        if cfg!(feature = "wasm") {
+            return;
+        }
+
         let _p = profile("RootDatabase::collect_garbage");
-        self.last_gc = time::Instant::now();
+        self.last_gc = crate::wasm_shims::Instant::now();
 
         let sweep = SweepStrategy::default().discard_values().sweep_all_revisions();
 
diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs
index 4c5159d61..afd9022ce 100644
--- a/crates/ra_ide_api/src/db.rs
+++ b/crates/ra_ide_api/src/db.rs
@@ -1,4 +1,4 @@
-use std::{sync::Arc, time};
+use std::sync::Arc;
 
 use ra_db::{
     salsa::{self, Database, Durability},
@@ -25,8 +25,8 @@ pub(crate) struct RootDatabase {
     runtime: salsa::Runtime<RootDatabase>,
     pub(crate) feature_flags: Arc<FeatureFlags>,
     pub(crate) debug_data: Arc<DebugData>,
-    pub(crate) last_gc: time::Instant,
-    pub(crate) last_gc_check: time::Instant,
+    pub(crate) last_gc: crate::wasm_shims::Instant,
+    pub(crate) last_gc_check: crate::wasm_shims::Instant,
 }
 
 impl hir::debug::HirDebugHelper for RootDatabase {
@@ -69,8 +69,8 @@ impl RootDatabase {
     pub fn new(lru_capacity: Option<usize>, feature_flags: FeatureFlags) -> RootDatabase {
         let mut db = RootDatabase {
             runtime: salsa::Runtime::default(),
-            last_gc: time::Instant::now(),
-            last_gc_check: time::Instant::now(),
+            last_gc: crate::wasm_shims::Instant::now(),
+            last_gc_check: crate::wasm_shims::Instant::now(),
             feature_flags: Arc::new(feature_flags),
             debug_data: Default::default(),
         };
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs
index 412dc4d71..44d1ec77b 100644
--- a/crates/ra_ide_api/src/lib.rs
+++ b/crates/ra_ide_api/src/lib.rs
@@ -40,6 +40,7 @@ mod typing;
 mod matching_brace;
 mod display;
 mod inlay_hints;
+mod wasm_shims;
 
 #[cfg(test)]
 mod marks;
diff --git a/crates/ra_ide_api/src/symbol_index.rs b/crates/ra_ide_api/src/symbol_index.rs
index a5729c368..02cdfbc60 100644
--- a/crates/ra_ide_api/src/symbol_index.rs
+++ b/crates/ra_ide_api/src/symbol_index.rs
@@ -38,6 +38,7 @@ use ra_syntax::{
     SyntaxKind::{self, *},
     SyntaxNode, SyntaxNodePtr, TextRange, WalkEvent,
 };
+#[cfg(not(feature = "wasm"))]
 use rayon::prelude::*;
 
 use crate::{db::RootDatabase, FileId, Query};
@@ -79,10 +80,17 @@ pub(crate) fn world_symbols(db: &RootDatabase, query: Query) -> Vec<FileSymbol>
 
     let buf: Vec<Arc<SymbolIndex>> = if query.libs {
         let snap = Snap(db.snapshot());
-        db.library_roots()
+        #[cfg(not(feature = "wasm"))]
+        let buf = db
+            .library_roots()
             .par_iter()
             .map_with(snap, |db, &lib_id| db.0.library_symbols(lib_id))
-            .collect()
+            .collect();
+
+        #[cfg(feature = "wasm")]
+        let buf = db.library_roots().iter().map(|&lib_id| snap.0.library_symbols(lib_id)).collect();
+
+        buf
     } else {
         let mut files = Vec::new();
         for &root in db.local_roots().iter() {
@@ -91,7 +99,14 @@ pub(crate) fn world_symbols(db: &RootDatabase, query: Query) -> Vec<FileSymbol>
         }
 
         let snap = Snap(db.snapshot());
-        files.par_iter().map_with(snap, |db, &file_id| db.0.file_symbols(file_id)).collect()
+        #[cfg(not(feature = "wasm"))]
+        let buf =
+            files.par_iter().map_with(snap, |db, &file_id| db.0.file_symbols(file_id)).collect();
+
+        #[cfg(feature = "wasm")]
+        let buf = files.iter().map(|&file_id| snap.0.file_symbols(file_id)).collect();
+
+        buf
     };
     query.search(&buf)
 }
@@ -135,9 +150,12 @@ impl SymbolIndex {
         fn cmp_key<'a>(s1: &'a FileSymbol) -> impl Ord + 'a {
             unicase::Ascii::new(s1.name.as_str())
         }
-
+        #[cfg(not(feature = "wasm"))]
         symbols.par_sort_by(|s1, s2| cmp_key(s1).cmp(&cmp_key(s2)));
 
+        #[cfg(feature = "wasm")]
+        symbols.sort_by(|s1, s2| cmp_key(s1).cmp(&cmp_key(s2)));
+
         let mut builder = fst::MapBuilder::memory();
 
         let mut last_batch_start = 0;
@@ -169,6 +187,7 @@ impl SymbolIndex {
         self.map.as_fst().size() + self.symbols.len() * mem::size_of::<FileSymbol>()
     }
 
+    #[cfg(not(feature = "wasm"))]
     pub(crate) fn for_files(
         files: impl ParallelIterator<Item = (FileId, Parse<ast::SourceFile>)>,
     ) -> SymbolIndex {
@@ -178,6 +197,16 @@ impl SymbolIndex {
         SymbolIndex::new(symbols)
     }
 
+    #[cfg(feature = "wasm")]
+    pub(crate) fn for_files(
+        files: impl Iterator<Item = (FileId, Parse<ast::SourceFile>)>,
+    ) -> SymbolIndex {
+        let symbols = files
+            .flat_map(|(file_id, file)| source_file_to_file_symbols(&file.tree(), file_id))
+            .collect::<Vec<_>>();
+        SymbolIndex::new(symbols)
+    }
+
     fn range_to_map_value(start: usize, end: usize) -> u64 {
         debug_assert![start <= (std::u32::MAX as usize)];
         debug_assert![end <= (std::u32::MAX as usize)];
diff --git a/crates/ra_ide_api/src/wasm_shims.rs b/crates/ra_ide_api/src/wasm_shims.rs
new file mode 100644
index 000000000..592dddf44
--- /dev/null
+++ b/crates/ra_ide_api/src/wasm_shims.rs
@@ -0,0 +1,17 @@
+#[cfg(not(feature = "wasm"))]
+pub use std::time::Instant;
+
+#[cfg(feature = "wasm")]
+#[derive(Clone, Copy, Debug)]
+pub struct Instant;
+
+#[cfg(feature = "wasm")]
+impl Instant {
+    pub fn now() -> Self {
+        Self
+    }
+
+    pub fn elapsed(&self) -> std::time::Duration {
+        std::time::Duration::new(0, 0)
+    }
+}
diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs
index 6c7fdc2cd..457f42a26 100644
--- a/crates/ra_parser/src/grammar/expressions/atom.rs
+++ b/crates/ra_parser/src/grammar/expressions/atom.rs
@@ -54,6 +54,7 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet =
         LIFETIME,
         ASYNC_KW,
         TRY_KW,
+        LOOP_KW
     ]);
 
 const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW];
diff --git a/crates/ra_parser/src/grammar/patterns.rs b/crates/ra_parser/src/grammar/patterns.rs
index a4ffd6960..aa9a6d18e 100644
--- a/crates/ra_parser/src/grammar/patterns.rs
+++ b/crates/ra_parser/src/grammar/patterns.rs
@@ -167,7 +167,7 @@ fn record_field_pat_list(p: &mut Parser) {
             // A trailing `..` is *not* treated as a DOT_DOT_PAT.
             T![.] if p.at(T![..]) => p.bump(T![..]),
 
-            IDENT if p.nth(1) == T![:] => record_field_pat(p),
+            IDENT | INT_NUMBER if p.nth(1) == T![:] => record_field_pat(p),
             T!['{'] => error_block(p, "expected ident"),
             T![box] => {
                 box_pat(p);
@@ -184,12 +184,21 @@ fn record_field_pat_list(p: &mut Parser) {
     m.complete(p, RECORD_FIELD_PAT_LIST);
 }
 
+// test record_field_pat
+// fn foo() {
+//     let S { 0: 1 } = ();
+//     let S { x: 1 } = ();
+// }
 fn record_field_pat(p: &mut Parser) {
-    assert!(p.at(IDENT));
+    assert!(p.at(IDENT) || p.at(INT_NUMBER));
     assert!(p.nth(1) == T![:]);
 
     let m = p.start();
-    name(p);
+
+    if !p.eat(INT_NUMBER) {
+        name(p)
+    }
+
     p.bump_any();
     pattern(p);
     m.complete(p, RECORD_FIELD_PAT);
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rs b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rs
new file mode 100644
index 000000000..26b1d5f89
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rs
@@ -0,0 +1,4 @@
+fn foo() {
+    let S { 0: 1 } = ();
+    let S { x: 1 } = ();
+}
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.txt b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.txt
new file mode 100644
index 000000000..06fbdfabf
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.txt
@@ -0,0 +1,75 @@
+SOURCE_FILE@[0; 63)
+  FN_DEF@[0; 62)
+    FN_KW@[0; 2) "fn"
+    WHITESPACE@[2; 3) " "
+    NAME@[3; 6)
+      IDENT@[3; 6) "foo"
+    PARAM_LIST@[6; 8)
+      L_PAREN@[6; 7) "("
+      R_PAREN@[7; 8) ")"
+    WHITESPACE@[8; 9) " "
+    BLOCK_EXPR@[9; 62)
+      BLOCK@[9; 62)
+        L_CURLY@[9; 10) "{"
+        WHITESPACE@[10; 15) "\n    "
+        LET_STMT@[15; 35)
+          LET_KW@[15; 18) "let"
+          WHITESPACE@[18; 19) " "
+          RECORD_PAT@[19; 29)
+            PATH@[19; 20)
+              PATH_SEGMENT@[19; 20)
+                NAME_REF@[19; 20)
+                  IDENT@[19; 20) "S"
+            WHITESPACE@[20; 21) " "
+            RECORD_FIELD_PAT_LIST@[21; 29)
+              L_CURLY@[21; 22) "{"
+              WHITESPACE@[22; 23) " "
+              RECORD_FIELD_PAT@[23; 27)
+                INT_NUMBER@[23; 24) "0"
+                COLON@[24; 25) ":"
+                WHITESPACE@[25; 26) " "
+                LITERAL_PAT@[26; 27)
+                  LITERAL@[26; 27)
+                    INT_NUMBER@[26; 27) "1"
+              WHITESPACE@[27; 28) " "
+              R_CURLY@[28; 29) "}"
+          WHITESPACE@[29; 30) " "
+          EQ@[30; 31) "="
+          WHITESPACE@[31; 32) " "
+          TUPLE_EXPR@[32; 34)
+            L_PAREN@[32; 33) "("
+            R_PAREN@[33; 34) ")"
+          SEMI@[34; 35) ";"
+        WHITESPACE@[35; 40) "\n    "
+        LET_STMT@[40; 60)
+          LET_KW@[40; 43) "let"
+          WHITESPACE@[43; 44) " "
+          RECORD_PAT@[44; 54)
+            PATH@[44; 45)
+              PATH_SEGMENT@[44; 45)
+                NAME_REF@[44; 45)
+                  IDENT@[44; 45) "S"
+            WHITESPACE@[45; 46) " "
+            RECORD_FIELD_PAT_LIST@[46; 54)
+              L_CURLY@[46; 47) "{"
+              WHITESPACE@[47; 48) " "
+              RECORD_FIELD_PAT@[48; 52)
+                NAME@[48; 49)
+                  IDENT@[48; 49) "x"
+                COLON@[49; 50) ":"
+                WHITESPACE@[50; 51) " "
+                LITERAL_PAT@[51; 52)
+                  LITERAL@[51; 52)
+                    INT_NUMBER@[51; 52) "1"
+              WHITESPACE@[52; 53) " "
+              R_CURLY@[53; 54) "}"
+          WHITESPACE@[54; 55) " "
+          EQ@[55; 56) "="
+          WHITESPACE@[56; 57) " "
+          TUPLE_EXPR@[57; 59)
+            L_PAREN@[57; 58) "("
+            R_PAREN@[58; 59) ")"
+          SEMI@[59; 60) ";"
+        WHITESPACE@[60; 61) "\n"
+        R_CURLY@[61; 62) "}"
+  WHITESPACE@[62; 63) "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rs b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rs
new file mode 100644
index 000000000..31c12522f
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.rs
@@ -0,0 +1,5 @@
+fn foo(x: i32) {}
+
+fn main() {
+    foo(loop {});
+}
\ No newline at end of file
diff --git a/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.txt b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.txt
new file mode 100644
index 000000000..cc8c3f7ec
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/ok/0057_loop_in_call.txt
@@ -0,0 +1,59 @@
+SOURCE_FILE@[0; 50)
+  FN_DEF@[0; 17)
+    FN_KW@[0; 2) "fn"
+    WHITESPACE@[2; 3) " "
+    NAME@[3; 6)
+      IDENT@[3; 6) "foo"
+    PARAM_LIST@[6; 14)
+      L_PAREN@[6; 7) "("
+      PARAM@[7; 13)
+        BIND_PAT@[7; 8)
+          NAME@[7; 8)
+            IDENT@[7; 8) "x"
+        COLON@[8; 9) ":"
+        WHITESPACE@[9; 10) " "
+        PATH_TYPE@[10; 13)
+          PATH@[10; 13)
+            PATH_SEGMENT@[10; 13)
+              NAME_REF@[10; 13)
+                IDENT@[10; 13) "i32"
+      R_PAREN@[13; 14) ")"
+    WHITESPACE@[14; 15) " "
+    BLOCK_EXPR@[15; 17)
+      BLOCK@[15; 17)
+        L_CURLY@[15; 16) "{"
+        R_CURLY@[16; 17) "}"
+  WHITESPACE@[17; 19) "\n\n"
+  FN_DEF@[19; 50)
+    FN_KW@[19; 21) "fn"
+    WHITESPACE@[21; 22) " "
+    NAME@[22; 26)
+      IDENT@[22; 26) "main"
+    PARAM_LIST@[26; 28)
+      L_PAREN@[26; 27) "("
+      R_PAREN@[27; 28) ")"
+    WHITESPACE@[28; 29) " "
+    BLOCK_EXPR@[29; 50)
+      BLOCK@[29; 50)
+        L_CURLY@[29; 30) "{"
+        WHITESPACE@[30; 35) "\n    "
+        EXPR_STMT@[35; 48)
+          CALL_EXPR@[35; 47)
+            PATH_EXPR@[35; 38)
+              PATH@[35; 38)
+                PATH_SEGMENT@[35; 38)
+                  NAME_REF@[35; 38)
+                    IDENT@[35; 38) "foo"
+            ARG_LIST@[38; 47)
+              L_PAREN@[38; 39) "("
+              LOOP_EXPR@[39; 46)
+                LOOP_KW@[39; 43) "loop"
+                WHITESPACE@[43; 44) " "
+                BLOCK_EXPR@[44; 46)
+                  BLOCK@[44; 46)
+                    L_CURLY@[44; 45) "{"
+                    R_CURLY@[45; 46) "}"
+              R_PAREN@[46; 47) ")"
+          SEMI@[47; 48) ";"
+        WHITESPACE@[48; 49) "\n"
+        R_CURLY@[49; 50) "}"
diff --git a/crates/ra_tools/src/main.rs b/crates/ra_tools/src/main.rs
index 65d211b44..a951ce427 100644
--- a/crates/ra_tools/src/main.rs
+++ b/crates/ra_tools/src/main.rs
@@ -167,7 +167,7 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
     }
     .run()?;
 
-    let code_binary = ["code", "code-insiders"].iter().find(|bin| {
+    let code_binary = ["code", "code-insiders", "codium"].iter().find(|bin| {
         Cmd {
             unix: &format!("{} --version", bin),
             windows: &format!("cmd.exe /c {}.cmd --version", bin),