13 files changed, 157 insertions, 62 deletions

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 77c92512a..4103e46c2 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -95,9 +95,6 @@ jobs:
       - name: Copy vscode extension
         run: mkdir -p ./dist/code && cp ./editors/code/*.vsix ./dist/
 
-      - name: Copy emacs mode
-        run: cp ./editors/emacs/rust-analyzer.el ./dist/rust-analyzer.el
-
       - name: Upload artifacts
         uses: actions/upload-artifact@v1
         with:
diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs
index 32c924acc..a58a7b21f 100644
--- a/crates/ra_hir_def/src/body/scope.rs
+++ b/crates/ra_hir_def/src/body/scope.rs
@@ -192,7 +192,7 @@ mod tests {
         let (off, code) = extract_offset(code);
         let code = {
             let mut buf = String::new();
-            let off = u32::from(off) as usize;
+            let off = off.to_usize();
             buf.push_str(&code[..off]);
             buf.push_str("marker");
             buf.push_str(&code[off..]);
diff --git a/crates/ra_project_model/src/sysroot.rs b/crates/ra_project_model/src/sysroot.rs
index 34d066b1e..a23265fc0 100644
--- a/crates/ra_project_model/src/sysroot.rs
+++ b/crates/ra_project_model/src/sysroot.rs
@@ -99,7 +99,8 @@ fn try_find_src_path(cargo_toml: &Path) -> Result<PathBuf> {
     let rustc_output = Command::new("rustc")
         .current_dir(cargo_toml.parent().unwrap())
         .args(&["--print", "sysroot"])
-        .output()?;
+        .output()
+        .map_err(|e| format!("rustc --print sysroot failed: {}", e))?;
     if !rustc_output.status.success() {
         Err("failed to locate sysroot")?;
     }
diff --git a/crates/ra_text_edit/src/lib.rs b/crates/ra_text_edit/src/lib.rs
index 5f1b12222..37f23d043 100644
--- a/crates/ra_text_edit/src/lib.rs
+++ b/crates/ra_text_edit/src/lib.rs
@@ -29,8 +29,8 @@ impl AtomTextEdit {
     }
 
     pub fn apply(&self, mut text: String) -> String {
-        let start = u32::from(self.delete.start()) as usize;
-        let end = u32::from(self.delete.end()) as usize;
+        let start = self.delete.start().to_usize();
+        let end = self.delete.end().to_usize();
         text.replace_range(start..end, &self.insert);
         text
     }
diff --git a/crates/ra_text_edit/src/text_edit.rs b/crates/ra_text_edit/src/text_edit.rs
index 413c7d782..3291ada42 100644
--- a/crates/ra_text_edit/src/text_edit.rs
+++ b/crates/ra_text_edit/src/text_edit.rs
@@ -66,13 +66,13 @@ impl TextEdit {
         let mut total_len = text.len();
         for atom in self.atoms.iter() {
             total_len += atom.insert.len();
-            total_len -= u32::from(atom.delete.end() - atom.delete.start()) as usize;
+            total_len -= (atom.delete.end() - atom.delete.start()).to_usize();
         }
         let mut buf = String::with_capacity(total_len);
         let mut prev = 0;
         for atom in self.atoms.iter() {
-            let start = u32::from(atom.delete.start()) as usize;
-            let end = u32::from(atom.delete.end()) as usize;
+            let start = atom.delete.start().to_usize();
+            let end = atom.delete.end().to_usize();
             if start > prev {
                 buf.push_str(&text[prev..start]);
             }
diff --git a/docs/dev/README.md b/docs/dev/README.md
index 732e4bdd3..991deaf90 100644
--- a/docs/dev/README.md
+++ b/docs/dev/README.md
@@ -74,7 +74,7 @@ relevant test and execute it (VS Code includes an action for running a single
 test).
 
 However, launching a VS Code instance with locally build language server is
-possible. There's "Run Extension (Dev Server)" launch configuration for this.
+possible. There's **"Run Extension (Dev Server)"** launch configuration for this.
 
 In general, I use one of the following workflows for fixing bugs and
 implementing features.
@@ -88,7 +88,14 @@ Code to sanity check that the thing works as I expect.
 
 If the problem concerns only the VS Code extension, I use **Run Extension**
 launch configuration from `launch.json`. Notably, this uses the usual
-`ra_lsp_server` binary from `PATH`. After I am done with the fix, I use `cargo
+`ra_lsp_server` binary from `PATH`. For this it is important to have the following
+in `setting.json` file:
+```json
+{
+    "rust-analyzer.raLspServerPath": "ra_lsp_server"
+}
+```
+After I am done with the fix, I use `cargo
 xtask install --client-code` to try the new extension for real.
 
 If I need to fix something in the `ra_lsp_server` crate, I feel sad because it's
diff --git a/docs/user/README.md b/docs/user/README.md
index 3da30a193..14ca6fd64 100644
--- a/docs/user/README.md
+++ b/docs/user/README.md
@@ -1,16 +1,26 @@
+[github-releases]: https://github.com/rust-analyzer/rust-analyzer/releases
+
 The main interface to rust-analyzer is the
 [LSP](https://microsoft.github.io/language-server-protocol/) implementation. To
-install lsp server, clone the repository and then run `cargo xtask install
---server` (which is shorthand for `cargo install --path
-./crates/ra_lsp_server`). This will produce a binary named `ra_lsp_server` which
-you should be able to use it with any LSP-compatible editor. We use custom
-extensions to LSP, so special client-side support is required to take full
-advantage of rust-analyzer. This repository contains support code for VS Code.
-
-```
+install lsp server, you have three options:
+
+* **Preferred and default:** install the plugin/extension for your IDE and it will ask your permission to automatically download the latest lsp server for you from [GitHub releases][github-releases]. (See docs to find out whether this is implemented for your editor below).
+* Manually download prebuilt binaries from [GitHub releases][github-releases]
+    * `ra_lsp_server-linux` for Linux
+    * `ra_lsp_server-mac` for Mac
+    * `ra_lsp_server-windows.exe` for Windows
+* Clone the repository and build from sources
+```bash
 $ git clone [email protected]:rust-analyzer/rust-analyzer && cd rust-analyzer
-$ cargo xtask install --server
+$ cargo xtask install --server # or cargo install --path ./crates/ra_lsp_server
 ```
+
+This way you will get a binary named `ra_lsp_server` (with os suffix for prebuilt binaries)
+which you should be able to use with any LSP-compatible editor.
+
+We make use of custom extensions to LSP, so special client-side support is required to take full
+advantage of rust-analyzer. This repository contains support code for VS Code.
+
 Rust Analyzer needs sources of rust standard library to work, so
 you might also need to execute
 
@@ -22,30 +32,34 @@ See [./features.md](./features.md) document for a list of features that are avai
 
 ## VS Code
 
-Prerequisites:
-
-In order to build the VS Code plugin, you need to have node.js and npm with
-a minimum version of 10 installed. Please refer to
-[node.js and npm documentation](https://nodejs.org) for installation instructions.
+### Prerequisites
 
-You will also need the most recent version of VS Code: we don't try to
+You will need the most recent version of VS Code: we don't try to
 maintain compatibility with older versions yet.
 
 ### Installation from prebuilt binaries
 
 We ship prebuilt binaries for Linux, Mac and Windows via
-[GitHub releases](https://github.com/rust-analyzer/rust-analyzer/releases).
+[GitHub releases][github-releases].
 In order to use them you need to install the client VSCode extension.
 
-Publishing to VSCode marketplace is currently WIP. Thus, you need to clone the repository and install **only** the client extension via
+Publishing to VS Code marketplace is currently WIP. Thus, you need to manually download
+`rust-analyzer-0.1.0.vsix` file from latest [GitHub release][github-releases].
+
+After you downloaded the `.vsix` file you can install it from the terminal
+
 ```
-$ git clone https://github.com/rust-analyzer/rust-analyzer.git --depth 1
-$ cd rust-analyzer
-$ cargo xtask install --client-code
+$ code --install-extension rust-analyzer-0.1.0.vsix
 ```
-Then open VSCode (or reload the window if it was already running), open some Rust project and you should
-see an info message pop-up.
 
+Or open VS Code, press <kbd>Ctrl+Shift+P</kbd>, and search for the following command:
+
+<img width="500px" alt="Install from VSIX command" src="https://user-images.githubusercontent.com/36276403/74108225-c0c11d80-4b80-11ea-9b2a-0a43f09e29af.png">
+
+Press <kbd>Enter</kbd> and go to `rust-analyzer-0.1.0.vsix` file through the file explorer.
+
+Then open some Rust project and you should
+see an info message pop-up.
 
 <img height="140px" src="https://user-images.githubusercontent.com/36276403/74103174-a40df100-4b52-11ea-81f4-372c70797924.png" alt="Download now message"/>
 
@@ -57,11 +71,15 @@ For updates you need to remove installed binary
 rm -rf ${HOME}/.config/Code/User/globalStorage/matklad.rust-analyzer
 ```
 
-`"Donwload latest language server"` command for VSCode and automatic updates detection is currently WIP.
+`"Download latest language server"` command for VSCode and automatic updates detection is currently WIP.
 
 
 ### Installation from sources
 
+In order to build the VS Code plugin from sources, you need to have node.js and npm with
+a minimum version of 12 installed. Please refer to
+[node.js and npm documentation](https://nodejs.org) for installation instructions.
+
 The experimental VS Code plugin can be built and installed by executing the
 following commands:
 
@@ -71,6 +89,16 @@ $ cd rust-analyzer
 $ cargo xtask install
 ```
 
+After that you need to amend your `settings.json` file to explicitly specify the
+path to `ra_lsp_server` that you've just built.
+```json
+{
+    "rust-analyzer.raLspServerPath": "ra_lsp_server"
+}
+```
+This should work on all platforms, otherwise if installed `ra_lsp_server` is not available through your `$PATH` then see how to configure it [here](#setting-up-the-PATH-variable).
+
+
 The automatic installation is expected to *just work* for common cases, if it
 doesn't, report bugs!
 
@@ -127,7 +155,7 @@ host.
   As an example, [Pale Fire](https://github.com/matklad/pale-fire/) color scheme tweaks rust colors.
 * `rust-analyzer.enableEnhancedTyping`: by default, rust-analyzer intercepts the
   `Enter` key to make it easier to continue comments. Note that it may conflict with VIM emulation plugin.
-* `rust-analyzer.raLspServerPath`: path to `ra_lsp_server` executable
+* `rust-analyzer.raLspServerPath`: path to `ra_lsp_server` executable, when absent or `null` defaults to prebuilt binary path
 * `rust-analyzer.enableCargoWatchOnStartup`: prompt to install & enable `cargo
   watch` for live error highlighting (note, this **does not** use rust-analyzer)
 * `rust-analyzer.excludeGlobs`: a list of glob-patterns for exclusion (see globset [docs](https://docs.rs/globset) for syntax).
@@ -232,6 +260,8 @@ Installation:
 
 * You can now invoke the command palette and type LSP enable to locally/globally enable the rust-analyzer LSP (type LSP enable, then choose either locally or globally, then select rust-analyzer)
 
+
+<!-- Update links to this header when changing it! -->
 ### Setting up the `PATH` variable
 
 On Unix systems, `rustup` adds `~/.cargo/bin` to `PATH` by modifying the shell's
diff --git a/editors/code/src/installation/language_server.ts b/editors/code/src/installation/language_server.ts
index 1ce67b8b2..3510f9178 100644
--- a/editors/code/src/installation/language_server.ts
+++ b/editors/code/src/installation/language_server.ts
@@ -100,15 +100,21 @@ export async function ensureLanguageServerBinary(
             try {
                 await downloadLatestLanguageServer(langServerSource);
             } catch (err) {
-                await vscode.window.showErrorMessage(
+                vscode.window.showErrorMessage(
                     `Failed to download language server from ${langServerSource.repo.name} ` +
                     `GitHub repository: ${err.message}`
                 );
 
-                await dns.resolve('www.google.com').catch(err => {
-                    console.error("DNS resolution failed, there might be an issue with Internet availability");
-                    console.error(err);
-                });
+                dns.resolve('example.com').then(
+                    addrs => console.log("DNS resolution for example.com was successful", addrs),
+                    err => {
+                        console.error(
+                            "DNS resolution for example.com failed, " +
+                            "there might be an issue with Internet availability"
+                        );
+                        console.error(err);
+                    }
+                );
 
                 return null;
             }
diff --git a/xtask/src/cmd.rs b/xtask/src/cmd.rs
index 2027f4893..37497fb74 100644
--- a/xtask/src/cmd.rs
+++ b/xtask/src/cmd.rs
@@ -18,7 +18,7 @@ impl Cmd<'_> {
             run(self.unix, self.work_dir)
         }
     }
-    pub fn run_with_output(self) -> Result<Output> {
+    pub fn run_with_output(self) -> Result<String> {
         if cfg!(windows) {
             run_with_output(self.windows, self.work_dir)
         } else {
@@ -34,8 +34,11 @@ pub fn run(cmdline: &str, dir: &str) -> Result<()> {
     .map(|_| ())
 }
 
-pub fn run_with_output(cmdline: &str, dir: &str) -> Result<Output> {
-    do_run(cmdline, dir, &mut |_| {})
+pub fn run_with_output(cmdline: &str, dir: &str) -> Result<String> {
+    let output = do_run(cmdline, dir, &mut |_| {})?;
+    let stdout = String::from_utf8(output.stdout)?;
+    let stdout = stdout.trim().to_string();
+    Ok(stdout)
 }
 
 fn do_run(cmdline: &str, dir: &str, f: &mut dyn FnMut(&mut Command)) -> Result<Output> {
diff --git a/xtask/src/install.rs b/xtask/src/install.rs
index 8c65b51e3..99e1eddb1 100644
--- a/xtask/src/install.rs
+++ b/xtask/src/install.rs
@@ -24,6 +24,7 @@ pub struct ServerOpt {
 
 impl InstallCmd {
     pub fn run(self) -> Result<()> {
+        let both = self.server.is_some() && self.client.is_some();
         if cfg!(target_os = "macos") {
             fix_path_for_mac().context("Fix path for mac")?
         }
@@ -33,6 +34,16 @@ impl InstallCmd {
         if let Some(client) = self.client {
             install_client(client).context("install client")?;
         }
+        if both {
+            eprintln!(
+                "
+    Installation complete.
+
+    Add `\"rust-analyzer.raLspServerPath\": \"ra_lsp_server\",` to VS Code settings,
+    otherwise it will use the latest release from GitHub.
+"
+            )
+        }
         Ok(())
     }
 }
@@ -116,15 +127,12 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
     }
     .run()?;
 
-    let installed_extensions = {
-        let output = Cmd {
-            unix: &format!(r"{} --list-extensions", code_binary),
-            windows: &format!(r"cmd.exe /c {}.cmd --list-extensions", code_binary),
-            work_dir: ".",
-        }
-        .run_with_output()?;
-        String::from_utf8(output.stdout)?
-    };
+    let installed_extensions = Cmd {
+        unix: &format!(r"{} --list-extensions", code_binary),
+        windows: &format!(r"cmd.exe /c {}.cmd --list-extensions", code_binary),
+        work_dir: ".",
+    }
+    .run_with_output()?;
 
     if !installed_extensions.contains("rust-analyzer") {
         anyhow::bail!(
@@ -150,12 +158,10 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
 
 fn install_server(opts: ServerOpt) -> Result<()> {
     let mut old_rust = false;
-    if let Ok(output) = run_with_output("cargo --version", ".") {
-        if let Ok(stdout) = String::from_utf8(output.stdout) {
-            println!("{}", stdout);
-            if !check_version(&stdout, REQUIRED_RUST_VERSION) {
-                old_rust = true;
-            }
+    if let Ok(stdout) = run_with_output("cargo --version", ".") {
+        println!("{}", stdout);
+        if !check_version(&stdout, REQUIRED_RUST_VERSION) {
+            old_rust = true;
         }
     }
 
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index 8fdf43e4a..1bb1882b0 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -15,7 +15,10 @@ use std::{
     process::{Command, Stdio},
 };
 
-use crate::{cmd::run, codegen::Mode};
+use crate::{
+    cmd::{run, run_with_output},
+    codegen::Mode,
+};
 
 pub use anyhow::Result;
 
@@ -156,3 +159,41 @@ fn rm_rf(path: &Path) -> Result<()> {
     if path.is_file() { fs::remove_file(path) } else { fs::remove_dir_all(path) }
         .with_context(|| format!("failed to remove {:?}", path))
 }
+
+pub fn run_release() -> Result<()> {
+    run("git switch release", ".")?;
+    run("git fetch upstream", ".")?;
+    run("git reset --hard upstream/master", ".")?;
+    run("git push", ".")?;
+
+    let changelog_dir = project_root().join("../rust-analyzer.github.io/thisweek/_posts");
+
+    let today = run_with_output("date --iso", ".")?;
+    let commit = run_with_output("git rev-parse HEAD", ".")?;
+    let changelog_n = fs::read_dir(changelog_dir.as_path())?.count();
+
+    let contents = format!(
+        "\
+= Changelog #{}
+:sectanchors:
+:page-layout: post
+
+Commit: commit:{}[] +
+Release: release:{}[]
+
+== New Features
+
+* pr:[] .
+
+== Fixes
+
+== Internal Improvements
+",
+        changelog_n, commit, today
+    );
+
+    let path = changelog_dir.join(format!("{}-changelog-{}.adoc", today, changelog_n));
+    fs::write(&path, &contents)?;
+
+    Ok(())
+}
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index c347de9ab..7ca727bde 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -14,7 +14,7 @@ use pico_args::Arguments;
 use xtask::{
     codegen::{self, Mode},
     install::{ClientOpt, InstallCmd, ServerOpt},
-    pre_commit, run_clippy, run_fuzzer, run_pre_cache, run_rustfmt, Result,
+    pre_commit, run_clippy, run_fuzzer, run_pre_cache, run_release, run_rustfmt, Result,
 };
 
 fn main() -> Result<()> {
@@ -92,6 +92,10 @@ FLAGS:
             args.finish()?;
             run_pre_cache()
         }
+        "release" => {
+            args.finish()?;
+            run_release()
+        }
         _ => {
             eprintln!(
                 "\
diff --git a/xtask/src/pre_commit.rs b/xtask/src/pre_commit.rs
index 88e868ca6..1533f64dc 100644
--- a/xtask/src/pre_commit.rs
+++ b/xtask/src/pre_commit.rs
@@ -14,7 +14,7 @@ pub fn run_hook() -> Result<()> {
     let diff = run_with_output("git diff --diff-filter=MAR --name-only --cached", ".")?;
 
     let root = project_root();
-    for line in String::from_utf8(diff.stdout)?.lines() {
+    for line in diff.lines() {
         run(&format!("git update-index --add {}", root.join(line).to_string_lossy()), ".")?;
     }