RIIR vscode extension

.github/workflows/ci.yaml

@@ -166,6 +166,9 @@ jobs:
         if: matrix.os == 'ubuntu-latest' && needs.changes.outputs.typescript == 'true'
         run: sudo apt-get install -y xvfb
 
+      - name: Install wasm-pack
+        run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+
       - run: npm ci
         working-directory: ./editors/code
         if: needs.changes.outputs.typescript == 'true'

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
-members = ["xtask/", "lib/*", "crates/*"]
+members = ["xtask/", "lib/*", "crates/*", "editors/code/wasm"]
 exclude = ["crates/proc-macro-srv/proc-macro-test/imp"]
+
 resolver = "2"
 
 [workspace.package]

crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs

@@ -359,7 +359,7 @@ impl<'p> TypeCx for MatchCheckCtx<'p> {
         &'a self,
         ctor: &'a rustc_pattern_analysis::constructor::Constructor<Self>,
         ty: &'a Self::Ty,
-    ) -> impl Iterator<Item = Self::Ty> + ExactSizeIterator + Captures<'a> {
+    ) -> impl ExactSizeIterator<Item = Self::Ty> + Captures<'a> {
         let single = |ty| smallvec![ty];
         let tys: SmallVec<[_; 2]> = match ctor {
             Struct | Variant(_) | UnionField => match ty.kind(Interner) {

editors/code/.eslintrc.js

@@ -12,7 +12,7 @@ module.exports = {
     },
     plugins: ["@typescript-eslint"],
     rules: {
-        camelcase: ["error"],
+        camelcase: ["off"], // This lint causes more trouble than good when mixing Rust and TS
         eqeqeq: ["error", "always", { null: "ignore" }],
         curly: ["error", "multi-line"],
         "no-console": ["error", { allow: ["warn", "error"] }],

editors/code/.prettierignore

@@ -1,3 +1,4 @@
 node_modules
 .vscode-test
 out
+wasm/pkg

editors/code/package.json

@@ -32,15 +32,17 @@
     "enabledApiProposals": [],
     "scripts": {
         "vscode:prepublish": "npm run build-base -- --minify",
-        "package": "vsce package -o rust-analyzer.vsix",
+        "package": "vsce package -o rust-analyzer.vsix && npm run patch-vsix",
+        "patch-vsix": "bash -c 'mkdir -p extension/out && cp wasm/pkg/* extension/out/ && 7z a rust-analyzer.vsix extension/out/* && rm -r extension'",
         "build-base": "esbuild ./src/main.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node --target=node16",
+        "build-wasm": "cd wasm && wasm-pack build -t nodejs",
         "build": "npm run build-base -- --sourcemap",
         "watch": "npm run build-base -- --sourcemap --watch",
         "format": "prettier --write .",
         "format:check": "prettier --check .",
         "lint": "eslint -c .eslintrc.js --ext ts ./src ./tests",
         "lint:fix": "npm run lint -- --fix",
-        "typecheck": "tsc",
+        "typecheck": "npm run build-wasm && tsc",
         "pretest": "npm run typecheck && npm run build",
         "test": "node ./out/tests/runTests.js"
     },

editors/code/src/main.ts

@@ -7,6 +7,7 @@ import * as diagnostics from "./diagnostics";
 import { activateTaskProvider } from "./tasks";
 import { setContextValue } from "./util";
 import type { JsonProject } from "./rust_project";
+import { check_conflicting_extensions } from "../wasm/pkg/vscode_ra_wasm";
 
 const RUST_PROJECT_CONTEXT_NAME = "inRustProject";
 
@@ -22,10 +23,15 @@ export async function deactivate() {
     await setContextValue(RUST_PROJECT_CONTEXT_NAME, undefined);
 }
 
+// @ts-ignore
+globalThis.vscode_window = vscode.window;
+// @ts-ignore
+globalThis.vscode_extensions = vscode.extensions;
+
 export async function activate(
     context: vscode.ExtensionContext,
 ): Promise<RustAnalyzerExtensionApi> {
-    checkConflictingExtensions();
+    check_conflicting_extensions();
 
     const ctx = new Ctx(context, createCommands(), fetchWorkspace());
     // VS Code doesn't show a notification when an extension fails to activate
@@ -191,26 +197,3 @@ function createCommands(): Record<string, CommandFactory> {
         revealDependency: { enabled: commands.revealDependency },
     };
 }
-
-function checkConflictingExtensions() {
-    if (vscode.extensions.getExtension("rust-lang.rust")) {
-        vscode.window
-            .showWarningMessage(
-                `You have both the rust-analyzer (rust-lang.rust-analyzer) and Rust (rust-lang.rust) ` +
-                    "plugins enabled. These are known to conflict and cause various functions of " +
-                    "both plugins to not work correctly. You should disable one of them.",
-                "Got it",
-            )
-            .then(() => {}, console.error);
-    }
-
-    if (vscode.extensions.getExtension("panicbit.cargo")) {
-        vscode.window
-            .showWarningMessage(
-                `You have both the rust-analyzer (rust-lang.rust-analyzer) and Cargo (panicbit.cargo) plugins enabled, ` +
-                    'you can disable it or set {"cargo.automaticCheck": false} in settings.json to avoid invoking cargo twice',
-                "Got it",
-            )
-            .then(() => {}, console.error);
-    }
-}

editors/code/wasm/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "vscode_ra_wasm"
+version = "0.1.0"
+rust-version.workspace = true
+edition.workspace = true
+license.workspace = true
+authors.workspace = true
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+wasm-bindgen = "0.2.74"

editors/code/wasm/src/lib.rs

@@ -0,0 +1,23 @@
+use wasm_bindgen::prelude::*;
+
+pub mod vscode;
+
+#[wasm_bindgen]
+pub fn check_conflicting_extensions() {
+    if vscode::extensions::getExtension("rust-lang.rust").is_truthy() {
+        vscode::window::showWarningMessage(
+            "You have both the rust-analyzer (rust-lang.rust-analyzer) and Rust (rust-lang.rust) \
+                plugins enabled. These are known to conflict and cause various functions of \
+                both plugins to not work correctly. You should disable one of them.",
+            "Got it",
+        );
+    }
+
+    if vscode::extensions::getExtension("panicbit.cargo").is_truthy() {
+        vscode::window::showWarningMessage(
+            "You have both the rust-analyzer (rust-lang.rust-analyzer) and Cargo (panicbit.cargo) plugins enabled, \
+            you can disable it or set {'cargo.automaticCheck': false} in settings.json to avoid invoking cargo twice",
+            "Got it",
+        );
+    }
+}

editors/code/wasm/src/vscode.rs

@@ -0,0 +1,19 @@
+pub mod window {
+    use wasm_bindgen::prelude::*;
+
+    #[wasm_bindgen]
+    extern "C" {
+        #[wasm_bindgen(js_namespace = vscode_window)]
+        pub fn showWarningMessage(message: &str, button: &str);
+    }
+}
+
+pub mod extensions {
+    use wasm_bindgen::prelude::*;
+
+    #[wasm_bindgen]
+    extern "C" {
+        #[wasm_bindgen(js_namespace = vscode_extensions)]
+        pub fn getExtension(s: &str) -> JsValue;
+    }
+}