Merge remote-tracking branch 'origin/master' into pr/sulfurandcu/19-3

Author: beicause

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [1.1.3] 2024-03-18
+
+- fix the file path label in graph, now it's the corresponding file system path instead of encoded Uri.
+- now the saved svg fits its original size, not moved or scaled.
+
 ## [1.1.3] 2023-10-26
 
 - use [node-ignore](https://www.npmjs.com/package/ignore) for .callgraphignore to fix relative issues([#17](https://github.com/beicause/call-graph/pull/17))

README.md

@@ -1,18 +1,19 @@
 # call-graph
 
-![call-graph](https://raw.githubusercontent.com/beicause/call-graph/master/images/call-graph.png)
+![call-graph](./images/call_graph_outgoing.png)
 vscode extension for generate call graph in [graphviz dot language](https://www.graphviz.org/doc/info/lang.html), based on vscode call hierarchy language feature.
 
 ## Features
 
-* generate call graph in dot language and preview.
+* generate call graph in graphviz dot language and preview.
 * save graph as dot or svg file
 
 ## Quick start
 1. Open your folder and select a entry function
-2. Run `CallGraph.showOutgoingCallGraph` command using `Ctrl+Shift+P` or context menu to show outgoing calls
-3. Or Run `CallGraph.showIncomingCallGraph` command using `Ctrl+Shift+P` or context menu to show incoming calls
-4. Add `.callgraphignore` file in your project root directory to ignore some files or folders
+2. Run `CallGraph.showOutgoingCallGraph` command using context menu or `Ctrl+Shift+P` to show outgoing calls
+3. Or Run `CallGraph.showIncomingCallGraph` command using context menu or `Ctrl+Shift+P` to show incoming calls
+4. Click `save dot file` or `save as svg` in the bottom left corner to save the graph
+5. Add `.callgraphignore` file in your project root directory to ignore some files or folders in workspace (the syntax is the same as `.gitignore`)
 
 ## How it works
 It depends `vscode.provideOutgoingCalls` and `vscode.provideIncomingCalls` built-in commands( the same with `Show Call Hierarchy` command, not available for some language server ).

images/call-graph.png

@@ -2,7 +2,7 @@
     "name": "call-graph",
     "displayName": "Call Graph",
     "description": "call graph for vscode",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "publisher": "LuoZhihao",
     "engines": {
         "vscode": "^1.65.0"
@@ -55,10 +55,10 @@
         }
     },
     "scripts": {
-        "vscode:prepublish": "yarn run compile",
+        "vscode:prepublish": "npm run compile",
         "compile": "tsc -p ./",
         "watch": "tsc -watch -p ./",
-        "pretest": "yarn run compile && yarn run lint",
+        "pretest": "npm run compile && npm run lint",
         "lint": "eslint src --ext ts",
         "test": "node ./out/test/runTest.js"
     },
@@ -80,7 +80,7 @@
         "url": "https://github.com/beicause/call-graph.git"
     },
     "license": "Apache",
-    "icon": "images/call-graph.png",
+    "icon": "images/call_graph_outgoing.png",
     "bugs": {
         "url": "https://github.com/beicause/call-graph/issues"
     },

images/call_graph_outgoing.png

@@ -2,18 +2,17 @@ import { CallHierarchyNode } from "./call"
 import * as fs from 'fs'
 import * as vscode from 'vscode'
 import { isDeepStrictEqual } from "util"
-import * as path from "path"
 import { output } from "./extension"
 
 export function generateDot(graph: CallHierarchyNode,path:string) {
     const dot = new Graph()
-    const root = vscode.workspace.workspaceFolders?.[0].uri.toString()??''
+    const root = vscode.workspace.workspaceFolders?.[0].uri.fsPath??''
     dot.addAttr({ rankdir: "LR" })
     const getNode = (n: CallHierarchyNode) => {
         return {
-            name: `"${n.item.uri}#${n.item.name}@${n.item.range.start.line}:${n.item.range.start.character}"`,
+            name: `"${n.item.uri.fsPath}#${n.item.name}@${n.item.range.start.line}:${n.item.range.start.character}"`,
             attr: { label: n.item.name },
-            subgraph: { name: n.item.uri.toString(), attr: { label: n.item.uri.toString().replace(root,'${workspace}') } },
+            subgraph: { name: n.item.uri.fsPath, attr: { label: n.item.uri.fsPath.replace(root,'${workspace}') } },
             next: []
         } as Node
     }

package-lock.json

@@ -114,7 +114,7 @@ export function activate(context: vscode.ExtensionContext) {
             type === 'Incoming' ? 'call_graph_incoming' : 'call_graph_outgoing'
         const dotFile = type === 'Incoming' ? dotFileIncoming : dotFileOutgoing
         const existed = (p: string) =>
-            vscode.window.showErrorMessage(`Already exists.\n${p} `)
+            vscode.window.showErrorMessage(`Already exists, please delete it manually.\n${p} `)
 
         if (msg.command === 'download') {
             const dir = vscode.workspace

package.json

@@ -17,6 +17,7 @@ export function getHtmlContent(dot?:string){
             <button id="downloadDot">save dot file</button>
             <button id="downloadSvg">save as svg</button>
         </div>
+        <div id="hide" style="display: none;"><div/>
     </body>
     <script>
         (async function () {
@@ -25,12 +26,12 @@ export function getHtmlContent(dot?:string){
             vscode.setState(dot)
             const res =await (await fetch(dot)).text()
             d3.select('#app').graphviz().renderDot(res)
-
-
+            d3.select('#hide').graphviz({zoom:false}).renderDot(res)
 
             d3.select('#downloadSvg').on('click',()=>{
                 const serializer = new XMLSerializer()
-                const svg = serializer.serializeToString(d3.select('svg').node())
+                // The svg in #app may have been scaled or moved, use #hide
+                const svg = serializer.serializeToString(d3.select('#hide>svg').node())
 
                 vscode.postMessage({
                     command: 'download',