wip on restoring links to preview pane, closes asciidoctor#435

danyill · Oct 4, 2021 · b6d8482 · b6d8482
1 parent 23f80e6
commit b6d8482
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/src/asciidocParser.ts b/src/asciidocParser.ts
@@ -1,6 +1,7 @@
 import * as vscode from 'vscode'
 import * as path from 'path'
 import { spawn } from 'child_process'
+import { WebviewAsciidocConverter } from './webviewAsciidocConverter'
 
 const asciidoctor = require('@asciidoctor/core')
 const docbook = require('@asciidoctor/docbook-converter')
@@ -126,6 +127,8 @@ export class AsciidocParser {
         extension_registry: registry,
       }
       try {
+        this.processor.ConverterFactory.register(new WebviewAsciidocConverter(), ['html5'])
+
         this.document = this.processor.load(text, options)
         const blocksWithLineNumber = this.document.findBy(function (b) {
           return typeof b.getLineNumber() !== 'undefined'

diff --git a/src/features/previewContentProvider.ts b/src/features/previewContentProvider.ts
@@ -88,7 +88,7 @@ export class AsciidocContentProvider {
           data-state="${JSON.stringify(state || {}).replace(/"/g, '&quot;')}">
         <script src="${this.extensionScriptPath('pre.js')}" nonce="${nonce}"></script>
         ${this.getStyles(sourceUri, nonce, config, state)}
-        <base href="${asciidocDocument.uri.with({ scheme: 'vscode-resource' }).toString(true)}">
+        <base href="${editor.webview.asWebviewUri(asciidocDocument.uri).toString(true)}">
       </head>
       <body class="${bodyClassesVal} vscode-body ${config.scrollBeyondLastLine ? 'scrollBeyondLastLine' : ''} ${config.wordWrap ? 'wordWrap' : ''} ${config.markEditorSelection ? 'showEditorSelection' : ''}">
         ${body}

diff --git a/src/webviewAsciidocConverter.ts b/src/webviewAsciidocConverter.ts
@@ -0,0 +1,19 @@
+const processor = require('@asciidoctor/core')()
+
+export class WebviewAsciidocConverter {
+  baseConverter: any
+
+  constructor () {
+    this.baseConverter = processor.Html5Converter.$new()
+  }
+
+  convert (node, transform) {
+    if (node.getNodeName() === 'inline_anchor' && node.type === 'link') {
+      const id = node.id ? ` id="${node.id}"` : ''
+      const role = node.role ? ` class="${node.role}"` : ''
+      const title = node.title ? ` title="${node.title}"` : ''
+      return `<a href="${node.target}"${id}${role}${title} data-href="${node.target}">${node.text}</a>`
+    }
+    return this.baseConverter.convert(node, transform)
+  }
+}