add new tests, format code (#157)

Co-authored-by: Marie Fischer <zoe23@online.de>

.squot

@@ -3,5 +3,6 @@ OrderedDictionary {
 	'packages/MarkdownEditor-Core.package' : #SquotCypressCodeSerializer,
 	'packages/MarkdownEditor-Tests.package' : #SquotCypressCodeSerializer,
 	'packages/MarkdownEditor-Utilities.package' : #SquotCypressCodeSerializer,
+	'MarkdownEditor-Parsing.package' : #SquotCypressCodeSerializer,
 	'packages/MarkdownEditor-Parsing.package' : #SquotCypressCodeSerializer
 }

MarkdownEditor-Parsing.package/.filetree

@@ -0,0 +1,4 @@
+{
+	"noMethodMetaData" : true,
+	"separateMethodMetaAndSource" : false,
+	"useCypressPropertiesFile" : true }

MarkdownEditor-Parsing.package/.squot-contents

@@ -0,0 +1,5 @@
+SquotTrackedObjectMetadata {
+	#objectClassName : #PackageInfo,
+	#objectsReplacedByNames : true,
+	#serializer : #SquotCypressCodeSerializer
+}

MarkdownEditor-Parsing.package/MarkdownATXHeading2.class/class/newFrom..st

@@ -0,0 +1,6 @@
+as yet unclassified
+newFrom: aString
+
+	^ ((self newWithOutClosingTagFrom: aString) 
+		ifNil: [self newWithClosingTagFrom: aString])
+

MarkdownEditor-Parsing.package/MarkdownATXHeading2.class/class/newWithClosingTagFrom..st

@@ -0,0 +1,12 @@
+as yet unclassified
+newWithClosingTagFrom: aString
+
+	| matcher |
+	matcher := RxMatcher forString: '\s{0,3}(#{1,6})(\s+(.*\S)\s+#+\s*|[#\s]*)'.
+	(matcher matches: aString)
+		ifTrue: [^self new
+				level: ((matcher subexpressions: 2) first size);
+				content: (StringUtil unescape: {$#} in: ((matcher subexpressions: 4) at: 1 ifAbsent: ['']));
+				isOpen: false;
+				yourself].
+	^ nil

MarkdownEditor-Parsing.package/MarkdownATXHeading2.class/class/newWithOutClosingTagFrom..st

@@ -0,0 +1,14 @@
+as yet unclassified
+newWithOutClosingTagFrom: aString
+
+	| matcher |
+	matcher := RxMatcher forString: '\s{0,3}(#{1,6})\s+(.*[^#\s])\s*'.
+	(matcher matches: aString) ifFalse: 
+	[matcher := RxMatcher forString: '\s{0,3}(#{1,6})\s+((\s*#*[^#\s]#*)*)\s*'].
+	(matcher matches: aString)
+		ifTrue: [^ self new
+				level: ((matcher subexpressions: 2) first size);
+				content: (StringUtil unescape: {$#} in: ((matcher subexpressions: 3) at: 1 ifAbsent: ['']));
+				isOpen: false;
+				yourself].
+	^ nil

MarkdownEditor-Parsing.package/MarkdownATXHeading2.class/instance/applyOnLine..st

@@ -0,0 +1,4 @@
+as yet unclassified
+applyOnLine: aString
+
+	^ nil

MarkdownEditor-Parsing.package/MarkdownATXHeading2.class/instance/level..st

@@ -0,0 +1,3 @@
+accessing
+level: anObject
+	level := anObject

MarkdownEditor-Parsing.package/MarkdownATXHeading2.class/instance/level.st

@@ -0,0 +1,3 @@
+accessing
+level
+	^ level

MarkdownEditor-Parsing.package/MarkdownATXHeading2.class/methodProperties.json

@@ -0,0 +1,9 @@
+{
+	"class" : {
+		"newFrom:" : "C.H. 6/14/2021 15:13",
+		"newWithClosingTagFrom:" : "C.H. 6/14/2021 15:14",
+		"newWithOutClosingTagFrom:" : "C.H. 6/14/2021 17:09" },
+	"instance" : {
+		"applyOnLine:" : "C.H. 6/11/2021 11:57",
+		"level" : "C.H. 6/5/2021 11:23",
+		"level:" : "C.H. 6/5/2021 11:23" } }

MarkdownEditor-Parsing.package/MarkdownATXHeading2.class/properties.json

@@ -0,0 +1,14 @@
+{
+	"category" : "MarkdownEditor-Parsing",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"level" ],
+	"name" : "MarkdownATXHeading2",
+	"pools" : [
+		 ],
+	"super" : "MarkdownLeafBlock",
+	"type" : "normal" }

MarkdownEditor-Parsing.package/MarkdownBlankLine2.class/class/newFrom..st

@@ -0,0 +1,11 @@
+as yet unclassified
+newFrom: aString
+
+	| matcher |
+	matcher := RxMatcher forString: '\s*'.
+	(matcher matches: aString)
+	ifTrue: [^self new 
+				content: '';
+				isOpen: false;
+				yourself].
+	^ nil 		

MarkdownEditor-Parsing.package/MarkdownBlankLine2.class/instance/applyOnLine..st

@@ -0,0 +1,4 @@
+as yet unclassified
+applyOnLine: aString
+
+	^ nil

MarkdownEditor-Parsing.package/MarkdownBlankLine2.class/methodProperties.json

@@ -0,0 +1,5 @@
+{
+	"class" : {
+		"newFrom:" : "C.H. 6/14/2021 17:35" },
+	"instance" : {
+		"applyOnLine:" : "C.H. 6/14/2021 17:20" } }

MarkdownEditor-Parsing.package/MarkdownBlankLine2.class/properties.json

@@ -0,0 +1,14 @@
+{
+	"category" : "MarkdownEditor-Parsing",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "MarkdownBlankLine2",
+	"pools" : [
+		 ],
+	"super" : "MarkdownLeafBlock",
+	"type" : "normal" }

MarkdownEditor-Parsing.package/MarkdownBlock2.class/class/newFrom..st

@@ -0,0 +1,4 @@
+as yet unclassified
+newFrom: aString
+
+	^self subclassResponsibility

MarkdownEditor-Parsing.package/MarkdownBlock2.class/class/startsWith..st

@@ -0,0 +1,4 @@
+as yet unclassified
+startsWith: aString
+
+	^ self subclassResponsibility

MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/applyOnLine..st

@@ -0,0 +1,4 @@
+nil
+applyOnLine: aMakdownLine
+
+	^self subclassResponsibility

MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/asString.st

@@ -0,0 +1,4 @@
+accessing
+asString
+
+	^ self asStringWithIndent: ''

MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/close.st

@@ -0,0 +1,4 @@
+accessing
+close
+
+	^ self subclassResponsibility

MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/initialize.st

@@ -0,0 +1,4 @@
+initialisation
+initialize
+
+	self isOpen: true.

MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/isOpen..st

@@ -0,0 +1,3 @@
+accessing
+isOpen: anObject
+	isOpen := anObject

MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/isOpen.st

@@ -0,0 +1,3 @@
+accessing
+isOpen
+	^ isOpen

MarkdownEditor-Parsing.package/MarkdownBlock2.class/methodProperties.json

@@ -0,0 +1,11 @@
+{
+	"class" : {
+		"newFrom:" : "C.H. 6/3/2021 16:41",
+		"startsWith:" : "C.H. 6/3/2021 16:36" },
+	"instance" : {
+		"applyOnLine:" : "C.H. 6/5/2021 11:12",
+		"asString" : "C.H. 6/14/2021 16:33",
+		"close" : "LL 6/15/2021 10:45",
+		"initialize" : "C.H. 6/6/2021 11:11",
+		"isOpen" : "C.H. 6/5/2021 11:14",
+		"isOpen:" : "C.H. 6/5/2021 11:14" } }

MarkdownEditor-Parsing.package/MarkdownBlock2.class/properties.json

@@ -0,0 +1,14 @@
+{
+	"category" : "MarkdownEditor-Parsing",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"isOpen" ],
+	"name" : "MarkdownBlock2",
+	"pools" : [
+		 ],
+	"super" : "Object",
+	"type" : "normal" }

MarkdownEditor-Parsing.package/MarkdownBlockquote2.class/class/newFrom..st

@@ -0,0 +1,10 @@
+as yet unclassified
+newFrom: aString
+
+	| matcher |
+	matcher := RxMatcher forString: '\s{0,3}>\s?(.*)'.
+	(matcher matches: aString)
+		ifTrue: [^self new 
+				innerLine: ((matcher subexpressions: 2) first);
+				yourself].
+	^ nil

MarkdownEditor-Parsing.package/MarkdownBlockquote2.class/instance/applyOnLine..st

@@ -0,0 +1,9 @@
+as yet unclassified
+applyOnLine: aString
+
+	"should also remain open if the line is a simple paragraph"
+	| matcher |
+	matcher := RxMatcher forString: '\s{0,3}>\s?(.*)'.
+	(matcher matches: aString)
+		ifTrue: [^(matcher subexpressions: 2) first].
+	^ nil

MarkdownEditor-Parsing.package/MarkdownBlockquote2.class/methodProperties.json

@@ -0,0 +1,5 @@
+{
+	"class" : {
+		"newFrom:" : "LL 6/7/2021 18:15" },
+	"instance" : {
+		"applyOnLine:" : "LL 6/7/2021 18:30" } }

MarkdownEditor-Parsing.package/MarkdownBlockquote2.class/properties.json

@@ -0,0 +1,14 @@
+{
+	"category" : "MarkdownEditor-Parsing",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "MarkdownBlockquote2",
+	"pools" : [
+		 ],
+	"super" : "MarkdownContainerBlock",
+	"type" : "normal" }

MarkdownEditor-Parsing.package/MarkdownBold2.class/methodProperties.json

@@ -0,0 +1,5 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		 } }

MarkdownEditor-Parsing.package/MarkdownBold2.class/properties.json

@@ -0,0 +1,14 @@
+{
+	"category" : "MarkdownEditor-Parsing",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "MarkdownBold2",
+	"pools" : [
+		 ],
+	"super" : "MarkdownEmphasis2",
+	"type" : "normal" }

MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/asStringWithIndent..st

@@ -0,0 +1,7 @@
+accessing
+asStringWithIndent: aString
+
+	^ (self children 
+		inject: (aString, 'a', self class, ' with subelements: ', Character cr, aString, '{ ', Character cr) 
+		into: [:text :child | text, (child asStringWithIndent: aString, '    '), ',', Character cr])
+			,aString, '}'

MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/children..st

@@ -0,0 +1,3 @@
+accessing
+children: anObject
+	children := anObject

MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/children.st

@@ -0,0 +1,3 @@
+accessing
+children
+	^ children

MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/close.st

@@ -0,0 +1,5 @@
+accessing
+close
+
+	self isOpen: false.
+	self children do: [:child | child close]. 

MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/initialize.st

@@ -0,0 +1,5 @@
+accessing
+initialize
+
+	super initialize.
+	self children: OrderedCollection new.

MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/innerLine..st

@@ -0,0 +1,3 @@
+accessing
+innerLine: anObject
+	innerLine := anObject

MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/innerLine.st

@@ -0,0 +1,3 @@
+accessing
+innerLine
+	^ innerLine

MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/methodProperties.json

@@ -0,0 +1,11 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"asStringWithIndent:" : "C.H. 6/14/2021 16:32",
+		"children" : "C.H. 5/31/2021 11:51",
+		"children:" : "C.H. 5/31/2021 11:51",
+		"close" : "C.H. 6/12/2021 17:13",
+		"initialize" : "jh 6/8/2021 08:58",
+		"innerLine" : "LL 6/7/2021 18:15",
+		"innerLine:" : "LL 6/7/2021 18:15" } }

MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/properties.json

@@ -0,0 +1,15 @@
+{
+	"category" : "MarkdownEditor-Parsing",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"innerLine",
+		"children" ],
+	"name" : "MarkdownContainerBlock",
+	"pools" : [
+		 ],
+	"super" : "MarkdownBlock2",
+	"type" : "normal" }

MarkdownEditor-Parsing.package/MarkdownDelimiter.class/class/newFrom..st

@@ -0,0 +1,12 @@
+creation
+newFrom: aString
+
+	| type |
+	type := aString second.
+	^ self new
+		count: (aString occurrencesOfRegex: '\',type);
+		type: type;
+		setOpenClosePropertyFrom: aString;
+		beValid;
+		yourself
+

MarkdownEditor-Parsing.package/MarkdownDelimiter.class/instance/^equals.st

@@ -0,0 +1,8 @@
+helpers
+= anotherDelimiter
+
+	^ (self type = anotherDelimiter type) 
+		and: [self count = anotherDelimiter count]
+		and: [self isPotentialOpener = anotherDelimiter isPotentialOpener]
+		and: [self isPotentialCloser = anotherDelimiter isPotentialCloser]
+		and: [self index = anotherDelimiter index]

MarkdownEditor-Parsing.package/MarkdownDelimiter.class/instance/asMarkdownString.st

@@ -0,0 +1,8 @@
+helpers
+asMarkdownString
+
+	| content |
+	content := ''.
+	self count
+		timesRepeat: [content := content , self type asString].
+	^ MarkdownString2 newFrom: content

MarkdownEditor-Parsing.package/MarkdownDelimiter.class/instance/beNotPotentialCloser.st

@@ -0,0 +1,4 @@
+accessing
+beNotPotentialCloser
+
+	potentialCloser := false

MarkdownEditor-Parsing.package/MarkdownDelimiter.class/instance/bePotentialCloser.st

@@ -0,0 +1,4 @@
+accessing
+bePotentialCloser
+
+	potentialCloser := true

MarkdownEditor-Parsing.package/MarkdownDelimiter.class/instance/bePotentialOpener.st

@@ -0,0 +1,4 @@
+accessing
+bePotentialOpener
+
+	potentialOpener := true