Skip to content

Commit 5401341

Browse files
committed
fixing external link and adding another test for list item
1 parent 469772a commit 5401341

File tree

2 files changed

+28
-4
lines changed

2 files changed

+28
-4
lines changed

src/Microdown-Templated/MicTemplatedWriter.class.st

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,18 @@ MicTemplatedWriter >> visitLineBreak: aPRLineBreak [
502502
ifAbsent: [ defaultWriter visitLineBreak: aPRLineBreak ]
503503
]
504504

505+
{ #category : 'visiting' }
506+
MicTemplatedWriter >> visitLink: aLink [
507+
508+
self
509+
write: aLink
510+
withTemplateFileName: self externalLinkTemplateFileName
511+
extraArguments: {
512+
'ref' -> aLink reference uri.
513+
'caption' -> aLink caption }
514+
ifAbsent: [ defaultWriter visitLink: aLink ]
515+
]
516+
505517
{ #category : 'visiting' }
506518
MicTemplatedWriter >> visitListItem: aPRListItem [
507519

src/Microdown-Templated/MicTemplatedWriterTest.class.st

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ MicTemplatedWriterTest >> createTemplateFileAt: aPath withContents: contents [
108108
{ #category : 'running' }
109109
MicTemplatedWriterTest >> externalLinkContents [
110110

111-
^ '<a href={{{contents}}}>{{{caption}}}</a>'
111+
^ '<a href={{{ref}}}>{{{caption}}}</a>'
112112
]
113113

114114
{ #category : 'running' }
@@ -256,13 +256,13 @@ MicTemplatedWriterTest >> testWriteEnvironmentUsesArguments [
256256
writes: 'before test after'
257257
]
258258

259-
{ #category : 'tests-templatefiles' }
259+
{ #category : 'new tests' }
260260
MicTemplatedWriterTest >> testWriteExternalLinkUsesExternalLinkTemplate [
261261

262262
self
263263
assertTemplate: MicTemplatedWriter externalLinkTemplateFileName
264-
writesValue: 'http://pharo.org'
265-
forNode: (Microdown parse: '[Pharo url](http://www.pharo.org)')
264+
writesValue: '<a href=https://www.pharo.org/>Pharo url</a>'
265+
forNode: (Microdown parse: '[Pharo url](https://www.pharo.org)') children first children first
266266
]
267267

268268
{ #category : 'new tests' }
@@ -326,6 +326,18 @@ MicTemplatedWriterTest >> testWriteListItemUsesListItemTemplate [
326326
forNode: MicListItemBlock new
327327
]
328328

329+
{ #category : 'new tests' }
330+
MicTemplatedWriterTest >> testWriteListItemUsesListItemTemplateWithBody [
331+
332+
self
333+
assertTemplate: MicTemplatedWriter listItemTemplateFileName
334+
writesValue: '<li>this is an item</li>'
335+
forNode: (MicListItemBlock new
336+
addChild: (MicTextBlock new
337+
bodyString: 'this is an item'; yourself) ;
338+
yourself)
339+
]
340+
329341
{ #category : 'tests-templatefiles' }
330342
MicTemplatedWriterTest >> testWriteMailLinkUsesMailLinkTemplate [
331343

0 commit comments

Comments
 (0)