Skip to content

Also apply fixes for PHP autocompletion #10807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
joedolson wants to merge 9 commits into from
+13 −7
Closed

Also apply fixes for PHP autocompletion #10807

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
535fd97
Also apply fixes for PHP autocompletion
joedolson Jan 28, 2026
4447d46
Use optional chaining operator
westonruter Jan 28, 2026
382a3f1
Add parentheses to conditions for readability and avoiding logic errors
westonruter Jan 28, 2026
87f107b
Merge branch 'trunk' of https://github.com/WordPress/wordpress-develo…
westonruter Jan 28, 2026
1311d39
Remove obsolete jshint comment after Core-64562 (97b09c8)
westonruter Jan 28, 2026
8cd4589
Update tagName check
westonruter Feb 2, 2026
43d18f8
Merge branch 'trunk' of https://github.com/WordPress/wordpress-develo…
westonruter Feb 2, 2026
462d9f5
Merge branch 'trunk' into codemirror-42822
westonruter Feb 2, 2026
b5997a8
Remove redundant check
westonruter Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/js/_enqueues/wp/code-editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
* @output wp-admin/js/code-editor.js
*/

/* eslint-env es2020 */

if ( 'undefined' === typeof window.wp ) {
/**
* @namespace wp
Expand Down Expand Up @@ -315,21 +317,25 @@ if ( 'undefined' === typeof window.wp.codeEditor ) {
innerMode = wp.CodeMirror.innerMode( codemirror.getMode(), token.state ).mode.name;
lineBeforeCursor = codemirror.doc.getLine( codemirror.doc.getCursor().line ).substr( 0, codemirror.doc.getCursor().ch );
if ( 'html' === innerMode || 'xml' === innerMode ) {
shouldAutocomplete =
shouldAutocomplete = (
'<' === event.key ||
'/' === event.key && 'tag' === token.type ||
isAlphaKey && 'tag' === token.type ||
isAlphaKey && 'attribute' === token.type ||
'=' === token.string && token.state.htmlState && token.state.htmlState.tagName;
( '/' === event.key && 'tag' === token.type ) ||
( isAlphaKey && 'tag' === token.type ) ||
( isAlphaKey && 'attribute' === token.type ) ||
( '=' === event.key && (
token.state.htmlState?.tagName ||
token.state.curState?.htmlState?.tagName
) )
);
} else if ( 'css' === innerMode ) {
shouldAutocomplete =
isAlphaKey ||
':' === event.key ||
' ' === event.key && /:\s+$/.test( lineBeforeCursor );
( ' ' === event.key && /:\s+$/.test( lineBeforeCursor ) );
} else if ( 'javascript' === innerMode ) {
shouldAutocomplete = isAlphaKey || '.' === event.key;
} else if ( 'clike' === innerMode && 'php' === codemirror.options.mode ) {
shouldAutocomplete = 'keyword' === token.type || 'variable' === token.type;
shouldAutocomplete = isAlphaKey && ( 'keyword' === token.type || 'variable' === token.type );
}
if ( shouldAutocomplete ) {
codemirror.showHint( { completeSingle: false } );
Expand Down
Loading