Merge pull request #118 from hpi-swa-teaching/dev

Release

.github/workflows/main.yml

@@ -0,0 +1,25 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+on:
+  push:
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        # Select platform(s)
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        # Select compatible Smalltalk image(s)
+        smalltalk: [ Squeak64-trunk, Squeak64-5.3, Squeak64-5.2 ]
+    name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: hpi-swa/setup-smalltalkCI@v1
+        with:
+          smalltalk-version: ${{ matrix.smalltalk }}
+      - run: smalltalkci -s ${{ matrix.smalltalk }}
+        timeout-minutes: 15

.smalltalk.ston

@@ -0,0 +1,11 @@
+SmalltalkCISpec {
+ #loading : [
+  SCIMetacelloLoadSpec {
+   #baseline : 'OmegaPrint',
+   #directory : 'packages',
+   #platforms : [ #squeak ],
+   #load : [ 'tests' ],
+   #useLatestMetacello : true
+  }
+ ]
+}

.squot

@@ -1,5 +1,5 @@
 OrderedDictionary {
-	'packages\/BaselineOfOhmPrettyPrint.package' : #SquotCypressCodeSerializer,
 	'packages\/OmegaPrint-Core.package' : #SquotCypressCodeSerializer,
-	'packages\/OhmPrettyPrint.package' : #SquotCypressCodeSerializer
-}
+	'packages\/OmegaPrint-Tests.package' : #SquotCypressCodeSerializer,
+	'packages\/BaselineOfOmegaPrint.package' : #SquotCypressCodeSerializer
+}

README.md

@@ -1,9 +1,11 @@
 # OhmPrettyPrint
