6 files changed, 31 insertions, 16 deletions

diff --git a/crates/ra_assists/src/assists/auto_import.rs b/crates/ra_assists/src/assists/auto_import.rs
index 69126a1c9..932a52bff 100644
--- a/crates/ra_assists/src/assists/auto_import.rs
+++ b/crates/ra_assists/src/assists/auto_import.rs
@@ -64,12 +64,16 @@ pub(crate) fn auto_import<F: ImportsLocator>(
         return None;
     }
 
-    ctx.add_assist_group(AssistId("auto_import"), "auto import", || {
-        proposed_imports
-            .into_iter()
-            .map(|import| import_to_action(import, &position, &path_to_import_syntax))
-            .collect()
-    })
+    ctx.add_assist_group(
+        AssistId("auto_import"),
+        format!("Import {}", path_to_import_syntax),
+        || {
+            proposed_imports
+                .into_iter()
+                .map(|import| import_to_action(import, &position, &path_to_import_syntax))
+                .collect()
+        },
+    )
 }
 
 fn import_to_action(import: String, position: &SyntaxNode, anchor: &SyntaxNode) -> ActionBuilder {
diff --git a/crates/ra_cli/src/analysis_stats.rs b/crates/ra_cli/src/analysis_stats.rs
index fd0027691..833235bff 100644
--- a/crates/ra_cli/src/analysis_stats.rs
+++ b/crates/ra_cli/src/analysis_stats.rs
@@ -171,12 +171,12 @@ pub fn run(
     println!(
         "Expressions of unknown type: {} ({}%)",
         num_exprs_unknown,
-        if num_exprs > 0 { (num_exprs_unknown * 100 / num_exprs) } else { 100 }
+        if num_exprs > 0 { num_exprs_unknown * 100 / num_exprs } else { 100 }
     );
     println!(
         "Expressions of partially unknown type: {} ({}%)",
         num_exprs_partially_unknown,
-        if num_exprs > 0 { (num_exprs_partially_unknown * 100 / num_exprs) } else { 100 }
+        if num_exprs > 0 { num_exprs_partially_unknown * 100 / num_exprs } else { 100 }
     );
     println!("Type mismatches: {}", num_type_mismatches);
     println!("Inference: {:?}, {}", inference_time.elapsed(), ra_prof::memory_usage());
diff --git a/editors/code/src/color_theme.ts b/editors/code/src/color_theme.ts
index cbad47f35..d816f617d 100644
--- a/editors/code/src/color_theme.ts
+++ b/editors/code/src/color_theme.ts
@@ -28,9 +28,11 @@ export class ColorTheme {
     static fromRules(rules: TextMateRule[]): ColorTheme {
         const res = new ColorTheme();
         for (const rule of rules) {
-            const scopes = typeof rule.scope === 'string'
-                ? [rule.scope]
-                : rule.scope;
+            const scopes = typeof rule.scope === 'undefined'
+                ? []
+                : typeof rule.scope === 'string'
+                    ? [rule.scope]
+                    : rule.scope;
             for (const scope of scopes) {
                 res.rules.set(scope, rule.settings);
             }
diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index 014e96f75..fc7cd5a1c 100644
--- a/editors/code/src/highlighting.ts
+++ b/editors/code/src/highlighting.ts
@@ -1,7 +1,6 @@
 import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
-import * as seedrandom_ from 'seedrandom';
-const seedrandom = seedrandom_; // https://github.com/jvandemo/generator-angular2-library/issues/221#issuecomment-355945207
+import seedrandom from 'seedrandom';
 
 import { ColorTheme, TextMateRuleSettings } from './color_theme';
 
diff --git a/editors/code/tsconfig.json b/editors/code/tsconfig.json
index e60eb8e5e..1ea433961 100644
--- a/editors/code/tsconfig.json
+++ b/editors/code/tsconfig.json
@@ -13,7 +13,8 @@
         "noUnusedParameters": true,
         "noImplicitReturns": true,
         "noFallthroughCasesInSwitch": true,
-        "newLine": "LF"
+        "newLine": "LF",
+        "esModuleInterop": true,
     },
     "exclude": [
         "node_modules"
diff --git a/editors/emacs/rust-analyzer.el b/editors/emacs/rust-analyzer.el
index 06db4f15f..9b426fcae 100644
--- a/editors/emacs/rust-analyzer.el
+++ b/editors/emacs/rust-analyzer.el
@@ -38,7 +38,9 @@
 
 (defconst rust-analyzer--action-handlers
   '(("rust-analyzer.applySourceChange" .
-     (lambda (p) (rust-analyzer--apply-source-change-command p)))))
+     (lambda (p) (rust-analyzer--apply-source-change-command p)))
+    ("rust-analyzer.selectAndApplySourceChange" .
+     (lambda (p) (rust-analyzer--select-and-apply-source-change-command p)))))
 
 (defun rust-analyzer--uri-filename (text-document)
   (lsp--uri-to-path (gethash "uri" text-document)))
@@ -71,6 +73,12 @@
   (let ((data (-> p (ht-get "arguments") (lsp-seq-first))))
     (rust-analyzer--apply-source-change data)))
 
+(defun rust-analyzer--select-and-apply-source-change-command (p)
+  (let* ((options (-> p (ht-get "arguments") (lsp-seq-first)))
+         (chosen-option (lsp--completing-read "Select option:" options
+                                              (-lambda ((&hash "label")) label))))
+    (rust-analyzer--apply-source-change chosen-option)))
+
 (lsp-register-client
  (make-lsp-client
   :new-connection (lsp-stdio-connection (lambda () rust-analyzer-command))
@@ -143,7 +151,8 @@
 
 (defun rust-analyzer-run (runnable)
   (interactive (list (rust-analyzer--select-runnable)))
-  (-let (((&hash "env" "bin" "args" "label") runnable))
+  (-let* (((&hash "env" "bin" "args" "label") runnable)
+          (compilation-environment (-map (-lambda ((k v)) (concat k "=" v)) (ht-items env))))
     (compilation-start
      (string-join (append (list bin) args '()) " ")
      ;; cargo-process-mode is nice, but try to work without it...