From 30ea41514f6b929a4147a95724b4bd3b7fa59f9b Mon Sep 17 00:00:00 2001
From: tgodzik <tomek.godzik@gmail.com>
Date: Mon, 10 Jun 2019 15:46:24 +0200
Subject: [PATCH] Update metals default version to 0.6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Ólafur Páll Geirsson <olafurpg@gmail.com>
---
 package.json |  4 ++--
 readme.md    | 32 ++++++++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index cd8286eb1..994b8e6c4 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
       "properties": {
         "metals.serverVersion": {
           "type": "string",
-          "default": "0.5.2",
+          "default": "0.6.1",
           "markdownDescription": "The version of the Metals server artifact. Requires reloading the window.\n\n**Change only if you know what you're doing**"
         },
         "metals.serverProperties": {
@@ -182,4 +182,4 @@
   "extensionDependencies": [
     "scala-lang.scala"
   ]
-}
\ No newline at end of file
+}
diff --git a/readme.md b/readme.md
index 323863b26..9eaa3c0b5 100644
--- a/readme.md
+++ b/readme.md
@@ -33,12 +33,13 @@ installation.
 on Ubuntu+Windows.
 
 **Scala 2.12 and 2.11**. Metals works only with Scala versions 2.12.8, 2.12.7,
-2.12.6, 2.12.5, 2.12.4, 2.11.12, 2.11.11, 2.11.10 and 2.11.9. Note that 2.10.x
+2.11.12, 2.12.6, 2.12.5, 2.12.4, 2.11.11, 2.11.10 and 2.11.9. Note that 2.10.x
 and 2.13.x are not supported.
 
 ## Installation
 
-Install the Metals extension from the Marketplace, search for "Metals".
+Install the Metals extension from the
+[Marketplace](https://marketplace.visualstudio.com/items?itemName=scalameta.metals).
 
 [![Install Metals extension](https://img.shields.io/badge/metals-vscode-blue.png)](vscode:extension/scalameta.metals)
 
@@ -64,6 +65,7 @@ build. Click "Import build" to start the installation step.
 - "Not now" disables this prompt for 2 minutes.
 - "Don't show again" disables this prompt forever, use `rm -rf .metals/` to
   re-enable the prompt.
+- Use `tail -f .metals/metals.log` to watch the build import progress.
 - Behind the scenes, Metals uses [Bloop](https://scalacenter.github.io/bloop/)
   to import sbt builds, but you don't need Bloop installed on your machine to
   run this step.
@@ -146,6 +148,17 @@ command to copy the Java 8 home path.
 /usr/libexec/java_home -v 1.8 | pbcopy
 ```
 
+## Custom artifact repositories (Maven or Ivy resolvers)
+
+Use the 'Custom Repositories' setting for the Metals VS Code extension to tell
+[Coursier](https://get-coursier.io/docs/other-proxy) to try to download Metals
+artifacts from your private artifact repository.
+
+Use `.jvmopts` to set sbt options
+(https://www.scala-sbt.org/1.0/docs/Proxy-Repositories.html) for
+`sbt bloopInstall` which resolves library dependencies. You can also provide a
+custom sbt script (see 'Custom sbt launcher').
+
 ## HTTP proxy
 
 Metals uses [Coursier](https://get-coursier.io/docs/other-proxy) to download
@@ -187,3 +200,18 @@ without opening the sidebar.
 
 As you type, the symbol outline is also visible at the top of the file.
 ![Document Symbols Outline](https://i.imgur.com/L217n4q.png)
+
+## Coming from IntelliJ
+
+Install the
+[IntelliJ IDEA Keybindings](https://marketplace.visualstudio.com/items?itemName=k--kato.intellij-idea-keybindings)
+extension to use default IntelliJ shortcuts with VS Code.
+
+| IntelliJ         | VS Code                   |
+| ---------------- | ------------------------- |
+| Go to class      | Go to symbol in workspace |
+| Parameter info   | Trigger parameter hints   |
+| Basic completion | Trigger suggest           |
+| Type info        | Show hover                |
+| Expand           | Fold                      |
+| Extend Selection | Expand selection          |