Configure jshint with same rules as core

WordPress · Aug 26, 2017 · 2db0d27 · 2db0d27
1 parent 533bd7a
commit 2db0d27
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/better-code-editing.php b/better-code-editing.php
@@ -49,6 +49,35 @@ class Better_Code_Editing_Plugin {
 				'outline-none',
 			),
 		),
+		'jshint' => array(
+			'rules' => array(
+				// The following are copied from <https://github.com/WordPress/wordpress-develop/blob/4.8.1/.jshintrc>.
+				'boss' => true,
+				'curly' => true,
+				'eqeqeq' => true,
+				'eqnull' => true,
+				'es3' => true,
+				'expr' => true,
+				'immed' => true,
+				'noarg' => true,
+				'nonbsp' => true,
+				'onevar' => true,
+				'quotmark' => 'single',
+				'trailing' => true,
+				'undef' => true,
+				'unused' => true,
+
+				'browser' => true,
+
+				'globals' => array(
+					'_' => false,
+					'Backbone' => false,
+					'jQuery' => false,
+					'JSON' => false,
+					'wp' => false,
+				),
+			),
+		),
 	);
 
 	/**

diff --git a/wp-admin/js/code-editor.js b/wp-admin/js/code-editor.js
@@ -64,9 +64,19 @@ if ( 'undefined' === typeof window.wp.codeEditor ) {
 		}
 
 		instanceSettings = $.extend( {}, wp.codeEditor.defaultSettings, settings );
+		instanceSettings.codemirror = $.extend( {}, instanceSettings.codemirror );
 
-		if ( 'undefined' !== typeof CSSLint && instanceSettings.csslint && instanceSettings.csslint.rules ) {
-			updateCSSLintRules( instanceSettings.csslint.rules );
+		if ( true === instanceSettings.codemirror.lint ) {
+
+			// Configure JSHint.
+			if ( 'text/javascript' === instanceSettings.codemirror.mode && true === instanceSettings.codemirror.lint && instanceSettings.jshint && instanceSettings.jshint.rules ) {
+				instanceSettings.codemirror.lint = instanceSettings.jshint.rules;
+			}
+
+			// Configure CSSLint.
+			if ( 'undefined' !== typeof CSSLint && instanceSettings.csslint && instanceSettings.csslint.rules ) {
+				updateCSSLintRules( instanceSettings.csslint.rules );
+			}
 		}
 
 		editor = CodeMirror.fromTextArea( $textarea[0], instanceSettings.codemirror );