af03df3 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

fix write scratch buffer to file

af03df3Skyler Hawthorne4 years ago

helix-term/src/commands/typed.rs−4

compare with master

unifiedsplit

@@ -273,10 +273,6 @@ fn write_impl(

273 let doc = doc_mut!(cx.editor);

274 let path = path.map(AsRef::as_ref);

275

276− if doc.path().is_none() {

277− bail!("cannot write a buffer without a filename");

278− }

279−

280 let fmt = if editor_auto_fmt {

276 let fmt = if editor_auto_fmt {

281 doc.auto_format().map(|fmt| {

277 doc.auto_format().map(|fmt| {

282 let callback = make_format_callback(

278 let callback = make_format_callback(

helix-term/tests/test/write.rs+54−17

@@ -128,6 +128,52 @@ async fn test_write_fail_mod_flag() -> anyhow::Result<()> {

128 Ok(())

129}

130

131+#[tokio::test]

132+async fn test_write_scratch_to_new_path() -> anyhow::Result<()> {

133+ let mut file = tempfile::NamedTempFile::new()?;

134+

135+ test_key_sequence(

136+ &mut Application::new(Args::default(), Config::default())?,

137+ Some(format!("ihello<esc>:w {}<ret>", file.path().to_string_lossy()).as_ref()),

138+ Some(&|app| {

139+ assert!(!app.editor.is_err());

140+

141+ let mut docs: Vec<_> = app.editor.documents().collect();

142+ assert_eq!(1, docs.len());

143+

144+ let doc = docs.pop().unwrap();

145+ assert_eq!(Some(&file.path().to_path_buf()), doc.path());

146+ }),

147+ false,

148+ )

149+ .await?;

150+

151+ helpers::assert_file_has_content(file.as_file_mut(), &helpers::platform_line("hello"))?;

152+

153+ Ok(())

154+}

155+

156+#[tokio::test]

157+async fn test_write_scratch_no_path_fails() -> anyhow::Result<()> {

158+ helpers::test_key_sequence_with_input_text(

159+ None,

160+ ("#[\n|]#", "ihello<esc>:w<ret>", "hello#[\n|]#"),

161+ &|app| {

162+ assert!(app.editor.is_err());

163+

164+ let mut docs: Vec<_> = app.editor.documents().collect();

165+ assert_eq!(1, docs.len());

166+

167+ let doc = docs.pop().unwrap();

168+ assert_eq!(None, doc.path());

169+ },

170+ false,

171+ )

172+ .await?;

173+

174+ Ok(())

175+}

176+

131#[tokio::test]

177#[tokio::test]

132async fn test_write_new_path() -> anyhow::Result<()> {

178async fn test_write_new_path() -> anyhow::Result<()> {

133 let mut file1 = tempfile::NamedTempFile::new().unwrap();

179 let mut file1 = tempfile::NamedTempFile::new().unwrap();

@@ -164,24 +210,15 @@ async fn test_write_new_path() -> anyhow::Result<()> {

164 )

210 )

165 .await?;

211 .await?;

166

212

167− file1.as_file_mut().flush()?;

213+ helpers::assert_file_has_content(

168− file1.as_file_mut().sync_all()?;

214+ file1.as_file_mut(),

169− file2.as_file_mut().flush()?;

215+ &helpers::platform_line("i can eat glass, it will not hurt me\n"),

170− file2.as_file_mut().sync_all()?;

216+ )?;

171

217

172− let mut file1_content = String::new();

218+ helpers::assert_file_has_content(

173− file1.as_file_mut().read_to_string(&mut file1_content)?;

174− assert_eq!(

175− helpers::platform_line("i can eat glass, it will not hurt me\n"),

176− file1_content

177− );

178−

179− let mut file2_content = String::new();

180− file2.as_file_mut().read_to_string(&mut file2_content)?;

219+ file2.as_file_mut(),

181− assert_eq!(

182− helpers::platform_line("i can eat glass, it will not hurt me\n"),

220+ &helpers::platform_line("i can eat glass, it will not hurt me\n"),

183− file2_content

184− );

221+ )?;

185

222

186 Ok(())

223 Ok(())

187}

224}

helix-view/src/document.rs+13−5

@@ -574,7 +574,12 @@ impl Document {

574 }

575 };

576

577− let identifier = self.identifier();

577+ let identifier = if self.path().is_some() {

578+ Some(self.identifier())

579+ } else {

580+ None

581+ };

582+

578 let language_server = self.language_server.clone();

583 let language_server = self.language_server.clone();

579

584

580 // mark changes up to now as saved

585 // mark changes up to now as saved

@@ -628,10 +633,13 @@ impl Document {

628 if !language_server.is_initialized() {

633 if !language_server.is_initialized() {

629 return Ok(event);

634 return Ok(event);

630 }

635 }

631− if let Some(notification) =

636+

637+ if let Some(identifier) = identifier {

638+ if let Some(notification) =

632− language_server.text_document_did_save(identifier, &text)

639+ language_server.text_document_did_save(identifier, &text)

633− {

640+ {

634− notification.await?;

641+ notification.await?;

642+ }

635 }

643 }

636 }

644 }

637

645