Issue 846 better syntax for annotated paragraph

src/Microdown-Tests/MicAnnotatedParagraphTest.class.st

@@ -15,7 +15,8 @@ MicAnnotatedParagraphTest >> subjectClass [
 MicAnnotatedParagraphTest >> testBasicAnnotetedParagraph [
 
 	| root annotatedParagraph |
-	root := parser parse: '!!important This is an important information'.
+	root := parser parse: '>[! important ]
+> This is an important information'.
 	self assert: root children size equals: 1.
 	annotatedParagraph := root children first.
 	self
@@ -25,12 +26,39 @@ MicAnnotatedParagraphTest >> testBasicAnnotetedParagraph [
 		equals: 'This is an important information'
 ]
 
+{ #category : 'tests' }
+MicAnnotatedParagraphTest >> testBasicAnnotetedParagraphIgnoreExtraTextInFirstLine [
+
+	| root annotatedParagraph |
+	root := parser parse: '>[! important ] This is an important information
+> This is an other information'.
+	self assert: root children size equals: 1.
+	annotatedParagraph := root children first.
+	self
+		assert: (annotatedParagraph isKindOf: MicAnnotatedParagraph);
+		assert: annotatedParagraph label equals: 'important';
+		assert: annotatedParagraph text
+		equals: 'This is an other information'
+]
+
+{ #category : 'tests' }
+MicAnnotatedParagraphTest >> testBasicAnnotetedParagraphWhitoutClosingBracket [
+
+	| root annotatedParagraph |
+	root := parser parse: '>[! important
+> This is an important information'.
+	self assert: root children size equals: 1.
+	annotatedParagraph := root children first.
+	self
+		assert: (annotatedParagraph isKindOf: MicBlockQuoteBlock)
+]
+
 { #category : 'tests' }
 MicAnnotatedParagraphTest >> testBasicAnnotetedParagraphWithALineBreak [
 
 	| root annotatedParagraph |
-	root := parser parse: '!!important 
-This is an important information'.
+	root := parser parse: '>[! important ]
+> This is an important information'.
 	self assert: root children size equals: 1.
 	annotatedParagraph := root children first.
 	self
@@ -44,7 +72,8 @@ This is an important information'.
 MicAnnotatedParagraphTest >> testBasicAnnotetedParagraphWithANonSupportedLabel [
 
 	| root annotatedParagraph |
-	root := parser parse: '!!test This is an important information'.
+	root := parser parse: '>[! test ]
+> This is an important information'.
 	self assert: root children size equals: 1.
 	annotatedParagraph := root children first.
 	self
@@ -58,7 +87,8 @@ MicAnnotatedParagraphTest >> testBasicAnnotetedParagraphWithANonSupportedLabel [
 MicAnnotatedParagraphTest >> testBasicAnnotetedParagraphWithANonSupportedLabelWithUpperCase [
 
 	| root annotatedParagraph |
-	root := parser parse: '!!Test This is an important information'.
+	root := parser parse: '>[! Test ]
+> This is an important information'.
 	self assert: root children size equals: 1.
 	annotatedParagraph := root children first.
 	self
@@ -73,7 +103,8 @@ MicAnnotatedParagraphTest >> testBasicAnnotetedParagraphWithBlodText [
 
 	| root annotatedParagraph |
 	root := parser parse:
-		        '!!important This is an **important** information'.
+		        '>[! important ]
+> This is an **important** information'.
 	self assert: root children size equals: 1.
 	annotatedParagraph := root children first.
 	self
@@ -91,7 +122,8 @@ MicAnnotatedParagraphTest >> testBasicAnnotetedParagraphWithBlodText [
 MicAnnotatedParagraphTest >> testBasicAnnotetedParagraphWithLabelHavingUpperCase [
 
 	| root annotatedParagraph |
-	root := parser parse: '!!ImporTanT This is an important information'.
+	root := parser parse: '>[! ImporTanT ]
+> This is an important information'.
 	self assert: root children size equals: 1.
 	annotatedParagraph := root children first.
 	self

src/Microdown/MicAbstractAnnotatedBlock.class.st

@@ -18,14 +18,18 @@ MicAbstractAnnotatedBlock >> addLineAndReturnNextNode: line [
 		ifTrue: [ ^ self ].
 	label 
 		ifNil: [ 
-			| indexOfFirstSpace |
-			indexOfFirstSpace := line indexOf: Character space.
-			label := indexOfFirstSpace = 0
-				ifTrue: [ '' ]
-				ifFalse: [line copyFrom: self lineMarkup size + 1 to: indexOfFirstSpace - 1.].
-			body := (line copyFrom: indexOfFirstSpace + 1 to: line size) trim.]
-		ifNotNil: [ body = '' ifTrue: [ body := body , line ]
-			ifFalse: [ body := body , String cr , line ]]
+			| indexOfFirstClosingBracket |
+			indexOfFirstClosingBracket := line indexOf: $].
+			label := indexOfFirstClosingBracket = 0
+				ifTrue: [ parent children removeLast. ^ self createMicBlockQuoteBlock: line ]
+				ifFalse: [line copyFrom: self lineMarkup size + 1 to: indexOfFirstClosingBracket - 1.
+					].
+				label := label trim]
+		ifNotNil: [ | treatedLine |
+	treatedLine := self extractLine: line.
+	body := body
+		ifNil: [ treatedLine ]
+		ifNotNil: [ body , String cr , treatedLine ]]
 ]
 
 { #category : 'accessing' }
@@ -41,6 +45,22 @@ MicAbstractAnnotatedBlock >> canConsumeLine: line [
 	^ line isNotEmpty 
 ]
 
+{ #category : 'as yet unclassified' }
+MicAbstractAnnotatedBlock >> createMicBlockQuoteBlock: line [
+
+^ MicBlockQuoteBlock new
+		setParser: parser;
+		parent: parent;
+		addLineAndReturnNextNode: line 
+
+
+]
+
+{ #category : 'actions' }
+MicAbstractAnnotatedBlock >> extractLine: line [
+	^ (line copyFrom: 2 to: line size) trim
+]
+
 { #category : 'initialization' }
 MicAbstractAnnotatedBlock >> initialize [
 

src/Microdown/MicMicrodownSharedPool.class.st

@@ -57,7 +57,7 @@ MicMicrodownSharedPool class >> initialize [
 	"self initialize"
 
 	AnchorMarkup := '@'.
-	AnnotatedParagraphMarkup := '!!'.
+	AnnotatedParagraphMarkup := '>[!'.
 	CodeblockMarkup := '```'.
 	CommentedLineMarkup := '%'.
 	EnvironmentClosingBlockMarkup := '!>'.