Merge pull request #3085 from otavio/extend-gitignore

[rust.git] / atom.md

diff --git a/atom.md b/atom.md
index a74a53233011c7ea943268b616d04712d7909a8c..6fbb9546bb4589cf88d8c4327b66a14cc1fbf731 100644 (file)
--- a/atom.md
+++ b/atom.md
@@ -1,16 +1,31 @@
 # Running Rustfmt from Atom
 
-You'll need to install [Beautify](https://atom.io/packages/atom-beautify), you
+## RLS
+
+Rustfmt is included with the Rust Language Server, itself provided by [ide-rust](https://atom.io/packages/ide-rust).
+
+`apm install ide-rust`
+
+Once installed a file is formatted with `ctrl-shift-c` or `cmd-shift-c`, also available in context menu.
+
+## atom-beautify
+
+Another way is to install [Beautify](https://atom.io/packages/atom-beautify), you
 can do this by running `apm install atom-beautify`.
 
-There are 2 setting that need to be configured in the atom beautifier config. 
+There are 2 setting that need to be configured in the atom beautifier configuration.
+
+-  Install rustfmt as per the [readme](README.md).
+-  Open the atom beautifier settings
+
+   Go to Edit->Preferences. Click the packages on the left side and click on setting for atom-beautifier
 
-Install rustfmt as per the [readme](README.md). In atom beautifier, make sure
-rustfmt is the formatter:
+-  Set rustfmt as the beautifier
 
-![image](https://cloud.githubusercontent.com/assets/6623285/11109392/e4bd9542-8915-11e5-805b-a02664b1f502.png)
+   Find the setting labeled *Language Config - Rust - Default Beautifier* and make sure it is set to rustfmt as shown below. You can also set the beautifier to auto format on save here.
+![image](https://cloud.githubusercontent.com/assets/6623285/11147685/c8ade16c-8a3d-11e5-9da5-bd3d998d97f9.png)
 
-Also set the path to your rustfmt location in atom beautifier as shown below.
-(This setting is towards the bottom of the screen. Need to scroll):
+-  Set the path to your rustfmt location
 
-![image](https://cloud.githubusercontent.com/assets/6623285/11109320/54a0117e-8915-11e5-94be-80b5e91072eb.png)
+   Find the setting labeled *Rust - Rustfmt Path*. This setting is towards the bottom and you will need to scroll a bit. Set it to the path for your rustfmt executable.
+![image](https://cloud.githubusercontent.com/assets/6623285/11147718/f4d10224-8a3d-11e5-9f69-9e900cbe0278.png)