diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-09-29 20:23:15 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-09-29 20:23:15 +0100 |
commit | 80b0b0ea03a36451210c6f1beec66aa1150f194f (patch) | |
tree | c5a634e9836978c0fbb679c2529eea518add1196 /crates/rust-analyzer/src/main_loop.rs | |
parent | 7283783b98ed61ee4f94961b81ad06e2344098d2 (diff) | |
parent | e7df0ad2fb48166937fdd061e1ae559c72a81990 (diff) |
Merge #6095
6095: Remove periodic gc stub r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/rust-analyzer/src/main_loop.rs')
-rw-r--r-- | crates/rust-analyzer/src/main_loop.rs | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index 06ab9d508..c2d0ac791 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs | |||
@@ -189,19 +189,16 @@ impl GlobalState { | |||
189 | } | 189 | } |
190 | lsp_server::Message::Response(resp) => self.complete_request(resp), | 190 | lsp_server::Message::Response(resp) => self.complete_request(resp), |
191 | }, | 191 | }, |
192 | Event::Task(task) => { | 192 | Event::Task(task) => match task { |
193 | match task { | 193 | Task::Response(response) => self.respond(response), |
194 | Task::Response(response) => self.respond(response), | 194 | Task::Diagnostics(diagnostics_per_file) => { |
195 | Task::Diagnostics(diagnostics_per_file) => { | 195 | for (file_id, diagnostics) in diagnostics_per_file { |
196 | for (file_id, diagnostics) in diagnostics_per_file { | 196 | self.diagnostics.set_native_diagnostics(file_id, diagnostics) |
197 | self.diagnostics.set_native_diagnostics(file_id, diagnostics) | ||
198 | } | ||
199 | } | 197 | } |
200 | Task::Workspaces(workspaces) => self.switch_workspaces(workspaces), | ||
201 | Task::Unit => (), | ||
202 | } | 198 | } |
203 | self.analysis_host.maybe_collect_garbage(); | 199 | Task::Workspaces(workspaces) => self.switch_workspaces(workspaces), |
204 | } | 200 | Task::Unit => (), |
201 | }, | ||
205 | Event::Vfs(mut task) => { | 202 | Event::Vfs(mut task) => { |
206 | let _p = profile::span("GlobalState::handle_event/vfs"); | 203 | let _p = profile::span("GlobalState::handle_event/vfs"); |
207 | loop { | 204 | loop { |