vscode-extensions.matklad.rust-analyzer: 0.2.834 -> 0.2.975

pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json

@@ -1,26 +1,19 @@
 {
   "name": "rust-analyzer",
-  "version": "0.2.834",
+  "version": "0.2.975",
   "dependencies": {
-    "https-proxy-agent": "^5.0.0",
-    "node-fetch": "^2.6.1",
-    "vscode-languageclient": "8.0.0-next.2",
-    "d3": "^7.1.0",
+    "vscode-languageclient": "8.0.0-next.8",
+    "d3": "^7.3.0",
     "d3-graphviz": "^4.0.0",
-    "@types/glob": "^7.1.4",
-    "@types/mocha": "^8.2.3",
     "@types/node": "~14.17.5",
-    "@types/node-fetch": "^2.5.11",
-    "@types/vscode": "^1.57.0",
-    "@typescript-eslint/eslint-plugin": "^4.28.2",
-    "@typescript-eslint/parser": "^4.28.2",
-    "eslint": "^7.30.0",
-    "glob": "^7.1.6",
-    "mocha": "^9.0.2",
+    "@types/vscode": "~1.63.0",
+    "@typescript-eslint/eslint-plugin": "^5.10.0",
+    "@typescript-eslint/parser": "^5.10.0",
+    "@vscode/test-electron": "^2.1.1",
+    "eslint": "^8.7.0",
     "tslib": "^2.3.0",
-    "typescript": "^4.3.5",
+    "typescript": "^4.5.5",
     "typescript-formatter": "^7.2.2",
-    "vsce": "^1.95.1",
-    "vscode-test": "^1.5.1"
+    "vsce": "^2.6.7"
   }
 }

pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix

@@ -20,13 +20,13 @@ let
   # Use the plugin version as in vscode marketplace, updated by update script.
   inherit (vsix) version;
 
-  releaseTag = "2021-11-29";
+  releaseTag = "2022-03-07";
 
   src = fetchFromGitHub {
     owner = "rust-analyzer";
     repo = "rust-analyzer";
     rev = releaseTag;
-    sha256 = "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw=";
+    sha256 = "sha256-/qKh4utesAjlyG8A3hEmSx+HBgh48Uje6ZRtUGz5f0g=";
   };
 
   build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps";

pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh

@@ -0,0 +1,49 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq libarchive
+#shellcheck shell=bash
+set -euo pipefail
+cd "$(dirname "$0")"
+nixpkgs=../../../../../../
+node_packages="$nixpkgs/pkgs/development/node-packages"
+owner=rust-analyzer
+repo=rust-analyzer
+ver=$(
+    curl -s "https://api.github.com/repos/$owner/$repo/releases" |
+    jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output
+)
+node_src="$(nix-build "$nixpkgs" -A rust-analyzer.src --no-out-link)/editors/code"
+
+# Check vscode compatibility
+req_vscode_ver="$(jq '.engines.vscode' "$node_src/package.json" --raw-output)"
+req_vscode_ver="${req_vscode_ver#^}"
+cur_vscode_ver="$(nix-instantiate --eval --strict "$nixpkgs" -A vscode.version | tr -d '"')"
+if [[ "$(nix-instantiate --eval --strict -E "(builtins.compareVersions \"$req_vscode_ver\" \"$cur_vscode_ver\")")" -gt 0 ]]; then
+    echo "vscode $cur_vscode_ver is incompatible with the extension requiring ^$req_vscode_ver"
+    exit 1
+fi
+
+extension_ver=$(curl "https://github.com/rust-analyzer/rust-analyzer/releases/download/$ver/rust-analyzer-linux-x64.vsix" -L |
+    bsdtar -xf - --to-stdout extension/package.json | # Use bsdtar to extract vsix(zip).
+    jq --raw-output '.version')
+echo "Extension version: $extension_ver"
+
+# We need devDependencies to build vsix.
+# `esbuild` is a binary package an is already in nixpkgs so we omit it here.
+jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies | del(.esbuild)) }' "$node_src/package.json" \
+    --arg ver "$extension_ver" \
+    >"build-deps/package.json.new"
+
+old_deps="$(jq '.dependencies' build-deps/package.json)"
+new_deps="$(jq '.dependencies' build-deps/package.json.new)"
+if [[ "$old_deps" == "$new_deps" ]]; then
+    echo "package.json dependencies not changed, do simple version change"
+
+    sed -E '/^  "rust-analyzer-build-deps/,+3 s/version = ".*"/version = "'"$extension_ver"'"/' \
+        --in-place "$node_packages"/node-packages.nix
+    mv build-deps/package.json{.new,}
+else
+    echo "package.json dependencies changed, updating nodePackages"
+    mv build-deps/package.json{.new,}
+
+    ./"$node_packages"/generate.sh
+fi

pkgs/development/node-packages/generate.sh

@@ -9,7 +9,7 @@ node2nix=$(nix-build ../../.. -A nodePackages.node2nix)
 rm -f ./node-env.nix
 
 # Track the latest active nodejs LTS here: https://nodejs.org/en/about/releases/
-${node2nix}/bin/node2nix \
+"${node2nix}/bin/node2nix" \
     -i node-packages.json \
     -o node-packages.nix \
     -c composition.nix \

pkgs/development/tools/rust/rust-analyzer/update.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i bash -p curl jq nix-prefetch libarchive
+# shellcheck shell=bash
 set -euo pipefail
 cd "$(dirname "$0")"
 owner=rust-analyzer