Merge branch 'asciidoctor:master' into local-includes

asciidoctor · Sep 26, 2024 · 44f59ff · 44f59ff
2 parents d6b49aa + 6a69acb
commit 44f59ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/features/antora/antoraSupport.ts b/src/features/antora/antoraSupport.ts
@@ -8,6 +8,8 @@ import * as nls from 'vscode-nls'
 import ContentCatalog from '@antora/content-classifier/content-catalog'
 import { getWorkspaceFolder } from '../../util/workspace'
 import { dir, exists } from '../../util/file'
+import * as contentClassifier from '@antora/content-classifier'
+const classifyContent = contentClassifier.default || contentClassifier
 
 const MAX_DEPTH_SEARCH_ANTORA_CONFIG = 100
 const localize = nls.loadMessageBundle()
@@ -316,10 +318,6 @@ export async function getAntoraDocumentContext (textDocumentUri: Uri, workspaceS
           files,
         }
       })))
-    let classifyContent = await import('@antora/content-classifier')
-    if ('default' in classifyContent) {
-      classifyContent = classifyContent.default // default export
-    }
     const contentCatalog = await classifyContent({
       site: {},
     }, contentAggregate)

diff --git a/syntaxes/Asciidoctor.json b/syntaxes/Asciidoctor.json
@@ -1974,7 +1974,7 @@
       "patterns": [
         {
           "name": "markup.table.asciidoc",
-          "begin": "^(\\|===)$",
+          "begin": "^(\\|===)\\s*$",
           "beginCaptures": {
             "0": {
               "name": "markup.table.delimiter.asciidoc"
@@ -1998,7 +1998,7 @@
               "include": "#tables-includes"
             }
           ],
-          "end": "^(\\1)$",
+          "end": "^(\\1)\\s*$",
           "endCaptures": {
             "0": {
               "name": "markup.table.delimiter.asciidoc"