Merge branch 'master' into assists_extract_enum

Author: mcrakhman

.github/actions/github-release/main.js

@@ -16,7 +16,7 @@ async function runOnce() {
   const slug = process.env.GITHUB_REPOSITORY;
   const owner = slug.split('/')[0];
   const repo = slug.split('/')[1];
-  const sha = process.env.GITHUB_SHA;
+  const sha = process.env.HEAD_SHA;
 
   core.info(`files: ${files}`);
   core.info(`name: ${name}`);

.github/workflows/ci.yaml

@@ -97,7 +97,13 @@ jobs:
 
   typescript:
     name: TypeScript
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    runs-on: ${{ matrix.os }}
+    
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
@@ -111,10 +117,19 @@ jobs:
       working-directory: ./editors/code
 
     - run: npm audit || { sleep 10 && npm audit; } || { sleep 30 && npm audit; }
+      if: runner.os == 'Linux'
       working-directory: ./editors/code
 
     - run: npm run lint
       working-directory: ./editors/code
 
+    - name: Run vscode tests
+      uses: GabrielBB/xvfb-action@v1.2
+      env:
+        VSCODE_CLI: 1
+      with:
+        run: npm --prefix ./editors/code test
+        # working-directory: ./editors/code  # does not work: https://github.com/GabrielBB/xvfb-action/issues/8
+
     - run: npm run package --scripts-prepend-node-path
       working-directory: ./editors/code

.github/workflows/release.yaml

@@ -6,7 +6,7 @@ on:
   push:
     branches:
     - release
-    - nightly
+    - trigger-nightly
 
 env:
   CARGO_INCREMENTAL: 0
@@ -88,6 +88,9 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
 
+    - run: echo "::set-env name=HEAD_SHA::$(git rev-parse HEAD)"
+    - run: 'echo "HEAD_SHA: $HEAD_SHA"'
+
     - uses: actions/download-artifact@v1
       with:
         name: dist-macos-latest

.gitignore

@@ -7,4 +7,6 @@ crates/*/target
 *.log
 *.iml
 .vscode/settings.json
-cargo-timing*.html
+*.html
+generated_assists.adoc
+generated_features.adoc

.vscode/launch.json

@@ -70,6 +70,28 @@
         "__RA_LSP_SERVER_DEBUG": "${workspaceFolder}/target/release/rust-analyzer"
       }
     },
+    {
+      // Used for testing the extension with a local build of the LSP server (in `target/release`)
+      // with all other extendions loaded.
+      "name": "Run With Extensions",
+      "type": "extensionHost",
+      "request": "launch",
+      "runtimeExecutable": "${execPath}",
+      "args": [
+        "--disable-extension", "matklad.rust-analyzer",
+        "--extensionDevelopmentPath=${workspaceFolder}/editors/code"
+      ],
+      "outFiles": [
+        "${workspaceFolder}/editors/code/out/**/*.js"
+      ],
+      "preLaunchTask": "Build Server (Release) and Extension",
+      "skipFiles": [
+        "<node_internals>/**/*.js"
+      ],
+      "env": {
+        "__RA_LSP_SERVER_DEBUG": "${workspaceFolder}/target/release/rust-analyzer"
+      }
+    },
     {
       // Used to attach LLDB to a running LSP server.
       // NOTE: Might require root permissions. For this run:
@@ -87,5 +109,17 @@
         "rust"
       ]
     },
+    {
+      "name": "Run Unit Tests",
+      "type": "extensionHost",
+      "request": "launch",
+      "runtimeExecutable": "${execPath}",
+      "args": [
+          "--extensionDevelopmentPath=${workspaceFolder}/editors/code",
+          "--extensionTestsPath=${workspaceFolder}/editors/code/out/tests/unit" ],
+      "sourceMaps": true,
+      "outFiles": [ "${workspaceFolder}/editors/code/out/tests/unit/**/*.js" ],
+      "preLaunchTask": "Pretest"
+    }
   ]
 }

.vscode/tasks.json

@@ -40,6 +40,18 @@
       "command": "cargo build --release --package rust-analyzer",
       "problemMatcher": "$rustc"
     },
+    {
+      "label": "Pretest",
+      "group": "build",
+      "isBackground": false,
+      "type": "npm",
+      "script": "pretest",
+      "path": "editors/code/",
+      "problemMatcher": {
+        "base": "$tsc",
+        "fileLocation": ["relative", "${workspaceFolder}/editors/code/"]
+      }
+    },
 
     {
       "label": "Build Server and Extension",