Removing the notion of syntaxState.

pillar-markup · Dec 1, 2024 · c4f1a75 · c4f1a75
1 parent f76c9a4
commit c4f1a75
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 133 deletions.
diff --git a/src/MicroEd-Spec-Tests/MDEditorFilePresenterTest.class.st b/src/MicroEd-Spec-Tests/MDEditorFilePresenterTest.class.st
@@ -69,13 +69,6 @@ MDEditorFilePresenterTest >> testGotMicrodownParser [
 	self assert: presenter microdownParser class equals: MicrodownParser
 ]
 
-{ #category : 'tests' }
-MDEditorFilePresenterTest >> testGotSyntaxStateWhenIsNotSpecify [
-
-	presenter syntaxState: MDMicroDownSyntax new.
-	self assert: presenter syntaxState class equals: MDMicroDownSyntax
-]
-
 { #category : 'running' }
 MDEditorFilePresenterTest >> testMDFileOverwriteFileReferenceWhenAnotherSameFile [
 
@@ -108,7 +101,7 @@ MDEditorFilePresenterTest >> testSaveWithExtension [
 { #category : 'tests' }
 MDEditorFilePresenterTest >> testTextInputTextIsNotSpecify [
 
-	self assert: presenter textInputText equals: '% Type your marked-up text here. Render it and see right the output generated as rich text', String cr, String cr, presenter syntaxState exampleText
+	self assert: presenter textInputText equals: '% Type your marked-up text here. Render it and see right the output generated as rich text', String cr, String cr, presenter exampleText
 ]
 
 { #category : 'tests' }

diff --git a/src/MicroEd-Spec/MDEditorPresenter.class.st b/src/MicroEd-Spec/MDEditorPresenter.class.st
@@ -64,6 +64,56 @@ MDEditorPresenter >> defaultLayout [
 	yourself
 ]
 
+{ #category : 'utilities' }
+MDEditorPresenter >> exampleText [
+
+	^ '# Header
+
+A figure:
+![Pharologo %width=80&caption=Our great figure.](https://files.pharo.org/media/logo/logo.png)
+
+A link: [http://pharo.org](http://pharo.org)
+
+Unordered Lists:
+- item 1
+  - item 1.1
+  - item 1.2
+- item 2
+- item 3
+  - item 3.1
+
+Ordered Lists:
+1. sub item 1
+3. sub item 2
+
+and nested 
+
+- item 1
+  1. sub item 1
+  3. sub item 2
+- item 2
+
+
+
+Horizontal line:
+***
+
+Common formats: **Bold**, _italic_, `monospace`
+
+Pharo hyperlinks in code: 
+- class `Point`, 
+- method `Point class`, `Point>>#setX:setY:`, and 
+- package `#’Microdown-Tests’ (for packages).
+
+A codeblock:
+
+```language=Pharo&caption=Beautiful&label=Fig1
+   this is a codeblock
+```
+
+'
+]
+
 { #category : 'api' }
 MDEditorPresenter >> initializeMenuBar [
 
@@ -111,8 +161,7 @@ MDEditorPresenter >> initializeMenuBar [
 MDEditorPresenter >> initializePresenters [
 
 	| initialText |
-	self syntaxState: MDMicroDownSyntax new.
-	initialText := '% Type your marked-up text here. Render it and see right the output generated as rich text', String cr, String cr, self syntaxState exampleText.
+	initialText := '% Type your marked-up text here. Render it and see right the output generated as rich text', String cr, String cr, self exampleText.
 
 	self initializePresentersWithText: initialText.
 
@@ -148,7 +197,7 @@ MDEditorPresenter >> initializeWindow: aWindowPresenter [
 	aWindowPresenter
 		title: self title;
 		initialExtent: 800 @ 600;
-		windowIcon: (self application iconNamed: #glamorousBrowseIcon)
+		windowIcon: (self application iconNamed: #browseIcon)
 ]
 
 { #category : 'accessing' }
@@ -160,7 +209,7 @@ MDEditorPresenter >> mdFile [
 { #category : 'accessing' }
 MDEditorPresenter >> mdFile: aMDFile [
 
-	mdFile := aMDFile.   
+	mdFile := aMDFile
 ]
 
 { #category : 'utilities' }
@@ -179,7 +228,8 @@ MDEditorPresenter >> openFile [
 		                openModal.
 	selectedFile 
 		ifNotNil: [ 
-			self mdFile: (MDFile new file: selectedFile).
+
+			self mdFile: (MDFile newFromFileReference: selectedFile asFileReference).
 			textInput text: selectedFile contents.
 			self cleanOutput.
 			self updateTitle ]

diff --git a/src/MicroEd-Tests/MDFileTest.class.st b/src/MicroEd-Tests/MDFileTest.class.st
@@ -21,12 +21,10 @@ MDFileTest >> setUp [
 	toDelete := OrderedCollection new.
 	mdfile := MDFile new.
 	fileExample := memoryFS / 'example.md'.
-	fileReferenceWithName := (memoryFS / 'anotherFile.md')
-		                         ensureCreateFile.
+	fileReferenceWithName := (memoryFS / 'anotherFile.md') ensureCreateFile.
 	toDelete add: fileExample.
 	fileExample writeStreamDo: [ :stream |
 		stream nextPutAll: 'example file' ].
-
 	parser := MicrodownParser new.
 ]
 
@@ -39,23 +37,23 @@ MDFileTest >> tearDown [
 	super tearDown
 ]
 
-{ #category : 'running' }
+{ #category : 'tests' }
 MDFileTest >> testMDFileCreationWithExistingFile [
 
 	mdfile initializeWithFileReference: fileExample.
 	self assert: mdfile hasFile.
 
 ]
 
-{ #category : 'running' }
+{ #category : 'tests' }
 MDFileTest >> testMDFileCreationWithoutExistingFile [
 
 	| fileWithoutFileReference |
 	fileWithoutFileReference := MDFile new.
 	self assert: fileWithoutFileReference hasFile not.
 ]
 
-{ #category : 'running' }
+{ #category : 'tests' }
 MDFileTest >> testMDFileExistingFileWithName [
 
 
@@ -69,7 +67,7 @@ MDFileTest >> testMDFileExistingFileWithName [
 
 ]
 
-{ #category : 'running' }
+{ #category : 'tests' }
 MDFileTest >> testMDFileExistingFileWithoutName [
 
 	| file fileReferenceWithoutName |
@@ -82,7 +80,7 @@ MDFileTest >> testMDFileExistingFileWithoutName [
 
 ]
 
-{ #category : 'running' }
+{ #category : 'tests' }
 MDFileTest >> testMDFileHasFileReferenceAddMetaData [
 
 	| root file |
@@ -98,7 +96,7 @@ MDFileTest >> testMDFileHasFileReferenceAddMetaData [
 
 ]
 
-{ #category : 'running' }
+{ #category : 'tests' }
 MDFileTest >> testMDFileHasFileReferenceHasMetaData [
 
 	| root file |
@@ -117,7 +115,7 @@ MDFileTest >> testMDFileHasFileReferenceHasMetaData [
 
 ]
 
-{ #category : 'running' }
+{ #category : 'tests' }
 MDFileTest >> testMDFileHasFileReferenceHasNotMetaData [
 
 	| root file |
@@ -131,7 +129,7 @@ MDFileTest >> testMDFileHasFileReferenceHasNotMetaData [
 
 ]
 
-{ #category : 'running' }
+{ #category : 'tests' }
 MDFileTest >> testMDFileHasFileReferenceWithFormatISO [
 
 	| file date |
@@ -141,10 +139,10 @@ MDFileTest >> testMDFileHasFileReferenceWithFormatISO [
 	self deny: (fileReferenceWithName exists )
 ]
 
-{ #category : 'running' }
+{ #category : 'tests' }
 MDFileTest >> testMDFileUnderstandFile [
 
 	mdfile initializeWithFileReference: fileExample.
-	self assert: mdfile file class equals: FileReference.
+	self assert: mdfile fileReference class equals: FileReference.
 
 ]
diff --git a/src/MicroEd-Tests/MDMicroDownSyntaxTest.class.st b/src/MicroEd-Tests/MDMicroDownSyntaxTest.class.st
@@ -7,24 +7,3 @@ Class {
 	#category : 'MicroEd-Tests',
 	#package : 'MicroEd-Tests'
 }
-
-{ #category : 'tests' }
-MDMicroDownSyntaxTest >> testGotExtensionWhenIsNotSpecify [
-
-	syntax := MDMicroDownSyntax new.
-	self assert: syntax extension equals: 'md'
-]
-
-{ #category : 'tests' }
-MDMicroDownSyntaxTest >> testGotNameWhenIsNotSpecify [
-
-	syntax := MDMicroDownSyntax new.
-	self assert: syntax name equals: 'MicroDown'
-]
-
-{ #category : 'tests' }
-MDMicroDownSyntaxTest >> testGotParserWhenIsNotSpecify [
-
-	syntax := MDMicroDownSyntax new.
-	self assert: syntax parser equals: MicrodownParser
-]
diff --git a/src/MicroEd/MDFile.class.st b/src/MicroEd/MDFile.class.st
@@ -25,13 +25,13 @@ MDFile >> addMetaDataElements [
 
 	| root |
 	root := MicrodownParser parse: fileReference contents.
-
+	
 	root hasMetaDataElement
 		ifFalse: [
 			root := MicrodownParser parse: '{
 		"author" : "addos" 
-		}
-		'.
+}
+'.
 			root metaDataElement
 				atKey: 'author' put: (fileReference entry reference path at: 3);
 				atKey: 'title' put: nameOfFileReferenceBeforeSaved;
@@ -102,6 +102,12 @@ MDFile >> fileReference [
 	^ fileReference 
 ]
 
+{ #category : 'accessing' }
+MDFile >> fileReference: aFileReference [
+
+	fileReference := aFileReference
+]
+
 { #category : 'accessing' }
 MDFile >> hasFile [ 
 

diff --git a/src/MicroEd/MDMicroDownSyntax.class.st b/src/MicroEd/MDMicroDownSyntax.class.st