Merge branch 'master' into develop

pixl8 · Mar 12, 2024 · 790900b · 790900b
2 parents 92b30db + 04471d8
commit 790900b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 65,779 deletions.
diff --git a/api/data/DocTree.cfc b/api/data/DocTree.cfc
@@ -165,10 +165,7 @@ component accessors=true {
 
 	private string function _getParentPagePathFromPagePath( required string pagePath ) {
 		var parts = arguments.pagePath.listToArray( "/" );
-
-		if ( ArrayLen( parts ) ) {
-			parts.deleteAt( parts.len() );
-		}
+		parts.deleteAt( parts.len() );
 
 		return "/" & parts.toList( "/" );
 	}

diff --git a/api/rendering/SyntaxHighlighter.cfc b/api/rendering/SyntaxHighlighter.cfc
@@ -25,7 +25,11 @@ component {
 			arguments.language = "cfm";
 		}
 
-		return highlighter.highlight( arguments.code, arguments.language, false );
+		try {
+			return highlighter.highlight( arguments.code, arguments.language, false );
+		} catch( any e ) {
+			throw( type="docs.syntax.highlight.error", message="Error highlighting code for language [#arguments.language#]: [#arguments.code#]")
+		}
 	}
 
 // PRIVATE HELPERS