Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/CI.yml

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We stop Pharo 11 support. I will create an issue to process that.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here: #281

Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,16 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
smalltalk: [ Pharo64-11, Pharo64-12, Pharo64-13 ]
smalltalk: [ Pharo64-12, Pharo64-13, Pharo64-14 ]
ston: [ .smalltalkci.default.ston ]
#Specific case for Pharo14 (experimental): ignore failures
include:
- smalltalk: Pharo64-14
experimental: true
runs-on: ${{ matrix.os }}
name: >
${{ matrix.smalltalk }} • ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental == true }}
steps:
- uses: actions/checkout@v3

Expand All @@ -30,4 +35,4 @@ jobs:
- name: Run ${{ matrix.ston == '.smalltalkci.default.ston' && 'Full' || 'Core' }} tests
run: smalltalkci -s ${{ matrix.smalltalk }} ${{ matrix.ston }}
shell: bash
timeout-minutes: 30
timeout-minutes: 30
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Pharo 11](https://img.shields.io/badge/Pharo-11-%23aac9ff.svg)](https://pharo.org/download)
[![Pharo 12](https://img.shields.io/badge/Pharo-12-%23aac9ff.svg)](https://pharo.org/download)
[![Pharo 13](https://img.shields.io/badge/Pharo-13-%23aac9ff.svg)](https://pharo.org/download)
[![Pharo 14](https://img.shields.io/badge/Pharo-14-%23aac9ff.svg)](https://pharo.org/download)

[![License](https://img.shields.io/github/license/OpenSmock/Pyramid.svg)](./LICENSE)
[![Unit tests](https://github.com/OpenSmock/Pyramid/actions/workflows/CI.yml/badge.svg)](https://github.com/OpenSmock/Pyramid/actions/workflows/CI.yml)
Expand Down
64 changes: 0 additions & 64 deletions src/Pyramid-Bloc/PyramidBreakpoint.class.st

This file was deleted.

64 changes: 64 additions & 0 deletions src/Pyramid-Bloc/PyramidDebugPoint.class.st
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
Class {
#name : #PyramidDebugPoint,
#superclass : #DebugPoint,
#instVars : [
'whenHitDo'
],
#category : #'Pyramid-Bloc-plugin-edit-on-running'
}

{ #category : #removing }
PyramidDebugPoint class >> removeAllPyramidDebugPoint [

<script: 'self removeAllPyramidDebugPoint'>
| pyramidDebugPoints |
pyramidDebugPoints := PyramidDebugPoint allInstances.
pyramidDebugPoints isEmptyOrNil ifTrue: [ ^ self ].
pyramidDebugPoints do: [ :each | each link ifNotNil:[ each remove ] ]
]

{ #category : #API }
PyramidDebugPoint >> hitWithContext: aContext [

| result |
result := super hitWithContext: aContext.
result ifTrue:[ self whenHitDo value: aContext ].

^result

]

{ #category : #initialization }
PyramidDebugPoint >> initialize [

super initialize.
whenHitDo := [ :c | ]
]

{ #category : #installing }
PyramidDebugPoint >> install [

"For compatibility P12"
self link ifNil:[ self link: self metaLink].

super install
]

{ #category : #testing }
PyramidDebugPoint >> isInstalled [

self link ifNil:[ ^false ].
^ self link methods isNotEmpty
]

{ #category : #accessing }
PyramidDebugPoint >> whenHitDo [

^ whenHitDo
]

{ #category : #accessing }
PyramidDebugPoint >> whenHitDo: anObject [

whenHitDo := anObject
]
12 changes: 6 additions & 6 deletions src/Pyramid-Bloc/PyramidPluginEditOnRunning.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PyramidPluginEditOnRunning class >> breakpoint [
^ breakpoint
]

{ #category : #'as yet unclassified' }
{ #category : #private }
PyramidPluginEditOnRunning class >> canEditSpace: aSpace [

aSpace ifNil:[ ^ false ].
Expand Down Expand Up @@ -54,13 +54,13 @@ PyramidPluginEditOnRunning class >> doShortcutAction: anEvent [
editor window whenClosedDo: [ whenClosedDo value ]
]

{ #category : #'as yet unclassified' }
{ #category : #accessing }
PyramidPluginEditOnRunning class >> editOnRunning [

^ editOnRunning ifNil: [ editOnRunning := true ]
]

{ #category : #'as yet unclassified' }
{ #category : #accessing }
PyramidPluginEditOnRunning class >> editOnRunning: aBoolean [

editOnRunning := aBoolean
Expand All @@ -77,10 +77,10 @@ PyramidPluginEditOnRunning class >> install [
PyramidPluginEditOnRunning class >> installBreakpoint [

| node |
PyramidBreakpoint removeAllPyramidBreakpoint.
PyramidDebugPoint removeAllPyramidDebugPoint.
node := (BlParallelUniverse methodNamed: #openSpace:) ast.

breakpoint := PyramidBreakpoint new.
breakpoint := PyramidDebugPoint new.
breakpoint node: node.
breakpoint whenHitDo: [ :context |
self addShortcutInSpace: context arguments first ].
Expand Down Expand Up @@ -122,6 +122,6 @@ PyramidPluginEditOnRunning class >> shortcut [
PyramidPluginEditOnRunning class >> uninstall [
"Undo some stuff here when the plugin used class oriented behavior"

PyramidBreakpoint removeAllPyramidBreakpoint.
PyramidDebugPoint removeAllPyramidDebugPoint.
breakpoint := nil.
]
4 changes: 2 additions & 2 deletions src/Pyramid-Bloc/PyramidSaveModelVerifier.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ PyramidSaveModelVerifier class >> classPackageIsEqual [
PyramidSaveModelVerifier class >> methodIsValid [

^ self new
verifyBlock: [ :model | model savingMethodName isValidSelector ];
verifyBlock: [ :model |model savingMethodName isValidSelector];
showBlock: [ :view | view showMethodIsNotValidError ];
yourself.
yourself
]

{ #category : #constructor }
Expand Down
2 changes: 1 addition & 1 deletion src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ PyramidPluginEditOnRunningTest >> testOnlyOnePyramidBreakpoint [
Smalltalk image garbageCollect.
Smalltalk image garbageCollect.
Smalltalk image garbageCollect.
self assert: (PyramidBreakpoint allInstances select: #isInstalled) size equals: 1
self assert: (PyramidDebugPoint allInstances select: #isInstalled) size equals: 1
]

{ #category : #tests }
Expand Down
Loading