Merge branch 'master' into remove-whitespace

.github/workflows/main.yml

@@ -38,8 +38,9 @@ jobs:
         with:
           webroot: ${{ github.workspace }}
           execute: /build-all.cfm
-          luceeVersion: 5.3.10.109-SNAPSHOT
-          extensions: 60772C12-F179-D555-8E2CD2B4F7428718  # redis
+          luceeVersion: 6.0.0.346-BETA
+          # redis, chart, lucene, form. ajax, chart
+          extensions: 60772C12-F179-D555-8E2CD2B4F7428718,D46B46A9-A0E3-44E1-D972A04AC3A8DC10,EFDEB172-F52E-4D84-9CD1A1F561B3DFC8,FAD67145-E3AE-30F8-1C11A6CCF544F0B7,6E2CB28F-98FB-4B51-B6BE6C64ADF35473,DF28D0A4-6748-44B9-A2FDC12E4E2E4D38
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

api/parsers/MarkdownParser.cfc

@@ -11,7 +11,7 @@ component {
 		return this;
 	}
 
-	public string function markdownToHtml( required string markdown, required boolean stripParagraph=false) {
+	public string function _markdownToHtml( required string markdown, required boolean stripParagraph=false) {
 		if (variables.flexmark){
 			var processor = _getMarkdownProcessor();
 			var doc = processor.parser.parse(arguments.markdown);

api/rendering/TemplateRenderer.cfc

@@ -14,10 +14,10 @@ component {
 		return Trim( rendered );
 	}
 
-	public string function markdownToHtml( required string markdown, required boolean stripParagraph=false ) {
+	public string function _markdownToHtml( required string markdown, required boolean stripParagraph=false ) {
 		var rendered = new SyntaxHighlighter().renderHighlights( arguments.markdown );
 
-		return new api.parsers.ParserFactory().getMarkdownParser().markdownToHtml( rendered, arguments.stripParagraph );
+		return new api.parsers.ParserFactory().getMarkdownParser()._markdownToHtml( rendered, arguments.stripParagraph );
 	}
 
 	private void function _includeHelpers( required string helpers ) {

builders/dash/templates/_method.cfm

@@ -5,7 +5,7 @@
 <cfset local.argumentsHaveDefaultValues = local.meth.argumentsHaveDefaultValues() />
 <cfoutput>
 	#getEditLink(path=local.meth.getSourceFile(), edit=args.edit)#
-	#markdownToHtml( local.meth.getBody() )#
+	#_markdownToHtml( local.meth.getBody() )#
 
     <p><strong>Returns:</strong> #local.meth.getReturnType()#</p>
 	<cfif len(local.meth.getIntroduced()) gt 0>
@@ -37,7 +37,7 @@
 							</td>
 							<td>
 								#getEditLink(path=local.meth.getSourceDir() & '_arguments/#local.arg.name#.md', edit=args.edit)#
-								#markdownToHtml( Trim( arg.description ) )#
+								#_markdownToHtml( Trim( arg.description ) )#
 								<cfif local.arg.keyExists("alias") and len(local.arg.alias) gt 0>
 									<p title="for compatibility, this argument has the following alias(es)">
 										<sub>Alias:</strong> #ListChangeDelims(local.arg.alias,", ",",")#</sub>
@@ -46,7 +46,7 @@
 							</td>
 							<cfif local.argumentsHaveDefaultValues>
  								<td>
- 									#markdownToHtml( local.arg.default ?: "" )#
+ 									#_markdownToHtml( local.arg.default ?: "" )#
  								</td>
  							</cfif>
 						</tr>
@@ -65,7 +65,7 @@
 		#getEditLink(path=local.meth.getSourceDir() & '_examples.md', edit=args.edit)#
 	</cfif>
 	<cfif Len( Trim( local.meth.getExamples() ) )>
-		#markdownToHtml( local.meth.getExamples() )#
+		#_markdownToHtml( local.meth.getExamples() )#
 	<cfelse>
 		<em>There are currently no examples for this function</em>
 	</cfif>

builders/dash/templates/_object.cfm

@@ -7,9 +7,9 @@
 	#getEditLink(path=local.pg.getSourceFile(), edit=args.edit)#
 	<p>
 	<cfif local.pg.getBody().len() gt 0>
-		#markdownToHtml( local.pg.getBody())#
+		#_markdownToHtml( local.pg.getBody())#
 	<cfelse>
-		#markdownToHtml("Object")#
+		#_markdownToHtml("Object")#
 	</cfif>
 	</p>
 

builders/dash/templates/aToZIndex.cfm

@@ -6,7 +6,7 @@
 
 <cfoutput>
 	<a class="pull-right" href="#getSourceLink( path=pg.getSourceFile() )#" title="Improve the docs"><i class="fa fa-pencil fa-fw"></i></a>
-	#markdownToHtml( pg.getBody() )#
+	#_markdownToHtml( pg.getBody() )#
 
 	<div class="row row-clear">
 		<cfloop array="#pg.getChildren()#" index="i" item="child">

builders/dash/templates/category.cfm

@@ -17,7 +17,7 @@
 
 <cfoutput>
 	#getEditLink(path=local.category.getSourceFile(), edit=args.edit)#
-	#markdownToHtml( local.category.getBody() )#
+	#_markdownToHtml( local.category.getBody() )#
 
 	<cfif not pages.len()>
 		<p><em>There are no pages tagged with this category.</em></p>

builders/dash/templates/changelog.cfm

@@ -83,7 +83,7 @@
 <cfoutput>
 
 	#getEditLink(path=local.changeLog.getSourceFile(), edit=args.edit)#
-	#markdownToHtml( local.changeLog.getBody() )#
+	#_markdownToHtml( local.changeLog.getBody() )#
 </cfoutput>
 
 <ul>

builders/dash/templates/function.cfm

@@ -6,7 +6,7 @@
 
 <cfoutput>
 	#getEditLink(path=local.fn.getSourceFile(), edit=args.edit)#
-	#markdownToHtml( local.fn.getBody() )#
+	#_markdownToHtml( local.fn.getBody() )#
 
 	<p><strong>Returns:</strong> #local.fn.getReturnType()#</p>
 	<cfif len(local.fn.getAlias()) gt 0>
@@ -41,7 +41,7 @@
 							</td>
 							<td>
 								#getEditLink(path=local.fn.getSourceDir() & '_arguments/#local.arg.name#.md', edit=args.edit)#
-								#markdownToHtml( Trim( local.arg.description ) )#
+								#_markdownToHtml( Trim( local.arg.description ) )#
 								<cfif len(local.arg.alias) gt 0>
 									<p title="for compatibility, this argument has the following alias(es)">
 										<sub>Alias:</strong> #ListChangeDelims(local.arg.alias,", ",",")#</sub>
@@ -50,7 +50,7 @@
 							</td>
 							<cfif local.argumentsHaveDefaultValues>
  								<td>
- 									#markdownToHtml( local.arg.default ?: "" )#
+ 									#_markdownToHtml( local.arg.default ?: "" )#
  								</td>
  							</cfif>
 						</tr>
@@ -69,7 +69,7 @@
 		#getEditLink(path=local.fn.getSourceDir() & '_examples.md', edit=args.edit)#
 	</cfif>
 	<cfif Len( Trim( local.fn.getExamples() ) )>
-		#markdownToHtml( local.fn.getExamples() )#
+		#_markdownToHtml( local.fn.getExamples() )#
 	<cfelse>
 		<em>There are currently no examples for this function</em>
 	</cfif>

builders/dash/templates/implementationStatus.cfm

@@ -7,7 +7,7 @@
 </cfscript>
 
 <cfoutput>
-	#markdownToHtml( local.pg.getBody() )#
+	#_markdownToHtml( local.pg.getBody() )#
 
 	<cfif StructCount(local.status.function) gt 0>
 		<div class="tile-wrap">

builders/dash/templates/page.cfm

@@ -5,5 +5,5 @@
 
 <cfoutput>
 	#getEditLink(path=local.pg.getSourceFile(), edit=args.edit)#
-	#markdownToHtml( local.pg.getBody() )#
+	#_markdownToHtml( local.pg.getBody() )#
 </cfoutput>

builders/dash/templates/tag.cfm

@@ -6,10 +6,10 @@
 
 <cfoutput>
 	#getEditLink(path=local.tag.getSourceFile(), edit=args.edit)#
-	#markdownToHtml( local.tag.getBody() )#
+	#_markdownToHtml( local.tag.getBody() )#
 
-	#markdownToHtml( Trim( local.tag.getBodyTypeDescription() ) )#
-	#markdownToHtml( Trim( local.tag.getScriptSupportDescription() ) )#
+	#_markdownToHtml( Trim( local.tag.getBodyTypeDescription() ) )#
+	#_markdownToHtml( Trim( local.tag.getScriptSupportDescription() ) )#
 
 	<h2>Attributes</h2>
 	<cfif !local.tag.getAttributes().len()>
@@ -32,11 +32,11 @@
 							</td>
 							<td>
 								#getEditLink(path=local.tag.getSourceDir() & '_attributes/#local.attrib.name#.md', edit=args.edit)#
-								#markdownToHtml( local.attrib.description ?: "" )#
+								#_markdownToHtml( local.attrib.description ?: "" )#
 							</td>
  							<cfif local.attributesHaveDefaultValues>
  								<td>
- 									#markdownToHtml( local.attrib.defaultValue ?: "" )#
+ 									#_markdownToHtml( local.attrib.defaultValue ?: "" )#
  								</td>
  							</cfif>
 						</tr>
@@ -55,7 +55,7 @@
 		#getEditLink(path=local.tag.getSourceDir() & '_examples.md', edit=args.edit)#
 	</cfif>
 	<cfif Len( Trim( local.tag.getExamples() ) )>
-		#markdownToHtml( local.tag.getExamples() )#
+		#_markdownToHtml( local.tag.getExamples() )#
 	<cfelse>
 		<em>There are currently no examples for this tag.</em>
 	</cfif>

builders/html/helpers/sourceRepoLink.cfm

@@ -13,11 +13,11 @@
 		return Replace( sourceBase, "{path}", fixPathCase( arguments.path ) );
 	}
 
-	string function showOriginalDescription( required struct props, required boolean edit, required any markdownToHtml ) {
+	string function showOriginalDescription( required struct props, required boolean edit, required any _markdownToHtml ) {
 		if (arguments.edit
 			and structKeyExists(arguments.props, "descriptionOriginal")
 			and arguments.props.descriptionOriginal neq arguments.props.description){
-				return "<b>Modified in Lucee Docs, Source Lucee definition:</b>" & arguments.markdownToHtml(arguments.props.descriptionOriginal);
+				return "<b>Modified in Lucee Docs, Source Lucee definition:</b>" & arguments._markdownToHtml(arguments.props.descriptionOriginal);
 		}
 		return "";
 	}

builders/html/templates/_method.cfm

@@ -5,7 +5,7 @@
 <cfset local.argumentsHaveDefaultValues = local.meth.argumentsHaveDefaultValues() />
 <cfoutput>
 	#getEditLink(path=local.meth.getSourceFile(), edit=args.edit)#
-	#markdownToHtml( local.meth.getBody() )#
+	#_markdownToHtml( local.meth.getBody() )#
 
 
 	<cfif len(local.meth.getIntroduced()) gt 0>
@@ -52,15 +52,15 @@
 							</td>
 							<td>
 								#getEditLink(path=local.meth.getSourceDir() & '_arguments/#local.arg.name#.md', edit=args.edit)#
-								#markdownToHtml( Trim( arg.description ) )#
+								#_markdownToHtml( Trim( arg.description ) )#
 								<cfif local.arg.keyExists("alias") and len(local.arg.alias) gt 0>
 									<p title="for compatibility, this argument has the following alias(es)"><sub>Alias:</strong> #ListChangeDelims(local.arg.alias,", ",",")#</sub></p>
 								</cfif>
-								#showOriginalDescription(props=local.arg, edit=args.edit, markdownToHtml=markdownToHtml)#
+								#showOriginalDescription(props=local.arg, edit=args.edit, _markdownToHtml=_markdownToHtml)#
 							</td>
 							<cfif local.argumentsHaveDefaultValues>
  								<td translate="no">
- 									#markdownToHtml( local.arg.default ?: "" )#
+ 									#_markdownToHtml( local.arg.default ?: "" )#
  								</td>
  							</cfif>
 						</tr>
@@ -75,7 +75,7 @@
 		#getEditLink(path=local.meth.getSourceDir() & '_examples.md', edit=args.edit)#
 	</cfif>
 	<cfif Len( Trim( local.meth.getExamples() ) )>
-		#markdownToHtml( local.meth.getExamples() )#
+		#_markdownToHtml( local.meth.getExamples() )#
 	<cfelse>
 		<em>There are currently no examples for this function</em>
 	</cfif>

builders/html/templates/_object.cfm

@@ -7,9 +7,9 @@
 	#getEditLink(path=local.pg.getSourceFile(), edit=args.edit)#
 	<p>
 	<cfif local.pg.getBody().len() gt 0>
-		#markdownToHtml( local.pg.getBody())#
+		#_markdownToHtml( local.pg.getBody())#
 	<cfelse>
-		#markdownToHtml("Object")#
+		#_markdownToHtml("Object")#
 	</cfif>
 	</p>
 

builders/html/templates/aToZIndex.cfm

@@ -8,7 +8,7 @@
 
 <cfoutput>
 	#getEditLink(path=local.pg.getSourceFile(), edit=args.edit)#
-	#markdownToHtml( local.pg.getBody() )#
+	#_markdownToHtml( local.pg.getBody() )#
 
 	<cfif ArrayLen(local.pg.getChildren()) lt 50>
 		<div class="tile-wrap">

builders/html/templates/category.cfm

@@ -20,7 +20,7 @@
 
 <cfoutput>
 	#getEditLink(path=local.category.getSourceFile(), edit=args.edit)#
-	#markdownToHtml( local.category.getBody() )#
+	#_markdownToHtml( local.category.getBody() )#
 
 	<cfif not pages.len()>
 		<p><em>There are no pages tagged with this category.</em></p>

builders/html/templates/changelog.cfm

@@ -83,7 +83,7 @@
 <cfoutput>
 
 	#getEditLink(path=local.changeLog.getSourceFile(), edit=args.edit)#
-	#markdownToHtml( local.changeLog.getBody() )#
+	#_markdownToHtml( local.changeLog.getBody() )#
 </cfoutput>
 
 <ul>

builders/html/templates/function.cfm

@@ -5,7 +5,7 @@
 <cfset local.argumentsHaveDefaultValues = local.fn.argumentsHaveDefaultValues() />
 <cfoutput>
 	#getEditLink(path=local.fn.getSourceFile(), edit=args.edit)#
-	#markdownToHtml( local.fn.getBody() )#
+	#_markdownToHtml( local.fn.getBody() )#
 	<!--- https://github.com/lucee/Lucee/pull/876 --->
 	<cfif len(local.fn.getStatus()) gt 0
 			and (local.fn.getStatus() neq "implemented" and local.fn.getStatus() neq "implemeted")>
@@ -41,7 +41,7 @@
 				#getEditLink(path=local.fn.getSourceDir() & '_returnTypeDesc.md', edit=args.edit)#
 			</div>
 			<cfif Len( Trim( local.fn.getReturnTypeDesc() ) )>
-				#markdownToHtml( local.fn.getReturnTypeDesc() )#
+				#_markdownToHtml( local.fn.getReturnTypeDesc() )#
 			</cfif>
 		</cfif>
 	</div>
@@ -88,22 +88,22 @@
 							</td>
 							<td>
 								#getEditLink(path=local.fn.getSourceDir() & '_arguments/#local.arg.name#.md', edit=args.edit)#
-								#markdownToHtml( Trim( local.arg.description ) )#
+								#_markdownToHtml( Trim( local.arg.description ) )#
 								<cfif len(local.arg.alias) gt 0>
 									<p title="for compatibility, this argument has the following alias(es)"><sub>Alias:</strong>
 									<span translate="no">#ListChangeDelims(local.arg.alias,", ",",")#</span></sub></p>
 								</cfif>
 								<cfif structKeyExists(local.arg, "status") and local.arg.status neq "implemented">
 									<em>* #local.arg.status# *</em>
 								</cfif>
-								#showOriginalDescription(props=local.arg, edit=args.edit, markdownToHtml=markdownToHtml)#
+								#showOriginalDescription(props=local.arg, edit=args.edit, _markdownToHtml=_markdownToHtml)#
 								<cfif structKeyExists(local.arg, "introduced") and len(local.arg.introduced) gt 0>
 									<p><strong>Introduced:</strong> #local.arg.introduced#</p>
 								</cfif>
 							</td>
 							<cfif local.argumentsHaveDefaultValues>
  								<td translate="no">
- 									#markdownToHtml( local.arg.default ?: "" )#
+ 									#_markdownToHtml( local.arg.default ?: "" )#
  								</td>
 							</cfif>
 
@@ -137,18 +137,18 @@
 								</td>
 								<td>
 									#getEditLink(path=local.fn.getSourceDir() & '_arguments/#local.arg.name#.md', edit=args.edit)#
-									#markdownToHtml( Trim( local.arg.description ) )#
+									#_markdownToHtml( Trim( local.arg.description ) )#
 									<cfif len(local.arg.alias) gt 0>
 										<p title="for compatibility, this argument has the following alias(es)"><sub>Alias:</strong> #ListChangeDelims(local.arg.alias,", ",",")#</sub></p>
 									</cfif>
 									<cfif structKeyExists(local.arg, "status") and local.arg.status neq "implemented">
 										<em>* #local.arg.status# *</em>
 									</cfif>
-									#showOriginalDescription(props=local.arg, edit=args.edit, markdownToHtml=markdownToHtml)#
+									#showOriginalDescription(props=local.arg, edit=args.edit, _markdownToHtml=_markdownToHtml)#
 								</td>
 								<cfif local.argumentsHaveDefaultValues>
 									 <td translate="no">
-										 #markdownToHtml( local.arg.default ?: "" )#
+										 #_markdownToHtml( local.arg.default ?: "" )#
 									 </td>
 								 </cfif>
 							</tr>
@@ -164,7 +164,7 @@
 			<h4>Usage Notes</h4>
 			#getEditLink(path=local.fn.getSourceDir() & '_usageNotes.md', edit=args.edit)#
 			<cfif Len( Trim( local.fn.getUsageNotes() ) )>
-				#markdownToHtml( local.fn.getUsageNotes() )#
+				#_markdownToHtml( local.fn.getUsageNotes() )#
 			</cfif>
 		</div>
 	</cfif>
@@ -174,7 +174,7 @@
 		#getEditLink(path=local.fn.getSourceDir() & '_examples.md', edit=args.edit)#
 	</cfif>
 	<cfif Len( Trim( local.fn.getExamples() ) )>
-		#markdownToHtml( local.fn.getExamples() )#
+		#_markdownToHtml( local.fn.getExamples() )#
 	<cfelse>
 		<em>There are currently no examples for this function</em>
 	</cfif>

builders/html/templates/implementationStatus.cfm

@@ -11,7 +11,7 @@
 
 <cfoutput>
 	#getEditLink(path=local.pg.getSourceFile(), edit=args.edit)#
-	#markdownToHtml( local.pg.getBody() )#
+	#_markdownToHtml( local.pg.getBody() )#
 
 	<cfif StructCount(local.status.function) gt 0>
 		<div class="tile-wrap">

builders/html/templates/page.cfm

@@ -4,5 +4,5 @@
 
 <cfoutput>
 	#getEditLink(path=local.pg.getSourceFile(), edit=arguments.args.edit)#
-	#markdownToHtml( local.pg.getBody() )#
+	#_markdownToHtml( local.pg.getBody() )#
 </cfoutput>