diff --git a/README.md b/README.md index bc3f53c..31f78d0 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,24 @@ 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) +OmegaPrint is a tool which prettifies your code in a consistent way. It uses [Ohm/S](https://github.com/hpi-swa/Ohm-S) as a parser. + ## How to install ```smalltalk Metacello new - baseline: 'OhmPrettyPrint'; + baseline: 'OmegaPrint'; repository: 'github://HPI-SWA-Teaching/OhmPrettyPrint:dev/packages'; load ``` + +## Usage +After installing OmegaPrint you will find a button in all your code holders (for example the browser). +![Hovering over formatter selection](/screenshots/hover_formatting_selection.png) +![Formatter selection clicked](/screenshots/click_formatting_selection.png) + +Selecting OmegaPrint will show you a prettified version of your code. Be aware that comments are not fully implemented yet. + +For more information about the implementation visit our [wiki](https://github.com/hpi-swa-teaching/OhmPrettyPrint/wiki). + +## History +- 2020: Tarik Alnawa, Felix Auringer, Paula Klinke, Patricia Sowa diff --git a/packages/OmegaPrint-Core.package/CodeHolder.extension/instance/isModeStyleable.st b/packages/OmegaPrint-Core.package/CodeHolder.extension/instance/isModeStyleable.st index 889e211..28e4554 100644 --- a/packages/OmegaPrint-Core.package/CodeHolder.extension/instance/isModeStyleable.st +++ b/packages/OmegaPrint-Core.package/CodeHolder.extension/instance/isModeStyleable.st @@ -1,4 +1,6 @@ *OmegaPrint-Core isModeStyleable "determine whether the current mode can be styled" - ^ self showingSource or: [ self showingPrettyPrint ] or: [ self isShowingOmegaPrint ] \ No newline at end of file + ^ self showingSource + or: [ self showingPrettyPrint ] + or: [ self isShowingOmegaPrint ] \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/CodeHolder.extension/instance/omegaPrintString.st b/packages/OmegaPrint-Core.package/CodeHolder.extension/instance/omegaPrintString.st index fe813e6..f82ba6d 100644 --- a/packages/OmegaPrint-Core.package/CodeHolder.extension/instance/omegaPrintString.st +++ b/packages/OmegaPrint-Core.package/CodeHolder.extension/instance/omegaPrintString.st @@ -2,5 +2,5 @@ omegaPrintString "returns a string whether omegaPrint is displayed" ^ ((contentsSymbol = #omegaPrint) - ifTrue: [''] - ifFalse: ['']) , 'omegaPrint' \ No newline at end of file + ifTrue: [ '' ] + ifFalse: [ '' ]) , 'omegaPrint' \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/CodeHolder.extension/instance/sourceStringPrettifiedAndDiffed.st b/packages/OmegaPrint-Core.package/CodeHolder.extension/instance/sourceStringPrettifiedAndDiffed.st index 3b15dd9..d5d86bd 100644 --- a/packages/OmegaPrint-Core.package/CodeHolder.extension/instance/sourceStringPrettifiedAndDiffed.st +++ b/packages/OmegaPrint-Core.package/CodeHolder.extension/instance/sourceStringPrettifiedAndDiffed.st @@ -6,21 +6,17 @@ sourceStringPrettifiedAndDiffed selector := self selectedMessageName. (class isNil or: [ selector isNil ]) ifTrue: [ ^ 'missing' ]. sourceString := class - ultimateSourceCodeAt: selector - ifAbsent: [ ^ 'error' ]. + 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 ]. + (#( #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 \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/CodeHolder.extension/methodProperties.json b/packages/OmegaPrint-Core.package/CodeHolder.extension/methodProperties.json index 366ab76..a9fdc25 100644 --- a/packages/OmegaPrint-Core.package/CodeHolder.extension/methodProperties.json +++ b/packages/OmegaPrint-Core.package/CodeHolder.extension/methodProperties.json @@ -2,8 +2,8 @@ "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" } } + "isModeStyleable" : "fau 8/5/2020 19:51", + "isShowingOmegaPrint" : "fau 8/5/2020 19:51", + "omegaPrintString" : "PK 8/7/2020 17:49", + "sourceStringPrettifiedAndDiffed" : "PK 8/7/2020 17:49", + "toggleOmegaPrint" : "fau 8/5/2020 19:51" } } diff --git a/packages/OmegaPrint-Core.package/OPCommentExtractor.class/README.md b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/README.md new file mode 100644 index 0000000..8f39d2a --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/README.md @@ -0,0 +1,9 @@ +An OPCommentExtractor can extract comments from a given node. Therefore it directly accesses the interval stream which is a hack but it is currently not possible any other way. The following methods are the most important: +commentNodesAfterMethod: expects a MethodDeclarationNode and returns the comments after the method. This is a special case as nodes only offer the method skippedSpacesNodes which returns the spaces nodes before the node. +commentNodesBefore: uses the method skippedSpacesNodes of OhmNode to return the comment nodes before this node. + + +commentMap + - A Bag of Integers + - It stores the start of the intervals for which the OPCommentExtractor already extracted a valid comment. + - Using this, the same comment cannot be extracted twice. diff --git a/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/collectCommentNodes..st b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/collectCommentNodes..st new file mode 100644 index 0000000..203d2ea --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/collectCommentNodes..st @@ -0,0 +1,6 @@ +extraction +collectCommentNodes: aNode + + | spaceNodes | + spaceNodes := aNode firstChild children. + ^ spaceNodes select: [ :each | each firstChild ruleName = #comment ] \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/commentMap..st b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentMap..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/commentMap..st rename to packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentMap..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/commentMap.st b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentMap.st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/commentMap.st rename to packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentMap.st diff --git a/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentNodesAfterMethod..st b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentNodesAfterMethod..st new file mode 100644 index 0000000..397a7d5 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentNodesAfterMethod..st @@ -0,0 +1,4 @@ +after method +commentNodesAfterMethod: aNode + + ^ (self commentNodesAtEndOfSourceMap: aNode) , (self commentNodesAfterSourceMap: aNode) \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/commentAfterSourceMap..st b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentNodesAfterSourceMap..st similarity index 57% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/commentAfterSourceMap..st rename to packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentNodesAfterSourceMap..st index 8f0d71b..07ca8b2 100644 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/commentAfterSourceMap..st +++ b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentNodesAfterSourceMap..st @@ -1,8 +1,8 @@ -comments -commentAfterSourceMap: aNode +after method +commentNodesAfterSourceMap: aNode | interval | interval := aNode sourceMap size + 1 to: aNode unformattedSourceCode size. ^ self - extractCommentFrom: interval + extractCommentNodesFrom: interval with: aNode \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentNodesAtEndOfSourceMap..st b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentNodesAtEndOfSourceMap..st new file mode 100644 index 0000000..ba87c8b --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentNodesAtEndOfSourceMap..st @@ -0,0 +1,9 @@ +after method +commentNodesAtEndOfSourceMap: aNode + + | reversedSourceMap interval | + reversedSourceMap := aNode sourceMap reversed. + interval := self findCommentInterval: reversedSourceMap. + ^ self + extractCommentNodesFrom: interval + with: aNode \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentNodesBefore..st b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentNodesBefore..st new file mode 100644 index 0000000..1a2277f --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/commentNodesBefore..st @@ -0,0 +1,8 @@ +before node +commentNodesBefore: aNode + + | commentNodes | + (self commentMap includes: aNode interval start) ifTrue: [ ^ {} ]. + commentNodes := self collectCommentNodes: aNode skippedSpacesNodes. + commentNodes ifNotEmpty: [ self commentMap add: aNode interval start ]. + ^ commentNodes \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/extractCommentNodesFrom.with..st b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/extractCommentNodesFrom.with..st new file mode 100644 index 0000000..356e335 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/extractCommentNodesFrom.with..st @@ -0,0 +1,10 @@ +extraction +extractCommentNodesFrom: anInterval with: aNode + + | spacesNode | + spacesNode := (OhmExplicitSendsSmalltalk + match: (self + extractWhitespaceFrom: anInterval + with: aNode) + startingFrom: #spaces) cst. + ^ self collectCommentNodes: spacesNode \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/extractWhitespaceFrom.with..st b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/extractWhitespaceFrom.with..st new file mode 100644 index 0000000..5861b69 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/extractWhitespaceFrom.with..st @@ -0,0 +1,6 @@ +extraction +extractWhitespaceFrom: anInterval with: aNode + + ^ aNode unformattedSourceCode + copyFrom: anInterval start + to: anInterval stop \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/findCommentInterval..st b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/findCommentInterval..st new file mode 100644 index 0000000..73ce2e6 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/findCommentInterval..st @@ -0,0 +1,7 @@ +after method +findCommentInterval: aReversedSourceMap + + | reversedIntervalStart intervalStart | + reversedIntervalStart := (aReversedSourceMap findFirst: [ :each | each size > 1 ]) - 1. + intervalStart := (aReversedSourceMap size - reversedIntervalStart) + 1. + ^ intervalStart to: aReversedSourceMap size \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/foundCommentBefore..st b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/foundCommentBefore..st new file mode 100644 index 0000000..35dbe48 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/foundCommentBefore..st @@ -0,0 +1,4 @@ +accessing +foundCommentBefore: aNode + + ^ self commentMap includes: aNode interval start \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/initialize.st b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/initialize.st new file mode 100644 index 0000000..af5f010 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/instance/initialize.st @@ -0,0 +1,5 @@ +initialize-release +initialize + + super initialize. + self commentMap: Bag new \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPCommentExtractor.class/methodProperties.json b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/methodProperties.json new file mode 100644 index 0000000..d13cc6c --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/methodProperties.json @@ -0,0 +1,16 @@ +{ + "class" : { + }, + "instance" : { + "collectCommentNodes:" : "fau 8/5/2020 22:13", + "commentMap" : "fau 8/5/2020 14:05", + "commentMap:" : "fau 8/5/2020 14:05", + "commentNodesAfterMethod:" : "fau 8/5/2020 22:16", + "commentNodesAfterSourceMap:" : "fau 8/5/2020 22:15", + "commentNodesAtEndOfSourceMap:" : "TA 8/7/2020 15:07", + "commentNodesBefore:" : "fau 8/5/2020 22:14", + "extractCommentNodesFrom:with:" : "fau 8/5/2020 22:13", + "extractWhitespaceFrom:with:" : "fau 8/5/2020 14:49", + "findCommentInterval:" : "TA 8/7/2020 15:11", + "foundCommentBefore:" : "fau 8/6/2020 10:45", + "initialize" : "fau 8/5/2020 14:06" } } diff --git a/packages/OmegaPrint-Core.package/OPCommentExtractor.class/properties.json b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/properties.json new file mode 100644 index 0000000..4504e82 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPCommentExtractor.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "OmegaPrint-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "PK 8/7/2020 16:53", + "instvars" : [ + "commentMap" ], + "name" : "OPCommentExtractor", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/README.md b/packages/OmegaPrint-Core.package/OPPrinter.class/README.md index e69de29..3505296 100644 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/README.md +++ b/packages/OmegaPrint-Core.package/OPPrinter.class/README.md @@ -0,0 +1 @@ +The OPPrinter offers an interface for the codeHolder with format:in:notifying. It then calls the method evaluate:startingFrom: which creates an OhmMatchResult with the OhmExplicitSendsSmalltalk grammar. The CST of this match result then gets evaluated by OPSourceRewriter in order to prettify the code. \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/class/evaluate.startingFrom..st b/packages/OmegaPrint-Core.package/OPPrinter.class/class/evaluate.startingFrom..st index 8c6dc1a..7f28cc5 100644 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/class/evaluate.startingFrom..st +++ b/packages/OmegaPrint-Core.package/OPPrinter.class/class/evaluate.startingFrom..st @@ -5,5 +5,5 @@ evaluate: aString startingFrom: aSymbol matchResult := OhmExplicitSendsSmalltalk match: aString startingFrom: aSymbol. - evaluator := OhmExplicitSendsSmalltalk synthesizedAttribute: OPPrinter new. + evaluator := OhmExplicitSendsSmalltalk synthesizedAttribute: OPSourceRewriter new. ^ evaluator value: matchResult cst \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/BinaryMessageSend.with.and..st b/packages/OmegaPrint-Core.package/OPPrinter.class/instance/BinaryMessageSend.with.and..st deleted file mode 100644 index 0b0bd77..0000000 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/BinaryMessageSend.with.and..st +++ /dev/null @@ -1,6 +0,0 @@ -actions -BinaryMessageSend: aNode with: aBinaryMessageReceiver and: aBinaryMessage - - ^ self - join: { aBinaryMessageReceiver . aBinaryMessage } - separatedBy: ' ' \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/KeywordMessageSend.with.and..st b/packages/OmegaPrint-Core.package/OPPrinter.class/instance/KeywordMessageSend.with.and..st deleted file mode 100644 index 7672b77..0000000 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/KeywordMessageSend.with.and..st +++ /dev/null @@ -1,13 +0,0 @@ -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 \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/MethodDeclaration.with.and.and..st b/packages/OmegaPrint-Core.package/OPPrinter.class/instance/MethodDeclaration.with.and.and..st deleted file mode 100644 index d9474d8..0000000 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/MethodDeclaration.with.and.and..st +++ /dev/null @@ -1,14 +0,0 @@ -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 \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/commentAtEndOfSourceMap..st b/packages/OmegaPrint-Core.package/OPPrinter.class/instance/commentAtEndOfSourceMap..st deleted file mode 100644 index a94c02d..0000000 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/commentAtEndOfSourceMap..st +++ /dev/null @@ -1,11 +0,0 @@ -comments -commentAtEndOfSourceMap: aNode - - | reversedSourceMap intervalStartReversed intervalStart interval | - reversedSourceMap := aNode sourceMap reversed. - intervalStartReversed := (reversedSourceMap findFirst: [ :each | each size > 1 ]) - 1. - intervalStart := (reversedSourceMap size - intervalStartReversed) + 1. - interval := intervalStart to: reversedSourceMap size. - ^ self - extractCommentFrom: interval - with: aNode \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/extractCommentFrom.with..st b/packages/OmegaPrint-Core.package/OPPrinter.class/instance/extractCommentFrom.with..st deleted file mode 100644 index aa57ecc..0000000 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/extractCommentFrom.with..st +++ /dev/null @@ -1,10 +0,0 @@ -comments -extractCommentFrom: anInterval with: aNode - - | string | - string := aNode unformattedSourceCode - copyFrom: anInterval start - to: anInterval stop. - ^ self value: (OhmExplicitSendsSmalltalk - match: string - startingFrom: #spaces) cst \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/include.between.and..st b/packages/OmegaPrint-Core.package/OPPrinter.class/instance/include.between.and..st deleted file mode 100644 index 81030cf..0000000 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/include.between.and..st +++ /dev/null @@ -1,6 +0,0 @@ -helper -include: aString between: leftDelimiter and: rightDelimiter - - aString - ifEmpty: [ ^ leftDelimiter , rightDelimiter ] - ifNotEmpty: [ ^ leftDelimiter , String space , aString , String space , rightDelimiter ] \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/lastComment..st b/packages/OmegaPrint-Core.package/OPPrinter.class/instance/lastComment..st deleted file mode 100644 index 06fe85c..0000000 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/lastComment..st +++ /dev/null @@ -1,4 +0,0 @@ -comments -lastComment: aNode - - ^ (self commentAtEndOfSourceMap: aNode) , (self commentAfterSourceMap: aNode) \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/newline.st b/packages/OmegaPrint-Core.package/OPPrinter.class/instance/newline.st deleted file mode 100644 index 951fdb8..0000000 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/newline.st +++ /dev/null @@ -1,4 +0,0 @@ -indentation -newline - - ^ String cr , (String new: self indentation withAll: Character tab) \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/spaceInBlockWith.and.and..st b/packages/OmegaPrint-Core.package/OPPrinter.class/instance/spaceInBlockWith.and.and..st deleted file mode 100644 index 6d3da0d..0000000 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/spaceInBlockWith.and.and..st +++ /dev/null @@ -1,11 +0,0 @@ -blocks -spaceInBlockWith: resultArguments and: resultVariables and: resultCode - - | lines | - lines := resultCode lineCount. - resultVariables ifNotEmpty: [ lines := lines - 1 ]. - (lines > 1 - and: [ resultArguments notEmpty ] - and: [ resultVariables isEmpty ]) - ifTrue: [ ^ self newline ] - ifFalse: [ ^ String space ] \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/valueWithComment.with..st b/packages/OmegaPrint-Core.package/OPPrinter.class/instance/valueWithComment.with..st deleted file mode 100644 index adc9256..0000000 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/valueWithComment.with..st +++ /dev/null @@ -1,11 +0,0 @@ -evaluation -valueWithComment: aNode with: aString - - (self commentMap includes: aNode interval start) - ifTrue: [ ^ aString ] - ifFalse: [ | spaces | - spaces := self value: aNode skippedSpacesNodes. - spaces ifNotEmpty: [ self commentMap add: aNode interval start ]. - ^ self - join: { spaces . aString } - separatedBy: self newline ] \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/methodProperties.json b/packages/OmegaPrint-Core.package/OPPrinter.class/methodProperties.json index 9efc2d9..1c7aef5 100644 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/methodProperties.json +++ b/packages/OmegaPrint-Core.package/OPPrinter.class/methodProperties.json @@ -1,47 +1,6 @@ { "class" : { - "evaluate:startingFrom:" : "fau 8/5/2020 10:29", - "format:in:notifying:" : "TA 7/30/2020 18:07" }, + "evaluate:startingFrom:" : "fau 8/5/2020 13:34", + "format:in:notifying:" : "TA 8/7/2020 15:48" }, "instance" : { - "BinaryMessageSend:with:and:" : "TA 8/4/2020 13:12", - "BlockLiteralNormal:with:and:and:and:" : "fau 8/5/2020 09:40", - "ByteArrayLiteral:with:and:and:" : "fau 8/5/2020 09:49", - "CascadedMessages:with:and:and:" : "fau 8/4/2020 11:56", - "ExecutableCode:with:and:and:" : "TA 8/4/2020 13:11", - "ExpressionBinaryCascade:with:and:" : "TA 7/29/2020 15:00", - "ExpressionOperandCascade:with:and:" : "TA 7/29/2020 15:00", - "ExpressionUnaryCascade:with:and:" : "TA 7/29/2020 15:00", - "FinalStatement:with:and:and:" : "TA 8/4/2020 13:13", - "KeywordMessageSend:with:and:" : "fau 8/4/2020 21:26", - "LiteralArrayLiteral:with:and:and:" : "PK 8/2/2020 19:49", - "LiteralArrayLiteralInLiteralArray:with:and:and:and:" : "PK 8/2/2020 19:49", - "MethodDeclaration:with:and:and:" : "fau 8/5/2020 09:13", - "MoreExecutableCode:with:and:" : "TA 8/4/2020 13:32", - "NestedExpression:with:and:and:" : "PS 7/30/2020 15:30", - "ObjectArrayLiteral:with:and:and:" : "fau 8/5/2020 08:24", - "ObjectArrayLiteralElementNormal:with:and:" : "PS 7/30/2020 15:31", - "Pragma:with:and:and:" : "PS 7/30/2020 15:31", - "PragmaValuesKeyword:with:" : "TA 8/4/2020 13:11", - "Pragmas:with:" : "TA 8/4/2020 13:12", - "Statements:with:and:" : "fau 8/4/2020 13:03", - "cascadeWith:and:" : "TA 8/4/2020 14:14", - "commentAfterSourceMap:" : "PS 8/4/2020 06:24", - "commentAtEndOfSourceMap:" : "fau 8/1/2020 10:08", - "commentMap" : "fau 8/1/2020 10:09", - "commentMap:" : "fau 8/1/2020 10:09", - "decreaseIndentation" : "fau 5/26/2020 09:46", - "defaultExpression:" : "fau 8/4/2020 22:48", - "extractCommentFrom:with:" : "fau 8/5/2020 10:30", - "include:between:and:" : "fau 8/5/2020 08:26", - "increaseIndentation" : "fau 5/26/2020 09:46", - "indentation" : "fau 5/26/2020 10:39", - "indentation:" : "fau 5/26/2020 10:39", - "initialize" : "fau 7/31/2020 16:50", - "join:separatedBy:" : "fau 8/4/2020 22:11", - "lastComment:" : "fau 8/5/2020 10:03", - "literalArrayWith:" : "fau 8/5/2020 09:49", - "newline" : "fau 8/5/2020 10:20", - "spaceInBlockWith:and:and:" : "fau 8/5/2020 07:36", - "spaces:with:" : "fau 8/5/2020 09:52", - "value:" : "fau 8/5/2020 11:06", - "valueWithComment:with:" : "fau 8/5/2020 10:36" } } + } } diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/properties.json b/packages/OmegaPrint-Core.package/OPPrinter.class/properties.json index a51faab..4c2fff8 100644 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/properties.json +++ b/packages/OmegaPrint-Core.package/OPPrinter.class/properties.json @@ -4,12 +4,11 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "fau 8/7/2020 09:24", "instvars" : [ - "indentation", - "commentMap" ], + ], "name" : "OPPrinter", "pools" : [ ], - "super" : "OhmSourceRewriter", + "super" : "Object", "type" : "normal" } diff --git a/packages/OmegaPrint-Core.package/OPSourceRewriter.class/README.md b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/README.md new file mode 100644 index 0000000..cda927f --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/README.md @@ -0,0 +1,13 @@ +An OPSourceRewriter is a code prettifier designed for the OhmExplicitSendsSmalltalk grammar. It inherits from OhmSourceRewriter and thus is a SemanticAction for CSTs built by Ohm/S. + +Being an OhmSourceRewriter, OPPrinter inherits from OhmAttributes and due to that understands the method value:. With this method one can traverse a CST and evaluate the OhmMatchResult. + +To implement customized evaluation the method names are exactly as the rule names in the grammar. That is why many methods in OPPrinter start with a capital letter. Also there are as many arguments in each method as there are arguments in the rule of the grammar. The first argument is always the parent node. All rules that are not implemented explicitly are handled by OPSourceRewriter >> defaultExpression:. + +Some rules have subrules. While the nodes are named ruleName_subruleName the matching methods are named ruleNameSubruleName. + +indentation + - Here we save how many tabs are the current indentation. It is just an integer. + +commentExtractor + - An instance of OPCommentExtractor used to get comments after the method or before a node. \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/BlockLiteralNormal.with.and.and.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/BlockLiteralNormal.with.and.and.and..st similarity index 93% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/BlockLiteralNormal.with.and.and.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/BlockLiteralNormal.with.and.and.and..st index 126214c..e0c85cb 100644 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/BlockLiteralNormal.with.and.and.and..st +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/BlockLiteralNormal.with.and.and.and..st @@ -7,7 +7,7 @@ BlockLiteralNormal: aNode with: aTerminal and: blockArguments and: executableCod resultCode := self value: executableCode. resultVariables := self value: executableCode firstChild. separator := self - spaceInBlockWith: resultArguments + separatorInBlockWith: resultArguments and: resultVariables and: resultCode. result := self diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/ByteArrayLiteral.with.and.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/ByteArrayLiteral.with.and.and..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/ByteArrayLiteral.with.and.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/ByteArrayLiteral.with.and.and..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/CascadedMessages.with.and.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/CascadedMessages.with.and.and..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/CascadedMessages.with.and.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/CascadedMessages.with.and.and..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/ExecutableCode.with.and.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/ExecutableCode.with.and.and..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/ExecutableCode.with.and.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/ExecutableCode.with.and.and..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/ExpressionBinaryCascade.with.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/ExpressionBinaryCascade.with.and..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/ExpressionBinaryCascade.with.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/ExpressionBinaryCascade.with.and..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/ExpressionOperandCascade.with.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/ExpressionOperandCascade.with.and..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/ExpressionOperandCascade.with.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/ExpressionOperandCascade.with.and..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/ExpressionUnaryCascade.with.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/ExpressionUnaryCascade.with.and..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/ExpressionUnaryCascade.with.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/ExpressionUnaryCascade.with.and..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/FinalStatement.with.and.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/FinalStatement.with.and.and..st similarity index 82% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/FinalStatement.with.and.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/FinalStatement.with.and.and..st index bd714d8..0afd612 100644 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/FinalStatement.with.and.and..st +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/FinalStatement.with.and.and..st @@ -3,4 +3,4 @@ FinalStatement: aNode with: aTerminal and: aStatement and: anotherTerminal ^ self join: { aTerminal . aStatement } - separatedBy: ' ' \ No newline at end of file + separatedBy: String space \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/KeywordMessage.with..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/KeywordMessage.with..st new file mode 100644 index 0000000..ffc9095 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/KeywordMessage.with..st @@ -0,0 +1,9 @@ +actions +KeywordMessage: aNode with: keywordMessageSegments + + | result | + result := self + keywordMessageWith: String empty + and: keywordMessageSegments. + keywordMessageSegments numberOfChildren > 1 ifTrue: [ result := String tab , result ]. + ^ result \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/KeywordMessageSend.with.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/KeywordMessageSend.with.and..st new file mode 100644 index 0000000..e0aca9e --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/KeywordMessageSend.with.and..st @@ -0,0 +1,6 @@ +actions +KeywordMessageSend: aNode with: aKeywordMessageReceiver and: keywordMessageSegments + + ^ self + keywordMessageWith: aKeywordMessageReceiver + and: keywordMessageSegments \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/LiteralArrayLiteral.with.and.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/LiteralArrayLiteral.with.and.and..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/LiteralArrayLiteral.with.and.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/LiteralArrayLiteral.with.and.and..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/LiteralArrayLiteralInLiteralArray.with.and.and.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/LiteralArrayLiteralInLiteralArray.with.and.and.and..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/LiteralArrayLiteralInLiteralArray.with.and.and.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/LiteralArrayLiteralInLiteralArray.with.and.and.and..st diff --git a/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/MethodDeclaration.with.and.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/MethodDeclaration.with.and.and..st new file mode 100644 index 0000000..275677e --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/MethodDeclaration.with.and.and..st @@ -0,0 +1,20 @@ +actions +MethodDeclaration: aNode with: aMethodHeader and: pragmas and: executableCode + + | result resultBody resultHeader commentNodes separator resultCode resultPragmas | + resultHeader := self value: aMethodHeader. + self increaseIndentation. + resultPragmas := self value: pragmas. + resultCode := self value: executableCode. + commentNodes := self commentExtractor commentNodesAfterMethod: aNode. + resultBody := self + join: { resultPragmas . resultCode } , commentNodes + separatedBy: self newline. + separator := self + separatorAfterHeaderWith: { pragmas . executableCode } + and: { resultPragmas . resultCode }. + result := self + join: { resultHeader . resultBody } + separatedBy: separator. + self decreaseIndentation. + ^ result \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/MoreExecutableCode.with.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/MoreExecutableCode.with.and..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/MoreExecutableCode.with.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/MoreExecutableCode.with.and..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/NestedExpression.with.and.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/NestedExpression.with.and.and..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/NestedExpression.with.and.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/NestedExpression.with.and.and..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/ObjectArrayLiteral.with.and.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/ObjectArrayLiteral.with.and.and..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/ObjectArrayLiteral.with.and.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/ObjectArrayLiteral.with.and.and..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/ObjectArrayLiteralElementNormal.with.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/ObjectArrayLiteralElementNormal.with.and..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/ObjectArrayLiteralElementNormal.with.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/ObjectArrayLiteralElementNormal.with.and..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/Pragma.with.and.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/Pragma.with.and.and..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/Pragma.with.and.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/Pragma.with.and.and..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/PragmaValuesKeyword.with..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/PragmaValuesKeyword.with..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/PragmaValuesKeyword.with..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/PragmaValuesKeyword.with..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/Pragmas.with..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/Pragmas.with..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/Pragmas.with..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/Pragmas.with..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/Statements.with.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/Statements.with.and..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/Statements.with.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/Statements.with.and..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/cascadeWith.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/cascadeWith.and..st similarity index 95% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/cascadeWith.and..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/cascadeWith.and..st index 649d74e..0cb3955 100644 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/cascadeWith.and..st +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/cascadeWith.and..st @@ -1,4 +1,4 @@ -cascades +helpers cascadeWith: aReceiver and: cascadedMessages | result | diff --git a/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/commentExtractor..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/commentExtractor..st new file mode 100644 index 0000000..9667d72 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/commentExtractor..st @@ -0,0 +1,4 @@ +accessing +commentExtractor: anOPCommentExtractor + + commentExtractor := anOPCommentExtractor \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/commentExtractor.st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/commentExtractor.st new file mode 100644 index 0000000..aff9737 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/commentExtractor.st @@ -0,0 +1,4 @@ +accessing +commentExtractor + + ^ commentExtractor \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/decreaseIndentation.st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/decreaseIndentation.st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/decreaseIndentation.st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/decreaseIndentation.st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/defaultExpression..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/defaultExpression..st similarity index 93% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/defaultExpression..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/defaultExpression..st index 12e67ea..d2ac083 100644 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/defaultExpression..st +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/defaultExpression..st @@ -1,4 +1,4 @@ -value +standard attributes defaultExpression: aNode | isSyntacticRule separator | diff --git a/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/include.between.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/include.between.and..st new file mode 100644 index 0000000..daa8036 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/include.between.and..st @@ -0,0 +1,6 @@ +helpers +include: aString between: leftDelimiter and: rightDelimiter + + aString + ifEmpty: [ ^ leftDelimiter , rightDelimiter ] + ifNotEmpty: [ ^ leftDelimiter , String space , aString , String space , rightDelimiter ] \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/increaseIndentation.st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/increaseIndentation.st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/increaseIndentation.st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/increaseIndentation.st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/indentation..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/indentation..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/indentation..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/indentation..st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/indentation.st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/indentation.st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/indentation.st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/indentation.st diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/initialize.st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/initialize.st similarity index 63% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/initialize.st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/initialize.st index 1c98917..39e988e 100644 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/initialize.st +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/initialize.st @@ -4,4 +4,4 @@ initialize super initialize. self indentation: 0; - commentMap: Bag new \ No newline at end of file + commentExtractor: OPCommentExtractor new diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/join.separatedBy..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/join.separatedBy..st similarity index 56% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/join.separatedBy..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/join.separatedBy..st index e4e9598..4021a79 100644 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/join.separatedBy..st +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/join.separatedBy..st @@ -1,9 +1,10 @@ -helper +helpers join: aCollection separatedBy: aString | values validValues | - values := aCollection collect: [ :each | each isString - ifTrue: [ each ] - ifFalse: [ self value: each ] ]. + values := aCollection collect: [ :each | + each isString + ifTrue: [ each ] + ifFalse: [ self value: each ] ]. validValues := values reject: [ :each | each isEmpty ]. ^ validValues joinSeparatedBy: aString \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/keywordMessageWith.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/keywordMessageWith.and..st new file mode 100644 index 0000000..08c495a --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/keywordMessageWith.and..st @@ -0,0 +1,14 @@ +helpers +keywordMessageWith: aReceiver and: segments + + | result | + segments numberOfChildren <= 1 + ifTrue: [ result := self + join: { aReceiver } , segments children + separatedBy: String space ] + ifFalse: [ self increaseIndentation. + result := self + join: { aReceiver } , segments children + separatedBy: self newline. + self decreaseIndentation ]. + ^ result \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/literalArrayWith..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/literalArrayWith..st similarity index 90% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/literalArrayWith..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/literalArrayWith..st index 0e08694..527f030 100644 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/literalArrayWith..st +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/literalArrayWith..st @@ -1,4 +1,4 @@ -literal array +helpers literalArrayWith: literalArrayLiteralElements ^ self diff --git a/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/newline.st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/newline.st new file mode 100644 index 0000000..165a0e3 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/newline.st @@ -0,0 +1,6 @@ +indentation +newline + + ^ String lf , (String + new: self indentation + withAll: Character tab) \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/separatorAfterHeaderWith.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/separatorAfterHeaderWith.and..st new file mode 100644 index 0000000..57d89c1 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/separatorAfterHeaderWith.and..st @@ -0,0 +1,10 @@ +helpers +separatorAfterHeaderWith: nodes and: results + + 1 + to: nodes size + do: [ :each | + (results at: each) ifNotEmpty: [ (self commentExtractor foundCommentBefore: (nodes at: each)) + ifTrue: [ ^ self newline ] + ifFalse: [ ^ String lf , self newline ] ] ]. + ^ self newline \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/separatorInBlockWith.and.and..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/separatorInBlockWith.and.and..st new file mode 100644 index 0000000..e72b4d7 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/separatorInBlockWith.and.and..st @@ -0,0 +1,11 @@ +helpers +separatorInBlockWith: resultArguments and: resultVariables and: resultCode + + | lineCountCode | + lineCountCode := resultCode lineCount. + resultVariables ifNotEmpty: [ lineCountCode := lineCountCode - 1 ]. + (lineCountCode > 1 + and: [ resultArguments notEmpty ] + and: [ resultVariables isEmpty ]) + ifTrue: [ ^ self newline ] + ifFalse: [ ^ String space ] \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/spaces.with..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/spaces.with..st similarity index 100% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/spaces.with..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/spaces.with..st diff --git a/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/terminalExpression..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/terminalExpression..st new file mode 100644 index 0000000..003f66b --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/terminalExpression..st @@ -0,0 +1,4 @@ +standard attributes +terminalExpression: aNode + + ^ aNode interval contents asString \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/value..st b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/value..st similarity index 69% rename from packages/OmegaPrint-Core.package/OPPrinter.class/instance/value..st rename to packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/value..st index b7fd713..9801ec5 100644 --- a/packages/OmegaPrint-Core.package/OPPrinter.class/instance/value..st +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/instance/value..st @@ -7,5 +7,5 @@ value: aNode (result isEmpty or: [ isLexicalRule ]) ifTrue: [ ^ result ] ifFalse: [ ^ self - valueWithComment: aNode - with: result ] \ No newline at end of file + join: (self commentExtractor commentNodesBefore: aNode) , { result } + separatedBy: self newline ] \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPSourceRewriter.class/methodProperties.json b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/methodProperties.json new file mode 100644 index 0000000..4ca9f82 --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/methodProperties.json @@ -0,0 +1,44 @@ +{ + "class" : { + }, + "instance" : { + "BlockLiteralNormal:with:and:and:and:" : "fau 8/6/2020 10:46", + "ByteArrayLiteral:with:and:and:" : "fau 8/5/2020 09:49", + "CascadedMessages:with:and:and:" : "fau 8/5/2020 13:59", + "ExecutableCode:with:and:and:" : "fau 8/5/2020 14:00", + "ExpressionBinaryCascade:with:and:" : "TA 7/29/2020 15:00", + "ExpressionOperandCascade:with:and:" : "TA 7/29/2020 15:00", + "ExpressionUnaryCascade:with:and:" : "TA 7/29/2020 15:00", + "FinalStatement:with:and:and:" : "fau 8/6/2020 16:44", + "KeywordMessage:with:" : "fau 8/6/2020 14:47", + "KeywordMessageSend:with:and:" : "fau 8/6/2020 14:39", + "LiteralArrayLiteral:with:and:and:" : "PK 8/2/2020 19:49", + "LiteralArrayLiteralInLiteralArray:with:and:and:and:" : "PK 8/2/2020 19:49", + "MethodDeclaration:with:and:and:" : "fau 8/6/2020 10:56", + "MoreExecutableCode:with:and:" : "fau 8/5/2020 14:00", + "NestedExpression:with:and:and:" : "PS 7/30/2020 15:30", + "ObjectArrayLiteral:with:and:and:" : "fau 8/5/2020 08:24", + "ObjectArrayLiteralElementNormal:with:and:" : "PS 7/30/2020 15:31", + "Pragma:with:and:and:" : "PS 7/30/2020 15:31", + "PragmaValuesKeyword:with:" : "fau 8/5/2020 14:00", + "Pragmas:with:" : "fau 8/5/2020 14:00", + "Statements:with:and:" : "fau 8/5/2020 14:00", + "cascadeWith:and:" : "fau 8/5/2020 14:00", + "commentExtractor" : "fau 8/5/2020 14:05", + "commentExtractor:" : "fau 8/5/2020 14:05", + "decreaseIndentation" : "fau 5/26/2020 09:46", + "defaultExpression:" : "fau 8/4/2020 22:48", + "include:between:and:" : "TA 8/7/2020 15:51", + "increaseIndentation" : "fau 5/26/2020 09:46", + "indentation" : "fau 5/26/2020 10:39", + "indentation:" : "fau 8/5/2020 21:42", + "initialize" : "fau 8/5/2020 14:18", + "join:separatedBy:" : "TA 8/7/2020 15:52", + "keywordMessageWith:and:" : "TA 8/7/2020 15:18", + "literalArrayWith:" : "fau 8/5/2020 09:49", + "newline" : "fau 8/6/2020 17:28", + "separatorAfterHeaderWith:and:" : "TA 8/7/2020 15:43", + "separatorInBlockWith:and:and:" : "TA 8/7/2020 15:23", + "spaces:with:" : "fau 8/5/2020 14:00", + "terminalExpression:" : "TA 8/5/2020 21:09", + "value:" : "TA 8/7/2020 15:54" } } diff --git a/packages/OmegaPrint-Core.package/OPSourceRewriter.class/properties.json b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/properties.json new file mode 100644 index 0000000..8c2514f --- /dev/null +++ b/packages/OmegaPrint-Core.package/OPSourceRewriter.class/properties.json @@ -0,0 +1,15 @@ +{ + "category" : "OmegaPrint-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "fau 8/7/2020 09:27", + "instvars" : [ + "indentation", + "commentExtractor" ], + "name" : "OPSourceRewriter", + "pools" : [ + ], + "super" : "OhmSourceRewriter", + "type" : "normal" } diff --git a/packages/OmegaPrint-Core.package/OPUserInterface.class/README.md b/packages/OmegaPrint-Core.package/OPUserInterface.class/README.md index e69de29..587a1e2 100644 --- a/packages/OmegaPrint-Core.package/OPUserInterface.class/README.md +++ b/packages/OmegaPrint-Core.package/OPUserInterface.class/README.md @@ -0,0 +1 @@ +The OPUserInterface class installs a button in the codeHolder when the class itself is initialized. Before installing the button, OPUserInterface checks whether the button is already installed. Thus, it can not be installed twice. \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPUserInterface.class/class/initialize.st b/packages/OmegaPrint-Core.package/OPUserInterface.class/class/initialize.st index d3dd832..b42ae63 100644 --- a/packages/OmegaPrint-Core.package/OPUserInterface.class/class/initialize.st +++ b/packages/OmegaPrint-Core.package/OPUserInterface.class/class/initialize.st @@ -2,5 +2,5 @@ class initialization initialize self isAlreadyInstalled ifFalse: [ CodeHolder - addContentsSymbolQuint: self omegaPrintQuint - afterEntry: #prettyPrint ] \ No newline at end of file + addContentsSymbolQuint: self omegaPrintQuint + afterEntry: #prettyPrint ] \ No newline at end of file diff --git a/packages/OmegaPrint-Core.package/OPUserInterface.class/methodProperties.json b/packages/OmegaPrint-Core.package/OPUserInterface.class/methodProperties.json index 0d2435d..0ca483a 100644 --- a/packages/OmegaPrint-Core.package/OPUserInterface.class/methodProperties.json +++ b/packages/OmegaPrint-Core.package/OPUserInterface.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - "initialize" : "PK 7/5/2020 18:06", + "initialize" : "TA 8/7/2020 15:55", "isAlreadyInstalled" : "PK 7/5/2020 18:06", "omegaPrintQuint" : "TA 6/18/2020 16:29" }, "instance" : { diff --git a/packages/OmegaPrint-Core.package/OPUserInterface.class/properties.json b/packages/OmegaPrint-Core.package/OPUserInterface.class/properties.json index 4c9acf6..553eeaa 100644 --- a/packages/OmegaPrint-Core.package/OPUserInterface.class/properties.json +++ b/packages/OmegaPrint-Core.package/OPUserInterface.class/properties.json @@ -4,11 +4,11 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "fau 8/7/2020 09:02", "instvars" : [ ], "name" : "OPUserInterface", "pools" : [ ], - "super" : "OhmSmalltalkSourceRewriter", + "super" : "Object", "type" : "normal" } diff --git a/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/README.md b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/README.md index e69de29..e6a3d54 100644 --- a/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/README.md +++ b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/README.md @@ -0,0 +1,3 @@ +An OPTestEvaluator is an abstract test class. Using the test method prettify:shouldEqual: one can test whether a given string when prettified using the OPPrinter matches the expectation. + +Therefor the matching will start from the startSymbol which each subclass has to define. diff --git a/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/lf.st b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/lf.st new file mode 100644 index 0000000..a3a0349 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/lf.st @@ -0,0 +1,4 @@ +constants +lf + + ^ String lf \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/lfLfTab.st b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/lfLfTab.st new file mode 100644 index 0000000..37b9ad0 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/lfLfTab.st @@ -0,0 +1,4 @@ +constants +lfLfTab + + ^ String lf , String lf , String tab \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/lfTab.st b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/lfTab.st new file mode 100644 index 0000000..65ee6a6 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/lfTab.st @@ -0,0 +1,4 @@ +constants +lfTab + + ^ String lf , String tab \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/lfTabTab.st b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/lfTabTab.st new file mode 100644 index 0000000..34a2611 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/lfTabTab.st @@ -0,0 +1,4 @@ +constants +lfTabTab + + ^ String lf , String tab , String tab \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/prettify.shouldEqual..st b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/prettify.shouldEqual..st index 27677b3..2aef343 100644 --- a/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/prettify.shouldEqual..st +++ b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/prettify.shouldEqual..st @@ -1,10 +1,7 @@ testing prettify: aString shouldEqual: anotherString - | result | - result := OPPrinter - evaluate: aString - startingFrom: self startSymbol. self - assert: anotherString - equals: result \ No newline at end of file + prettify: aString + startingFrom: self startSymbol + shouldEqual: anotherString \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/prettify.startingFrom.shouldEqual..st b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/prettify.startingFrom.shouldEqual..st similarity index 66% rename from packages/OmegaPrint-Tests.package/TestComment.class/instance/prettify.startingFrom.shouldEqual..st rename to packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/prettify.startingFrom.shouldEqual..st index b9e70d5..641962c 100644 --- a/packages/OmegaPrint-Tests.package/TestComment.class/instance/prettify.startingFrom.shouldEqual..st +++ b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/prettify.startingFrom.shouldEqual..st @@ -1,5 +1,5 @@ testing -prettify: aString startingFrom: aSymbol shouldEqual: anotherString +prettify: aString startingFrom: aSymbol shouldEqual: anotherString | result | result := OPPrinter diff --git a/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/tab.st b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/tab.st new file mode 100644 index 0000000..5d201e1 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/instance/tab.st @@ -0,0 +1,4 @@ +constants +tab + + ^ String tab \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/methodProperties.json b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/methodProperties.json index 203b899..184fe77 100644 --- a/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/methodProperties.json @@ -2,5 +2,11 @@ "class" : { }, "instance" : { - "prettify:shouldEqual:" : "TA 7/10/2020 10:35", - "startSymbol" : "TA 7/3/2020 12:00" } } + "lf" : "fau 8/6/2020 17:01", + "lfLfTab" : "fau 8/6/2020 17:06", + "lfTab" : "fau 8/6/2020 16:54", + "lfTabTab" : "fau 8/6/2020 16:55", + "prettify:shouldEqual:" : "fau 8/6/2020 17:19", + "prettify:startingFrom:shouldEqual:" : "PK 8/7/2020 16:17", + "startSymbol" : "TA 7/3/2020 12:00", + "tab" : "fau 8/6/2020 17:04" } } diff --git a/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/properties.json b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/properties.json index 157d6bd..71a38b1 100644 --- a/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/properties.json +++ b/packages/OmegaPrint-Tests.package/OPTestEvaluator.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 8/1/2020 11:02", "instvars" : [ ], "name" : "OPTestEvaluator", diff --git a/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/README.md b/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/README.md index e69de29..2a41f3a 100644 --- a/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/README.md @@ -0,0 +1,3 @@ +TestAssignmentOperation is the class which checks whether the prettifying of the AssignmentOperationNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/instance/testWithBindableIdentifierWithAssignmentOperator.st b/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/instance/testWithIdentifierWithOperator.st similarity index 58% rename from packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/instance/testWithBindableIdentifierWithAssignmentOperator.st rename to packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/instance/testWithIdentifierWithOperator.st index 5fe3e19..6179817 100644 --- a/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/instance/testWithBindableIdentifierWithAssignmentOperator.st +++ b/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/instance/testWithIdentifierWithOperator.st @@ -1,5 +1,5 @@ base -testWithBindableIdentifierWithAssignmentOperator +testWithIdentifierWithOperator self prettify: 'identifier:=' diff --git a/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/methodProperties.json index 2f4c235..b88a504 100644 --- a/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/methodProperties.json @@ -3,4 +3,4 @@ }, "instance" : { "startSymbol" : "TA 7/12/2020 18:27", - "testWithBindableIdentifierWithAssignmentOperator" : "TA 7/12/2020 18:32" } } + "testWithIdentifierWithOperator" : "fau 8/7/2020 06:21" } } diff --git a/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/properties.json b/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/properties.json index 6d2dd48..5203066 100644 --- a/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestAssignmentOperation.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 14:09", "instvars" : [ ], "name" : "TestAssignmentOperation", diff --git a/packages/OmegaPrint-Tests.package/TestBinaryMessage.class/README.md b/packages/OmegaPrint-Tests.package/TestBinaryMessage.class/README.md index e69de29..5865692 100644 --- a/packages/OmegaPrint-Tests.package/TestBinaryMessage.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestBinaryMessage.class/README.md @@ -0,0 +1,3 @@ +TestBinaryMessage is the class which checks whether the prettifying of the BinaryMessageNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBinaryMessage.class/properties.json b/packages/OmegaPrint-Tests.package/TestBinaryMessage.class/properties.json index 87df7c4..53c73aa 100644 --- a/packages/OmegaPrint-Tests.package/TestBinaryMessage.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestBinaryMessage.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 14:40", "instvars" : [ ], "name" : "TestBinaryMessage", diff --git a/packages/OmegaPrint-Tests.package/TestBinaryMessageSend.class/README.md b/packages/OmegaPrint-Tests.package/TestBinaryMessageSend.class/README.md index e69de29..108dcfc 100644 --- a/packages/OmegaPrint-Tests.package/TestBinaryMessageSend.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestBinaryMessageSend.class/README.md @@ -0,0 +1,3 @@ +TestBinaryMessageSend is the class which checks whether the prettifying of the BinaryMessageSendNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBinaryMessageSend.class/properties.json b/packages/OmegaPrint-Tests.package/TestBinaryMessageSend.class/properties.json index ae9e341..071249a 100644 --- a/packages/OmegaPrint-Tests.package/TestBinaryMessageSend.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestBinaryMessageSend.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 15:15", "instvars" : [ ], "name" : "TestBinaryMessageSend", diff --git a/packages/OmegaPrint-Tests.package/TestBinaryMethodHeader.class/README.md b/packages/OmegaPrint-Tests.package/TestBinaryMethodHeader.class/README.md index e69de29..5e8af56 100644 --- a/packages/OmegaPrint-Tests.package/TestBinaryMethodHeader.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestBinaryMethodHeader.class/README.md @@ -0,0 +1,3 @@ +TestBinaryMethodHeader is the class which checks whether the prettifying of the BinaryMethodHeaderNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBinaryMethodHeader.class/properties.json b/packages/OmegaPrint-Tests.package/TestBinaryMethodHeader.class/properties.json index ff8e254..149c288 100644 --- a/packages/OmegaPrint-Tests.package/TestBinaryMethodHeader.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestBinaryMethodHeader.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 15:16", "instvars" : [ ], "name" : "TestBinaryMethodHeader", diff --git a/packages/OmegaPrint-Tests.package/TestBlockArguments.class/README.md b/packages/OmegaPrint-Tests.package/TestBlockArguments.class/README.md index e69de29..66d7e5a 100644 --- a/packages/OmegaPrint-Tests.package/TestBlockArguments.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestBlockArguments.class/README.md @@ -0,0 +1,3 @@ +TestBlockArguments is the class which checks whether the prettifying of the BlockArgumentsNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockArguments.class/properties.json b/packages/OmegaPrint-Tests.package/TestBlockArguments.class/properties.json index 63d9f92..78c9c07 100644 --- a/packages/OmegaPrint-Tests.package/TestBlockArguments.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestBlockArguments.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 15:17", "instvars" : [ ], "name" : "TestBlockArguments", diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/README.md b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/README.md index e69de29..5007803 100644 --- a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/README.md @@ -0,0 +1,3 @@ +TestBlockLiteral is the class which checks whether the prettifying of the BlockLiteralNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithLocalVariablesWithMultipleLines.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithLocalVariablesWithMultipleLines.st deleted file mode 100644 index c21b757..0000000 --- a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithLocalVariablesWithMultipleLines.st +++ /dev/null @@ -1,6 +0,0 @@ -normal -testWithArgumentsWithLocalVariablesWithMultipleLines - - self - prettify: '[:arg||variable|statement1.statement2.]' - shouldEqual: '[ :arg | | variable |' , String cr , String tab , 'statement1.' , String cr , String tab , 'statement2 ]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithLocalVariablesWithSingleLine.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithLocalVariablesWithSingleLine.st deleted file mode 100644 index e5d42e1..0000000 --- a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithLocalVariablesWithSingleLine.st +++ /dev/null @@ -1,6 +0,0 @@ -normal -testWithArgumentsWithLocalVariablesWithSingleLine - - self - prettify: '[:arg||variable|statement.]' - shouldEqual: '[ :arg | | variable |' , String cr , String tab , 'statement ]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithVariableListWithMultipleStatements.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithVariableListWithMultipleStatements.st new file mode 100644 index 0000000..e3b135e --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithVariableListWithMultipleStatements.st @@ -0,0 +1,6 @@ +normal +testWithArgumentsWithVariableListWithMultipleStatements + + self + prettify: '[:arg||variable|statement1.statement2.]' + shouldEqual: '[ :arg | | variable |' , self lfTab , 'statement1.' , self lfTab , 'statement2 ]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithVariableListWithSingleStatement.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithVariableListWithSingleStatement.st new file mode 100644 index 0000000..f35ff8c --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithVariableListWithSingleStatement.st @@ -0,0 +1,6 @@ +normal +testWithArgumentsWithVariableListWithSingleStatement + + self + prettify: '[:arg||variable|statement.]' + shouldEqual: '[ :arg | | variable |' , self lfTab , 'statement ]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithVariableListWithoutStatement.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithVariableListWithoutStatement.st new file mode 100644 index 0000000..493aa4f --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithVariableListWithoutStatement.st @@ -0,0 +1,6 @@ +normal +testWithArgumentsWithVariableListWithoutStatement + + self + prettify: '[:arg||variable|]' + shouldEqual: '[ :arg | | variable | ]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutLocalVariablesWithMultipleLines.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutLocalVariablesWithMultipleLines.st deleted file mode 100644 index 99111d9..0000000 --- a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutLocalVariablesWithMultipleLines.st +++ /dev/null @@ -1,6 +0,0 @@ -normal -testWithArgumentsWithoutLocalVariablesWithMultipleLines - - self - prettify: '[:arg|statement1.statement2.]' - shouldEqual: '[ :arg |' , String cr , String tab , 'statement1.' , String cr , String tab , 'statement2 ]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutVariableListWithMultipleStatements.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutVariableListWithMultipleStatements.st new file mode 100644 index 0000000..18bf77a --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutVariableListWithMultipleStatements.st @@ -0,0 +1,6 @@ +normal +testWithArgumentsWithoutVariableListWithMultipleStatements + + self + prettify: '[:arg|statement1.statement2.]' + shouldEqual: '[ :arg |' , self lfTab , 'statement1.' , self lfTab , 'statement2 ]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutLocalVariablesWithSingleLine.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutVariableListWithSingleStatement.st similarity index 59% rename from packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutLocalVariablesWithSingleLine.st rename to packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutVariableListWithSingleStatement.st index 3acb814..e28648d 100644 --- a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutLocalVariablesWithSingleLine.st +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutVariableListWithSingleStatement.st @@ -1,5 +1,5 @@ normal -testWithArgumentsWithoutLocalVariablesWithSingleLine +testWithArgumentsWithoutVariableListWithSingleStatement self prettify: '[:arg|statement.]' diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutCode.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutVariableListWithoutStatement.st similarity index 54% rename from packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutCode.st rename to packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutVariableListWithoutStatement.st index 151bdc7..8b24b7f 100644 --- a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutCode.st +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithArgumentsWithoutVariableListWithoutStatement.st @@ -1,5 +1,5 @@ normal -testWithArgumentsWithoutCode +testWithArgumentsWithoutVariableListWithoutStatement self prettify: '[:arg|]' diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithLocalVariablesWithMultipleLines.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithLocalVariablesWithMultipleLines.st deleted file mode 100644 index d2b84c6..0000000 --- a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithLocalVariablesWithMultipleLines.st +++ /dev/null @@ -1,6 +0,0 @@ -normal -testWithoutArgumentsWithLocalVariablesWithMultipleLines - - self - prettify: '[|variable|statement1.statement2.]' - shouldEqual: '[ | variable |' , String cr , String tab , 'statement1.' , String cr , String tab , 'statement2 ]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithLocalVariablesWithSingleLine.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithLocalVariablesWithSingleLine.st deleted file mode 100644 index cf59f95..0000000 --- a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithLocalVariablesWithSingleLine.st +++ /dev/null @@ -1,6 +0,0 @@ -normal -testWithoutArgumentsWithLocalVariablesWithSingleLine - - self - prettify: '[|variable|statement.]' - shouldEqual: '[ | variable |' , String cr , String tab , 'statement ]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithVariableListWithMultipleStatements.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithVariableListWithMultipleStatements.st new file mode 100644 index 0000000..69adbe1 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithVariableListWithMultipleStatements.st @@ -0,0 +1,6 @@ +normal +testWithoutArgumentsWithVariableListWithMultipleStatements + + self + prettify: '[|variable|statement1.statement2.]' + shouldEqual: '[ | variable |' , self lfTab , 'statement1.' , self lfTab , 'statement2 ]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithVariableListWithSingleStatement.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithVariableListWithSingleStatement.st new file mode 100644 index 0000000..b799f72 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithVariableListWithSingleStatement.st @@ -0,0 +1,6 @@ +normal +testWithoutArgumentsWithVariableListWithSingleStatement + + self + prettify: '[|variable|statement.]' + shouldEqual: '[ | variable |' , self lfTab , 'statement ]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithVariableListWithoutStatement.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithVariableListWithoutStatement.st new file mode 100644 index 0000000..a6c261f --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithVariableListWithoutStatement.st @@ -0,0 +1,6 @@ +normal +testWithoutArgumentsWithVariableListWithoutStatement + + self + prettify: '[|variable|]' + shouldEqual: '[ | variable | ]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutCode.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutCode.st deleted file mode 100644 index 15554a0..0000000 --- a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutCode.st +++ /dev/null @@ -1,6 +0,0 @@ -normal -testWithoutArgumentsWithoutCode - - self - prettify: '[]' - shouldEqual: '[]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutLocalVariablesWithMultipleLines.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutLocalVariablesWithMultipleLines.st deleted file mode 100644 index c2061ee..0000000 --- a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutLocalVariablesWithMultipleLines.st +++ /dev/null @@ -1,6 +0,0 @@ -normal -testWithoutArgumentsWithoutLocalVariablesWithMultipleLines - - self - prettify: '[statement1.statement2.]' - shouldEqual: '[ statement1.' , String cr , String tab , 'statement2 ]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutVariableListWithMultipleStatements.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutVariableListWithMultipleStatements.st new file mode 100644 index 0000000..bfe6fec --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutVariableListWithMultipleStatements.st @@ -0,0 +1,6 @@ +normal +testWithoutArgumentsWithoutVariableListWithMultipleStatements + + self + prettify: '[statement1.statement2.]' + shouldEqual: '[ statement1.' , self lfTab , 'statement2 ]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutLocalVariablesWithSingleLine.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutVariableListWithSingleStatement.st similarity index 54% rename from packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutLocalVariablesWithSingleLine.st rename to packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutVariableListWithSingleStatement.st index f5ea295..a588829 100644 --- a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutLocalVariablesWithSingleLine.st +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutVariableListWithSingleStatement.st @@ -1,5 +1,5 @@ normal -testWithoutArgumentsWithoutLocalVariablesWithSingleLine +testWithoutArgumentsWithoutVariableListWithSingleStatement self prettify: '[statement.]' diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutVariableListWithoutStatement.st b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutVariableListWithoutStatement.st new file mode 100644 index 0000000..f7a5ef3 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/instance/testWithoutArgumentsWithoutVariableListWithoutStatement.st @@ -0,0 +1,6 @@ +normal +testWithoutArgumentsWithoutVariableListWithoutStatement + + self + prettify: '[]' + shouldEqual: '[]' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/methodProperties.json index ca14bd0..41c58f1 100644 --- a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/methodProperties.json @@ -3,15 +3,17 @@ }, "instance" : { "startSymbol" : "PS 7/5/2020 17:36", - "testWithArgumentsWithLocalVariablesWithMultipleLines" : "fau 7/10/2020 10:25", - "testWithArgumentsWithLocalVariablesWithSingleLine" : "fau 7/10/2020 10:16", - "testWithArgumentsWithoutCode" : "PS 7/5/2020 17:39", - "testWithArgumentsWithoutLocalVariablesWithMultipleLines" : "fau 7/10/2020 10:25", - "testWithArgumentsWithoutLocalVariablesWithSingleLine" : "fau 7/10/2020 10:25", + "testWithArgumentsWithVariableListWithMultipleStatements" : "fau 8/7/2020 07:09", + "testWithArgumentsWithVariableListWithSingleStatement" : "fau 8/7/2020 07:10", + "testWithArgumentsWithVariableListWithoutStatement" : "fau 8/7/2020 07:13", + "testWithArgumentsWithoutVariableListWithMultipleStatements" : "fau 8/7/2020 07:11", + "testWithArgumentsWithoutVariableListWithSingleStatement" : "fau 8/7/2020 07:11", + "testWithArgumentsWithoutVariableListWithoutStatement" : "fau 8/7/2020 07:10", "testWithMultipleArguments" : "PS 7/5/2020 17:44", "testWithSingleArgument" : "PS 7/5/2020 17:45", - "testWithoutArgumentsWithLocalVariablesWithMultipleLines" : "fau 7/10/2020 10:26", - "testWithoutArgumentsWithLocalVariablesWithSingleLine" : "fau 7/10/2020 10:26", - "testWithoutArgumentsWithoutCode" : "TA 7/12/2020 17:12", - "testWithoutArgumentsWithoutLocalVariablesWithMultipleLines" : "fau 7/10/2020 10:26", - "testWithoutArgumentsWithoutLocalVariablesWithSingleLine" : "fau 7/10/2020 10:27" } } + "testWithoutArgumentsWithVariableListWithMultipleStatements" : "fau 8/7/2020 07:14", + "testWithoutArgumentsWithVariableListWithSingleStatement" : "fau 8/7/2020 07:14", + "testWithoutArgumentsWithVariableListWithoutStatement" : "fau 8/7/2020 07:15", + "testWithoutArgumentsWithoutVariableListWithMultipleStatements" : "fau 8/7/2020 07:16", + "testWithoutArgumentsWithoutVariableListWithSingleStatement" : "fau 8/7/2020 07:16", + "testWithoutArgumentsWithoutVariableListWithoutStatement" : "fau 8/7/2020 07:15" } } diff --git a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/properties.json b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/properties.json index 9f7b293..c4c3b23 100644 --- a/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestBlockLiteral.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 15:18", "instvars" : [ ], "name" : "TestBlockLiteral", diff --git a/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/README.md b/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/README.md index e69de29..b7ceaf8 100644 --- a/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/README.md @@ -0,0 +1,3 @@ +TestByteArrayLiteral is the class which checks whether the prettifying of the ByteArrayLiteralNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithMultipleIntegerLiterals.st b/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithMultipleLiterals.st similarity index 64% rename from packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithMultipleIntegerLiterals.st rename to packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithMultipleLiterals.st index f0eb62d..bf1f138 100644 --- a/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithMultipleIntegerLiterals.st +++ b/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithMultipleLiterals.st @@ -1,5 +1,5 @@ base -testWithMultipleIntegerLiterals +testWithMultipleLiterals self prettify: '#[0 1]' diff --git a/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithSingleIntegerLiteral.st b/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithSingleLiteral.st similarity index 65% rename from packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithSingleIntegerLiteral.st rename to packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithSingleLiteral.st index 274c619..eb9084c 100644 --- a/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithSingleIntegerLiteral.st +++ b/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithSingleLiteral.st @@ -1,5 +1,5 @@ base -testWithSingleIntegerLiteral +testWithSingleLiteral self prettify: '#[0]' diff --git a/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithoutIntegerLiteral.st b/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithoutLiteral.st similarity index 65% rename from packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithoutIntegerLiteral.st rename to packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithoutLiteral.st index bd7eafc..58f43fa 100644 --- a/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithoutIntegerLiteral.st +++ b/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/instance/testWithoutLiteral.st @@ -1,5 +1,5 @@ base -testWithoutIntegerLiteral +testWithoutLiteral self prettify: '#[]' diff --git a/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/methodProperties.json index 2b2b2bb..1e804c8 100644 --- a/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/methodProperties.json @@ -3,6 +3,6 @@ }, "instance" : { "startSymbol" : "fau 7/12/2020 20:28", - "testWithMultipleIntegerLiterals" : "fau 7/12/2020 20:30", - "testWithSingleIntegerLiteral" : "fau 7/12/2020 20:30", - "testWithoutIntegerLiteral" : "fau 7/12/2020 20:29" } } + "testWithMultipleLiterals" : "fau 8/7/2020 07:20", + "testWithSingleLiteral" : "fau 8/7/2020 07:20", + "testWithoutLiteral" : "fau 8/7/2020 07:20" } } diff --git a/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/properties.json b/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/properties.json index 7fcd0af..2dd2d8d 100644 --- a/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestByteArrayLiteral.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 15:19", "instvars" : [ ], "name" : "TestByteArrayLiteral", diff --git a/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/README.md b/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/README.md index e69de29..9be23e4 100644 --- a/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/README.md @@ -0,0 +1,3 @@ +TestCascadedMessages is the class which checks whether the prettifying of the CascadedMessagesNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/instance/testWithMessageChainWithMultipleMessageChains.st b/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/instance/testWithMessageChainWithMultipleMessageChains.st index 206a71c..06ebab5 100644 --- a/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/instance/testWithMessageChainWithMultipleMessageChains.st +++ b/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/instance/testWithMessageChainWithMultipleMessageChains.st @@ -3,4 +3,4 @@ testWithMessageChainWithMultipleMessageChains self prettify: 'message1;message2;message3' - shouldEqual: 'message1;' , String cr , 'message2;' , String cr , 'message3' \ No newline at end of file + shouldEqual: 'message1;' , self lf , 'message2;' , self lf , 'message3' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/instance/testWithMessageChainWithSingleMessageChain.st b/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/instance/testWithMessageChainWithSingleMessageChain.st index 1febca9..e66917d 100644 --- a/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/instance/testWithMessageChainWithSingleMessageChain.st +++ b/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/instance/testWithMessageChainWithSingleMessageChain.st @@ -3,4 +3,4 @@ testWithMessageChainWithSingleMessageChain self prettify: 'message1;message2' - shouldEqual: 'message1;' , String cr , 'message2' \ No newline at end of file + shouldEqual: 'message1;' , self lf , 'message2' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/methodProperties.json index cedc856..6734679 100644 --- a/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/methodProperties.json @@ -3,5 +3,5 @@ }, "instance" : { "startSymbol" : "PS 7/5/2020 17:46", - "testWithMessageChainWithMultipleMessageChains" : "fau 7/10/2020 10:27", - "testWithMessageChainWithSingleMessageChain" : "fau 7/10/2020 10:27" } } + "testWithMessageChainWithMultipleMessageChains" : "fau 8/6/2020 17:01", + "testWithMessageChainWithSingleMessageChain" : "fau 8/6/2020 17:01" } } diff --git a/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/properties.json b/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/properties.json index 0c15b05..a7f2d8b 100644 --- a/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestCascadedMessages.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:37", "instvars" : [ ], "name" : "TestCascadedMessages", diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/README.md b/packages/OmegaPrint-Tests.package/TestComment.class/README.md index e69de29..ed74493 100644 --- a/packages/OmegaPrint-Tests.package/TestComment.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestComment.class/README.md @@ -0,0 +1,9 @@ +TestComment is a class which holds some tests concerning comments. It tests from different starting points to ensure that comments are not removed in statements, method declarations and cascades. More tests for other nodes are required. +The tests are not as small as the other ones as comments are a more complex topic. Comments are not fully implemented yet. +Also newlines are removed which are a similar problem as comments. + +Comments and whitespace get removed by Ohm during parsing. Therefore the methods OhmNode >> skippedSpacesString and OhmNode >> skippedSpacesNodes exist to get the spaces (including comments) ahead of the node. More difficult is the question how to get the spaces at the end of the method. + +Also there should be tests for almost every node including comments. Maybe this class then becomes redundant. + +For more inspiration how comments could be formatted have a look at the issues in our github project. diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/startSymbol.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/startSymbol.st new file mode 100644 index 0000000..6f3eaf8 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestComment.class/instance/startSymbol.st @@ -0,0 +1,4 @@ +constants +startSymbol + + ^ #MethodDeclaration \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testCascadeWithCommentAfterReceiver.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testCascadeWithCommentAfterReceiver.st index 6d81d90..33d5a45 100644 --- a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testCascadeWithCommentAfterReceiver.st +++ b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testCascadeWithCommentAfterReceiver.st @@ -4,4 +4,4 @@ testCascadeWithCommentAfterReceiver self prettify: 'receiver"comment"message1;message2' startingFrom: #Expression - shouldEqual: 'receiver' , String cr , String tab , '"comment"' , String cr , String tab , 'message1;' , String cr , String tab , 'message2' \ No newline at end of file + shouldEqual: 'receiver' , self lfTab , '"comment"' , self lfTab , 'message1;' , self lfTab , 'message2' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testCascadeWithCommentInCascadedMessages.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testCascadeWithCommentInCascadedMessages.st index d0b225e..4bdf30b 100644 --- a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testCascadeWithCommentInCascadedMessages.st +++ b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testCascadeWithCommentInCascadedMessages.st @@ -4,4 +4,4 @@ testCascadeWithCommentInCascadedMessages self prettify: 'receiver message1;"comment"message2' startingFrom: #Expression - shouldEqual: 'receiver' , String cr , String tab , 'message1;' , String cr , String tab , '"comment"' , String cr , String tab , 'message2' \ No newline at end of file + shouldEqual: 'receiver' , self lfTab , 'message1;' , self lfTab , '"comment"' , self lfTab , 'message2' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterCode.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterCode.st new file mode 100644 index 0000000..4ea8740 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterCode.st @@ -0,0 +1,6 @@ +method comment +testMethodWithCommentAfterCode + + self + prettify: 'header statement."comment"' + shouldEqual: 'header' , self lfLfTab , 'statement' , self lfTab , '"comment"' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeader.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeader.st deleted file mode 100644 index 0a5511d..0000000 --- a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeader.st +++ /dev/null @@ -1,7 +0,0 @@ -method comment -testMethodWithCommentAfterMethodHeader - - self - prettify: 'header"comment"' - startingFrom: #MethodDeclaration - shouldEqual: 'header' , String cr , String cr , String tab , '"comment"' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeaderWithPragmasWithCode.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeaderWithPragmasWithCode.st new file mode 100644 index 0000000..21ce0f5 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeaderWithPragmasWithCode.st @@ -0,0 +1,6 @@ +method comment +testMethodWithCommentAfterMethodHeaderWithPragmasWithCode + + self + prettify: 'header"comment"statement.' + shouldEqual: 'header' , self lfTab , '"comment"' , self lfTab , '' , self lfTab , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeaderWithPragmasWithoutCode.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeaderWithPragmasWithoutCode.st new file mode 100644 index 0000000..22ece74 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeaderWithPragmasWithoutCode.st @@ -0,0 +1,6 @@ +method comment +testMethodWithCommentAfterMethodHeaderWithPragmasWithoutCode + + self + prettify: 'header"comment"' + shouldEqual: 'header' , self lfTab , '"comment"' , self lfTab , '' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeaderWithoutPragmasWithCode.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeaderWithoutPragmasWithCode.st new file mode 100644 index 0000000..b7548d9 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeaderWithoutPragmasWithCode.st @@ -0,0 +1,6 @@ +method comment +testMethodWithCommentAfterMethodHeaderWithoutPragmasWithCode + + self + prettify: 'header"comment"statement.' + shouldEqual: 'header' , self lfTab , '"comment"' , self lfTab , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeaderWithoutPragmasWithoutCode.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeaderWithoutPragmasWithoutCode.st new file mode 100644 index 0000000..61ba7af --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterMethodHeaderWithoutPragmasWithoutCode.st @@ -0,0 +1,6 @@ +method comment +testMethodWithCommentAfterMethodHeaderWithoutPragmasWithoutCode + + self + prettify: 'header"comment"' + shouldEqual: 'header' , self lfTab , '"comment"' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterStatement.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterStatement.st deleted file mode 100644 index dc18bf4..0000000 --- a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentAfterStatement.st +++ /dev/null @@ -1,7 +0,0 @@ -method comment -testMethodWithCommentAfterStatement - - self - prettify: 'header statement"comment"' - startingFrom: #MethodDeclaration - shouldEqual: 'header' , String cr , String cr , String tab , 'statement' , String cr , String tab , '"comment"' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentBeforeMethodHeader.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentBeforeMethodHeader.st index dcb553b..d14dd50 100644 --- a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentBeforeMethodHeader.st +++ b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentBeforeMethodHeader.st @@ -3,5 +3,4 @@ testMethodWithCommentBeforeMethodHeader self prettify: '"comment"header' - startingFrom: #MethodDeclaration - shouldEqual: '"comment"' , String cr , 'header' \ No newline at end of file + shouldEqual: '"comment"' , self lf , 'header' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentBetweenPragmasAndCode.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentBetweenPragmasAndCode.st new file mode 100644 index 0000000..c834476 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testMethodWithCommentBetweenPragmasAndCode.st @@ -0,0 +1,6 @@ +method comment +testMethodWithCommentBetweenPragmasAndCode + + self + prettify: 'header"comment"statement.' + shouldEqual: 'header' , self lfLfTab , '' , self lfTab , '"comment"' , self lfTab , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testStatementWithCommentBefore.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testStatementWithCommentBefore.st index 312c751..c66b810 100644 --- a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testStatementWithCommentBefore.st +++ b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testStatementWithCommentBefore.st @@ -4,4 +4,4 @@ testStatementWithCommentBefore self prettify: '"comment"statement' startingFrom: #Statement - shouldEqual: '"comment"' , String cr , 'statement' \ No newline at end of file + shouldEqual: '"comment"' , self lf , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testStatementsWithCommentInBetween.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testStatementsWithCommentInBetween.st index e557505..c1ca093 100644 --- a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testStatementsWithCommentInBetween.st +++ b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testStatementsWithCommentInBetween.st @@ -4,4 +4,4 @@ testStatementsWithCommentInBetween self prettify: 'statement1."comment"statement2.' startingFrom: #Statements - shouldEqual: 'statement1.' , String cr , '"comment"' , String cr , 'statement2' \ No newline at end of file + shouldEqual: 'statement1.' , self lf , '"comment"' , self lf , 'statement2' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testWithCommentAfterMethodHeaderWithStatement.st b/packages/OmegaPrint-Tests.package/TestComment.class/instance/testWithCommentAfterMethodHeaderWithStatement.st deleted file mode 100644 index 569168b..0000000 --- a/packages/OmegaPrint-Tests.package/TestComment.class/instance/testWithCommentAfterMethodHeaderWithStatement.st +++ /dev/null @@ -1,7 +0,0 @@ -method comment -testWithCommentAfterMethodHeaderWithStatement - - self - prettify: 'header"comment"statement.' - startingFrom: #MethodDeclaration - shouldEqual: 'header' , String cr , String cr , String tab , '"comment"' , String cr , String tab , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestComment.class/methodProperties.json index 193d055..acd9578 100644 --- a/packages/OmegaPrint-Tests.package/TestComment.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestComment.class/methodProperties.json @@ -2,12 +2,15 @@ "class" : { }, "instance" : { - "prettify:startingFrom:shouldEqual:" : "PS 7/12/2020 18:32", - "testCascadeWithCommentAfterReceiver" : "PS 7/14/2020 09:41", - "testCascadeWithCommentInCascadedMessages" : "PS 7/14/2020 09:42", - "testMethodWithCommentAfterMethodHeader" : "fau 8/5/2020 09:14", - "testMethodWithCommentAfterStatement" : "PS 7/14/2020 10:03", - "testMethodWithCommentBeforeMethodHeader" : "PS 7/14/2020 09:43", - "testStatementWithCommentBefore" : "fau 7/24/2020 09:43", - "testStatementsWithCommentInBetween" : "fau 7/24/2020 09:44", - "testWithCommentAfterMethodHeaderWithStatement" : "fau 7/24/2020 09:36" } } + "startSymbol" : "PK 8/7/2020 16:04", + "testCascadeWithCommentAfterReceiver" : "fau 8/6/2020 17:08", + "testCascadeWithCommentInCascadedMessages" : "fau 8/6/2020 17:08", + "testMethodWithCommentAfterCode" : "PK 8/7/2020 16:04", + "testMethodWithCommentAfterMethodHeaderWithPragmasWithCode" : "PK 8/7/2020 16:05", + "testMethodWithCommentAfterMethodHeaderWithPragmasWithoutCode" : "PK 8/7/2020 16:05", + "testMethodWithCommentAfterMethodHeaderWithoutPragmasWithCode" : "PK 8/7/2020 16:05", + "testMethodWithCommentAfterMethodHeaderWithoutPragmasWithoutCode" : "PK 8/7/2020 16:05", + "testMethodWithCommentBeforeMethodHeader" : "PK 8/7/2020 16:05", + "testMethodWithCommentBetweenPragmasAndCode" : "PK 8/7/2020 16:05", + "testStatementWithCommentBefore" : "fau 8/6/2020 17:10", + "testStatementsWithCommentInBetween" : "fau 8/6/2020 17:10" } } diff --git a/packages/OmegaPrint-Tests.package/TestComment.class/properties.json b/packages/OmegaPrint-Tests.package/TestComment.class/properties.json index a1e1c73..48f6ce5 100644 --- a/packages/OmegaPrint-Tests.package/TestComment.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestComment.class/properties.json @@ -4,11 +4,11 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 8/7/2020 16:50", "instvars" : [ ], "name" : "TestComment", "pools" : [ ], - "super" : "TestCase", + "super" : "OPTestEvaluator", "type" : "normal" } diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/README.md b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/README.md index e69de29..5e5cfae 100644 --- a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/README.md @@ -0,0 +1,3 @@ +TestExecutableCode is the class which checks whether the prettifying of the ExecutableCodeNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariableListWithPragmasWithCode.st b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariableListWithPragmasWithCode.st new file mode 100644 index 0000000..1a853d8 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariableListWithPragmasWithCode.st @@ -0,0 +1,6 @@ +base +testWithVariableListWithPragmasWithCode + + self + prettify: '|variable|statement.' + shouldEqual: '| variable |' , self lf , '' , self lf , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariableListWithPragmasWithoutCode.st b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariableListWithPragmasWithoutCode.st new file mode 100644 index 0000000..987c8f1 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariableListWithPragmasWithoutCode.st @@ -0,0 +1,6 @@ +base +testWithVariableListWithPragmasWithoutCode + + self + prettify: '|variable|' + shouldEqual: '| variable |' , self lf , '' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariableListWithoutPragmasWithCode.st b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariableListWithoutPragmasWithCode.st new file mode 100644 index 0000000..4647ea3 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariableListWithoutPragmasWithCode.st @@ -0,0 +1,6 @@ +base +testWithVariableListWithoutPragmasWithCode + + self + prettify: '|variable|statement.' + shouldEqual: '| variable |' , self lf , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariablesWithoutPragmasWithoutCode.st b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariableListWithoutPragmasWithoutCode.st similarity index 58% rename from packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariablesWithoutPragmasWithoutCode.st rename to packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariableListWithoutPragmasWithoutCode.st index 01adc17..bc65c57 100644 --- a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariablesWithoutPragmasWithoutCode.st +++ b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariableListWithoutPragmasWithoutCode.st @@ -1,5 +1,5 @@ base -testWithVariablesWithoutPragmasWithoutCode +testWithVariableListWithoutPragmasWithoutCode self prettify: '|variable|' diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariablesWithPragmasWithCode.st b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariablesWithPragmasWithCode.st deleted file mode 100644 index b0484ac..0000000 --- a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariablesWithPragmasWithCode.st +++ /dev/null @@ -1,6 +0,0 @@ -base -testWithVariablesWithPragmasWithCode - - self - prettify: '|variable|statement.' - shouldEqual: '| variable |' , String cr , '' , String cr , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariablesWithPragmasWithoutCode.st b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariablesWithPragmasWithoutCode.st deleted file mode 100644 index 647bee7..0000000 --- a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariablesWithPragmasWithoutCode.st +++ /dev/null @@ -1,6 +0,0 @@ -base -testWithVariablesWithPragmasWithoutCode - - self - prettify: '|variable|' - shouldEqual: '| variable |' , String cr , '' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariablesWithoutPragmasWithCode.st b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariablesWithoutPragmasWithCode.st deleted file mode 100644 index 472042b..0000000 --- a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithVariablesWithoutPragmasWithCode.st +++ /dev/null @@ -1,6 +0,0 @@ -base -testWithVariablesWithoutPragmasWithCode - - self - prettify: '|variable|statement.' - shouldEqual: '| variable |' , String cr , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariableListWithPragmasWithCode.st b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariableListWithPragmasWithCode.st new file mode 100644 index 0000000..7ccec4b --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariableListWithPragmasWithCode.st @@ -0,0 +1,6 @@ +base +testWithoutVariableListWithPragmasWithCode + + self + prettify: 'statement.' + shouldEqual: '' , self lf , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariablesWithPragmasWithoutCode.st b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariableListWithPragmasWithoutCode.st similarity index 56% rename from packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariablesWithPragmasWithoutCode.st rename to packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariableListWithPragmasWithoutCode.st index c97e65c..11f66bd 100644 --- a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariablesWithPragmasWithoutCode.st +++ b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariableListWithPragmasWithoutCode.st @@ -1,5 +1,5 @@ base -testWithoutVariablesWithPragmasWithoutCode +testWithoutVariableListWithPragmasWithoutCode self prettify: '' diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariablesWithoutPragmasWithCode.st b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariableListWithoutPragmasWithCode.st similarity index 57% rename from packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariablesWithoutPragmasWithCode.st rename to packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariableListWithoutPragmasWithCode.st index d6b49da..112a4c4 100644 --- a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariablesWithoutPragmasWithCode.st +++ b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariableListWithoutPragmasWithCode.st @@ -1,5 +1,5 @@ base -testWithoutVariablesWithoutPragmasWithCode +testWithoutVariableListWithoutPragmasWithCode self prettify: 'statement.' diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariableListWithoutPragmasWithoutCode.st b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariableListWithoutPragmasWithoutCode.st new file mode 100644 index 0000000..aa7526d --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariableListWithoutPragmasWithoutCode.st @@ -0,0 +1,6 @@ +base +testWithoutVariableListWithoutPragmasWithoutCode + + self + prettify: '' + shouldEqual: '' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariablesWithPragmasWithCode.st b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariablesWithPragmasWithCode.st deleted file mode 100644 index 1c9d773..0000000 --- a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariablesWithPragmasWithCode.st +++ /dev/null @@ -1,6 +0,0 @@ -base -testWithoutVariablesWithPragmasWithCode - - self - prettify: 'statement.' - shouldEqual: '' , String cr , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariablesWithoutPragmasWithoutCode.st b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariablesWithoutPragmasWithoutCode.st deleted file mode 100644 index f757bef..0000000 --- a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/instance/testWithoutVariablesWithoutPragmasWithoutCode.st +++ /dev/null @@ -1,6 +0,0 @@ -base -testWithoutVariablesWithoutPragmasWithoutCode - - self - prettify: '' - shouldEqual: '' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/methodProperties.json index 1433ac7..cb47114 100644 --- a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/methodProperties.json @@ -3,11 +3,11 @@ }, "instance" : { "startSymbol" : "PS 7/5/2020 17:52", - "testWithVariablesWithPragmasWithCode" : "TA 7/16/2020 16:09", - "testWithVariablesWithPragmasWithoutCode" : "fau 7/24/2020 10:09", - "testWithVariablesWithoutPragmasWithCode" : "fau 7/10/2020 10:29", - "testWithVariablesWithoutPragmasWithoutCode" : "fau 7/24/2020 10:10", - "testWithoutVariablesWithPragmasWithCode" : "TA 7/16/2020 16:09", - "testWithoutVariablesWithPragmasWithoutCode" : "fau 7/24/2020 10:10", - "testWithoutVariablesWithoutPragmasWithCode" : "fau 7/10/2020 10:29", - "testWithoutVariablesWithoutPragmasWithoutCode" : "fau 7/24/2020 10:10" } } + "testWithVariableListWithPragmasWithCode" : "fau 8/7/2020 07:23", + "testWithVariableListWithPragmasWithoutCode" : "fau 8/7/2020 07:24", + "testWithVariableListWithoutPragmasWithCode" : "fau 8/7/2020 07:24", + "testWithVariableListWithoutPragmasWithoutCode" : "fau 8/7/2020 07:24", + "testWithoutVariableListWithPragmasWithCode" : "fau 8/7/2020 07:24", + "testWithoutVariableListWithPragmasWithoutCode" : "fau 8/7/2020 07:24", + "testWithoutVariableListWithoutPragmasWithCode" : "fau 8/7/2020 07:25", + "testWithoutVariableListWithoutPragmasWithoutCode" : "fau 8/7/2020 07:25" } } diff --git a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/properties.json b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/properties.json index 4ec59a8..84e29b4 100644 --- a/packages/OmegaPrint-Tests.package/TestExecutableCode.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestExecutableCode.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:38", "instvars" : [ ], "name" : "TestExecutableCode", diff --git a/packages/OmegaPrint-Tests.package/TestExpression.class/README.md b/packages/OmegaPrint-Tests.package/TestExpression.class/README.md index e69de29..5d4621f 100644 --- a/packages/OmegaPrint-Tests.package/TestExpression.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestExpression.class/README.md @@ -0,0 +1,3 @@ +TestExpression is the class which checks whether the prettifying of the ExpressionNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testMultipleKeywordSegmentsInCascade.st b/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testMultipleKeywordSegmentsInCascade.st new file mode 100644 index 0000000..a871e78 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testMultipleKeywordSegmentsInCascade.st @@ -0,0 +1,6 @@ +special cases +testMultipleKeywordSegmentsInCascade + + self + prettify: 'receiver keyword1:arg1 keyword2:arg2;message' + shouldEqual: 'receiver' , self lfTabTab , 'keyword1: arg1' , self lfTabTab , 'keyword2: arg2;' , self lfTab , 'message' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithBinaryMessageSendWithCascadedMessages.st b/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithBinaryMessageSendWithCascadedMessages.st index 2677f99..bd8121c 100644 --- a/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithBinaryMessageSendWithCascadedMessages.st +++ b/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithBinaryMessageSendWithCascadedMessages.st @@ -2,5 +2,5 @@ binary cascade testWithBinaryMessageSendWithCascadedMessages self - prettify: 'receiver+arg1 keyword:arg2;message' - shouldEqual: 'receiver + arg1' , String cr , String tab , 'keyword: arg2;' , String cr , String tab , 'message' \ No newline at end of file + prettify: 'receiver@arg1 keyword:arg2;message' + shouldEqual: 'receiver @ arg1' , self lfTab , 'keyword: arg2;' , self lfTab , 'message' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithKeywordMessageSend.st b/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithKeywordMessageSend.st new file mode 100644 index 0000000..7f007b0 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithKeywordMessageSend.st @@ -0,0 +1,6 @@ +base +testWithKeywordMessageSend + + self + prettify: 'receiver' + shouldEqual: 'receiver' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithOperandWithCascadedMessages.st b/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithOperandWithCascadedMessages.st index 0865530..3c4244a 100644 --- a/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithOperandWithCascadedMessages.st +++ b/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithOperandWithCascadedMessages.st @@ -3,4 +3,4 @@ testWithOperandWithCascadedMessages self prettify: 'receiver message1;message2' - shouldEqual: 'receiver' , String cr , String tab , 'message1;' , String cr , String tab , 'message2' \ No newline at end of file + shouldEqual: 'receiver' , self lfTab , 'message1;' , self lfTab , 'message2' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithUnaryMessageSendWithCascadedMessages.st b/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithUnaryMessageSendWithCascadedMessages.st index 197132a..badf1c9 100644 --- a/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithUnaryMessageSendWithCascadedMessages.st +++ b/packages/OmegaPrint-Tests.package/TestExpression.class/instance/testWithUnaryMessageSendWithCascadedMessages.st @@ -3,4 +3,4 @@ testWithUnaryMessageSendWithCascadedMessages self prettify: 'receiver message1 message2;message3' - shouldEqual: 'receiver message1' , String cr , String tab , 'message2;' , String cr , String tab , 'message3' \ No newline at end of file + shouldEqual: 'receiver message1' , self lfTab , 'message2;' , self lfTab , 'message3' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestExpression.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestExpression.class/methodProperties.json index 5f7d8d4..1ae3768 100644 --- a/packages/OmegaPrint-Tests.package/TestExpression.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestExpression.class/methodProperties.json @@ -3,6 +3,8 @@ }, "instance" : { "startSymbol" : "TA 7/10/2020 10:50", - "testWithBinaryMessageSendWithCascadedMessages" : "PK 7/11/2020 14:55", - "testWithOperandWithCascadedMessages" : "PK 7/11/2020 14:53", - "testWithUnaryMessageSendWithCascadedMessages" : "PK 7/11/2020 14:53" } } + "testMultipleKeywordSegmentsInCascade" : "fau 8/7/2020 07:33", + "testWithBinaryMessageSendWithCascadedMessages" : "fau 8/7/2020 07:29", + "testWithKeywordMessageSend" : "fau 8/7/2020 07:31", + "testWithOperandWithCascadedMessages" : "fau 8/6/2020 17:03", + "testWithUnaryMessageSendWithCascadedMessages" : "fau 8/6/2020 17:03" } } diff --git a/packages/OmegaPrint-Tests.package/TestExpression.class/properties.json b/packages/OmegaPrint-Tests.package/TestExpression.class/properties.json index a9a5890..38e8dc7 100644 --- a/packages/OmegaPrint-Tests.package/TestExpression.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestExpression.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:38", "instvars" : [ ], "name" : "TestExpression", diff --git a/packages/OmegaPrint-Tests.package/TestFinalStatement.class/README.md b/packages/OmegaPrint-Tests.package/TestFinalStatement.class/README.md index e69de29..371634a 100644 --- a/packages/OmegaPrint-Tests.package/TestFinalStatement.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestFinalStatement.class/README.md @@ -0,0 +1,3 @@ +TestFinalStatement is the class which checks whether the prettifying of the FinalStatementNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestFinalStatement.class/properties.json b/packages/OmegaPrint-Tests.package/TestFinalStatement.class/properties.json index ebdaed5..1179ada 100644 --- a/packages/OmegaPrint-Tests.package/TestFinalStatement.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestFinalStatement.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:39", "instvars" : [ ], "name" : "TestFinalStatement", diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/README.md b/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/README.md new file mode 100644 index 0000000..f8aa2af --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/README.md @@ -0,0 +1,3 @@ +TestKeywordMessage is the class which checks whether the prettifying of the KeywordMessageNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/instance/startSymbol.st b/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/instance/startSymbol.st new file mode 100644 index 0000000..30b94c1 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/instance/startSymbol.st @@ -0,0 +1,4 @@ +constants +startSymbol + + ^ #KeywordMessage \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/instance/testWithMultipleSegments.st b/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/instance/testWithMultipleSegments.st new file mode 100644 index 0000000..3e15e28 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/instance/testWithMultipleSegments.st @@ -0,0 +1,6 @@ +base +testWithMultipleSegments + + self + prettify: 'keyword1:arg1 keyword2:arg2' + shouldEqual: self tab , 'keyword1: arg1' , self lfTab , 'keyword2: arg2' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/instance/testWithSingleSegment.st b/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/instance/testWithSingleSegment.st new file mode 100644 index 0000000..107b94e --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/instance/testWithSingleSegment.st @@ -0,0 +1,6 @@ +base +testWithSingleSegment + + self + prettify: 'keyword:arg' + shouldEqual: 'keyword: arg' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/methodProperties.json new file mode 100644 index 0000000..034de90 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/methodProperties.json @@ -0,0 +1,7 @@ +{ + "class" : { + }, + "instance" : { + "startSymbol" : "fau 8/6/2020 13:58", + "testWithMultipleSegments" : "fau 8/6/2020 17:04", + "testWithSingleSegment" : "fau 8/6/2020 14:00" } } diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/properties.json b/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/properties.json new file mode 100644 index 0000000..c9de1c1 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessage.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "OmegaPrint-Tests", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "fau 8/7/2020 09:15", + "instvars" : [ + ], + "name" : "TestKeywordMessage", + "pools" : [ + ], + "super" : "OPTestEvaluator", + "type" : "normal" } diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/README.md b/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/README.md index e69de29..6b80055 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/README.md @@ -0,0 +1,3 @@ +TestKeywordMessageSegment is the class which checks whether the prettifying of the KeywordMessageSegmentNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/instance/testWithKeywordWithArgument.st b/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/instance/testWithKeywordWithArgument.st index 1f798e9..3442598 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/instance/testWithKeywordWithArgument.st +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/instance/testWithKeywordWithArgument.st @@ -2,5 +2,5 @@ base testWithKeywordWithArgument self - prettify: 'keyword:arg' + prettify: 'keyword:arg' shouldEqual: 'keyword: arg' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/methodProperties.json index 77a7b49..89db719 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/methodProperties.json @@ -3,4 +3,4 @@ }, "instance" : { "startSymbol" : "PS 7/5/2020 18:03", - "testWithKeywordWithArgument" : "fau 7/10/2020 12:40" } } + "testWithKeywordWithArgument" : "PK 8/7/2020 16:06" } } diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/properties.json b/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/properties.json index 864b702..7505e41 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessageSegment.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:39", "instvars" : [ ], "name" : "TestKeywordMessageSegment", diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/README.md b/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/README.md index e69de29..d9e7c86 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/README.md @@ -0,0 +1,3 @@ +testKeywordMessageSend is the class which checks whether the prettifying of the KeywordMessageSendNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/instance/testWithReceiverWithMultipleSegments.st b/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/instance/testWithReceiverWithMultipleSegments.st index 9212b65..cca7a97 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/instance/testWithReceiverWithMultipleSegments.st +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/instance/testWithReceiverWithMultipleSegments.st @@ -3,4 +3,4 @@ testWithReceiverWithMultipleSegments self prettify: 'receiver keyword1:arg1 keyword2:arg2' - shouldEqual: 'receiver' , String cr , String tab , 'keyword1: arg1' , String cr , String tab , 'keyword2: arg2' \ No newline at end of file + shouldEqual: 'receiver' , self lfTab , 'keyword1: arg1' , self lfTab , 'keyword2: arg2' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/instance/testWithReceiverWithMultipleSegmentsWithComplexArgument.st b/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/instance/testWithReceiverWithMultipleSegmentsWithComplexArgument.st new file mode 100644 index 0000000..aea46a3 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/instance/testWithReceiverWithMultipleSegmentsWithComplexArgument.st @@ -0,0 +1,6 @@ +special cases +testWithReceiverWithMultipleSegmentsWithComplexArgument + + self + prettify: 'receiver1 keyword1:(receiver2 keyword2:arg1 keyword3:arg2)keyword4:arg3' + shouldEqual: 'receiver1' , self lfTab , 'keyword1: (receiver2' , self lfTabTab , 'keyword2: arg1' , self lfTabTab , 'keyword3: arg2)' , self lfTab , 'keyword4: arg3' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/instance/testWithReceiverWithSingleSegment.st b/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/instance/testWithReceiverWithSingleSegment.st index 5f1e19f..d1922d4 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/instance/testWithReceiverWithSingleSegment.st +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/instance/testWithReceiverWithSingleSegment.st @@ -2,5 +2,5 @@ base testWithReceiverWithSingleSegment self - prettify: 'receiver keyword:arg' + prettify: 'receiver keyword:arg' shouldEqual: 'receiver keyword: arg' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/instance/testWithReceiverWithSingleSegmentWithComplexArgument.st b/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/instance/testWithReceiverWithSingleSegmentWithComplexArgument.st new file mode 100644 index 0000000..97c77ac --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/instance/testWithReceiverWithSingleSegmentWithComplexArgument.st @@ -0,0 +1,6 @@ +special cases +testWithReceiverWithSingleSegmentWithComplexArgument + + self + prettify: 'receiver1 keyword1:(receiver2 keyword2:arg1 keyword3:arg2)' + shouldEqual: 'receiver1 keyword1: (receiver2' , self lfTab , 'keyword2: arg1' , self lfTab , 'keyword3: arg2)' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/methodProperties.json index d30b2ff..163f923 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/methodProperties.json @@ -3,6 +3,8 @@ }, "instance" : { "startSymbol" : "PS 7/5/2020 18:04", - "testWithReceiverWithMultipleSegments" : "fau 7/10/2020 12:39", - "testWithReceiverWithSingleSegment" : "fau 7/10/2020 12:39", + "testWithReceiverWithMultipleSegments" : "fau 8/6/2020 17:05", + "testWithReceiverWithMultipleSegmentsWithComplexArgument" : "fau 8/7/2020 07:39", + "testWithReceiverWithSingleSegment" : "PK 8/7/2020 16:07", + "testWithReceiverWithSingleSegmentWithComplexArgument" : "fau 8/6/2020 17:05", "testWithReceiverWithoutSegment" : "fau 7/10/2020 10:34" } } diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/properties.json b/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/properties.json index b9d18f5..609fc5c 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestKeywordMessageSend.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:40", "instvars" : [ ], "name" : "TestKeywordMessageSend", diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMethodHeader.class/README.md b/packages/OmegaPrint-Tests.package/TestKeywordMethodHeader.class/README.md index e69de29..94f0dad 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordMethodHeader.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestKeywordMethodHeader.class/README.md @@ -0,0 +1,3 @@ +TestKeywordMethodHeader is the class which checks whether the prettifying of the KeywordMethodHeaderNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMethodHeader.class/properties.json b/packages/OmegaPrint-Tests.package/TestKeywordMethodHeader.class/properties.json index edd4d4e..29f8f48 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordMethodHeader.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestKeywordMethodHeader.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:41", "instvars" : [ ], "name" : "TestKeywordMethodHeader", diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMethodHeaderSegment.class/README.md b/packages/OmegaPrint-Tests.package/TestKeywordMethodHeaderSegment.class/README.md index e69de29..2021481 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordMethodHeaderSegment.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestKeywordMethodHeaderSegment.class/README.md @@ -0,0 +1,3 @@ +TestKeywordMethodHeaderSegment is the class which checks whether the prettifying of the KeywordMethodHeaderSegmentNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordMethodHeaderSegment.class/properties.json b/packages/OmegaPrint-Tests.package/TestKeywordMethodHeaderSegment.class/properties.json index c7898e1..473e071 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordMethodHeaderSegment.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestKeywordMethodHeaderSegment.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:41", "instvars" : [ ], "name" : "TestKeywordMethodHeaderSegment", diff --git a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/README.md b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/README.md index e69de29..7460ecb 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/README.md @@ -0,0 +1,3 @@ +TestKeywordPragma is the class which checks whether the prettifying of the KeywordPragmaNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithKeyWithMultiplePragmaLiterals.st b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithKeyWithMultiplePragmaLiterals.st new file mode 100644 index 0000000..3d43cb7 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithKeyWithMultiplePragmaLiterals.st @@ -0,0 +1,6 @@ +base +testWithKeyWithMultiplePragmaLiterals + + self + prettify: 'key:pragmaLiteral1 pragmaLiteral2' + shouldEqual: 'key: pragmaLiteral1 pragmaLiteral2' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithKeyWithSinglePragmaLiteral.st b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithKeyWithSinglePragmaLiteral.st new file mode 100644 index 0000000..7a50253 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithKeyWithSinglePragmaLiteral.st @@ -0,0 +1,6 @@ +base +testWithKeyWithSinglePragmaLiteral + + self + prettify: 'key:pragmaLiteral' + shouldEqual: 'key: pragmaLiteral' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithKeyWithoutPragmaLiteral.st b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithKeyWithoutPragmaLiteral.st new file mode 100644 index 0000000..24c98e9 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithKeyWithoutPragmaLiteral.st @@ -0,0 +1,6 @@ +base +testWithKeyWithoutPragmaLiteral + + self + prettify: 'key:' + shouldEqual: 'key:' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithPragmaKeyWithMultiplePragmaLiteral.st b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithPragmaKeyWithMultiplePragmaLiteral.st deleted file mode 100644 index bdaeaea..0000000 --- a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithPragmaKeyWithMultiplePragmaLiteral.st +++ /dev/null @@ -1,6 +0,0 @@ -base -testWithPragmaKeyWithMultiplePragmaLiteral - - self - prettify: 'identifier:pragmaLiteral1 pragmaLiteral2' - shouldEqual: 'identifier: pragmaLiteral1 pragmaLiteral2' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithPragmaKeyWithSinglePragmaLiteral.st b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithPragmaKeyWithSinglePragmaLiteral.st deleted file mode 100644 index 389d02f..0000000 --- a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithPragmaKeyWithSinglePragmaLiteral.st +++ /dev/null @@ -1,6 +0,0 @@ -base -testWithPragmaKeyWithSinglePragmaLiteral - - self - prettify: 'identifier:pragmaLiteral' - shouldEqual: 'identifier: pragmaLiteral' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithPragmaKeyWithoutPragmaLiteral.st b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithPragmaKeyWithoutPragmaLiteral.st deleted file mode 100644 index 5d06407..0000000 --- a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/instance/testWithPragmaKeyWithoutPragmaLiteral.st +++ /dev/null @@ -1,6 +0,0 @@ -base -testWithPragmaKeyWithoutPragmaLiteral - - self - prettify: 'identifier:' - shouldEqual: 'identifier:' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/methodProperties.json index 3024fc7..0cfc002 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/methodProperties.json @@ -3,6 +3,6 @@ }, "instance" : { "startSymbol" : "TA 7/17/2020 09:23", - "testWithPragmaKeyWithMultiplePragmaLiteral" : "TA 7/17/2020 09:43", - "testWithPragmaKeyWithSinglePragmaLiteral" : "TA 7/17/2020 09:43", - "testWithPragmaKeyWithoutPragmaLiteral" : "TA 7/17/2020 09:24" } } + "testWithKeyWithMultiplePragmaLiterals" : "fau 8/7/2020 07:44", + "testWithKeyWithSinglePragmaLiteral" : "fau 8/7/2020 07:44", + "testWithKeyWithoutPragmaLiteral" : "fau 8/7/2020 07:44" } } diff --git a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/properties.json b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/properties.json index 28202bd..7fc3850 100644 --- a/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestKeywordPragma.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:42", "instvars" : [ ], "name" : "TestKeywordPragma", diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/README.md b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/README.md index e69de29..834338e 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/README.md @@ -0,0 +1,3 @@ +TestLiteralArrayLiteral is the class which checks whether the prettifying of the LiteralArrayLiteralNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithMultipleLiteralArrayLiteralElements.st b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithMultipleElements.st similarity index 56% rename from packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithMultipleLiteralArrayLiteralElements.st rename to packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithMultipleElements.st index edd2ea9..274f89b 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithMultipleLiteralArrayLiteralElements.st +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithMultipleElements.st @@ -1,5 +1,5 @@ base -testWithMultipleLiteralArrayLiteralElements +testWithMultipleElements self prettify: '#(0 1)' diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithSingleLiteralArrayLiteralElement.st b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithSingleElement.st similarity index 56% rename from packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithSingleLiteralArrayLiteralElement.st rename to packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithSingleElement.st index 5c3104c..ede20d2 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithSingleLiteralArrayLiteralElement.st +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithSingleElement.st @@ -1,5 +1,5 @@ base -testWithSingleLiteralArrayLiteralElement +testWithSingleElement self prettify: '#(0)' diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithoutLiteralArrayLiteralElement.st b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithoutElement.st similarity index 56% rename from packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithoutLiteralArrayLiteralElement.st rename to packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithoutElement.st index dc5d08c..ce40fcb 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithoutLiteralArrayLiteralElement.st +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/instance/testWithoutElement.st @@ -1,5 +1,5 @@ base -testWithoutLiteralArrayLiteralElement +testWithoutElement self prettify: '#()' diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/methodProperties.json index 34f98c8..b444de5 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/methodProperties.json @@ -3,6 +3,6 @@ }, "instance" : { "startSymbol" : "fau 7/12/2020 20:32", - "testWithMultipleLiteralArrayLiteralElements" : "fau 7/12/2020 20:33", - "testWithSingleLiteralArrayLiteralElement" : "fau 7/12/2020 20:33", - "testWithoutLiteralArrayLiteralElement" : "fau 7/12/2020 20:33" } } + "testWithMultipleElements" : "fau 8/7/2020 07:46", + "testWithSingleElement" : "fau 8/7/2020 07:45", + "testWithoutElement" : "fau 8/7/2020 07:45" } } diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/properties.json b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/properties.json index c0c8d8f..fb7b86b 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteral.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:43", "instvars" : [ ], "name" : "TestLiteralArrayLiteral", diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/README.md b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/README.md index e69de29..d633772 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/README.md @@ -0,0 +1,3 @@ +TestLiteralArrayLiteralInLiteralArray is the class which checks whether the prettifying of the LiteralArrayLiteralInLiteralArrayNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithMultipleLiteralArrayLiteralElements.st b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithMultipleElements.st similarity index 52% rename from packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithMultipleLiteralArrayLiteralElements.st rename to packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithMultipleElements.st index 9dd229d..22f6bcb 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithMultipleLiteralArrayLiteralElements.st +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithMultipleElements.st @@ -1,5 +1,5 @@ base -testWithHashWithMultipleLiteralArrayLiteralElements +testWithHashWithMultipleElements self prettify: '#(0 1)' diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithSingleLiteralArrayLiteralElement.st b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithSingleElement.st similarity index 52% rename from packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithSingleLiteralArrayLiteralElement.st rename to packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithSingleElement.st index 746a8ef..bb0e1b2 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithSingleLiteralArrayLiteralElement.st +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithSingleElement.st @@ -1,5 +1,5 @@ base -testWithHashWithSingleLiteralArrayLiteralElement +testWithHashWithSingleElement self prettify: '#(0)' diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithoutLiteralArrayLiteralElement.st b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithoutElement.st similarity index 52% rename from packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithoutLiteralArrayLiteralElement.st rename to packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithoutElement.st index 773e335..d766ce2 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithoutLiteralArrayLiteralElement.st +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithHashWithoutElement.st @@ -1,5 +1,5 @@ base -testWithHashWithoutLiteralArrayLiteralElement +testWithHashWithoutElement self prettify: '#()' diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithMultipleLiteralArrayLiteralElements.st b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithMultipleElements.st similarity index 50% rename from packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithMultipleLiteralArrayLiteralElements.st rename to packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithMultipleElements.st index 6722b6c..769a168 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithMultipleLiteralArrayLiteralElements.st +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithMultipleElements.st @@ -1,5 +1,5 @@ base -testWithoutHashWithMultipleLiteralArrayLiteralElements +testWithoutHashWithMultipleElements self prettify: '(0 1)' diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithSingleLiteralArrayLiteralElement.st b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithSingleElement.st similarity index 50% rename from packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithSingleLiteralArrayLiteralElement.st rename to packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithSingleElement.st index cb586e5..c52b3dd 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithSingleLiteralArrayLiteralElement.st +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithSingleElement.st @@ -1,5 +1,5 @@ base -testWithoutHashWithSingleLiteralArrayLiteralElement +testWithoutHashWithSingleElement self prettify: '(0)' diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithoutLiteralArrayLiteralElement.st b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithoutElement.st similarity index 50% rename from packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithoutLiteralArrayLiteralElement.st rename to packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithoutElement.st index bef9140..81cb5cc 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithoutLiteralArrayLiteralElement.st +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/instance/testWithoutHashWithoutElement.st @@ -1,5 +1,5 @@ base -testWithoutHashWithoutLiteralArrayLiteralElement +testWithoutHashWithoutElement self prettify: '()' diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/methodProperties.json index 8a1c0c3..bd557b1 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/methodProperties.json @@ -3,9 +3,9 @@ }, "instance" : { "startSymbol" : "fau 7/12/2020 20:34", - "testWithHashWithMultipleLiteralArrayLiteralElements" : "fau 7/12/2020 20:37", - "testWithHashWithSingleLiteralArrayLiteralElement" : "fau 7/12/2020 20:38", - "testWithHashWithoutLiteralArrayLiteralElement" : "fau 7/12/2020 20:38", - "testWithoutHashWithMultipleLiteralArrayLiteralElements" : "fau 7/12/2020 21:21", - "testWithoutHashWithSingleLiteralArrayLiteralElement" : "fau 7/12/2020 21:21", - "testWithoutHashWithoutLiteralArrayLiteralElement" : "fau 7/12/2020 21:21" } } + "testWithHashWithMultipleElements" : "fau 8/7/2020 07:46", + "testWithHashWithSingleElement" : "fau 8/7/2020 07:47", + "testWithHashWithoutElement" : "fau 8/7/2020 07:47", + "testWithoutHashWithMultipleElements" : "fau 8/7/2020 07:47", + "testWithoutHashWithSingleElement" : "fau 8/7/2020 07:47", + "testWithoutHashWithoutElement" : "fau 8/7/2020 07:47" } } diff --git a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/properties.json b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/properties.json index 002f20e..30c3b6d 100644 --- a/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestLiteralArrayLiteralInLiteralArray.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:45", "instvars" : [ ], "name" : "TestLiteralArrayLiteralInLiteralArray", diff --git a/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/README.md b/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/README.md index e69de29..56aa87d 100644 --- a/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/README.md @@ -0,0 +1,3 @@ +TestLocalVariableDeclarationList is the class which checks whether the prettifying of the LocalVariableDeclarationNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithMultipleIdentifiers.st b/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithMultipleIdentifiers.st new file mode 100644 index 0000000..d1dc3e5 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithMultipleIdentifiers.st @@ -0,0 +1,6 @@ +base +testWithMultipleIdentifiers + + self + prettify: '|identifier1 identifier2|' + shouldEqual: '| identifier1 identifier2 |' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithMultipleVariables.st b/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithMultipleVariables.st deleted file mode 100644 index 5913afd..0000000 --- a/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithMultipleVariables.st +++ /dev/null @@ -1,6 +0,0 @@ -base -testWithMultipleVariables - - self - prettify: '|variable1 variable2|' - shouldEqual: '| variable1 variable2 |' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithSingleIdentifier.st b/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithSingleIdentifier.st new file mode 100644 index 0000000..89b3a52 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithSingleIdentifier.st @@ -0,0 +1,6 @@ +base +testWithSingleIdentifier + + self + prettify: '|identifier|' + shouldEqual: '| identifier |' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithVariable.st b/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithVariable.st deleted file mode 100644 index 1fe80fa..0000000 --- a/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithVariable.st +++ /dev/null @@ -1,6 +0,0 @@ -base -testWithVariable - - self - prettify: '|variable|' - shouldEqual: '| variable |' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithoutVariable.st b/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithoutIdentifier.st similarity index 69% rename from packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithoutVariable.st rename to packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithoutIdentifier.st index c03c7ce..67e9496 100644 --- a/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithoutVariable.st +++ b/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/instance/testWithoutIdentifier.st @@ -1,5 +1,5 @@ base -testWithoutVariable +testWithoutIdentifier self prettify: '||' diff --git a/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/methodProperties.json index 01d11e9..8ce3483 100644 --- a/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/methodProperties.json @@ -3,6 +3,6 @@ }, "instance" : { "startSymbol" : "PS 7/5/2020 18:11", - "testWithMultipleVariables" : "PS 7/5/2020 18:12", - "testWithVariable" : "fau 7/10/2020 10:38", - "testWithoutVariable" : "PS 7/5/2020 18:13" } } + "testWithMultipleIdentifiers" : "fau 8/7/2020 07:50", + "testWithSingleIdentifier" : "fau 8/7/2020 07:50", + "testWithoutIdentifier" : "fau 8/7/2020 07:49" } } diff --git a/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/properties.json b/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/properties.json index a7377b0..260fa70 100644 --- a/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestLocalVariableDeclarationList.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:46", "instvars" : [ ], "name" : "TestLocalVariableDeclarationList", diff --git a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/README.md b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/README.md index e69de29..2a5193c 100644 --- a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/README.md @@ -0,0 +1,3 @@ +TestMethodDeclaration is the class which checks whether the prettifying of the MethodDeclarationNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithHeaderWithPragmasWithCode.st b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithHeaderWithPragmasWithCode.st new file mode 100644 index 0000000..5e4a5c4 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithHeaderWithPragmasWithCode.st @@ -0,0 +1,6 @@ +base +testWithHeaderWithPragmasWithCode + + self + prettify: 'headerstatement.' + shouldEqual: 'header' , self lfLfTab , '' , self lfTab , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithHeaderWithPragmasWithoutCode.st b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithHeaderWithPragmasWithoutCode.st new file mode 100644 index 0000000..3856e31 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithHeaderWithPragmasWithoutCode.st @@ -0,0 +1,6 @@ +base +testWithHeaderWithPragmasWithoutCode + + self + prettify: 'header' + shouldEqual: 'header' , self lfLfTab , '' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithHeaderWithoutPragmasWithCode.st b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithHeaderWithoutPragmasWithCode.st new file mode 100644 index 0000000..344efa6 --- /dev/null +++ b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithHeaderWithoutPragmasWithCode.st @@ -0,0 +1,6 @@ +base +testWithHeaderWithoutPragmasWithCode + + self + prettify: 'header statement.' + shouldEqual: 'header' , self lfLfTab , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithMethodHeaderWithoutPragmasWithoutCode.st b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithHeaderWithoutPragmasWithoutCode.st similarity index 54% rename from packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithMethodHeaderWithoutPragmasWithoutCode.st rename to packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithHeaderWithoutPragmasWithoutCode.st index 449a245..d108362 100644 --- a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithMethodHeaderWithoutPragmasWithoutCode.st +++ b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithHeaderWithoutPragmasWithoutCode.st @@ -1,5 +1,5 @@ base -testWithMethodHeaderWithoutPragmasWithoutCode +testWithHeaderWithoutPragmasWithoutCode self prettify: 'header' diff --git a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithMethodHeaderWithPragmasWithCode.st b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithMethodHeaderWithPragmasWithCode.st deleted file mode 100644 index 8a61a97..0000000 --- a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithMethodHeaderWithPragmasWithCode.st +++ /dev/null @@ -1,6 +0,0 @@ -base -testWithMethodHeaderWithPragmasWithCode - - self - prettify: 'headerstatement.' - shouldEqual: 'header' , String cr , String cr , String tab , '' , String cr , String tab , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithMethodHeaderWithPragmasWithoutCode.st b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithMethodHeaderWithPragmasWithoutCode.st deleted file mode 100644 index 0a9f2b2..0000000 --- a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithMethodHeaderWithPragmasWithoutCode.st +++ /dev/null @@ -1,6 +0,0 @@ -base -testWithMethodHeaderWithPragmasWithoutCode - - self - prettify: 'header' - shouldEqual: 'header' , String cr , String cr , String tab , '' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithMethodHeaderWithoutPragmasWithCode.st b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithMethodHeaderWithoutPragmasWithCode.st deleted file mode 100644 index 413704a..0000000 --- a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/instance/testWithMethodHeaderWithoutPragmasWithCode.st +++ /dev/null @@ -1,6 +0,0 @@ -base -testWithMethodHeaderWithoutPragmasWithCode - - self - prettify: 'header statement.' - shouldEqual: 'header' , String cr , String cr , String tab , 'statement' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/methodProperties.json index c8ace0f..fdf84a0 100644 --- a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/methodProperties.json @@ -3,7 +3,7 @@ }, "instance" : { "startSymbol" : "PS 7/5/2020 18:14", - "testWithMethodHeaderWithPragmasWithCode" : "fau 8/5/2020 09:11", - "testWithMethodHeaderWithPragmasWithoutCode" : "fau 8/5/2020 09:11", - "testWithMethodHeaderWithoutPragmasWithCode" : "fau 7/10/2020 10:38", - "testWithMethodHeaderWithoutPragmasWithoutCode" : "fau 7/19/2020 18:16" } } + "testWithHeaderWithPragmasWithCode" : "fau 8/7/2020 07:51", + "testWithHeaderWithPragmasWithoutCode" : "fau 8/7/2020 07:51", + "testWithHeaderWithoutPragmasWithCode" : "fau 8/7/2020 07:51", + "testWithHeaderWithoutPragmasWithoutCode" : "fau 8/7/2020 07:51" } } diff --git a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/properties.json b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/properties.json index 6a25edd..e26b668 100644 --- a/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestMethodDeclaration.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:46", "instvars" : [ ], "name" : "TestMethodDeclaration", diff --git a/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/README.md b/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/README.md index e69de29..537f7b0 100644 --- a/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/README.md @@ -0,0 +1,3 @@ +TestMoreExecutableCode is the class which checks whether the prettifying of the MoreExecutableCodeNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithStatementsWithFinalStatement.st b/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithStatementsWithFinalStatement.st index 2cc3311..db1e8cc 100644 --- a/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithStatementsWithFinalStatement.st +++ b/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithStatementsWithFinalStatement.st @@ -3,4 +3,4 @@ testWithStatementsWithFinalStatement self prettify: 'statement1.^statement2' - shouldEqual: 'statement1.' , String cr , '^ statement2' \ No newline at end of file + shouldEqual: 'statement1.' , self lf , '^ statement2' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithoutStatementWithFinalStatement.st b/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithoutStatementsWithFinalStatement.st similarity index 61% rename from packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithoutStatementWithFinalStatement.st rename to packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithoutStatementsWithFinalStatement.st index 1b95c0a..0695008 100644 --- a/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithoutStatementWithFinalStatement.st +++ b/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithoutStatementsWithFinalStatement.st @@ -1,5 +1,5 @@ base -testWithoutStatementWithFinalStatement +testWithoutStatementsWithFinalStatement self prettify: '^statement' diff --git a/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithoutStatementWithoutFinalStatement.st b/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithoutStatementsWithoutFinalStatement.st similarity index 50% rename from packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithoutStatementWithoutFinalStatement.st rename to packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithoutStatementsWithoutFinalStatement.st index a4d8e1a..be45cc9 100644 --- a/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithoutStatementWithoutFinalStatement.st +++ b/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/instance/testWithoutStatementsWithoutFinalStatement.st @@ -1,5 +1,5 @@ base -testWithoutStatementWithoutFinalStatement +testWithoutStatementsWithoutFinalStatement self prettify: '' diff --git a/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/methodProperties.json index 9ab86c7..aac5ac9 100644 --- a/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/methodProperties.json @@ -3,7 +3,7 @@ }, "instance" : { "startSymbol" : "PS 7/5/2020 18:23", - "testWithStatementsWithFinalStatement" : "fau 7/10/2020 10:43", + "testWithStatementsWithFinalStatement" : "fau 8/6/2020 17:07", "testWithStatementsWithoutFinalStatement" : "fau 7/10/2020 10:44", - "testWithoutStatementWithFinalStatement" : "fau 7/10/2020 10:44", - "testWithoutStatementWithoutFinalStatement" : "PS 7/5/2020 18:31" } } + "testWithoutStatementsWithFinalStatement" : "fau 8/7/2020 07:53", + "testWithoutStatementsWithoutFinalStatement" : "fau 8/7/2020 07:53" } } diff --git a/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/properties.json b/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/properties.json index 4a940b3..f1f0ec1 100644 --- a/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestMoreExecutableCode.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:47", "instvars" : [ ], "name" : "TestMoreExecutableCode", diff --git a/packages/OmegaPrint-Tests.package/TestNestedExpression.class/README.md b/packages/OmegaPrint-Tests.package/TestNestedExpression.class/README.md index e69de29..d1027dd 100644 --- a/packages/OmegaPrint-Tests.package/TestNestedExpression.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestNestedExpression.class/README.md @@ -0,0 +1,3 @@ +TestNestedExpression is the class which checks whether the prettifying of the NestedExpressionNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestNestedExpression.class/instance/testWithStatementWithSingleParentheses.st b/packages/OmegaPrint-Tests.package/TestNestedExpression.class/instance/testWithStatement.st similarity index 62% rename from packages/OmegaPrint-Tests.package/TestNestedExpression.class/instance/testWithStatementWithSingleParentheses.st rename to packages/OmegaPrint-Tests.package/TestNestedExpression.class/instance/testWithStatement.st index 0413a5f..d742e09 100644 --- a/packages/OmegaPrint-Tests.package/TestNestedExpression.class/instance/testWithStatementWithSingleParentheses.st +++ b/packages/OmegaPrint-Tests.package/TestNestedExpression.class/instance/testWithStatement.st @@ -1,5 +1,5 @@ base -testWithStatementWithSingleParentheses +testWithStatement self prettify: '(statement)' diff --git a/packages/OmegaPrint-Tests.package/TestNestedExpression.class/instance/testWithStatementWithMultipleParentheses.st b/packages/OmegaPrint-Tests.package/TestNestedExpression.class/instance/testWithStatementWithMultipleParentheses.st index 1b7eeab..7f8cf22 100644 --- a/packages/OmegaPrint-Tests.package/TestNestedExpression.class/instance/testWithStatementWithMultipleParentheses.st +++ b/packages/OmegaPrint-Tests.package/TestNestedExpression.class/instance/testWithStatementWithMultipleParentheses.st @@ -1,4 +1,4 @@ -base +special cases testWithStatementWithMultipleParentheses self diff --git a/packages/OmegaPrint-Tests.package/TestNestedExpression.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestNestedExpression.class/methodProperties.json index 5b5c24b..6d75d8c 100644 --- a/packages/OmegaPrint-Tests.package/TestNestedExpression.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestNestedExpression.class/methodProperties.json @@ -3,5 +3,5 @@ }, "instance" : { "startSymbol" : "PS 7/5/2020 18:38", - "testWithStatementWithMultipleParentheses" : "fau 7/10/2020 10:47", - "testWithStatementWithSingleParentheses" : "fau 7/10/2020 10:46" } } + "testWithStatement" : "fau 8/7/2020 07:55", + "testWithStatementWithMultipleParentheses" : "fau 8/7/2020 07:55" } } diff --git a/packages/OmegaPrint-Tests.package/TestNestedExpression.class/properties.json b/packages/OmegaPrint-Tests.package/TestNestedExpression.class/properties.json index 7f3a5f3..70c249c 100644 --- a/packages/OmegaPrint-Tests.package/TestNestedExpression.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestNestedExpression.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:47", "instvars" : [ ], "name" : "TestNestedExpression", diff --git a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/README.md b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/README.md index e69de29..2eb8aa8 100644 --- a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/README.md @@ -0,0 +1,3 @@ +TestObjectArrayLiteral is the class which checks whether the prettifying of the ObjectArrayLiteralNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithMultipleObjectArrayLiteralElementsWithPoint.st b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithMultipleElements.st similarity index 64% rename from packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithMultipleObjectArrayLiteralElementsWithPoint.st rename to packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithMultipleElements.st index e62621c..1065bc5 100644 --- a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithMultipleObjectArrayLiteralElementsWithPoint.st +++ b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithMultipleElements.st @@ -1,5 +1,5 @@ base -testWithMultipleObjectArrayLiteralElementsWithPoint +testWithMultipleElements self prettify: '{statement1.statement2.}' diff --git a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithMultipleObjectArrayLiteralElementsWithoutPoint.st b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithMultipleElementsWithoutPoint.st similarity index 59% rename from packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithMultipleObjectArrayLiteralElementsWithoutPoint.st rename to packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithMultipleElementsWithoutPoint.st index 1570a3e..4b9e33e 100644 --- a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithMultipleObjectArrayLiteralElementsWithoutPoint.st +++ b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithMultipleElementsWithoutPoint.st @@ -1,5 +1,5 @@ -base -testWithMultipleObjectArrayLiteralElementsWithoutPoint +special cases +testWithMultipleElementsWithoutPoint self prettify: '{statement1.statement2}' diff --git a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithSingleObjectArrayLiteralElementWithPoint.st b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithSingleElement.st similarity index 58% rename from packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithSingleObjectArrayLiteralElementWithPoint.st rename to packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithSingleElement.st index e60736e..e23d620 100644 --- a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithSingleObjectArrayLiteralElementWithPoint.st +++ b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithSingleElement.st @@ -1,5 +1,5 @@ base -testWithSingleObjectArrayLiteralElementWithPoint +testWithSingleElement self prettify: '{statement.}' diff --git a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithSingleObjectArrayLiteralElementWithoutPoint.st b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithSingleElementWithoutPoint.st similarity index 52% rename from packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithSingleObjectArrayLiteralElementWithoutPoint.st rename to packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithSingleElementWithoutPoint.st index 5fd1cdb..1c97801 100644 --- a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithSingleObjectArrayLiteralElementWithoutPoint.st +++ b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithSingleElementWithoutPoint.st @@ -1,5 +1,5 @@ -base -testWithSingleObjectArrayLiteralElementWithoutPoint +special cases +testWithSingleElementWithoutPoint self prettify: '{statement}' diff --git a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithoutObjectArrayLiteralElement.st b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithoutElement.st similarity index 56% rename from packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithoutObjectArrayLiteralElement.st rename to packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithoutElement.st index ac5cfe8..13356e3 100644 --- a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithoutObjectArrayLiteralElement.st +++ b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/instance/testWithoutElement.st @@ -1,5 +1,5 @@ base -testWithoutObjectArrayLiteralElement +testWithoutElement self prettify: '{}' diff --git a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/methodProperties.json index 6889abd..e77f4ef 100644 --- a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/methodProperties.json @@ -3,8 +3,8 @@ }, "instance" : { "startSymbol" : "fau 7/12/2020 20:39", - "testWithMultipleObjectArrayLiteralElementsWithPoint" : "fau 7/12/2020 20:45", - "testWithMultipleObjectArrayLiteralElementsWithoutPoint" : "fau 7/12/2020 20:45", - "testWithSingleObjectArrayLiteralElementWithPoint" : "fau 7/12/2020 20:46", - "testWithSingleObjectArrayLiteralElementWithoutPoint" : "fau 7/12/2020 20:46", - "testWithoutObjectArrayLiteralElement" : "fau 7/12/2020 20:41" } } + "testWithMultipleElements" : "fau 8/7/2020 07:57", + "testWithMultipleElementsWithoutPoint" : "fau 8/7/2020 07:55", + "testWithSingleElement" : "fau 8/7/2020 07:57", + "testWithSingleElementWithoutPoint" : "fau 8/7/2020 07:56", + "testWithoutElement" : "fau 8/7/2020 07:57" } } diff --git a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/properties.json b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/properties.json index 3fa9030..c9629a3 100644 --- a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteral.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:48", "instvars" : [ ], "name" : "TestObjectArrayLiteral", diff --git a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteralElement.class/README.md b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteralElement.class/README.md index e69de29..e70a7e4 100644 --- a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteralElement.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteralElement.class/README.md @@ -0,0 +1,3 @@ +TestObjectArrayLiteralElement is the class which checks whether the prettifying of the ObjectArrayLiteralElementNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteralElement.class/properties.json b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteralElement.class/properties.json index 80de32e..ac31e7a 100644 --- a/packages/OmegaPrint-Tests.package/TestObjectArrayLiteralElement.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestObjectArrayLiteralElement.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:48", "instvars" : [ ], "name" : "TestObjectArrayLiteralElement", diff --git a/packages/OmegaPrint-Tests.package/TestPragma.class/README.md b/packages/OmegaPrint-Tests.package/TestPragma.class/README.md index e69de29..8586b0d 100644 --- a/packages/OmegaPrint-Tests.package/TestPragma.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestPragma.class/README.md @@ -0,0 +1,3 @@ +TestPragma is the class which checks whether the prettifying of the PragmaNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestPragma.class/instance/testWithPragmaValues.st b/packages/OmegaPrint-Tests.package/TestPragma.class/instance/testWithValues.st similarity index 74% rename from packages/OmegaPrint-Tests.package/TestPragma.class/instance/testWithPragmaValues.st rename to packages/OmegaPrint-Tests.package/TestPragma.class/instance/testWithValues.st index aa2c9d2..296bf4d 100644 --- a/packages/OmegaPrint-Tests.package/TestPragma.class/instance/testWithPragmaValues.st +++ b/packages/OmegaPrint-Tests.package/TestPragma.class/instance/testWithValues.st @@ -1,5 +1,5 @@ base -testWithPragmaValues +testWithValues self prettify: '' diff --git a/packages/OmegaPrint-Tests.package/TestPragma.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestPragma.class/methodProperties.json index a47590e..8b8864a 100644 --- a/packages/OmegaPrint-Tests.package/TestPragma.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestPragma.class/methodProperties.json @@ -3,4 +3,4 @@ }, "instance" : { "startSymbol" : "TA 7/16/2020 16:23", - "testWithPragmaValues" : "TA 7/16/2020 16:24" } } + "testWithValues" : "fau 8/7/2020 07:59" } } diff --git a/packages/OmegaPrint-Tests.package/TestPragma.class/properties.json b/packages/OmegaPrint-Tests.package/TestPragma.class/properties.json index f6e2e0c..97cb762 100644 --- a/packages/OmegaPrint-Tests.package/TestPragma.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestPragma.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:49", "instvars" : [ ], "name" : "TestPragma", diff --git a/packages/OmegaPrint-Tests.package/TestPragmaValues.class/README.md b/packages/OmegaPrint-Tests.package/TestPragmaValues.class/README.md index e69de29..66ed493 100644 --- a/packages/OmegaPrint-Tests.package/TestPragmaValues.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestPragmaValues.class/README.md @@ -0,0 +1,3 @@ +TestPragmaValues is the class which checks whether the prettifying of the TestPragmaValuesNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestPragmaValues.class/instance/testWithMultipleKeywordPragmas.st b/packages/OmegaPrint-Tests.package/TestPragmaValues.class/instance/testWithMultipleKeywordPragmas.st index d3e9279..7948bf2 100644 --- a/packages/OmegaPrint-Tests.package/TestPragmaValues.class/instance/testWithMultipleKeywordPragmas.st +++ b/packages/OmegaPrint-Tests.package/TestPragmaValues.class/instance/testWithMultipleKeywordPragmas.st @@ -2,5 +2,5 @@ keyword testWithMultipleKeywordPragmas self - prettify: 'identifier1:pragmaLiteral1 identifier2:pragmaLiteral2' - shouldEqual: 'identifier1: pragmaLiteral1' , String cr , 'identifier2: pragmaLiteral2' \ No newline at end of file + prettify: 'key1:pragmaLiteral1 key2:pragmaLiteral2' + shouldEqual: 'key1: pragmaLiteral1' , self lf , 'key2: pragmaLiteral2' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestPragmaValues.class/instance/testWithSingleKeywordPragma.st b/packages/OmegaPrint-Tests.package/TestPragmaValues.class/instance/testWithSingleKeywordPragma.st index fd657c7..6610649 100644 --- a/packages/OmegaPrint-Tests.package/TestPragmaValues.class/instance/testWithSingleKeywordPragma.st +++ b/packages/OmegaPrint-Tests.package/TestPragmaValues.class/instance/testWithSingleKeywordPragma.st @@ -2,5 +2,5 @@ keyword testWithSingleKeywordPragma self - prettify: 'identifier:pragmaLiteral' - shouldEqual: 'identifier: pragmaLiteral' \ No newline at end of file + prettify: 'key:pragmaLiteral' + shouldEqual: 'key: pragmaLiteral' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestPragmaValues.class/instance/testWithUnaryPragma.st b/packages/OmegaPrint-Tests.package/TestPragmaValues.class/instance/testWithUnaryPragma.st index aaee95b..618072a 100644 --- a/packages/OmegaPrint-Tests.package/TestPragmaValues.class/instance/testWithUnaryPragma.st +++ b/packages/OmegaPrint-Tests.package/TestPragmaValues.class/instance/testWithUnaryPragma.st @@ -2,5 +2,5 @@ unary testWithUnaryPragma self - prettify: 'identifier' - shouldEqual: 'identifier' \ No newline at end of file + prettify: 'unaryPragma' + shouldEqual: 'unaryPragma' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestPragmaValues.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestPragmaValues.class/methodProperties.json index 4e1a23a..cdda093 100644 --- a/packages/OmegaPrint-Tests.package/TestPragmaValues.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestPragmaValues.class/methodProperties.json @@ -3,6 +3,6 @@ }, "instance" : { "startSymbol" : "TA 7/17/2020 09:14", - "testWithMultipleKeywordPragmas" : "TA 7/30/2020 15:30", - "testWithSingleKeywordPragma" : "TA 7/17/2020 09:44", - "testWithUnaryPragma" : "TA 8/1/2020 12:21" } } + "testWithMultipleKeywordPragmas" : "fau 8/7/2020 08:00", + "testWithSingleKeywordPragma" : "fau 8/7/2020 08:00", + "testWithUnaryPragma" : "fau 8/7/2020 07:59" } } diff --git a/packages/OmegaPrint-Tests.package/TestPragmaValues.class/properties.json b/packages/OmegaPrint-Tests.package/TestPragmaValues.class/properties.json index 983ad7a..e03ab2d 100644 --- a/packages/OmegaPrint-Tests.package/TestPragmaValues.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestPragmaValues.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:49", "instvars" : [ ], "name" : "TestPragmaValues", diff --git a/packages/OmegaPrint-Tests.package/TestPragmas.class/README.md b/packages/OmegaPrint-Tests.package/TestPragmas.class/README.md index e69de29..ae0a4cc 100644 --- a/packages/OmegaPrint-Tests.package/TestPragmas.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestPragmas.class/README.md @@ -0,0 +1,3 @@ +TestPragmas is the class which checks whether the prettifying of the PragmasNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestPragmas.class/instance/testWithMultiplePragmas.st b/packages/OmegaPrint-Tests.package/TestPragmas.class/instance/testWithMultiplePragmas.st index 20c60df..eb9c3c8 100644 --- a/packages/OmegaPrint-Tests.package/TestPragmas.class/instance/testWithMultiplePragmas.st +++ b/packages/OmegaPrint-Tests.package/TestPragmas.class/instance/testWithMultiplePragmas.st @@ -3,4 +3,4 @@ testWithMultiplePragmas self prettify: '' - shouldEqual: '' , String cr , '' \ No newline at end of file + shouldEqual: '' , self lf , '' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestPragmas.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestPragmas.class/methodProperties.json index d073ee2..2301668 100644 --- a/packages/OmegaPrint-Tests.package/TestPragmas.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestPragmas.class/methodProperties.json @@ -3,6 +3,6 @@ }, "instance" : { "startSymbol" : "TA 7/16/2020 16:44", - "testWithMultiplePragmas" : "TA 7/16/2020 16:46", + "testWithMultiplePragmas" : "fau 8/6/2020 17:08", "testWithSinglePragma" : "TA 7/16/2020 16:44", "testWithoutPragma" : "TA 7/16/2020 16:44" } } diff --git a/packages/OmegaPrint-Tests.package/TestPragmas.class/properties.json b/packages/OmegaPrint-Tests.package/TestPragmas.class/properties.json index 0f65566..e658390 100644 --- a/packages/OmegaPrint-Tests.package/TestPragmas.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestPragmas.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:50", "instvars" : [ ], "name" : "TestPragmas", diff --git a/packages/OmegaPrint-Tests.package/TestStatement.class/README.md b/packages/OmegaPrint-Tests.package/TestStatement.class/README.md index e69de29..f24f388 100644 --- a/packages/OmegaPrint-Tests.package/TestStatement.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestStatement.class/README.md @@ -0,0 +1,3 @@ +TestStatement is the class which checks whether the prettifying of the StatementNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestStatement.class/properties.json b/packages/OmegaPrint-Tests.package/TestStatement.class/properties.json index 5a71aa6..360b98e 100644 --- a/packages/OmegaPrint-Tests.package/TestStatement.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestStatement.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:50", "instvars" : [ ], "name" : "TestStatement", diff --git a/packages/OmegaPrint-Tests.package/TestStatements.class/README.md b/packages/OmegaPrint-Tests.package/TestStatements.class/README.md index e69de29..309d519 100644 --- a/packages/OmegaPrint-Tests.package/TestStatements.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestStatements.class/README.md @@ -0,0 +1,3 @@ +TestStatements is the class which checks whether the prettifying of the StatementsNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestStatements.class/instance/testWithMultipleStatements.st b/packages/OmegaPrint-Tests.package/TestStatements.class/instance/testWithMultipleStatements.st index c98ac7c..c38cd91 100644 --- a/packages/OmegaPrint-Tests.package/TestStatements.class/instance/testWithMultipleStatements.st +++ b/packages/OmegaPrint-Tests.package/TestStatements.class/instance/testWithMultipleStatements.st @@ -3,4 +3,4 @@ testWithMultipleStatements self prettify: 'statement1.statement2.' - shouldEqual: 'statement1.' , String cr , 'statement2' \ No newline at end of file + shouldEqual: 'statement1.' , self lf , 'statement2' \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestStatements.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestStatements.class/methodProperties.json index d353f29..6438737 100644 --- a/packages/OmegaPrint-Tests.package/TestStatements.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestStatements.class/methodProperties.json @@ -3,6 +3,6 @@ }, "instance" : { "startSymbol" : "PS 7/5/2020 18:42", - "testWithMultipleStatements" : "PS 8/4/2020 07:08", + "testWithMultipleStatements" : "fau 8/6/2020 17:08", "testWithSingleStatement" : "fau 7/10/2020 10:47", "testWithoutStatement" : "PS 7/5/2020 18:44" } } diff --git a/packages/OmegaPrint-Tests.package/TestStatements.class/properties.json b/packages/OmegaPrint-Tests.package/TestStatements.class/properties.json index 2a043e9..2ffcfa7 100644 --- a/packages/OmegaPrint-Tests.package/TestStatements.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestStatements.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:50", "instvars" : [ ], "name" : "TestStatements", diff --git a/packages/OmegaPrint-Tests.package/TestUI.class/README.md b/packages/OmegaPrint-Tests.package/TestUI.class/README.md index e69de29..7e9f5fe 100644 --- a/packages/OmegaPrint-Tests.package/TestUI.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestUI.class/README.md @@ -0,0 +1 @@ +The TestUI class holds all tests for the UI namely the button and the codeholder. It tests the existence of the button and it's functionality. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestUI.class/instance/exampleMethod.st b/packages/OmegaPrint-Tests.package/TestUI.class/instance/exampleMethod.st index 616370c..7be61d9 100644 --- a/packages/OmegaPrint-Tests.package/TestUI.class/instance/exampleMethod.st +++ b/packages/OmegaPrint-Tests.package/TestUI.class/instance/exampleMethod.st @@ -1,6 +1,6 @@ button functionality exampleMethod - | localVariable localVariable2 | - localVariable := 1. - localVariable2 := 2 \ No newline at end of file + | variable1 variable2 | + variable1 := 1. + variable2 := 1 \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestUI.class/instance/testAboutToStyleImplemented.st b/packages/OmegaPrint-Tests.package/TestUI.class/instance/testAboutToStyleImplemented.st index d7d5caf..0436115 100644 --- a/packages/OmegaPrint-Tests.package/TestUI.class/instance/testAboutToStyleImplemented.st +++ b/packages/OmegaPrint-Tests.package/TestUI.class/instance/testAboutToStyleImplemented.st @@ -1,5 +1,6 @@ message trace testAboutToStyleImplemented + | messageSet | messageSet := MessageSet new. messageSet contentsSymbol: #omegaPrint. diff --git a/packages/OmegaPrint-Tests.package/TestUI.class/instance/testFormatString.st b/packages/OmegaPrint-Tests.package/TestUI.class/instance/testFormatString.st index f0c8c91..c201472 100644 --- a/packages/OmegaPrint-Tests.package/TestUI.class/instance/testFormatString.st +++ b/packages/OmegaPrint-Tests.package/TestUI.class/instance/testFormatString.st @@ -10,5 +10,5 @@ testFormatString assert: result equals: (OPPrinter format: method - in: TestUI + in: self class notifying: nil) \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestUI.class/instance/testOmegaPrintQuint.st b/packages/OmegaPrint-Tests.package/TestUI.class/instance/testOmegaPrintQuint.st index b62739b..45f5175 100644 --- a/packages/OmegaPrint-Tests.package/TestUI.class/instance/testOmegaPrintQuint.st +++ b/packages/OmegaPrint-Tests.package/TestUI.class/instance/testOmegaPrintQuint.st @@ -4,6 +4,12 @@ testOmegaPrintQuint | quint | quint := OPUserInterface omegaPrintQuint. self assert: quint size = 5. - self assert: #omegaPrint equals: quint first. - self assert: #toggleOmegaPrint equals: quint second. - self assert: #omegaPrintString equals: quint third \ No newline at end of file + self + assert: #omegaPrint + equals: quint first. + self + assert: #toggleOmegaPrint + equals: quint second. + self + assert: #omegaPrintString + equals: quint third \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestUI.class/instance/testToggleOmegaPrint.st b/packages/OmegaPrint-Tests.package/TestUI.class/instance/testToggleOmegaPrint.st index d49c2aa..65b1b8a 100644 --- a/packages/OmegaPrint-Tests.package/TestUI.class/instance/testToggleOmegaPrint.st +++ b/packages/OmegaPrint-Tests.package/TestUI.class/instance/testToggleOmegaPrint.st @@ -5,6 +5,10 @@ testToggleOmegaPrint codeHolder := CodeHolder new. codeHolder contentsSymbol: #omegaPrint. codeHolder toggleOmegaPrint. - self assert: #source equals: codeHolder contentsSymbol. + self + assert: #source + equals: codeHolder contentsSymbol. codeHolder toggleOmegaPrint. - self assert: #omegaPrint equals: codeHolder contentsSymbol \ No newline at end of file + self + assert: #omegaPrint + equals: codeHolder contentsSymbol \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestUI.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestUI.class/methodProperties.json index 02497b4..b0de6f9 100644 --- a/packages/OmegaPrint-Tests.package/TestUI.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestUI.class/methodProperties.json @@ -2,15 +2,15 @@ "class" : { }, "instance" : { - "exampleMethod" : "TA 7/30/2020 18:08", - "testAboutToStyleImplemented" : "fau 7/10/2020 11:53", + "exampleMethod" : "PK 8/7/2020 16:10", + "testAboutToStyleImplemented" : "fau 8/5/2020 13:42", "testCodeHolderOmegaPrintNotStyleable" : "PK 7/7/2020 12:10", "testCodeHolderOmegaPrintStyleable" : "TA 6/25/2020 20:59", "testExistenceButton" : "PS 7/5/2020 18:56", - "testFormatString" : "TA 6/25/2020 20:53", - "testFormatStringWithButton" : "TA 6/25/2020 20:51", - "testOmegaPrintQuint" : "fau 8/4/2020 10:23", + "testFormatString" : "TA 8/6/2020 08:03", + "testFormatStringWithButton" : "fau 8/5/2020 21:45", + "testOmegaPrintQuint" : "PK 8/7/2020 16:13", "testOmegaPrintStringNegative" : "PS 7/7/2020 12:00", "testOmegaPrintStringPositive" : "PS 7/7/2020 12:01", "testRepeatAddButton" : "fau 6/28/2020 18:19", - "testToggleOmegaPrint" : "fau 7/10/2020 11:53" } } + "testToggleOmegaPrint" : "PK 8/7/2020 16:14" } } diff --git a/packages/OmegaPrint-Tests.package/TestUI.class/properties.json b/packages/OmegaPrint-Tests.package/TestUI.class/properties.json index 5f5f0af..a4fc7cc 100644 --- a/packages/OmegaPrint-Tests.package/TestUI.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestUI.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 8/2/2020 08:22", "instvars" : [ ], "name" : "TestUI", diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/README.md b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/README.md index e69de29..bdcd97b 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/README.md @@ -0,0 +1,3 @@ +TestUnaryMessage is the class which checks whether the prettifying of the UnaryMessageNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithFalse.st b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithFalse.st similarity index 74% rename from packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithFalse.st rename to packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithFalse.st index 7b3580e..06308d5 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithFalse.st +++ b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithFalse.st @@ -1,5 +1,5 @@ special cases -testUnaryMessageWithFalse +testWithFalse self prettify: 'falseMessage' diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithNil.st b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithNil.st similarity index 75% rename from packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithNil.st rename to packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithNil.st index 763591e..c7e86f0 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithNil.st +++ b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithNil.st @@ -1,5 +1,5 @@ special cases -testUnaryMessageWithNil +testWithNil self prettify: 'nilMessage' diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithSelf.st b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithSelf.st similarity index 75% rename from packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithSelf.st rename to packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithSelf.st index 72bee9f..0cc684a 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithSelf.st +++ b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithSelf.st @@ -1,5 +1,5 @@ special cases -testUnaryMessageWithSelf +testWithSelf self prettify: 'selfMessage' diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithSuper.st b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithSuper.st similarity index 74% rename from packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithSuper.st rename to packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithSuper.st index e322a1f..8525bc6 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithSuper.st +++ b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithSuper.st @@ -1,5 +1,5 @@ special cases -testUnaryMessageWithSuper +testWithSuper self prettify: 'superMessage' diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithThisContext.st b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithThisContext.st similarity index 73% rename from packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithThisContext.st rename to packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithThisContext.st index 6c86224..a067a95 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithThisContext.st +++ b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithThisContext.st @@ -1,5 +1,5 @@ special cases -testUnaryMessageWithThisContext +testWithThisContext self prettify: 'thisContextMessage' diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithTrue.st b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithTrue.st similarity index 75% rename from packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithTrue.st rename to packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithTrue.st index 9c91d64..7c2b30e 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testUnaryMessageWithTrue.st +++ b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/instance/testWithTrue.st @@ -1,5 +1,5 @@ special cases -testUnaryMessageWithTrue +testWithTrue self prettify: 'trueMessage' diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/methodProperties.json index 7a1572a..c5ba81b 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/methodProperties.json @@ -3,10 +3,10 @@ }, "instance" : { "startSymbol" : "PS 7/5/2020 20:17", - "testUnaryMessageWithFalse" : "fau 7/10/2020 10:48", - "testUnaryMessageWithNil" : "fau 7/10/2020 10:48", - "testUnaryMessageWithSelf" : "fau 7/10/2020 10:48", - "testUnaryMessageWithSuper" : "fau 7/10/2020 10:48", - "testUnaryMessageWithThisContext" : "fau 7/10/2020 10:48", - "testUnaryMessageWithTrue" : "fau 7/10/2020 10:48", - "testWithSelector" : "fau 7/10/2020 11:14" } } + "testWithFalse" : "fau 8/7/2020 08:03", + "testWithNil" : "fau 8/7/2020 08:03", + "testWithSelector" : "fau 7/10/2020 11:14", + "testWithSelf" : "fau 8/7/2020 08:03", + "testWithSuper" : "fau 8/7/2020 08:03", + "testWithThisContext" : "fau 8/7/2020 08:03", + "testWithTrue" : "fau 8/7/2020 08:04" } } diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/properties.json b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/properties.json index 5b6dcac..8f24375 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestUnaryMessage.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:51", "instvars" : [ ], "name" : "TestUnaryMessage", diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMessageSend.class/README.md b/packages/OmegaPrint-Tests.package/TestUnaryMessageSend.class/README.md index e69de29..4af6e5e 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMessageSend.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestUnaryMessageSend.class/README.md @@ -0,0 +1,3 @@ +TestUnaryMessageSend is the class which checks whether the prettifying of the UnaryMessageSendNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMessageSend.class/properties.json b/packages/OmegaPrint-Tests.package/TestUnaryMessageSend.class/properties.json index fc01e0d..b3ba882 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMessageSend.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestUnaryMessageSend.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:51", "instvars" : [ ], "name" : "TestUnaryMessageSend", diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/README.md b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/README.md index e69de29..8da9eab 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/README.md +++ b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/README.md @@ -0,0 +1,3 @@ +TestUnaryMethodHeader is the class which checks whether the prettifying of the UnaryMethodHeaderNode is correct. + +Further information can be found in the OPTestEvaluator. \ No newline at end of file diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithFalse.st b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithFalse.st similarity index 74% rename from packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithFalse.st rename to packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithFalse.st index be899eb..f860827 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithFalse.st +++ b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithFalse.st @@ -1,5 +1,5 @@ special cases -testMethodHeaderWithFalse +testWithFalse self prettify: 'falseHeader' diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithNil.st b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithNil.st similarity index 74% rename from packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithNil.st rename to packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithNil.st index 7fae064..632d8d4 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithNil.st +++ b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithNil.st @@ -1,5 +1,5 @@ special cases -testMethodHeaderWithNil +testWithNil self prettify: 'nilHeader' diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithSelf.st b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithSelf.st similarity index 74% rename from packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithSelf.st rename to packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithSelf.st index 4b450ad..7916b5c 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithSelf.st +++ b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithSelf.st @@ -1,5 +1,5 @@ special cases -testMethodHeaderWithSelf +testWithSelf self prettify: 'selfHeader' diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithSuper.st b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithSuper.st similarity index 74% rename from packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithSuper.st rename to packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithSuper.st index b6be2a4..83b18dd 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithSuper.st +++ b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithSuper.st @@ -1,5 +1,5 @@ special cases -testMethodHeaderWithSuper +testWithSuper self prettify: 'superHeader' diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithThisContext.st b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithThisContext.st similarity index 73% rename from packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithThisContext.st rename to packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithThisContext.st index 8e092a4..d665b6a 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithThisContext.st +++ b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithThisContext.st @@ -1,5 +1,5 @@ special cases -testMethodHeaderWithThisContext +testWithThisContext self prettify: 'thisContextHeader' diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithTrue.st b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithTrue.st similarity index 74% rename from packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithTrue.st rename to packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithTrue.st index 8ca8268..2c37bbe 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testMethodHeaderWithTrue.st +++ b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/instance/testWithTrue.st @@ -1,5 +1,5 @@ special cases -testMethodHeaderWithTrue +testWithTrue self prettify: 'trueHeader' diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/methodProperties.json b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/methodProperties.json index ebd7fc5..bb07c95 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/methodProperties.json +++ b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/methodProperties.json @@ -3,10 +3,10 @@ }, "instance" : { "startSymbol" : "PS 7/5/2020 18:36", - "testMethodHeaderWithFalse" : "fau 7/10/2020 10:50", - "testMethodHeaderWithNil" : "fau 7/10/2020 10:51", - "testMethodHeaderWithSelf" : "fau 7/10/2020 10:51", - "testMethodHeaderWithSuper" : "fau 7/10/2020 10:51", - "testMethodHeaderWithThisContext" : "fau 7/10/2020 10:51", - "testMethodHeaderWithTrue" : "fau 7/10/2020 10:51", - "testWithSelector" : "fau 7/10/2020 11:01" } } + "testWithFalse" : "fau 8/7/2020 08:05", + "testWithNil" : "fau 8/7/2020 08:05", + "testWithSelector" : "fau 7/10/2020 11:01", + "testWithSelf" : "fau 8/7/2020 08:05", + "testWithSuper" : "fau 8/7/2020 08:05", + "testWithThisContext" : "fau 8/7/2020 08:05", + "testWithTrue" : "fau 8/7/2020 08:05" } } diff --git a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/properties.json b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/properties.json index 55ec333..3272a89 100644 --- a/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/properties.json +++ b/packages/OmegaPrint-Tests.package/TestUnaryMethodHeader.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "PK 7/30/2020 16:52", "instvars" : [ ], "name" : "TestUnaryMethodHeader", diff --git a/screenshots/click_formatting_selection.png b/screenshots/click_formatting_selection.png new file mode 100644 index 0000000..d17928b Binary files /dev/null and b/screenshots/click_formatting_selection.png differ diff --git a/screenshots/hover_formatting_selection.png b/screenshots/hover_formatting_selection.png new file mode 100644 index 0000000..a188cc0 Binary files /dev/null and b/screenshots/hover_formatting_selection.png differ