Merge pull request #90 from Viper007Bond/add/gutenberg-plugin-support-back

Add Gutenberg plugin support back

Author: Viper007Bond

readme.txt

@@ -1,7 +1,7 @@
 === SyntaxHighlighter Evolved ===
 Contributors: Viper007Bond, automattic
 Donate link: http://www.viper007bond.com/wordpress-plugins/syntaxhighlighter/donate/
-Tags: code, sourcecode, php, xhtml, html, css, WordPress.com
+Tags: code, sourcecode, block, php, xhtml, html, css, WordPress.com
 Requires at least: 4.2.3
 Tested up to: 5.0
 Stable tag: trunk
@@ -10,6 +10,8 @@ Easily post syntax-highlighted code to your site without having to modify the co
 
 == Description ==
 
+*Now with support for the new block editor in WordPress 5.0!*
+
 SyntaxHighlighter Evolved allows you to easily post syntax-highlighted code to your site without losing its formatting or making any manual changes. It uses the [SyntaxHighlighter JavaScript package by Alex Gorbatchev](http://alexgorbatchev.com/wiki/SyntaxHighlighter).
 
 For a live demo, see [this plugin's homepage](http://www.viper007bond.com/wordpress-plugins/syntaxhighlighter/).
@@ -35,6 +37,10 @@ Try excluding this plugin's Javascript from any performance optimizations your s
 
 == ChangeLog ==
 
+= Version 3.4.1 =
+
+* Bring back support for the Gutenberg plugin for the people that are still on older versions of WordPress (pre-5.0) and are using the new block editor via the Gutenberg plugin.
+
 = Version 3.4.0 =
 
 * Drop support for the Gutenberg plugin in favor of WordPress 5.0's native functionality (different function names).

syntaxhighlighter.php

@@ -4,7 +4,7 @@
 
 Plugin Name:  SyntaxHighlighter Evolved
 Plugin URI:   http://www.viper007bond.com/wordpress-plugins/syntaxhighlighter/
-Version:      3.4.0
+Version:      3.4.1
 Description:  Easily post syntax-highlighted code to your site without having to modify the code at all. Uses Alex Gorbatchev's <a href="http://alexgorbatchev.com/wiki/SyntaxHighlighter">SyntaxHighlighter</a>. <strong>TIP:</strong> Don't use the Visual editor if you don't want your code mangled. TinyMCE will "clean up" your HTML.
 Author:       Alex Mills (Viper007Bond)
 Author URI:   http://www.viper007bond.com/
@@ -21,7 +21,7 @@
 
 class SyntaxHighlighter {
 	// All of these variables are private. Filters are provided for things that can be modified.
-	var $pluginver            = '3.4.0';  // Plugin version
+	var $pluginver            = '3.4.1';  // Plugin version
 	var $agshver              = false;    // Alex Gorbatchev's SyntaxHighlighter version (dynamically set below due to v2 vs v3)
 	var $shfolder             = false;    // Controls what subfolder to load SyntaxHighlighter from (v2 or v3)
 	var $settings             = array();  // Contains the user's settings
@@ -73,7 +73,10 @@ function __construct() {
 		add_filter( 'plugin_action_links', array( $this, 'settings_link' ), 10, 2 );
 
 		// Editor Blocks
-		if ( function_exists( 'parse_blocks' ) ) {
+		if (
+			function_exists( 'parse_blocks' ) // WordPress 5.0+
+			|| function_exists( 'the_gutenberg_project' ) // Gutenberg plugin for older WordPress
+		) {
 			add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_block_editor_assets' ) );
 			add_action( 'the_content', array( $this, 'enable_brushes_used_in_blocks' ), 0 );
 		}
@@ -317,7 +320,10 @@ function enqueue_block_editor_assets() {
 				: $this->pluginver
 		);
 
-		wp_set_script_translations( 'syntaxhighlighter-blocks', 'syntaxhighlighter' );
+		// WordPress 5.0+ only, no Gutenberg plugin support
+		if ( function_exists( 'wp_set_script_translations' ) ) {
+			wp_set_script_translations( 'syntaxhighlighter-blocks', 'syntaxhighlighter' );
+		}
 
 		natsort( $this->brush_names );
 
@@ -353,7 +359,13 @@ function enable_brushes_used_in_blocks( $content ) {
 			return $content;
 		}
 
-		$blocks = parse_blocks( $content );
+		if ( function_exists( 'parse_blocks' ) ) { // WP 5.0+
+			$blocks = parse_blocks( $content );
+		} elseif ( Function_exists( 'gutenberg_parse_blocks' ) ) { // Gutenberg plugin
+			$blocks = gutenberg_parse_blocks( $content );
+		} else {
+			return $content;
+		}
 
 		foreach ( $blocks as $block ) {
 			if ( empty( $block['blockName'] ) || 'syntaxhighlighter/code' !== $block['blockName'] ) {