feature: dword: codemirror v5.65.16

coderaiser · coderaiser · commit 5631d48ee3ec · 2024-02-02T12:07:56.000+02:00
diff --git a/modules/codemirror/AUTHORS b/modules/codemirror/AUTHORS
@@ -301,6 +301,7 @@ fraxx001
 Fredrik Borg
 FUJI Goro (gfx)
 fzipp
+Gabriela Gutierrez
 Gabriel Gheorghian
 Gabriel Horner
 Gabriel Nahmias
@@ -718,6 +719,7 @@ Panupong Pasupat
 paris
 Paris
 Paris Kasidiaris
+Parker Lougheed
 Patil Arpith
 Patrick Kettner
 Patrick Stoica
diff --git a/modules/codemirror/CHANGELOG.md b/modules/codemirror/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 5.65.16 (2023-11-20)
+
+### Bug fixes
+
+Fix focus tracking in shadow DOM.
+
+[go mode](https://codemirror.net/5/mode/go/): Allow underscores in numbers.
+
+[jsx mode](https://codemirror.net/5/mode/jsx/index.html): Support TS generics marked by trailing comma.
+
+## 5.65.15 (2023-08-29)
+
+### Bug fixes
+
+[lint addon](https://codemirror.net/5/doc/manual.html#addon_lint): Prevent tooltips from sticking out of the viewport.
+
+[yaml mode](https://codemirror.net/5/mode/yaml/): Fix an exponential-complexity regular expression.
+
 ## 5.65.14 (2023-07-17)
 
 ### Bug fixes
diff --git a/modules/codemirror/README.md b/modules/codemirror/README.md
@@ -1,7 +1,8 @@
-# CodeMirror
+# CodeMirror 5
+
+**NOTE:** [CodeMirror 6](https://codemirror.net/) exists, and is more mobile-friendly, more accessible, better designed, and much more actively maintained.
 
 [![Build Status](https://github.com/codemirror/codemirror5/workflows/main/badge.svg)](https://github.com/codemirror/codemirror5/actions)
-[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
 
 CodeMirror is a versatile text editor implemented in JavaScript for
 the browser. It is specialized for editing code, and comes with over
@@ -33,7 +34,7 @@ Either get the [zip file](https://codemirror.net/5/codemirror.zip) with
 the latest version, or make sure you have [Node](https://nodejs.org/)
 installed and run:
 
-    npm install codemirror
+    npm install codemirror@5
 
 **NOTE**: This is the source repository for the library, and not the
 distribution channel. Cloning it is not the recommended way to install
diff --git a/modules/codemirror/addon/lint/lint.js b/modules/codemirror/addon/lint/lint.js
@@ -24,8 +24,10 @@
 
     function position(e) {
       if (!tt.parentNode) return CodeMirror.off(document, "mousemove", position);
-      tt.style.top = Math.max(0, e.clientY - tt.offsetHeight - 5) + "px";
-      tt.style.left = (e.clientX + 5) + "px";
+      var top = Math.max(0, e.clientY - tt.offsetHeight - 5);
+      var left = Math.max(0, Math.min(e.clientX + 5, tt.ownerDocument.defaultView.innerWidth - tt.offsetWidth));
+      tt.style.top = top + "px"
+      tt.style.left = left + "px";
     }
     CodeMirror.on(document, "mousemove", position);
     position(e);
diff --git a/modules/codemirror/changes b/modules/codemirror/changes
@@ -0,0 +1,3 @@
+* Fix focus tracking in shadow DOM.
+* [go mode](https://codemirror.net/5/mode/go/): Allow underscores in numbers.
+* [jsx mode](https://codemirror.net/5/mode/jsx/index.html): Support TS generics marked by trailing comma.
diff --git a/modules/codemirror/mode/dart/dart.js b/modules/codemirror/mode/dart/dart.js
@@ -15,7 +15,7 @@
     "implements mixin get native set typedef with enum throw rethrow assert break case " +
     "continue default in return new deferred async await covariant try catch finally " +
     "do else for if switch while import library export part of show hide is as extension " +
-    "on yield late required sealed base interface when inline").split(" ");
+    "on yield late required sealed base interface when").split(" ");
   var blockKeywords = "try catch finally do else for if switch while".split(" ");
   var atoms = "true false null".split(" ");
   var builtins = "void bool num int double dynamic var String Null Never".split(" ");
diff --git a/modules/codemirror/mode/go/go.js b/modules/codemirror/mode/go/go.js
@@ -46,11 +46,11 @@ CodeMirror.defineMode("go", function(config) {
     }
     if (/[\d\.]/.test(ch)) {
       if (ch == ".") {
-        stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/);
+        stream.match(/^[0-9_]+([eE][\-+]?[0-9_]+)?/);
       } else if (ch == "0") {
-        stream.match(/^[xX][0-9a-fA-F]+/) || stream.match(/^0[0-7]+/);
+        stream.match(/^[xX][0-9a-fA-F_]+/) || stream.match(/^[0-7_]+/);
       } else {
-        stream.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/);
+        stream.match(/^[0-9_]*\.?[0-9_]*([eE][\-+]?[0-9_]+)?/);
       }
       return "number";
     }
diff --git a/modules/codemirror/mode/jsx/jsx.js b/modules/codemirror/mode/jsx/jsx.js
@@ -103,7 +103,8 @@
     }
 
     function jsToken(stream, state, cx) {
-      if (stream.peek() == "<" && jsMode.expressionAllowed(stream, cx.state)) {
+      if (stream.peek() == "<" && !stream.match(/^<([^<>]|<[^>]*>)+,\s*>/, false) &&
+          jsMode.expressionAllowed(stream, cx.state)) {
         state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "", "")),
                                     xmlMode, 0, state.context)
         jsMode.skipExpression(cx.state)
diff --git a/modules/codemirror/mode/yaml/yaml.js b/modules/codemirror/mode/yaml/yaml.js
@@ -85,7 +85,7 @@ CodeMirror.defineMode("yaml", function() {
       }
 
       /* pairs (associative arrays) -> key */
-      if (!state.pair && stream.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^,\[\]{}#&*!|>'"%@`])[^#]*?(?=\s*:($|\s))/)) {
+      if (!state.pair && stream.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^\s,\[\]{}#&*!|>'"%@`])[^#:]*(?=:($|\s))/)) {
         state.pair = true;
         state.keyCol = stream.indentation();
         return "atom";
diff --git a/modules/codemirror/src/display/operations.js b/modules/codemirror/src/display/operations.js
@@ -2,7 +2,7 @@ import { clipPos } from "../line/pos.js"
 import { findMaxLine } from "../line/spans.js"
 import { displayWidth, measureChar, scrollGap } from "../measurement/position_measurement.js"
 import { signal } from "../util/event.js"
-import { activeElt, doc } from "../util/dom.js"
+import { activeElt, root } from "../util/dom.js"
 import { finishOperation, pushOperation } from "../util/operation_group.js"
 
 import { ensureFocus } from "./focus.js"
@@ -116,7 +116,7 @@ function endOperation_W2(op) {
     cm.display.maxLineChanged = false
   }
 
-  let takeFocus = op.focus && op.focus == activeElt(doc(cm))
+  let takeFocus = op.focus && op.focus == activeElt(root(cm))
   if (op.preparedSelection)
     cm.display.input.showSelection(op.preparedSelection, takeFocus)
   if (op.updatedDisplay || op.startHeight != cm.doc.height)
diff --git a/modules/codemirror/src/display/update_display.js b/modules/codemirror/src/display/update_display.js
@@ -3,7 +3,7 @@ import { heightAtLine, visualLineEndNo, visualLineNo } from "../line/spans.js"
 import { getLine, lineNumberFor } from "../line/utils_line.js"
 import { displayHeight, displayWidth, getDimensions, paddingVert, scrollGap } from "../measurement/position_measurement.js"
 import { mac, webkit } from "../util/browser.js"
-import { activeElt, removeChildren, contains, win, doc } from "../util/dom.js"
+import { activeElt, removeChildren, contains, win, root, rootNode } from "../util/dom.js"
 import { hasHandler, signal } from "../util/event.js"
 import { signalLater } from "../util/operation_group.js"
 import { indexOf } from "../util/misc.js"
@@ -57,7 +57,7 @@ export function maybeClipScrollbars(cm) {
 
 function selectionSnapshot(cm) {
   if (cm.hasFocus()) return null
-  let active = activeElt(doc(cm))
+  let active = activeElt(root(cm))
   if (!active || !contains(cm.display.lineDiv, active)) return null
   let result = {activeElt: active}
   if (window.getSelection) {
@@ -73,7 +73,7 @@ function selectionSnapshot(cm) {
 }
 
 function restoreSelection(snapshot) {
-  if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt(snapshot.activeElt.ownerDocument)) return
+  if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt(rootNode(snapshot.activeElt))) return
   snapshot.activeElt.focus()
   if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) &&
       snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
diff --git a/modules/codemirror/src/edit/fromTextArea.js b/modules/codemirror/src/edit/fromTextArea.js
@@ -1,5 +1,5 @@
 import { CodeMirror } from "./CodeMirror.js"
-import { activeElt } from "../util/dom.js"
+import { activeElt, rootNode } from "../util/dom.js"
 import { off, on } from "../util/event.js"
 import { copyObj } from "../util/misc.js"
 
@@ -13,7 +13,7 @@ export function fromTextArea(textarea, options) {
   // Set autofocus to true if this textarea is focused, or if it has
   // autofocus and no other element is focused.
   if (options.autofocus == null) {
-    let hasFocus = activeElt(textarea.ownerDocument)
+    let hasFocus = activeElt(rootNode(textarea))
     options.autofocus = hasFocus == textarea ||
       textarea.getAttribute("autofocus") != null && hasFocus == document.body
   }
diff --git a/modules/codemirror/src/edit/key_events.js b/modules/codemirror/src/edit/key_events.js
@@ -3,7 +3,7 @@ import { restartBlink } from "../display/selection.js"
 import { isModifierKey, keyName, lookupKey } from "../input/keymap.js"
 import { eventInWidget } from "../measurement/widgets.js"
 import { ie, ie_version, mac, presto, gecko } from "../util/browser.js"
-import { activeElt, addClass, rmClass, doc } from "../util/dom.js"
+import { activeElt, addClass, rmClass, root } from "../util/dom.js"
 import { e_preventDefault, off, on, signalDOMEvent } from "../util/event.js"
 import { hasCopyEvent } from "../util/feature_detection.js"
 import { Delayed, Pass } from "../util/misc.js"
@@ -107,7 +107,7 @@ let lastStoppedKey = null
 export function onKeyDown(e) {
   let cm = this
   if (e.target && e.target != cm.display.input.getField()) return
-  cm.curOp.focus = activeElt(doc(cm))
+  cm.curOp.focus = activeElt(root(cm))
   if (signalDOMEvent(cm, e)) return
   // IE does strange things with escape.
   if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false
diff --git a/modules/codemirror/src/edit/main.js b/modules/codemirror/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.14"
+CodeMirror.version = "5.65.16"
diff --git a/modules/codemirror/src/edit/methods.js b/modules/codemirror/src/edit/methods.js
@@ -1,7 +1,7 @@
 import { deleteNearSelection } from "./deleteNearSelection.js"
 import { commands } from "./commands.js"
 import { attachDoc } from "../model/document_data.js"
-import { activeElt, addClass, rmClass, doc, win } from "../util/dom.js"
+import { activeElt, addClass, rmClass, root, win } from "../util/dom.js"
 import { eventMixin, signal } from "../util/event.js"
 import { getLineStyles, getContextBefore, takeToken } from "../line/highlight.js"
 import { indentLine } from "../input/indent.js"
@@ -358,7 +358,7 @@ export default function(CodeMirror) {
 
       signal(this, "overwriteToggle", this, this.state.overwrite)
     },
-    hasFocus: function() { return this.display.input.getField() == activeElt(doc(this)) },
+    hasFocus: function() { return this.display.input.getField() == activeElt(root(this)) },
     isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) },
 
     scrollTo: methodOp(function (x, y) { scrollToCoords(this, x, y) }),
diff --git a/modules/codemirror/src/edit/mouse_events.js b/modules/codemirror/src/edit/mouse_events.js
@@ -9,7 +9,7 @@ import { normalizeSelection, Range, Selection } from "../model/selection.js"
 import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates.js"
 import { captureRightClick, chromeOS, ie, ie_version, mac, webkit, safari } from "../util/browser.js"
 import { getOrder, getBidiPartAt } from "../util/bidi.js"
-import { activeElt, doc as getDoc, win } from "../util/dom.js"
+import { activeElt, root, win } from "../util/dom.js"
 import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event.js"
 import { dragAndDrop } from "../util/feature_detection.js"
 import { bind, countColumn, findColumn, sel_mouse } from "../util/misc.js"
@@ -128,7 +128,7 @@ function configureMouse(cm, repeat, event) {
 
 function leftButtonDown(cm, pos, repeat, event) {
   if (ie) setTimeout(bind(ensureFocus, cm), 0)
-  else cm.curOp.focus = activeElt(getDoc(cm))
+  else cm.curOp.focus = activeElt(root(cm))
 
   let behavior = configureMouse(cm, repeat, event)
 
@@ -292,7 +292,7 @@ function leftButtonSelect(cm, event, start, behavior) {
     let cur = posFromMouse(cm, e, true, behavior.unit == "rectangle")
     if (!cur) return
     if (cmp(cur, lastPos) != 0) {
-      cm.curOp.focus = activeElt(getDoc(cm))
+      cm.curOp.focus = activeElt(root(cm))
       extendTo(cur)
       let visible = visibleLines(display, doc)
       if (cur.line >= visible.to || cur.line < visible.from)
diff --git a/modules/codemirror/src/input/ContentEditableInput.js b/modules/codemirror/src/input/ContentEditableInput.js
@@ -10,7 +10,7 @@ import { simpleSelection } from "../model/selection.js"
 import { setSelection } from "../model/selection_updates.js"
 import { getBidiPartAt, getOrder } from "../util/bidi.js"
 import { android, chrome, gecko, ie_version } from "../util/browser.js"
-import { activeElt, contains, range, removeChildrenAndAdd, selectInput } from "../util/dom.js"
+import { activeElt, contains, range, removeChildrenAndAdd, selectInput, rootNode } from "../util/dom.js"
 import { on, signalDOMEvent } from "../util/event.js"
 import { Delayed, lst, sel_dontScroll } from "../util/misc.js"
 
@@ -97,7 +97,7 @@ export default class ContentEditableInput {
       disableBrowserMagic(te)
       cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild)
       te.value = lastCopied.text.join("\n")
-      let hadFocus = activeElt(div.ownerDocument)
+      let hadFocus = activeElt(rootNode(div))
       selectInput(te)
       setTimeout(() => {
         cm.display.lineSpace.removeChild(kludge)
@@ -120,7 +120,7 @@ export default class ContentEditableInput {
 
   prepareSelection() {
     let result = prepareSelection(this.cm, false)
-    result.focus = activeElt(this.div.ownerDocument) == this.div
+    result.focus = activeElt(rootNode(this.div)) == this.div
     return result
   }
 
@@ -214,7 +214,7 @@ export default class ContentEditableInput {
 
   focus() {
     if (this.cm.options.readOnly != "nocursor") {
-      if (!this.selectionInEditor() || activeElt(this.div.ownerDocument) != this.div)
+      if (!this.selectionInEditor() || activeElt(rootNode(this.div)) != this.div)
         this.showSelection(this.prepareSelection(), true)
       this.div.focus()
     }
diff --git a/modules/codemirror/src/input/TextareaInput.js b/modules/codemirror/src/input/TextareaInput.js
@@ -6,7 +6,7 @@ import { eventInWidget } from "../measurement/widgets.js"
 import { simpleSelection } from "../model/selection.js"
 import { selectAll, setSelection } from "../model/selection_updates.js"
 import { captureRightClick, ie, ie_version, ios, mac, mobile, presto, webkit } from "../util/browser.js"
-import { activeElt, removeChildrenAndAdd, selectInput } from "../util/dom.js"
+import { activeElt, removeChildrenAndAdd, selectInput, rootNode } from "../util/dom.js"
 import { e_preventDefault, e_stop, off, on, signalDOMEvent } from "../util/event.js"
 import { hasSelection } from "../util/feature_detection.js"
 import { Delayed, sel_dontScroll } from "../util/misc.js"
@@ -182,7 +182,7 @@ export default class TextareaInput {
   supportsTouch() { return false }
 
   focus() {
-    if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt(this.textarea.ownerDocument) != this.textarea)) {
+    if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt(rootNode(this.textarea)) != this.textarea)) {
       try { this.textarea.focus() }
       catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
     }
diff --git a/modules/codemirror/src/util/dom.js b/modules/codemirror/src/util/dom.js
@@ -64,13 +64,14 @@ export function contains(parent, child) {
   } while (child = child.parentNode)
 }
 
-export function activeElt(doc) {
+export function activeElt(rootNode) {
   // IE and Edge may throw an "Unspecified Error" when accessing document.activeElement.
   // IE < 10 will throw when accessed while the page is loading or in an iframe.
   // IE > 9 and Edge will throw when accessed in an iframe if document.body is unavailable.
+  let doc = rootNode.ownerDocument || rootNode
   let activeElement
   try {
-    activeElement = doc.activeElement
+    activeElement = rootNode.activeElement
   } catch(e) {
     activeElement = doc.body || null
   }
@@ -98,4 +99,13 @@ else if (ie) // Suppress mysterious IE10 errors
 
 export function doc(cm) { return cm.display.wrapper.ownerDocument }
 
+export function root(cm) {
+  return rootNode(cm.display.wrapper)
+}
+
+export function rootNode(element) {
+  // Detect modern browsers (2017+).
+  return element.getRootNode ? element.getRootNode() : element.ownerDocument
+}
+
 export function win(cm) { return doc(cm).defaultView }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+* Fix focus tracking in shadow DOM.`
	`2`	`+* [go mode](https://codemirror.net/5/mode/go/): Allow underscores in numbers.`
	`3`	`+* [jsx mode](https://codemirror.net/5/mode/jsx/index.html): Support TS generics marked by trailing comma.`
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,11 @@ CodeMirror.defineMode("go", function(config) {`
`46`	`46`	`}`
`47`	`47`	`if (/[\d\.]/.test(ch)) {`
`48`	`48`	`if (ch == ".") {`
`49`		`- stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/);`
	`49`	`+ stream.match(/^[0-9_]+([eE][\-+]?[0-9_]+)?/);`
`50`	`50`	`} else if (ch == "0") {`
`51`		`- stream.match(/^[xX][0-9a-fA-F]+/) \|\| stream.match(/^0[0-7]+/);`
	`51`	`+ stream.match(/^[xX][0-9a-fA-F_]+/) \|\| stream.match(/^[0-7_]+/);`
`52`	`52`	`} else {`
`53`		`- stream.match(/^[0-9]\.?[0-9]([eE][\-+]?[0-9]+)?/);`
	`53`	`+ stream.match(/^[0-9_]\.?[0-9_]([eE][\-+]?[0-9_]+)?/);`
`54`	`54`	`}`
`55`	`55`	`return "number";`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,8 @@`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`function jsToken(stream, state, cx) {`
`106`		`- if (stream.peek() == "<" && jsMode.expressionAllowed(stream, cx.state)) {`
	`106`	`+ if (stream.peek() == "<" && !stream.match(/^<([^<>]\|<[^>]>)+,\s>/, false) &&`
	`107`	`+ jsMode.expressionAllowed(stream, cx.state)) {`
`107`	`108`	`state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "", "")),`
`108`	`109`	`xmlMode, 0, state.context)`
`109`	`110`	`jsMode.skipExpression(cx.state)`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ CodeMirror.defineMode("yaml", function() {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/* pairs (associative arrays) -> key */`
`88`		- if (!state.pair && stream.match(/^\s(?:[,\[\]{}&!\|>'"%@`][^\s'":]\|[^,\[\]{}#&!\|>'"%@`])[^#]?(?=\s*:($\|\s))/)) {
	`88`	+ if (!state.pair && stream.match(/^\s(?:[,\[\]{}&!\|>'"%@`][^\s'":]\|[^\s,\[\]{}#&!\|>'"%@`])[^#:](?=:($\|\s))/)) {
`89`	`89`	`state.pair = true;`
`90`	`90`	`state.keyCol = stream.indentation();`
`91`	`91`	`return "atom";`