Merge pull request #6608 from ampproject/fix/lgtm-errors

Fix LGTM code analysis warnings
ampproject · Sep 14, 2021 · 6822183 · 6822183
2 parents a8706f7 + 3a7f9cc
commit 6822183
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 38 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -1,5 +1,12 @@
 name: CodeQL
 
+# Cancel previous workflow run groups that have not completed.
+concurrency:
+  # Group workflow runs by workflow name, along with the head branch ref of the pull request
+  # or otherwise the branch or tag ref.
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 on:
   push:
     # Only run if JS or Python files changed.

diff --git a/assets/src/admin/paired-browsing/client.js b/assets/src/admin/paired-browsing/client.js
@@ -67,7 +67,7 @@ function receiveMessage( event ) {
 		case 'init':
 			if ( ! initialized ) {
 				initialized = true;
-				receiveInit( event.data );
+				receiveInit();
 			}
 			break;
 		case 'scroll':

diff --git a/assets/src/block-editor/components/layout-controls.js b/assets/src/block-editor/components/layout-controls.js
@@ -2,7 +2,6 @@
  * External dependencies
  */
 import PropTypes from 'prop-types';
-import { ReactElement } from 'react';
 
 /**
  * WordPress dependencies
@@ -17,7 +16,7 @@ import { __, sprintf } from '@wordpress/i18n';
  * @param {Object}   props.attributes       Block attributes.
  * @param {Function} props.setAttributes    Callback to update block attributes.
  * @param {Array}    props.ampLayoutOptions Layout options.
- * @return {ReactElement} Controls.
+ * @return {JSX.Element} Controls.
  */
 const LayoutControls = ( { attributes, setAttributes, ampLayoutOptions } ) => {
 	const { ampLayout, height, width } = attributes;

diff --git a/assets/src/block-editor/components/media-placeholder.js b/assets/src/block-editor/components/media-placeholder.js
@@ -2,7 +2,6 @@
  * External dependencies
  */
 import PropTypes from 'prop-types';
-import { ReactElement } from 'react';
 
 /**
  * WordPress dependencies
@@ -16,7 +15,7 @@ import { __ } from '@wordpress/i18n';
  * @param {Object} props      Component props.
  * @param {string} props.name Block's name.
  * @param {string} props.url  URL.
- * @return {ReactElement} Placeholder.
+ * @return {JSX.Element} Placeholder.
  */
 const MediaPlaceholder = ( { name, url } ) => {
 	return (

diff --git a/assets/src/block-editor/helpers/index.js b/assets/src/block-editor/helpers/index.js
@@ -2,7 +2,6 @@
  * External dependencies
  */
 import PropTypes from 'prop-types';
-import { ReactElement } from 'react';
 import { isFunction, isObject, isString } from 'lodash';
 
 /**
@@ -221,8 +220,8 @@ export const removeAmpFitTextFromBlocks = ( settings, name ) => {
  * removed and the deprecation of the block and proceed without error.
  *
  * @see removeAmpFitTextFromBlocks
- * @param {ReactElement} element Block save result.
- * @return {ReactElement} Modified block if it is of `amp-fit-text` type, otherwise the  original element is returned.
+ * @param {JSX.Element} element Block save result.
+ * @return {JSX.Element} Modified block if it is of `amp-fit-text` type, otherwise the  original element is returned.
  */
 export const removeClassFromAmpFitTextBlocks = ( element ) => {
 	if ( isValidElement( element ) && 'amp-fit-text' === element.type && undefined !== element.props.className ) {
@@ -352,7 +351,7 @@ export const setImageBlockLayoutAttributes = ( props, layout ) => {
  * Default setup for inspector controls.
  *
  * @param {Object} props Props.
- * @return {ReactElement} Inspector Controls.
+ * @return {JSX.Element} Inspector Controls.
  */
 export const setUpInspectorControls = ( props ) => {
 	const { isSelected } = props;
@@ -380,7 +379,7 @@ setUpInspectorControls.propTypes = {
  *
  * @deprecated As of v2.1. Blocks with the `ampLayout` attribute will still be able to use the control.
  * @param {Object} props Props.
- * @return {ReactElement} Element.
+ * @return {JSX.Element} Element.
  */
 export const AmpLayoutControl = ( props ) => {
 	const { name, attributes: { ampLayout }, setAttributes } = props;
@@ -438,7 +437,7 @@ AmpLayoutControl.propTypes = {
  *
  * @deprecated As of v2.1. Blocks with the `ampNoLoading` attribute will still be able to use the control.
  * @param {Object} props Props.
- * @return {ReactElement} Element.
+ * @return {JSX.Element} Element.
  */
 export const AmpNoloadingToggle = ( props ) => {
 	const { attributes: { ampNoLoading }, setAttributes } = props;
@@ -484,7 +483,7 @@ AmpNoloadingToggle.propTypes = {
  * Get AMP Lightbox toggle control.
  *
  * @param {Object} props Props.
- * @return {ReactElement} Element.
+ * @return {JSX.Element} Element.
  */
 const AmpLightboxToggle = ( props ) => {
 	const { attributes: { ampLightbox, linkTo, ampLayout }, setAttributes } = props;

diff --git a/assets/src/block-validation/components/sidebar-notification/index.js b/assets/src/block-validation/components/sidebar-notification/index.js
@@ -3,7 +3,6 @@
  */
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
-import { ReactNode } from 'react';
 
 /**
  * Internal dependencies
@@ -14,12 +13,12 @@ import { Loading } from '../../../components/loading';
 /**
  * Notification component used in the block editor sidebar.
  *
- * @param {Object}    props
- * @param {ReactNode} props.action    Call to action element.
- * @param {ReactNode} props.icon      Status icon element.
- * @param {boolean}   props.isLoading Flag indicating if it's a loading message.
- * @param {boolean}   props.isSmall   Flag indicating if the notification is small.
- * @param {string}    props.message   Message text.
+ * @param {Object}      props
+ * @param {JSX.Element} props.action    Call to action element.
+ * @param {JSX.Element} props.icon      Status icon element.
+ * @param {boolean}     props.isLoading Flag indicating if it's a loading message.
+ * @param {boolean}     props.isSmall   Flag indicating if the notification is small.
+ * @param {string}      props.message   Message text.
  */
 export function SidebarNotification( {
 	action,

diff --git a/assets/src/settings-page/plugin-suppression.js b/assets/src/settings-page/plugin-suppression.js
@@ -356,7 +356,7 @@ export function PluginSuppression() {
 					</tr>
 				</thead>
 				<tbody>
-					{ Object.keys( suppressiblePlugins || {} ).map( ( pluginKey ) => (
+					{ Object.keys( suppressiblePlugins ).map( ( pluginKey ) => (
 						<PluginRow
 							key={ `plugin-row-${ pluginKey }` }
 							pluginDetails={ suppressiblePlugins[ pluginKey ] }

diff --git a/assets/src/settings-page/supported-templates.js b/assets/src/settings-page/supported-templates.js
@@ -231,7 +231,7 @@ export function SupportedTemplatesFieldset() {
 		reader_theme: readerTheme,
 	} = editedOptions || {};
 
-	if ( ( 'reader' === themeSupport && 'legacy' === readerTheme ) || ! supportableTemplates ) {
+	if ( ( 'reader' === themeSupport && 'legacy' === readerTheme ) || ! supportableTemplates?.length ) {
 		return null;
 	}
 
@@ -256,14 +256,7 @@ export function SupportedTemplatesFieldset() {
 						} }
 					/>
 
-					{ supportableTemplates
-						? <SupportedTemplatesCheckboxes supportableTemplates={ supportableTemplates } />
-						: (
-							<p>
-								{ __( 'Your site does not provide any templates to support.', 'amp' ) }
-							</p>
-						)
-					}
+					<SupportedTemplatesCheckboxes supportableTemplates={ supportableTemplates } />
 				</>
 			) : null }
 		</fieldset>

diff --git a/bin/amphtml-update.py b/bin/amphtml-update.py
@@ -17,19 +17,14 @@
 import glob
 import logging
 import os
-import platform
 import re
-import shutil
 import subprocess
 import sys
 import tempfile
 import collections
 import json
 import google
-from collections import defaultdict
 import imp
-import re
-import urllib
 
 seen_spec_names = set()
 
@@ -388,7 +383,7 @@ def ParseRules(repo_directory, out_dir):
 					descendant_lists[_list.name].append( val.lower() )
 
 	# Separate extension scripts from non-extension scripts and gather the versions
-	extension_scripts = defaultdict(list)
+	extension_scripts = collections.defaultdict(list)
 	extension_specs_by_satisfies = dict()
 	script_tags = []
 	for script_tag in allowed_tags['script']:
@@ -682,7 +677,6 @@ def GetTagRules(tag_spec):
 		tag_rules['disallowed_ancestor'] = disallowed_ancestor_list
 
 	if tag_spec.html_format:
-		html_format_list = []
 		has_amp_format = False
 		for html_format in tag_spec.html_format:
 			if 1 == html_format:
@@ -767,7 +761,7 @@ def GetTagRules(tag_spec):
 		tag_rules['unique_warning'] = tag_spec.unique_warning
 
 	if tag_spec.HasField('child_tags'):
-		child_tags = defaultdict( lambda: [] )
+		child_tags = collections.defaultdict( lambda: [] )
 		for field in tag_spec.child_tags.ListFields():
 			if isinstance(field[1], (int)):
 				child_tags[ field[0].name ] = field[1]
@@ -953,7 +947,7 @@ def Phpize(data, indent=0):
 
 	# Clean up formatting.
 	# TODO: Just use PHPCBF for this.
-	php_exported = re.sub( r'^ +', lambda match: ( len(match.group(0))/2 ) * '\t', php_exported, flags=re.MULTILINE )
+	php_exported = re.sub( r'^ +', lambda match: int( round(len(match.group(0))/2) ) * '\t', php_exported, flags=re.MULTILINE )
 	php_exported = php_exported.replace( 'array (', 'array(' )
 	php_exported = re.sub( r' => \n\s+', ' => ', php_exported, flags=re.MULTILINE )
 	php_exported = re.sub( r'^(\s+)\d+ =>\s*', r'\1', php_exported, flags=re.MULTILINE )