+dev: ![CI](https://github.com/hpi-swa-teaching/OhmPrettyPrint/workflows/CI/badge.svg?branch=dev)  
+master: ![CI](https://github.com/hpi-swa-teaching/OhmPrettyPrint/workflows/CI/badge.svg?branch=master)
 
 ## How to install
-```
+```smalltalk
 Metacello new
 	baseline: 'OhmPrettyPrint';
-	repository: 'github://hpi-swa-teaching/OhmPrettyPrint';
-	load.
+	repository: 'github://HPI-SWA-Teaching/OhmPrettyPrint:dev/packages';
+	load
 ```

packages/BaselineOfOmegaPrint.package/BaselineOfOmegaPrint.class/instance/baseline..st

@@ -0,0 +1,13 @@
+baseline
+baseline: spec
+	<baseline>
+	spec for: #common do: [
+		spec baseline: 'Ohm' with: [
+				spec
+					repository: 'github://felixauringer/ohm-s:swt-submission/packages'].
+		spec 
+			package: 'OmegaPrint-Core' with: [spec requires: #('Ohm')];
+			package: 'OmegaPrint-Tests' with: [ spec requires: #('default') ];
+			group: 'default' with: #('OmegaPrint-Core');
+			group: 'tests' with: #('OmegaPrint-Tests')
+		]

packages/BaselineOfOmegaPrint.package/BaselineOfOmegaPrint.class/instance/projectClass.st

@@ -0,0 +1,6 @@
+accessing
+projectClass
+
+	^ Smalltalk
+		at: #MetacelloCypressBaselineProject
+		ifAbsent: [ super projectClass ]

packages/BaselineOfOmegaPrint.package/BaselineOfOmegaPrint.class/methodProperties.json

@@ -0,0 +1,6 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"baseline:" : "fau 8/4/2020 09:49",
+		"projectClass" : "PK 8/2/2020 20:17" } }

packages/BaselineOfOhmPrettyPrint.package/BaselineOfOhmPrettyPrint.class/properties.json → packages/BaselineOfOmegaPrint.package/BaselineOfOmegaPrint.class/properties.json

@@ -1,13 +1,13 @@
 {
-	"category" : "BaselineOfOhmPrettyPrint",
+	"category" : "BaselineOfOmegaPrint",
 	"classinstvars" : [
 		 ],
 	"classvars" : [
 		 ],
 	"commentStamp" : "",
 	"instvars" : [
 		 ],
-	"name" : "BaselineOfOhmPrettyPrint",
+	"name" : "BaselineOfOmegaPrint",
 	"pools" : [
 		 ],
 	"super" : "BaselineOf",

packages/BaselineOfOmegaPrint.package/monticello.meta/categories.st

@@ -0,0 +1 @@
+SystemOrganization addCategory: #BaselineOfOmegaPrint!

packages/OmegaPrint-Core.package/CodeHolder.extension/instance/isModeStyleable.st

@@ -0,0 +1,4 @@
+*OmegaPrint-Core
+isModeStyleable
+	"determine whether the current mode can be styled"
+	^ self showingSource or: [ self showingPrettyPrint ] or: [ self isShowingOmegaPrint ]

packages/OmegaPrint-Core.package/CodeHolder.extension/instance/isShowingOmegaPrint.st

@@ -0,0 +1,4 @@
+*OmegaPrint-Core
+isShowingOmegaPrint
+
+	^ contentsSymbol = #omegaPrint

packages/OmegaPrint-Core.package/CodeHolder.extension/instance/omegaPrintString.st

@@ -0,0 +1,6 @@
+*OmegaPrint-Core
+omegaPrintString
+	"returns a string whether omegaPrint is displayed"
+	^ ((contentsSymbol = #omegaPrint)
+			ifTrue: ['<yes>']
+			ifFalse: ['<no>']) , 'omegaPrint'

packages/OmegaPrint-Core.package/CodeHolder.extension/instance/sourceStringPrettifiedAndDiffed.st

@@ -0,0 +1,26 @@
+*OmegaPrint-Core
+sourceStringPrettifiedAndDiffed
+	"Answer a copy of the source code for the selected message, transformed by diffing and pretty-printing exigencies"
+	| class selector sourceString prettifierClass |
+	class := self selectedClassOrMetaClass.
+	selector := self selectedMessageName.
+	(class isNil or: [ selector isNil ]) ifTrue: [ ^ 'missing' ].
+	sourceString := class
+						ultimateSourceCodeAt: selector
+						ifAbsent: [ ^ 'error' ].
+	self
+		validateMessageSource: sourceString
+		forSelector: selector
+		inClass: class.
+	(#(#prettyPrint #prettyDiffs) includes: contentsSymbol) 
+		ifTrue: [ prettifierClass := class prettyPrinterClass ].
+	(#omegaPrint = contentsSymbol)
+		ifTrue: [ prettifierClass := OPPrinter ].
+	prettifierClass ifNotNil:
+		[ sourceString := prettifierClass
+							format: sourceString
+							in: class
+							notifying: nil ].
+	self showingAnyKindOfDiffs 
+		ifTrue: [ sourceString := self diffFromPriorSourceFor: sourceString ].
+	^ sourceString

packages/OmegaPrint-Core.package/CodeHolder.extension/instance/toggleOmegaPrint.st

@@ -0,0 +1,9 @@
+*OmegaPrint-Core
+toggleOmegaPrint
+
+	self restoreTextualCodingPane.
+	self okToChange ifTrue: [ self isShowingOmegaPrint
+			ifTrue: [ contentsSymbol := #source ]
+			ifFalse: [ contentsSymbol := #omegaPrint ].
+		self setContentsToForceRefetch.
+		self contentsChanged ]

packages/OmegaPrint-Core.package/CodeHolder.extension/methodProperties.json

@@ -0,0 +1,9 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"isModeStyleable" : "PK 6/1/2020 18:27",
+		"isShowingOmegaPrint" : "fau 8/4/2020 10:22",
+		"omegaPrintString" : "fau 8/4/2020 10:22",
+		"sourceStringPrettifiedAndDiffed" : "PK 6/3/2020 13:21",
+		"toggleOmegaPrint" : "PS 8/4/2020 07:04" } }

packages/OmegaPrint-Core.package/CodeHolder.extension/properties.json

@@ -0,0 +1,2 @@
+{
+	"name" : "CodeHolder" }

packages/OmegaPrint-Core.package/MessageSet.extension/instance/aboutToStyle..st

@@ -0,0 +1,10 @@
+*OmegaPrint-Core
+aboutToStyle: aStyler
+	"This is a notification that aStyler is about to re-style its text.
+	Answer true to allow styling to proceed, or false to veto the styling"
+	| type |
+	self isModeStyleable ifFalse: [ ^ false ].
+	type := self editSelection.
+	(#( newMessage editMessage editClass newClass ) includes: type) ifFalse: [ ^ false ].
+	aStyler classOrMetaClass: ((type = #editClass or: [ type = #newClass ]) ifFalse: [ self selectedClassOrMetaClass ]).
+	^ true

packages/OmegaPrint-Core.package/MessageSet.extension/instance/editSelection.st

@@ -0,0 +1,4 @@
+*OmegaPrint-Core
+editSelection
+
+	^ editSelection

packages/OmegaPrint-Core.package/MessageSet.extension/instance/initialize.st

@@ -0,0 +1,7 @@
+*OmegaPrint-Core
+initialize
+
+	super initialize.
+	self
+		messageList: OrderedCollection new;
+		editSelection: #editMessage

packages/OmegaPrint-Core.package/MessageSet.extension/instance/messageList..st

@@ -0,0 +1,4 @@
+*OmegaPrint-Core
+messageList: aCollection
+
+	messageList := aCollection

packages/OmegaPrint-Core.package/MessageSet.extension/methodProperties.json

@@ -0,0 +1,8 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"aboutToStyle:" : "TA 6/25/2020 20:30",
+		"editSelection" : "TA 6/25/2020 19:49",
+		"initialize" : "PK 7/2/2020 14:34",
+		"messageList:" : "PK 7/2/2020 14:34" } }

packages/OmegaPrint-Core.package/MessageSet.extension/properties.json

@@ -0,0 +1,2 @@
+{
+	"name" : "MessageSet" }

packages/OmegaPrint-Core.package/OPPrinter.class/class/evaluate.startingFrom..st

@@ -0,0 +1,9 @@
+format
+evaluate: aString startingFrom: aSymbol
+
+	| matchResult evaluator |
+	matchResult := OhmExplicitSendsSmalltalk
+		match: aString
+		startingFrom: aSymbol.
+	evaluator := OhmExplicitSendsSmalltalk synthesizedAttribute: OPPrinter new.
+	^ evaluator value: matchResult cst

packages/OmegaPrint-Core.package/OPPrinter.class/class/format.in.notifying..st

@@ -0,0 +1,6 @@
+format
+format: aString in: aClass notifying: ignored
+	"interface as used by content display in squeak"
+	^ self
+		evaluate: aString
+		startingFrom: #MethodDeclaration

packages/OmegaPrint-Core.package/OPPrinter.class/instance/BinaryMessageSend.with.and..st

@@ -0,0 +1,6 @@
+actions
+BinaryMessageSend: aNode with: aBinaryMessageReceiver and: aBinaryMessage
+
+	^ self
+		join: { aBinaryMessageReceiver . aBinaryMessage }
+		separatedBy: ' '

packages/OmegaPrint-Core.package/OPPrinter.class/instance/BlockLiteralNormal.with.and.and.and..st

@@ -0,0 +1,20 @@
+actions
+BlockLiteralNormal: aNode with: aTerminal and: blockArguments and: executableCode and: anotherTerminal
+
+	| result resultArguments resultVariables resultCode separator |
+	self increaseIndentation.
+	resultArguments := self value: blockArguments.
+	resultCode := self value: executableCode.
+	resultVariables := self value: executableCode firstChild.
+	separator := self
+		spaceInBlockWith: resultArguments
+		and: resultVariables
+		and: resultCode.
+	result := self
+		join: { resultArguments . resultCode }
+		separatedBy: separator.
+	self decreaseIndentation.
+	^ self
+		include: result
+		between: '['
+		and: ']'

packages/OmegaPrint-Core.package/OPPrinter.class/instance/ByteArrayLiteral.with.and.and..st

@@ -0,0 +1,7 @@
+actions
+ByteArrayLiteral: aNode with: aTerminal and: integerLiterals and: anotherTerminal
+
+	^ self
+		include: (self value: integerLiterals)
+		between: '#['
+		and: ']'

packages/OmegaPrint-Core.package/OPPrinter.class/instance/CascadedMessages.with.and.and..st

@@ -0,0 +1,6 @@
+actions
+CascadedMessages: aNode with: aMessageChain and: aTerminal and: messageChains
+
+	^ self
+		join: { aMessageChain } , messageChains children
+		separatedBy: ';' , self newline

packages/OmegaPrint-Core.package/OPPrinter.class/instance/ExecutableCode.with.and.and..st

@@ -0,0 +1,6 @@
+actions
+ExecutableCode: aNode with: aLocalVariableDeclarationList and: pragmas and: moreExecutableCode
+
+	^ self
+		join: { aLocalVariableDeclarationList . pragmas . moreExecutableCode }
+		separatedBy: self newline

packages/OmegaPrint-Core.package/OPPrinter.class/instance/ExpressionBinaryCascade.with.and..st

@@ -0,0 +1,6 @@
+actions
+ExpressionBinaryCascade: aNode with: aBinaryMessageSend and: cascadedMessages
+
+	^ self
+		cascadeWith: aBinaryMessageSend
+		and: cascadedMessages

packages/OmegaPrint-Core.package/OPPrinter.class/instance/ExpressionOperandCascade.with.and..st

@@ -0,0 +1,6 @@
+actions
+ExpressionOperandCascade: aNode with: anOperand and: cascadedMessages
+
+	^ self
+		cascadeWith: anOperand
+		and: cascadedMessages

packages/OmegaPrint-Core.package/OPPrinter.class/instance/ExpressionUnaryCascade.with.and..st

@@ -0,0 +1,6 @@
+actions
+ExpressionUnaryCascade: aNode with: anUnaryMessageSend and: cascadedMessages
+
+	^ self
+		cascadeWith: anUnaryMessageSend
+		and: cascadedMessages

packages/OmegaPrint-Core.package/OPPrinter.class/instance/FinalStatement.with.and.and..st

@@ -0,0 +1,6 @@
+actions
+FinalStatement: aNode with: aTerminal and: aStatement and: anotherTerminal
+
+	^ self
+		join: { aTerminal . aStatement }
+		separatedBy: ' '

packages/OmegaPrint-Core.package/OPPrinter.class/instance/KeywordMessageSend.with.and..st

@@ -0,0 +1,13 @@
+actions
+KeywordMessageSend: aNode with: aKeywordMessageReceiver and: keywordMessageSegments
+
+	| separator result |
+	self increaseIndentation.
+	keywordMessageSegments numberOfChildren < 2
+		ifTrue: [ separator := String space ]
+		ifFalse: [ separator := self newline ].
+	self decreaseIndentation.
+	result := self
+		join: { aKeywordMessageReceiver } , keywordMessageSegments children
+		separatedBy: separator.
+	^ result

packages/OmegaPrint-Core.package/OPPrinter.class/instance/LiteralArrayLiteral.with.and.and..st

@@ -0,0 +1,4 @@
+actions
+LiteralArrayLiteral: aNode with: aTerminal and: literalArrayLiteralElements and: anotherTerminal
+
+	^ self literalArrayWith: literalArrayLiteralElements

packages/OmegaPrint-Core.package/OPPrinter.class/instance/LiteralArrayLiteralInLiteralArray.with.and.and.and..st

@@ -0,0 +1,4 @@
+actions
+LiteralArrayLiteralInLiteralArray: aNode with: aTerminal and: anotherTerminal and: literalArrayLiteralElements and: yetAnotherTerminal
+
+	^ self literalArrayWith: literalArrayLiteralElements

packages/OmegaPrint-Core.package/OPPrinter.class/instance/MethodDeclaration.with.and.and..st

@@ -0,0 +1,14 @@
+actions
+MethodDeclaration: aNode with: aMethodHeader and: pragmas and: executableCode
+
+	| result resultBody resultHeader |
+	resultHeader := self value: aMethodHeader.
+	self increaseIndentation.
+	resultBody := self
+		join: { pragmas . executableCode . self lastComment: aNode }
+		separatedBy: self newline.
+	result := self
+		join: { resultHeader . resultBody }
+		separatedBy: String cr , self newline.
+	self decreaseIndentation.
+	^ result