Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: fe5c7a50d8e3011d908ed5014acaa9e941225e05
https://github.com/WebKit/WebKit/commit/fe5c7a50d8e3011d908ed5014acaa9e941225e05
Author: Razvan Caliman <[email protected]>
Date: 2025-09-22 (Mon, 22 Sep 2025)
Changed paths:
M Source/WebInspectorUI/Scripts/update-codemirror-resources.rb
M Source/WebInspectorUI/Tools/CodeMirrorModes/index.html
M Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE
M Source/WebInspectorUI/UserInterface/External/CodeMirror/clike.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/clojure.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/closebrackets.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.css
M Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/coffeescript.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/comment.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/css.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/htmlmixed.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/javascript.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/jsx.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/livescript.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/mark-selection.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/matchbrackets.js
R Source/WebInspectorUI/UserInterface/External/CodeMirror/overlay.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/placeholder.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/runmode.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/sass.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/searchcursor.js
R Source/WebInspectorUI/UserInterface/External/CodeMirror/sql.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/sublime.js
M Source/WebInspectorUI/UserInterface/External/CodeMirror/xml.js
M Source/WebInspectorUI/UserInterface/Main.html
M Source/WebInspectorUI/UserInterface/Models/CSSStyleDeclaration.js
M Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js
M Source/WebInspectorUI/UserInterface/Views/CodeMirrorOverrides.css
M Source/WebInspectorUI/UserInterface/Views/SpreadsheetStyleProperty.js
M
Source/WebInspectorUI/UserInterface/Views/SyntaxHighlightingDefaultTheme.css
M Source/WebInspectorUI/UserInterface/Views/TextEditor.js
Log Message:
-----------
Web inspector fails to syntax highlight JS with backtick-delimited format
strings
https://bugs.webkit.org/show_bug.cgi?id=283870
rdar://107619553
Reviewed by Devin Rousso and BJ Burg.
Update CodeMirror from version 5.21.1 to 5.65.20
Highlights
- Syntax highlighting for template literals (template strings)
- Styntax highlighting for private class elements
* Source/WebInspectorUI/Scripts/update-codemirror-resources.rb:
Check for the latest repository name format.
Stop copying over addon/mode/overlay.js and mode/sql/sql.js because they're not
used anymore.
* Source/WebInspectorUI/Tools/CodeMirrorModes/index.html:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/clike.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/clojure.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/closebrackets.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.css:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/codemirror.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/coffeescript.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/comment.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/css.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/htmlmixed.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/javascript.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/jsx.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/livescript.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/mark-selection.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/matchbrackets.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/overlay.js: Removed.
`CodeMirror.overlayMode` Doesn't seem to be used anywhere.
This file has existed since Web Inspector inception and was periodically
updated,
but whatever used this functionality was probably removed at some point.
* Source/WebInspectorUI/UserInterface/External/CodeMirror/placeholder.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/runmode.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/sass.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/searchcursor.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/sql.js: Removed.
SQL syntax highlighting is no longer used.
* Source/WebInspectorUI/UserInterface/External/CodeMirror/sublime.js:
* Source/WebInspectorUI/UserInterface/External/CodeMirror/xml.js:
* Source/WebInspectorUI/UserInterface/Main.html:
* Source/WebInspectorUI/UserInterface/Models/CSSStyleDeclaration.js:
(WI.CSSStyleDeclaration.prototype.resolveVariableValue):
* Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js:
* Source/WebInspectorUI/UserInterface/Views/CodeMirrorOverrides.css:
(.CodeMirror pre:is(.CodeMirror-line, .CodeMirror-line-like)):
(.CodeMirror pre): Deleted.
* Source/WebInspectorUI/UserInterface/Views/SpreadsheetStyleProperty.js:
(WI.SpreadsheetStyleProperty.prototype._addGradientTokens):
(WI.SpreadsheetStyleProperty.prototype._addColorTokens):
(WI.SpreadsheetStyleProperty.prototype._addTimingFunctionTokens):
(WI.SpreadsheetStyleProperty.prototype._addVariableTokens):
In CodeMirror version 5.43.0, the token type for CSS functions was changed
from "atom" to "variable callee":
https://github.com/codemirror/codemirror5/commit/3c79c54a335411fd1aff55246b77131dd98bb81b
Update references in Web Inspector which check against that token type.
* Source/WebInspectorUI/UserInterface/Views/SyntaxHighlightingDefaultTheme.css:
(.cm-s-default :is(.cm-tag, .cm-bracket, .cm-atom, .cm-variable.cm-callee,
.cm-keyword, .cm-m-javascript.cm-builtin),):
(.cm-s-default :is(.cm-tag, .cm-bracket, .cm-atom, .cm-keyword,
.cm-m-javascript.cm-builtin),): Deleted.
Update syntax highlighting theme to account for the new `cm-callee` class name
set on CSS functions.
* Source/WebInspectorUI/UserInterface/Views/TextEditor.js:
(WI.TextEditor.prototype.toggleStyleClassForLine): Deleted.
toggleStyleClassForLine() is no longer used.
Canonical link: https://commits.webkit.org/300332@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
