Merge remote-tracking branch 'origin/squeak60' into squeak60

hpi-swa-lab · Dec 27, 2023 · 1c6f981 · 1c6f981
2 parents f3d7319 + 9d1175a
commit 1c6f981
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -3,7 +3,7 @@ name: Tests & Benchmarks
 on: [push, workflow_dispatch]
 
 env:
-  SMALLTALK_IMAGE: Squeak64-Trunk
+  SMALLTALK_IMAGE: Squeak64-6.0
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -13,11 +13,8 @@ jobs:
         uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-image: ${{ env.SMALLTALK_IMAGE }}
-      - id: download-vm
-        name: Download latest VM
-        run: scripts/download_vm.sh
       - name: Run tests
-        run: smalltalkci -s "${{ steps.smalltalkci.outputs.smalltalk-image }}" --vm "${{ steps.download-vm.outputs.vm-path }}" tests.smalltalk.ston
+        run: smalltalkci -s "${{ steps.smalltalkci.outputs.smalltalk-image }}" tests.smalltalk.ston
         timeout-minutes: 15
         env:
           # for uploading coverage reports
@@ -31,11 +28,8 @@ jobs:
         uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-image: ${{ env.SMALLTALK_IMAGE }}
-      - id: download-vm
-        name: Download latest VM
-        run: scripts/download_vm.sh
       - name: Run benchmarks
-        run: smalltalkci -s ${{ steps.smalltalkci.outputs.smalltalk-image }} --vm "${{ steps.download-vm.outputs.vm-path }}" benchmarks.smalltalk.ston
+        run: smalltalkci -s ${{ steps.smalltalkci.outputs.smalltalk-image }} benchmarks.smalltalk.ston
         timeout-minutes: 15
         env:
           TDB_BENCHMARK_RESULTS_PATH: ${{ runner.temp }}/benchmark-data.json

diff --git a/packages/TraceDebugger.package/TraceDebugger.class/instance/controlButtonSpecs.st b/packages/TraceDebugger.package/TraceDebugger.class/instance/controlButtonSpecs.st
@@ -6,6 +6,7 @@ controlButtonSpecs
 		('Restart'		restart			'rewind this context to its start (r)'		canStepBackward)
 		('Into'			stepInto		'step into next message send (e)'		canStepForward)
 		('Over'			stepOver		'step over next message send (t)'		canStepForward)
-		('Through'		stepThrough	'step into next block/out of current block (T)'				canStepForward)
+		('Through'		stepThrough	'step into next block/out of current block (T)'	canStepForward)
 		('Back'			stepBack		'rewind before previous message send (B)'		canStepBackward)
-		('Where'		showWhere		'select next expression (w)'				hasContextSelected))
+		('Where'		showWhere		'select next expression'				hasContextSelected)
+		('Up'			jumpToSender	'jump to sender (w)'				hasContextSelected))
diff --git a/packages/TraceDebugger.package/TraceDebugger.class/methodProperties.json b/packages/TraceDebugger.package/TraceDebugger.class/methodProperties.json
@@ -124,7 +124,7 @@
 		"contextTreeKey:from:event:" : "ct 8/1/2022 01:10",
 		"contextVariablesInspector" : "ct 11/20/2021 16:11",
 		"contextVariablesInspectorClass" : "ct 3/19/2022 20:49",
-		"controlButtonSpecs" : "ct 2/21/2022 19:43",
+		"controlButtonSpecs" : "ct 9/15/2023 22:37",
 		"controlButtonsFrame" : "ct 11/20/2021 15:33",
 		"copyBugReportToClipboard" : "ct 3/12/2022 17:40",
 		"currentCompiledMethod" : "ct 11/20/2021 21:08",

diff --git a/packages/TraceDebugger.package/TraceDebuggerHelp.class/class/basicBasicNavigation.st b/packages/TraceDebugger.package/TraceDebuggerHelp.class/class/basicBasicNavigation.st
@@ -17,9 +17,10 @@ You can use the stepping buttons to navigate through the program trace. The trac
 <#figureButtonThrough> Step to the next expression in the same method, including expressions in blocks.
 <#figureButtonBack> Step back the previous message send.
 <#figureButtonWhere> Select the expression that will be executed next.
+<#figureButtonUp> Jump to the sender of the current context.
 
 Alternatively to the stepping buttons, you can also navigate through the context tree: Red-click any context to jump to the time where it was active. Shift + red-click any context to select its sender at its activation time.!
-]style[(16 1 97 13 1257)a0b,a0,,i,!' readStream nextChunkText)
+]style[(16 1 97 13 1318)a0b,a0,,i,!' readStream nextChunkText)
 			key: #basicBasicNavigation;
 			shouldStyle: false;
 			yourself
diff --git a/packages/TraceDebugger.package/TraceDebuggerHelp.class/class/figureButtonUp.st b/packages/TraceDebugger.package/TraceDebuggerHelp.class/class/figureButtonUp.st
@@ -0,0 +1,4 @@
+figures
+figureButtonUp
+
+	^ self figureButtonNamed: 'Up'
diff --git a/packages/TraceDebugger.package/TraceDebuggerHelp.class/methodProperties.json b/packages/TraceDebugger.package/TraceDebuggerHelp.class/methodProperties.json
@@ -2,7 +2,7 @@
 	"class" : {
 		"applyUserInterfaceTheme" : "ct 3/18/2022 20:45",
 		"basicAdvancedNavigation" : "ct 8/1/2022 01:11",
-		"basicBasicNavigation" : "ct 6/18/2022 21:29",
+		"basicBasicNavigation" : "ct 9/15/2023 22:40",
 		"basicContextFilters" : "ct 3/18/2022 20:43",
 		"basicEntryPoints" : "ct 5/11/2022 22:54",
 		"basicFindingContexts" : "ct 3/18/2022 20:32",
@@ -28,6 +28,7 @@
 		"figureButtonProceed" : "ct 3/18/2022 19:36",
 		"figureButtonRestart" : "ct 3/18/2022 19:38",
 		"figureButtonThrough" : "ct 3/18/2022 19:38",
+		"figureButtonUp" : "ct 9/15/2023 22:40",
 		"figureButtonWhere" : "ct 3/18/2022 19:38",
 		"figureContextAddFilter" : "ct 3/18/2022 21:16",
 		"figureContextToolTip" : "ct 3/18/2022 18:35",