Merge pull request #147 from skogsbaer/sw/fix-union-bug

skogsbaer · web-flow · commit 538f6fb44ee2 · 2024-11-15T08:24:03.000+01:00
fix union bug
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,13 @@
 # Write Your Python Program - CHANGELOG
 
+* ? (?)
+  * Fix bug with union of unions
+* 1.2.1 (2024-11-05)
+  * Fix assets for visualization
+* 1.2.0 (2024-11-04)
+  * Support for visualization
+  * Fix handling of lazy annotations in records
+  * Fix output of execution fails but some tests were successful
 * 1.1.0 (2024-10-02)
   * Improve invocation on windows, always use cmd.exe
   * Fixed bugs #132, #133, #134, and #135
diff --git a/media/programflow-visualization/leader-line.min.js b/media/programflow-visualization/leader-line.min.js
diff --git a/media/programflow-visualization/webview.css b/media/programflow-visualization/webview.css
@@ -18,7 +18,6 @@ body {
 .floating-right-content {
   width: 65%;
   padding: 10px;
-  min-height: 450px;
   max-height: 90%;
 }
 
@@ -31,7 +30,6 @@ body {
   width: 35%;
   padding: 10px;
   max-height: 90%;
-  min-height: 450px;
   margin-right: 100px;
 }
 
diff --git a/media/programflow-visualization/webview.js b/media/programflow-visualization/webview.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
 	"displayName": "Write Your Python Program!",
 	"description": "A user friendly python environment for beginners",
 	"license": "See license in LICENSE",
-	"version": "1.1.0",
+	"version": "1.2.1",
 	"publisher": "StefanWehr",
 	"icon": "icon.png",
 	"engines": {
@@ -81,7 +81,6 @@
 	},
 	"dependencies": {
 		"@types/node": "^18.11.13",
-		"leader-line": "^1.0.7",
 		"stringify-json": "^2.0.0",
 		"tmp": "^0.2.3",
 		"ts-md5": "^1.3.1"
diff --git a/python/deps/untypy/untypy/impl/union.py b/python/deps/untypy/untypy/impl/union.py
@@ -71,7 +71,7 @@ def describe(self) -> str:
     def base_type(self) -> list[Any]:
         out = []
         for checker in self.inner:
-            out.append(checker.base_type())
+            out.extend(checker.base_type())
         return out
 
 
diff --git a/python/fileTests b/python/fileTests
@@ -287,6 +287,7 @@ checkWithOutputAux yes 0 test-data/testUnion3.py
 checkWithOutputAux yes 1 test-data/testLiteral1.py
 checkWithOutputAux yes 0 test-data/testForwardTypeInRecord.py
 checkWithOutputAux yes 0 test-data/testForwardTypeInRecord2.py
+checkWithOutputAux yes 0 test-data/testUnionOfUnion.py
 
 function is_min_version()
 {
diff --git a/python/test-data/testUnionOfUnion.err b/python/test-data/testUnionOfUnion.err
diff --git a/python/test-data/testUnionOfUnion.out b/python/test-data/testUnionOfUnion.out
@@ -0,0 +1,3 @@
+pizza: Napoli
+noodles: Penne
+beer: Export
diff --git a/python/test-data/testUnionOfUnion.py b/python/test-data/testUnionOfUnion.py
@@ -0,0 +1,31 @@
+from wypp import *
+
+@record
+class Pizza:
+    nameP: str
+
+@record
+class Noodles:
+    nameN: str
+
+type Food = Union[Pizza, Noodles]
+
+@record
+class Beer:
+    nameB: str
+
+type All = Union[Food, Beer]
+
+def foo(a: All):
+    if isinstance(a, Pizza):
+        print(f'pizza: {a.nameP}')
+    elif isinstance(a, Noodles):
+        print(f'noodles: {a.nameN}')
+    elif isinstance(a, Beer):
+        print(f'beer: {a.nameB}')
+    else:
+        impossible()
+
+foo(Pizza('Napoli'))
+foo(Noodles('Penne'))
+foo(Beer('Export'))
diff --git a/src/programflow-visualization/frontend/visualization_panel.ts b/src/programflow-visualization/frontend/visualization_panel.ts
@@ -5,7 +5,7 @@ import { HTMLGenerator } from './HTMLGenerator';
 import { MessagePort } from 'worker_threads';
 import { cacheTrace } from '../trace_cache';
 
-const FRONTEND_RESOURCE_PATH = 'src/programflow-visualization/frontend/resources';
+const FRONTEND_RESOURCE_PATH = 'media/programflow-visualization';
 
 export class VisualizationPanel {
   private _panel: vscode.WebviewPanel | undefined;

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ body {`
`18`	`18`	`.floating-right-content {`
`19`	`19`	`width: 65%;`
`20`	`20`	`padding: 10px;`
`21`		`- min-height: 450px;`
`22`	`21`	`max-height: 90%;`
`23`	`22`	`}`
`24`	`23`
`@@ -31,7 +30,6 @@ body {`
`31`	`30`	`width: 35%;`
`32`	`31`	`padding: 10px;`
`33`	`32`	`max-height: 90%;`
`34`		`- min-height: 450px;`
`35`	`33`	`margin-right: 100px;`
`36`	`34`	`}`
`37`	`35`
Original file line number	Diff line number	Diff line change
`@@ -287,6 +287,7 @@ checkWithOutputAux yes 0 test-data/testUnion3.py`
`287`	`287`	`checkWithOutputAux yes 1 test-data/testLiteral1.py`
`288`	`288`	`checkWithOutputAux yes 0 test-data/testForwardTypeInRecord.py`
`289`	`289`	`checkWithOutputAux yes 0 test-data/testForwardTypeInRecord2.py`
	`290`	`+checkWithOutputAux yes 0 test-data/testUnionOfUnion.py`
`290`	`291`
`291`	`292`	`function is_min_version()`
`292`	`293`	`{`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+pizza: Napoli`
	`2`	`+noodles: Penne`
	`3`	`+beer: Export`