upgrade codeblock

Author: Al Manning

src/resources/extensions/quarto/confluence/overrides.lua

@@ -118,8 +118,7 @@ function LinkConfluence(source, target, title, attr)
             escape(title,true) .. "'>" .. source .. "</a>"
 end
 
-function CodeBlockConfluence(codeValue, attributes)
-  local languageValue = attributes and attributes.class or ''
+function CodeBlockConfluence(codeValue, languageValue)
   local CODE_SNIPPET = [[<ac:structured-macro
       ac:name="code"
       ac:schema-version="1"
@@ -132,7 +131,7 @@ function CodeBlockConfluence(codeValue, attributes)
 
   return interpolate {
     CODE_SNIPPET,
-    languageValue = languageValue,
+    languageValue = languageValue or '',
     codeValue = codeValue,
     doubleBraket = ']]'
   }

src/resources/extensions/quarto/confluence/publish.lua

@@ -25,15 +25,21 @@ function Writer (doc, opts)
               image.src,
               image.title,
               pandoc.utils.stringify(image.caption),
-              image.attr)
+              image.attributes)
       return pandoc.RawInline('html', renderString)
     end,
     Link = function (link)
       local renderString = confluence.LinkConfluence(
               pandoc.utils.stringify(link.content),
               link.target,
               link.title,
-              link.attr)
+              link.attributes)
+      return pandoc.RawInline('html', renderString)
+    end,
+    CodeBlock = function (codeBlock)
+      local renderString = confluence.CodeBlockConfluence(
+              codeBlock.text,
+              codeBlock.classes[1] or '')
       return pandoc.RawInline('html', renderString)
     end
   }

src/resources/extensions/quarto/confluence/test-suite.lua

@@ -75,17 +75,15 @@ function TestCodeBlockConfluence:testWithAllAttributes()
       ac:name="code"
       ac:schema-version="1"
       ac:macro-id="1d1a2d13-0179-4d8f-b448-b28dfaceea4a">
-        <ac:parameter ac:name="language">fake-class</ac:parameter>
+        <ac:parameter ac:name="language">python</ac:parameter>
         <ac:plain-text-body>
           <![CDATA[fake-codeValue{doubleBracket}>
         </ac:plain-text-body>
     </ac:structured-macro>]]
   local codeValue = 'fake-codeValue'
-  local attributes = {
-    class = 'fake-class'
-  }
+  local languageValue = 'python'
   expected = confluence.interpolate{expected, doubleBracket = ']]'}
-  local actual = confluence.CodeBlockConfluence(codeValue, attributes)
+  local actual = confluence.CodeBlockConfluence(codeValue, languageValue)
 
   lu.assertEquals(actual, expected)
 end