Quellcode durchsuchen

Upgrade Lezer dependencies (#21987)

GitOrigin-RevId: 5eb834bb1144c499ea29539750f1b73edeeff2f8
Alf Eaton vor 1 Jahr
Ursprung
Commit
2304e6d32b

+ 19 - 17
package-lock.json

@@ -6466,10 +6466,11 @@
       "dev": true
     },
     "node_modules/@lezer/common": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz",
-      "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==",
-      "dev": true
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
+      "integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@lezer/css": {
       "version": "1.0.0",
@@ -6533,10 +6534,11 @@
       }
     },
     "node_modules/@lezer/markdown": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.3.1.tgz",
-      "integrity": "sha512-DGlzU/i8DC8k0uz1F+jeePrkATl0jWakauTzftMQOcbaMkHbNSRki/4E2tOzJWsVpoKYhe7iTJ03aepdwVUXUA==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.3.2.tgz",
+      "integrity": "sha512-Wu7B6VnrKTbBEohqa63h5vxXjiC4pO5ZQJ/TDbhJxPQaaIoRD/6UVDhSDtVsCwVZV12vvN9KxuLL3ATMnlG0oQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.0.0",
         "@lezer/highlight": "^1.0.0"
@@ -41477,11 +41479,11 @@
         "@codemirror/state": "^6.4.1",
         "@codemirror/view": "^6.34.3",
         "@juggle/resize-observer": "^3.3.1",
-        "@lezer/common": "^1.2.1",
+        "@lezer/common": "^1.2.3",
         "@lezer/generator": "^1.7.1",
         "@lezer/highlight": "^1.2.1",
         "@lezer/lr": "^1.4.2",
-        "@lezer/markdown": "^1.3.1",
+        "@lezer/markdown": "^1.3.2",
         "@opentelemetry/api": "^1.4.1",
         "@opentelemetry/auto-instrumentations-web": "^0.33.1",
         "@opentelemetry/context-zone": "^1.15.2",
@@ -48448,9 +48450,9 @@
       "dev": true
     },
     "@lezer/common": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz",
-      "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
+      "integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==",
       "dev": true
     },
     "@lezer/css": {
@@ -48512,9 +48514,9 @@
       }
     },
     "@lezer/markdown": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.3.1.tgz",
-      "integrity": "sha512-DGlzU/i8DC8k0uz1F+jeePrkATl0jWakauTzftMQOcbaMkHbNSRki/4E2tOzJWsVpoKYhe7iTJ03aepdwVUXUA==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.3.2.tgz",
+      "integrity": "sha512-Wu7B6VnrKTbBEohqa63h5vxXjiC4pO5ZQJ/TDbhJxPQaaIoRD/6UVDhSDtVsCwVZV12vvN9KxuLL3ATMnlG0oQ==",
       "dev": true,
       "requires": {
         "@lezer/common": "^1.0.0",
@@ -50975,11 +50977,11 @@
         "@contentful/rich-text-types": "^16.0.2",
         "@google-cloud/bigquery": "^6.0.1",
         "@juggle/resize-observer": "^3.3.1",
-        "@lezer/common": "^1.2.1",
+        "@lezer/common": "^1.2.3",
         "@lezer/generator": "^1.7.1",
         "@lezer/highlight": "^1.2.1",
         "@lezer/lr": "^1.4.2",
-        "@lezer/markdown": "^1.3.1",
+        "@lezer/markdown": "^1.3.2",
         "@node-oauth/oauth2-server": "^5.1.0",
         "@node-saml/passport-saml": "^4.0.4",
         "@opentelemetry/api": "^1.4.1",

+ 6 - 7
services/web/frontend/js/features/source-editor/utils/tree-operations/figure.ts

@@ -2,24 +2,23 @@ import { SyntaxNode, SyntaxNodeRef } from '@lezer/common'
 import { CenteringCtrlSeq } from '../../lezer-latex/latex.terms.mjs'
 
 export function centeringNodeForEnvironment(
-  node: SyntaxNodeRef
+  environmentNodeRef: SyntaxNodeRef
 ): SyntaxNode | null {
   let centeringNode: SyntaxNode | null = null
-  const cursor = node.node.cursor()
-  cursor.next()
+  const cursor = environmentNodeRef.node.cursor()
   cursor.iterate(nodeRef => {
     if (centeringNode) {
       return false
     }
-    if (nodeRef.from > node.to) {
-      return false
-    }
     if (nodeRef.type.is(CenteringCtrlSeq)) {
       centeringNode = nodeRef.node
       return false
     }
     // don't descend into nested environments
-    if (nodeRef.type.is('$Environment')) {
+    if (
+      nodeRef.node !== environmentNodeRef.node &&
+      nodeRef.type.is('$Environment')
+    ) {
       return false
     }
   })

+ 2 - 2
services/web/package.json

@@ -187,11 +187,11 @@
     "@codemirror/state": "^6.4.1",
     "@codemirror/view": "^6.34.3",
     "@juggle/resize-observer": "^3.3.1",
-    "@lezer/common": "^1.2.1",
+    "@lezer/common": "^1.2.3",
     "@lezer/generator": "^1.7.1",
     "@lezer/highlight": "^1.2.1",
     "@lezer/lr": "^1.4.2",
-    "@lezer/markdown": "^1.3.1",
+    "@lezer/markdown": "^1.3.2",
     "@opentelemetry/api": "^1.4.1",
     "@opentelemetry/auto-instrumentations-web": "^0.33.1",
     "@opentelemetry/context-zone": "^1.15.2",