most features working, added positions for styling to the blocks

hpi-swa-teaching · Jul 4, 2021 · cfba4ab · cfba4ab
1 parent 379114b
commit cfba4ab
Show file tree

Hide file tree

Showing 83 changed files with 264 additions and 269 deletions.
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownATXHeading2.class/class/createNew..st b/packages/MarkdownEditor-Parsing.package/MarkdownATXHeading2.class/class/createNew..st
@@ -5,9 +5,9 @@ createNew: aParsingState
 		newHeading := ((self newWithOutClosingTagFrom: aParsingState currentLine) 
 			ifNil: [self newWithClosingTagFrom: aParsingState currentLine])
 		ifNil: [^ 0].
-		aParsingState 
-			newBlock: newHeading;
-			reduceCurrentLineTo: ''.
+		newHeading startPosition: aParsingState charPos.
+		aParsingState newBlock: newHeading.
+		aParsingState newBlock innerLine: ''.
 		^ 2.
 
 

diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownATXHeading2.class/class/newFrom..st b/packages/MarkdownEditor-Parsing.package/MarkdownATXHeading2.class/class/newFrom..st
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownATXHeading2.class/methodProperties.json b/packages/MarkdownEditor-Parsing.package/MarkdownATXHeading2.class/methodProperties.json
@@ -1,7 +1,6 @@
 {
 	"class" : {
-		"createNew:" : "C.H. 6/30/2021 16:05",
-		"newFrom:" : "C.H. 6/14/2021 15:13",
+		"createNew:" : "C.H. 7/3/2021 21:05",
 		"newWithClosingTagFrom:" : "C.H. 6/30/2021 20:50",
 		"newWithOutClosingTagFrom:" : "C.H. 6/30/2021 20:51" },
 	"instance" : {

diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlankLine2.class/README.md b/packages/MarkdownEditor-Parsing.package/MarkdownBlankLine2.class/README.md
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlankLine2.class/class/newFrom..st b/packages/MarkdownEditor-Parsing.package/MarkdownBlankLine2.class/class/newFrom..st
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlankLine2.class/instance/continue..st b/packages/MarkdownEditor-Parsing.package/MarkdownBlankLine2.class/instance/continue..st
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlankLine2.class/methodProperties.json b/packages/MarkdownEditor-Parsing.package/MarkdownBlankLine2.class/methodProperties.json
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlankLine2.class/properties.json b/packages/MarkdownEditor-Parsing.package/MarkdownBlankLine2.class/properties.json
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/acceptsLines.st b/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/acceptsLines.st
@@ -1,4 +1,4 @@
-newStrat
+accessing
 acceptsLines
 
 	^ self subclassResponsibility
diff --git a/...ages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/adaptToDocumentWith..st b/...ages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/adaptToDocumentWith..st
@@ -1,5 +1,6 @@
-accessing
+applying
 adaptToDocumentWith: aParsingState
-
-	aParsingState tip addChild: self.
-	aParsingState tip: self.
+
+	aParsingState tip addChild: self withState: aParsingState.
+	aParsingState tip: self.
+	aParsingState reduceCurrentLineTo: self innerLine.
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/addChild..st b/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/addChild..st
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/addChild.withState..st b/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/addChild.withState..st
@@ -0,0 +1,9 @@
+applying
+addChild: aBlock withState: aParsingState
+
+	(self canContain: aBlock) 
+		ifFalse: [self finalize: aParsingState.
+			self beClosed. 
+			^ self container addChild: aBlock withState: aParsingState].
+	self appendChild: aBlock.
+	^ aBlock.
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/asString.st b/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/asString.st
@@ -1,4 +1,4 @@
-accessing
+debugging
 asString
 
 	^ self asStringWithIndent: ''
diff --git a/...downEditor-Parsing.package/MarkdownBlock2.class/instance/closeUnsuitableFor.withState..st b/...downEditor-Parsing.package/MarkdownBlock2.class/instance/closeUnsuitableFor.withState..st
@@ -0,0 +1,8 @@
+applying
+closeUnsuitableFor: aBlock withState: aParsingState 
+
+	(self canContain: aBlock) 
+		ifFalse: [self finalize: aParsingState.
+			self beClosed. 
+			^ self container closeUnsuitableFor: aBlock withState: aParsingState].
+	^ aBlock.
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/continue..st b/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/continue..st
@@ -1,4 +1,4 @@
-newStrat
+applying
 continue: aParserState
 
 	^ self subclassResponsibility
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/endPosition..st b/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/endPosition..st
@@ -0,0 +1,3 @@
+accessing
+endPosition: anObject
+	endPosition := anObject
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/endPosition.st b/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/endPosition.st
@@ -0,0 +1,3 @@
+accessing
+endPosition
+	^ endPosition
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/finalize..st b/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/finalize..st
@@ -1,4 +1,4 @@
-as yet unclassified
+applying
 finalize: aParsingState
 
-	^ self
+	self endPosition: aParsingState charPos - 1.
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/innerLine..st b/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/innerLine..st
@@ -0,0 +1,3 @@
+accessing
+innerLine: anObject
+	innerLine := anObject
diff --git a/...ontainerBlock.class/instance/innerLine.st → ...arkdownBlock2.class/instance/innerLine.st b/...ontainerBlock.class/instance/innerLine.st → ...arkdownBlock2.class/instance/innerLine.st
@@ -1,4 +1,3 @@
 accessing
 innerLine
-
 	^ innerLine
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/lastChild.st b/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/lastChild.st
@@ -0,0 +1,4 @@
+accessing
+lastChild
+
+	^ self subclassResponsibility.
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/startPosition..st b/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/startPosition..st
@@ -0,0 +1,3 @@
+accessing
+startPosition: anObject
+	startPosition := anObject
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/startPosition.st b/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/instance/startPosition.st
@@ -0,0 +1,3 @@
+accessing
+startPosition
+	^ startPosition
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/methodProperties.json b/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/methodProperties.json
@@ -3,15 +3,23 @@
 		"createNew:" : "C.H. 7/1/2021 12:02" },
 	"instance" : {
 		"acceptsLines" : "C.H. 6/29/2021 09:50",
-		"adaptToDocumentWith:" : "C.H. 7/1/2021 12:17",
-		"addChild:" : "C.H. 7/1/2021 15:21",
+		"adaptToDocumentWith:" : "C.H. 7/3/2021 21:10",
+		"addChild:withState:" : "C.H. 7/3/2021 20:21",
 		"asString" : "C.H. 6/14/2021 16:33",
 		"beClosed" : "JE 6/16/2021 13:07",
 		"beOpen" : "JE 6/16/2021 13:07",
 		"canContain:" : "C.H. 6/30/2021 15:32",
+		"closeUnsuitableFor:withState:" : "C.H. 7/3/2021 20:41",
 		"container" : "C.H. 6/23/2021 17:13",
 		"container:" : "C.H. 6/23/2021 17:13",
 		"continue:" : "C.H. 6/26/2021 20:23",
-		"finalize:" : "C.H. 6/29/2021 10:13",
+		"endPosition" : "C.H. 7/2/2021 15:55",
+		"endPosition:" : "C.H. 7/2/2021 15:55",
+		"finalize:" : "C.H. 7/4/2021 10:26",
 		"initialize" : "C.H. 7/1/2021 14:53",
-		"isOpen" : "JE 6/16/2021 13:06" } }
+		"innerLine" : "C.H. 7/3/2021 21:02",
+		"innerLine:" : "C.H. 7/3/2021 21:02",
+		"isOpen" : "JE 6/16/2021 13:06",
+		"lastChild" : "C.H. 7/3/2021 13:44",
+		"startPosition" : "C.H. 7/2/2021 15:55",
+		"startPosition:" : "C.H. 7/2/2021 15:55" } }
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/properties.json b/packages/MarkdownEditor-Parsing.package/MarkdownBlock2.class/properties.json
@@ -7,7 +7,10 @@
 	"commentStamp" : "",
 	"instvars" : [
 		"isOpen",
-		"container" ],
+		"container",
+		"startPosition",
+		"endPosition",
+		"innerLine" ],
 	"name" : "MarkdownBlock2",
 	"pools" : [
 		 ],

diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlockquote2.class/class/createNew..st b/packages/MarkdownEditor-Parsing.package/MarkdownBlockquote2.class/class/createNew..st
@@ -4,7 +4,10 @@ createNew: aParsingState
 	| matcher |
 	matcher := RxMatcher forString: '\s{0,3}>\s?(.*)'.
 	(matcher matches: aParsingState currentLine)
-		ifTrue: [aParsingState newBlock: self new.
-			aParsingState reduceCurrentLineTo: (matcher subexpressions: 2) first.
+		ifTrue: [aParsingState newBlock: 
+				(self new
+					startPosition: aParsingState charPos;
+					yourself).
+			aParsingState newBlock innerLine: (matcher subexpressions: 2) first.
 			^ 1].
 	^ 0
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlockquote2.class/class/newFrom..st b/packages/MarkdownEditor-Parsing.package/MarkdownBlockquote2.class/class/newFrom..st
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownBlockquote2.class/methodProperties.json b/packages/MarkdownEditor-Parsing.package/MarkdownBlockquote2.class/methodProperties.json
@@ -1,7 +1,6 @@
 {
 	"class" : {
-		"createNew:" : "C.H. 7/1/2021 15:25",
-		"newFrom:" : "LL 6/7/2021 18:15" },
+		"createNew:" : "C.H. 7/3/2021 21:06" },
 	"instance" : {
 		"acceptsLines" : "C.H. 6/29/2021 09:50",
 		"canContain:" : "C.H. 6/30/2021 15:34",

diff --git a/...ages/MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/appendChild..st b/...ages/MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/appendChild..st
@@ -1,4 +1,4 @@
-as yet unclassified
+accessing
 appendChild: aMarkdownBlock
 
 	aMarkdownBlock container: self.

diff --git a/...rkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/asStringWithIndent..st b/...rkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/asStringWithIndent..st
@@ -1,7 +1,7 @@
-accessing
+debugging
 asStringWithIndent: aString
 
 	^ (self children 
-		inject: (aString, 'a', self class, ' with subelements: ', Character cr, aString, '{ ', Character cr) 
+		inject: (aString, 'a', self class, ' range: (', self startPosition, ', ', self endPosition, ') with subelements: ', Character cr, aString, '{ ', Character cr) 
 		into: [:text :child | text, (child asStringWithIndent: aString, '    '), ',', Character cr])
 			,aString, '}'
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/initialize.st b/packages/MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/initialize.st
@@ -1,4 +1,4 @@
-accessing
+initialisation
 initialize
 
 	super initialize.

diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/innerLine..st b/packages/MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/innerLine..st
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/lastChild.st b/packages/MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/instance/lastChild.st
@@ -0,0 +1,5 @@
+accessing
+lastChild
+
+	self children ifEmpty: [^nil].
+	^ self children last.
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/methodProperties.json b/packages/MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/methodProperties.json
@@ -3,10 +3,9 @@
 		 },
 	"instance" : {
 		"appendChild:" : "C.H. 6/25/2021 08:22",
-		"asStringWithIndent:" : "C.H. 6/14/2021 16:32",
+		"asStringWithIndent:" : "C.H. 7/2/2021 19:17",
 		"children" : "JE 6/16/2021 13:11",
 		"children:" : "JE 6/16/2021 13:11",
 		"initialize" : "JE 6/16/2021 13:12",
-		"innerLine" : "JE 6/16/2021 13:11",
-		"innerLine:" : "JE 6/16/2021 13:12",
+		"lastChild" : "C.H. 7/3/2021 13:46",
 		"leafBlocks" : "LL 6/16/2021 15:02" } }
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/properties.json b/packages/MarkdownEditor-Parsing.package/MarkdownContainerBlock.class/properties.json
@@ -6,7 +6,6 @@
 		 ],
 	"commentStamp" : "",
 	"instvars" : [
-		"innerLine",
 		"children" ],
 	"name" : "MarkdownContainerBlock",
 	"pools" : [

diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownDocument.class/class/newFrom..st b/packages/MarkdownEditor-Parsing.package/MarkdownDocument.class/class/newFrom..st
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownDocument.class/instance/acceptsLines.st b/packages/MarkdownEditor-Parsing.package/MarkdownDocument.class/instance/acceptsLines.st
@@ -1,4 +1,4 @@
-as yet unclassified
+applying
 acceptsLines 
 
 	^ false
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownDocument.class/instance/canContain..st b/packages/MarkdownEditor-Parsing.package/MarkdownDocument.class/instance/canContain..st
@@ -1,4 +1,4 @@
-as yet unclassified
+applying
 canContain: aMarkdownBlock
 
 	^ aMarkdownBlock class ~= MarkdownListItem2
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownDocument.class/instance/continue..st b/packages/MarkdownEditor-Parsing.package/MarkdownDocument.class/instance/continue..st
@@ -1,4 +1,4 @@
-as yet unclassified
+applying
 continue: aParsingState
 
 	^ 0
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownDocument.class/methodProperties.json b/packages/MarkdownEditor-Parsing.package/MarkdownDocument.class/methodProperties.json
@@ -1,6 +1,6 @@
 {
 	"class" : {
-		"newFrom:" : "JE 6/16/2021 13:15" },
+		 },
 	"instance" : {
 		"acceptsLines" : "C.H. 6/29/2021 09:51",
 		"canContain:" : "C.H. 6/30/2021 15:34",

diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownFencedCodeBlock2.class/class/createNew..st b/packages/MarkdownEditor-Parsing.package/MarkdownFencedCodeBlock2.class/class/createNew..st
@@ -2,14 +2,14 @@ instance creation
 createNew: aParsingState
 
 	| matcher |
-	"((\s*)(`{3,1000}(?!.*`)|~{3,1000}))(.*)"
-	matcher := RxMatcher forString: '((\s*)(`{3,1000}|~{3,1000}))(.*)'.
+	matcher := RxMatcher forString: '((\s*)(`{3,1000}(?!.*`)|~{3,1000}))(.*)'.
 	(matcher matches: aParsingState currentLine)
 		ifTrue: [aParsingState newBlock: 
 				(self new
 					indention: ((matcher subexpressions: 3) first size);
 					openingFence: ((matcher subexpressions: 4) first);
+					startPosition: aParsingState charPos;
 					yourself).
-			aParsingState reduceCurrentLineTo: (matcher subexpressions: 5) first.
+			aParsingState newBlock innerLine: (matcher subexpressions: 7) first.
 			^ 2].
 	^ 0
diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownFencedCodeBlock2.class/instance/continue..st b/packages/MarkdownEditor-Parsing.package/MarkdownFencedCodeBlock2.class/instance/continue..st
@@ -1,10 +1,10 @@
 applying
 continue: aParsingState
 
-
 	(aParsingState currentLine 
-		matchesRegex: '\s{0,3}', self openingFence, self openingFence first, '*')
-	ifTrue: [self finalize. 
+		matchesRegex: '\s{0,3}', self openingFence, self openingFence first, '*\s*')
+	ifTrue: [self finalize: aParsingState. 
+		self beClosed.
 		aParsingState tip: self container.
 		^ 2]
 	ifFalse: [aParsingState reduceCurrentLineTo: 

diff --git a/packages/MarkdownEditor-Parsing.package/MarkdownFencedCodeBlock2.class/instance/finalize..st b/packages/MarkdownEditor-Parsing.package/MarkdownFencedCodeBlock2.class/instance/finalize..st
@@ -1,5 +1,6 @@
 applying
 finalize: aParsingState
 
+	super finalize: aParsingState.
 	(self content lines) 
-	ifNotEmpty: [self info: (self content lines) first]
+	ifNotEmpty: [self info: (self content lines) first].