aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crates/ra_ide_api/Cargo.toml3
-rw-r--r--crates/ra_ide_api/src/change.rs20
-rw-r--r--crates/ra_ide_api/src/db.rs10
-rw-r--r--crates/ra_ide_api/src/lib.rs1
-rw-r--r--crates/ra_ide_api/src/symbol_index.rs37
-rw-r--r--crates/ra_ide_api/src/wasm_shims.rs17
6 files changed, 76 insertions, 12 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"
4version = "0.1.0" 4version = "0.1.0"
5authors = ["rust-analyzer developers"] 5authors = ["rust-analyzer developers"]
6 6
7[features]
8wasm = []
9
7[dependencies] 10[dependencies]
8format-buf = "1.0.0" 11format-buf = "1.0.0"
9itertools = "0.8.0" 12itertools = "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::{
6}; 6};
7use ra_prof::{memory_usage, profile, Bytes}; 7use ra_prof::{memory_usage, profile, Bytes};
8use ra_syntax::SourceFile; 8use ra_syntax::SourceFile;
9#[cfg(not(feature = "wasm"))]
9use rayon::prelude::*; 10use rayon::prelude::*;
10use relative_path::RelativePathBuf; 11use relative_path::RelativePathBuf;
11use rustc_hash::FxHashMap; 12use rustc_hash::FxHashMap;
@@ -143,7 +144,12 @@ impl LibraryData {
143 root_id: SourceRootId, 144 root_id: SourceRootId,
144 files: Vec<(FileId, RelativePathBuf, Arc<String>)>, 145 files: Vec<(FileId, RelativePathBuf, Arc<String>)>,
145 ) -> LibraryData { 146 ) -> LibraryData {
146 let symbol_index = SymbolIndex::for_files(files.par_iter().map(|(file_id, _, text)| { 147 #[cfg(not(feature = "wasm"))]
148 let iter = files.par_iter();
149 #[cfg(feature = "wasm")]
150 let iter = files.iter();
151
152 let symbol_index = SymbolIndex::for_files(iter.map(|(file_id, _, text)| {
147 let parse = SourceFile::parse(text); 153 let parse = SourceFile::parse(text);
148 (*file_id, parse) 154 (*file_id, parse)
149 })); 155 }));
@@ -234,8 +240,12 @@ impl RootDatabase {
234 } 240 }
235 241
236 pub(crate) fn maybe_collect_garbage(&mut self) { 242 pub(crate) fn maybe_collect_garbage(&mut self) {
243 if cfg!(feature = "wasm") {
244 return;
245 }
246
237 if self.last_gc_check.elapsed() > GC_COOLDOWN { 247 if self.last_gc_check.elapsed() > GC_COOLDOWN {
238 self.last_gc_check = time::Instant::now(); 248 self.last_gc_check = crate::wasm_shims::Instant::now();
239 let retained_trees = syntax_tree_stats(self).retained; 249 let retained_trees = syntax_tree_stats(self).retained;
240 if retained_trees > 100 { 250 if retained_trees > 100 {
241 log::info!("automatic garbadge collection, {} retained trees", retained_trees); 251 log::info!("automatic garbadge collection, {} retained trees", retained_trees);
@@ -245,8 +255,12 @@ impl RootDatabase {
245 } 255 }
246 256
247 pub(crate) fn collect_garbage(&mut self) { 257 pub(crate) fn collect_garbage(&mut self) {
258 if cfg!(feature = "wasm") {
259 return;
260 }
261
248 let _p = profile("RootDatabase::collect_garbage"); 262 let _p = profile("RootDatabase::collect_garbage");
249 self.last_gc = time::Instant::now(); 263 self.last_gc = crate::wasm_shims::Instant::now();
250 264
251 let sweep = SweepStrategy::default().discard_values().sweep_all_revisions(); 265 let sweep = SweepStrategy::default().discard_values().sweep_all_revisions();
252 266
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 @@
1use std::{sync::Arc, time}; 1use std::sync::Arc;
2 2
3use ra_db::{ 3use ra_db::{
4 salsa::{self, Database, Durability}, 4 salsa::{self, Database, Durability},
@@ -25,8 +25,8 @@ pub(crate) struct RootDatabase {
25 runtime: salsa::Runtime<RootDatabase>, 25 runtime: salsa::Runtime<RootDatabase>,
26 pub(crate) feature_flags: Arc<FeatureFlags>, 26 pub(crate) feature_flags: Arc<FeatureFlags>,
27 pub(crate) debug_data: Arc<DebugData>, 27 pub(crate) debug_data: Arc<DebugData>,
28 pub(crate) last_gc: time::Instant, 28 pub(crate) last_gc: crate::wasm_shims::Instant,
29 pub(crate) last_gc_check: time::Instant, 29 pub(crate) last_gc_check: crate::wasm_shims::Instant,
30} 30}
31 31
32impl hir::debug::HirDebugHelper for RootDatabase { 32impl hir::debug::HirDebugHelper for RootDatabase {
@@ -69,8 +69,8 @@ impl RootDatabase {
69 pub fn new(lru_capacity: Option<usize>, feature_flags: FeatureFlags) -> RootDatabase { 69 pub fn new(lru_capacity: Option<usize>, feature_flags: FeatureFlags) -> RootDatabase {
70 let mut db = RootDatabase { 70 let mut db = RootDatabase {
71 runtime: salsa::Runtime::default(), 71 runtime: salsa::Runtime::default(),
72 last_gc: time::Instant::now(), 72 last_gc: crate::wasm_shims::Instant::now(),
73 last_gc_check: time::Instant::now(), 73 last_gc_check: crate::wasm_shims::Instant::now(),
74 feature_flags: Arc::new(feature_flags), 74 feature_flags: Arc::new(feature_flags),
75 debug_data: Default::default(), 75 debug_data: Default::default(),
76 }; 76 };
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;
40mod matching_brace; 40mod matching_brace;
41mod display; 41mod display;
42mod inlay_hints; 42mod inlay_hints;
43mod wasm_shims;
43 44
44#[cfg(test)] 45#[cfg(test)]
45mod marks; 46mod 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::{
38 SyntaxKind::{self, *}, 38 SyntaxKind::{self, *},
39 SyntaxNode, SyntaxNodePtr, TextRange, WalkEvent, 39 SyntaxNode, SyntaxNodePtr, TextRange, WalkEvent,
40}; 40};
41#[cfg(not(feature = "wasm"))]
41use rayon::prelude::*; 42use rayon::prelude::*;
42 43
43use crate::{db::RootDatabase, FileId, Query}; 44use crate::{db::RootDatabase, FileId, Query};
@@ -79,10 +80,17 @@ pub(crate) fn world_symbols(db: &RootDatabase, query: Query) -> Vec<FileSymbol>
79 80
80 let buf: Vec<Arc<SymbolIndex>> = if query.libs { 81 let buf: Vec<Arc<SymbolIndex>> = if query.libs {
81 let snap = Snap(db.snapshot()); 82 let snap = Snap(db.snapshot());
82 db.library_roots() 83 #[cfg(not(feature = "wasm"))]
84 let buf = db
85 .library_roots()
83 .par_iter() 86 .par_iter()
84 .map_with(snap, |db, &lib_id| db.0.library_symbols(lib_id)) 87 .map_with(snap, |db, &lib_id| db.0.library_symbols(lib_id))
85 .collect() 88 .collect();
89
90 #[cfg(feature = "wasm")]
91 let buf = db.library_roots().iter().map(|&lib_id| snap.0.library_symbols(lib_id)).collect();
92
93 buf
86 } else { 94 } else {
87 let mut files = Vec::new(); 95 let mut files = Vec::new();
88 for &root in db.local_roots().iter() { 96 for &root in db.local_roots().iter() {
@@ -91,7 +99,14 @@ pub(crate) fn world_symbols(db: &RootDatabase, query: Query) -> Vec<FileSymbol>
91 } 99 }
92 100
93 let snap = Snap(db.snapshot()); 101 let snap = Snap(db.snapshot());
94 files.par_iter().map_with(snap, |db, &file_id| db.0.file_symbols(file_id)).collect() 102 #[cfg(not(feature = "wasm"))]
103 let buf =
104 files.par_iter().map_with(snap, |db, &file_id| db.0.file_symbols(file_id)).collect();
105
106 #[cfg(feature = "wasm")]
107 let buf = files.iter().map(|&file_id| snap.0.file_symbols(file_id)).collect();
108
109 buf
95 }; 110 };
96 query.search(&buf) 111 query.search(&buf)
97} 112}
@@ -135,9 +150,12 @@ impl SymbolIndex {
135 fn cmp_key<'a>(s1: &'a FileSymbol) -> impl Ord + 'a { 150 fn cmp_key<'a>(s1: &'a FileSymbol) -> impl Ord + 'a {
136 unicase::Ascii::new(s1.name.as_str()) 151 unicase::Ascii::new(s1.name.as_str())
137 } 152 }
138 153 #[cfg(not(feature = "wasm"))]
139 symbols.par_sort_by(|s1, s2| cmp_key(s1).cmp(&cmp_key(s2))); 154 symbols.par_sort_by(|s1, s2| cmp_key(s1).cmp(&cmp_key(s2)));
140 155
156 #[cfg(feature = "wasm")]
157 symbols.sort_by(|s1, s2| cmp_key(s1).cmp(&cmp_key(s2)));
158
141 let mut builder = fst::MapBuilder::memory(); 159 let mut builder = fst::MapBuilder::memory();
142 160
143 let mut last_batch_start = 0; 161 let mut last_batch_start = 0;
@@ -169,6 +187,7 @@ impl SymbolIndex {
169 self.map.as_fst().size() + self.symbols.len() * mem::size_of::<FileSymbol>() 187 self.map.as_fst().size() + self.symbols.len() * mem::size_of::<FileSymbol>()
170 } 188 }
171 189
190 #[cfg(not(feature = "wasm"))]
172 pub(crate) fn for_files( 191 pub(crate) fn for_files(
173 files: impl ParallelIterator<Item = (FileId, Parse<ast::SourceFile>)>, 192 files: impl ParallelIterator<Item = (FileId, Parse<ast::SourceFile>)>,
174 ) -> SymbolIndex { 193 ) -> SymbolIndex {
@@ -178,6 +197,16 @@ impl SymbolIndex {
178 SymbolIndex::new(symbols) 197 SymbolIndex::new(symbols)
179 } 198 }
180 199
200 #[cfg(feature = "wasm")]
201 pub(crate) fn for_files(
202 files: impl Iterator<Item = (FileId, Parse<ast::SourceFile>)>,
203 ) -> SymbolIndex {
204 let symbols = files
205 .flat_map(|(file_id, file)| source_file_to_file_symbols(&file.tree(), file_id))
206 .collect::<Vec<_>>();
207 SymbolIndex::new(symbols)
208 }
209
181 fn range_to_map_value(start: usize, end: usize) -> u64 { 210 fn range_to_map_value(start: usize, end: usize) -> u64 {
182 debug_assert![start <= (std::u32::MAX as usize)]; 211 debug_assert![start <= (std::u32::MAX as usize)];
183 debug_assert![end <= (std::u32::MAX as usize)]; 212 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 @@
1#[cfg(not(feature = "wasm"))]
2pub use std::time::Instant;
3
4#[cfg(feature = "wasm")]
5#[derive(Clone, Copy, Debug)]
6pub struct Instant;
7
8#[cfg(feature = "wasm")]
9impl Instant {
10 pub fn now() -> Self {
11 Self
12 }
13
14 pub fn elapsed(&self) -> std::time::Duration {
15 std::time::Duration::new(0, 0)
16 }
17}