Merge 30842a2

pillar-markup · Mar 13, 2024 · 65248a6 · 65248a6
2 parents 0fa8e29 + 30842a2
commit 65248a6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/src/Microdown-HTMLExporter/MicHTMLDocument.class.st b/src/Microdown-HTMLExporter/MicHTMLDocument.class.st
@@ -346,12 +346,12 @@ MicHTMLDocument >> setCharSetUTF8 [
 MicHTMLDocument >> tempFileName [
 	"Answer a <String> representing a random file in a temporary location in the receiver's file system"
 
-	^ String streamContents: [ : str | 
-		str 
-			<< FileLocator temp fullName;
-			<< DiskStore delimiter asString;
-			<< UUIDGenerator new next asString36;
-			<< '.html' ]
+	^ String streamContents: [ :str |
+		  str
+			  << FileLocator temp fullName;
+			  << DiskStore delimiter asString;
+			  << UUID new asString36;
+			  << '.html' ]
 ]
 
 { #category : 'accessing' }

diff --git a/src/Microdown-HTMLExporter/Microdown.extension.st b/src/Microdown-HTMLExporter/Microdown.extension.st
@@ -1,7 +1,7 @@
 Extension { #name : 'Microdown' }
 
 { #category : '*Microdown-HTMLExporter' }
-Microdown class >> asHTMLDocument: aStringOrDoc [
+Microdown classSide >> asHTMLDocument: aStringOrDoc [
 	"Facade method to serialize a Microdown document or string to HTML"
 
 	^ MicHTMLVisitor serializeToHTMLDoc: aStringOrDoc.
@@ -10,7 +10,7 @@ Microdown class >> asHTMLDocument: aStringOrDoc [
 ]
 
 { #category : '*Microdown-HTMLExporter' }
-Microdown class >> asHTMLString: aStringOrDoc [
+Microdown classSide >> asHTMLString: aStringOrDoc [
 	"Facade method to render a microdown document or string to HTML"
 
 	^ MicHTMLVisitor asHTMLString: aStringOrDoc.
@@ -19,7 +19,7 @@ Microdown class >> asHTMLString: aStringOrDoc [
 ]
 
 { #category : '*Microdown-HTMLExporter' }
-Microdown class >> asHTMLString: aStringOrDoc configuration: aMicHTMLConfiguration [
+Microdown classSide >> asHTMLString: aStringOrDoc configuration: aMicHTMLConfiguration [
 	"Facade method to render a microdown document or string to HTML"
 
 	^ MicHTMLVisitor asHTMLString: aStringOrDoc configuration: aMicHTMLConfiguration

diff --git a/src/Microdown-RichTextComposer-Tests/MicRichTextComposerTest.class.st b/src/Microdown-RichTextComposer-Tests/MicRichTextComposerTest.class.st
@@ -134,7 +134,6 @@ MicRichTextComposerTest >> setUp [
 	parser := Microdown new.
 	offlineStatus := Microdown offline.
 	Microdown offline: false.
-	MicRichTextComposer initialize.
 ]
 
 { #category : 'skipped tests' }
@@ -649,7 +648,7 @@ MicRichTextComposerTest >> testStrikethroughFormat [
 MicRichTextComposerTest >> testStylerForMethod [
 
 	| code source richText blueLocation textColor |
-	self composerClass initialize.
+
 	code := '
 codeStylerFor: aString
 <codeblockStylerFor: #smalltalk>

diff --git a/src/Microdown-RichTextComposer/MicrodownParser.extension.st b/src/Microdown-RichTextComposer/MicrodownParser.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : 'MicrodownParser' }
 
 { #category : '*Microdown-RichTextComposer' }
-MicrodownParser class >> convertToRichText: aString [
+MicrodownParser classSide >> convertToRichText: aString [
 	^ MicRichTextComposer new visit: (self new parse: aString)
 ]
diff --git a/src/Microdown/RPackage.extension.st → src/Microdown/Package.extension.st b/src/Microdown/RPackage.extension.st → src/Microdown/Package.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : 'RPackage' }
+Extension { #name : 'Package' }
 
 { #category : '*Microdown' }
-RPackage >> buildMicroDownUsing: aBuilder withComment: aString [
+Package >> buildMicroDownUsing: aBuilder withComment: aString [
 
 	"I'm on a package and the package is a baseline package."
 	self class environment