Merge branch 'python-in-extension' into release-0.0.5

src/vscode/extension.ts

@@ -6,6 +6,7 @@ import { Graphviz } from "@hpcc-js/wasm-graphviz";
 import { graphToDot } from "../control-flow/render";
 import { simplifyCFG, trimFor } from "../control-flow/graph-ops";
 import { newCFGBuilder, type Language } from "../control-flow/cfg";
+import { mergeNodeAttrs } from "../control-flow/cfg-defs";
 
 let graphviz: Graphviz;
 interface SupportedLanguage {
@@ -24,11 +25,17 @@ const supportedLanguages: SupportedLanguage[] = [
     language: "Go" as Language,
     parserName: "tree-sitter-go.wasm",
   },
+  {
+    languageId: "python",
+    language: "Python" as Language,
+    parserName: "tree-sitter-python.wasm",
+  },
 ];
 
 const functionNodeTypes: { [key: string]: string[] } = {
   go: ["function_declaration", "method_declaration", "func_literal"],
   c: ["function_definition"],
+  python: ["function_definition"],
 };
 
 const supportedLanguageIds = supportedLanguages.map((lang) => lang.languageId);
@@ -176,7 +183,7 @@ export async function activate(context: vscode.ExtensionContext) {
             .getConfiguration("functionGraphOverview")
             .get("simplify")
         ) {
-          cfg = simplifyCFG(cfg);
+          cfg = simplifyCFG(cfg, mergeNodeAttrs);
         }
         const dot = graphToDot(cfg);
         const svg = graphviz.dot(dot);
@@ -189,7 +196,7 @@ export async function activate(context: vscode.ExtensionContext) {
 }
 
 // This method is called when your extension is deactivated
-export function deactivate() {}
+export function deactivate() { }
 
 //------------------------------------------------
 
@@ -198,7 +205,7 @@ class OverviewViewProvider implements vscode.WebviewViewProvider {
 
   private _view?: vscode.WebviewView;
 
-  constructor(private readonly _extensionUri: vscode.Uri) {}
+  constructor(private readonly _extensionUri: vscode.Uri) { }
 
   public setSVG(svg: string) {
     if (this._view) {