Use local node_modules to allow the graph to load offline

p32blo · p32blo · commit 8a563e4a46a6 · 2021-08-10T13:43:08.000Z
- Fix some warnings
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs
@@ -3,8 +3,8 @@
 //! `ide` crate.
 
 use std::{
-    io::{Read, Write as _},
-    process::{self, Command, Stdio},
+    io::{Write as _},
+    process::{self, Stdio},
 };
 
 use ide::{
diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts
@@ -1,6 +1,7 @@
 import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
 import * as ra from './lsp_ext';
+import * as path from 'path';
 
 import { Ctx, Cmd } from './ctx';
 import { applySnippetWorkspaceEdit, applySnippetTextEdits } from './snippets';
@@ -474,28 +475,47 @@ function crateGraph(ctx: Ctx, full: boolean): Cmd {
     return async () => {
         const panel = vscode.window.createWebviewPanel("rust-analyzer.crate-graph", "rust-analyzer crate graph", vscode.ViewColumn.Two, {
             enableScripts: true,
-            retainContextWhenHidden: true
-          });
+            retainContextWhenHidden: true,
+            localResourceRoots: [vscode.Uri.joinPath(vscode.Uri.parse(ctx.extensionPath), "node_modules")]
+        });
         const params = {
             full: full,
         };
         const dot = await ctx.client.sendRequest(ra.viewCrateGraph, params);
 
         console.log(dot);
 
+        let script_d3 = vscode.Uri.file(path.join(ctx.extensionPath, 'node_modules', 'd3', 'dist', 'd3.min.js'));
+        let script_d3_gv = vscode.Uri.file(path.join(ctx.extensionPath, 'node_modules', 'd3-graphviz', 'build', 'd3-graphviz.min.js'));
+        let script_wasm = vscode.Uri.file(path.join(ctx.extensionPath, 'node_modules', '@hpcc-js', 'wasm', 'dist', 'index.min.js'));
+
+        console.log(script_d3, script_d3_gv, script_wasm);
+
         const html = `
         <!DOCTYPE html>
         <meta charset="utf-8">
-
+        <head>
+            <style>
+                body {
+                    padding: 0px
+                }
+                ::-webkit-scrollbar {
+                    display: none;
+                }
+            </style>
+        </head>
         <body>
-            <script src="https://d3js.org/d3.v5.min.js"></script>
-            <script src="https://unpkg.com/@hpcc-js/wasm@0.3.11/dist/index.min.js"></script>
-            <script src="https://unpkg.com/d3-graphviz@3.0.5/build/d3-graphviz.js"></script>
-            <div id="graph" style="text-align: center;"></div>
+            <script src="${panel.webview.asWebviewUri(script_d3)}"></script>
+            <script src="${panel.webview.asWebviewUri(script_wasm)}"></script>
+            <script src="${panel.webview.asWebviewUri(script_d3_gv)}"></script>
+            <div id="graph"></div>
             <script>
-                let margin = 0;
-                d3.select("#graph").graphviz().fit(true).width(window.innerWidth - margin).height(window.innerHeight - margin)
-                    .renderDot(\`${dot}\`);
+                d3.select("#graph")
+                  .graphviz()
+                  .fit(true)
+                  .width(window.innerWidth)
+                  .height(window.innerHeight)
+                  .renderDot(\`${dot}\`);
             </script>
         </body>
         `;
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
@@ -68,6 +68,10 @@ export class Ctx {
         this.pushCleanup(d);
     }
 
+    get extensionPath(): string {
+        return this.extCtx.extensionPath;
+    }
+
     get globalState(): vscode.Memento {
         return this.extCtx.globalState;
     }

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,10 @@ export class Ctx {`
`68`	`68`	`this.pushCleanup(d);`
`69`	`69`	`}`
`70`	`70`
	`71`	`+ get extensionPath(): string {`
	`72`	`+ return this.extCtx.extensionPath;`
	`73`	`+ }`
	`74`	`+`
`71`	`75`	`get globalState(): vscode.Memento {`
`72`	`76`	`return this.extCtx.globalState;`
`73`	`77`	`}`