aboutsummaryrefslogtreecommitdiff
path: root/crates/server/src/server_world.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2018-08-30 14:27:09 +0100
committerAleksey Kladov <[email protected]>2018-08-30 14:27:09 +0100
commit9fcebbc51284408203c05219a0ee92519f51ea74 (patch)
tree5fd3f53769e3fe5b8f6a0d2a5eaa86167b7a3b10 /crates/server/src/server_world.rs
parent7570d85869da7e2d35958047f8d1a90e3b6e2212 (diff)
subscriptions
Diffstat (limited to 'crates/server/src/server_world.rs')
-rw-r--r--crates/server/src/server_world.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/crates/server/src/server_world.rs b/crates/server/src/server_world.rs
index 9ba7df0b8..d99ef661e 100644
--- a/crates/server/src/server_world.rs
+++ b/crates/server/src/server_world.rs
@@ -61,10 +61,11 @@ impl ServerWorldState {
61 self.analysis_host.change_files(changes); 61 self.analysis_host.change_files(changes);
62 } 62 }
63 63
64 pub fn add_mem_file(&mut self, path: PathBuf, text: String) { 64 pub fn add_mem_file(&mut self, path: PathBuf, text: String) -> FileId {
65 let file_id = self.path_map.get_or_insert(path); 65 let file_id = self.path_map.get_or_insert(path);
66 self.mem_map.insert(file_id, None); 66 self.mem_map.insert(file_id, None);
67 self.analysis_host.change_file(file_id, Some(text)); 67 self.analysis_host.change_file(file_id, Some(text));
68 file_id
68 } 69 }
69 70
70 pub fn change_mem_file(&mut self, path: &Path, text: String) -> Result<()> { 71 pub fn change_mem_file(&mut self, path: &Path, text: String) -> Result<()> {
@@ -75,7 +76,7 @@ impl ServerWorldState {
75 Ok(()) 76 Ok(())
76 } 77 }
77 78
78 pub fn remove_mem_file(&mut self, path: &Path) -> Result<()> { 79 pub fn remove_mem_file(&mut self, path: &Path) -> Result<FileId> {
79 let file_id = self.path_map.get_id(path).ok_or_else(|| { 80 let file_id = self.path_map.get_id(path).ok_or_else(|| {
80 format_err!("change to unknown file: {}", path.display()) 81 format_err!("change to unknown file: {}", path.display())
81 })?; 82 })?;
@@ -86,7 +87,7 @@ impl ServerWorldState {
86 // Do this via file watcher ideally. 87 // Do this via file watcher ideally.
87 let text = fs::read_to_string(path).ok(); 88 let text = fs::read_to_string(path).ok();
88 self.analysis_host.change_file(file_id, text); 89 self.analysis_host.change_file(file_id, text);
89 Ok(()) 90 Ok(file_id)
90 } 91 }
91 92
92 pub fn snapshot(&self) -> ServerWorld { 93 pub fn snapshot(&self) -> ServerWorld {