feat: upgrade to vscode-textmate-v7. fix #343

packages/renderer-svg/src/__tests__/styleAttributes.test.ts

@@ -42,6 +42,6 @@ test(`SVG renderer should ignore minimal background width when it's own boundari
   })
 
   const out = (await r).renderToSVG([[{ content: 'foo', color: '#aabbccff' }]])
-  expect(out).toContain(`<svg viewBox="0 0 156.4921875 `)
+  expect(out).toContain(`<svg viewBox="0 0 150 `)
   // expect(out).toMatchSnapshot()
 })

packages/shiki/package.json

@@ -33,7 +33,7 @@
   "dependencies": {
     "jsonc-parser": "^3.0.0",
     "vscode-oniguruma": "^1.6.1",
-    "vscode-textmate": "^6.0.0"
+    "vscode-textmate": "^7.0.1"
   },
   "devDependencies": {
     "@types/node": "^14.17.7"

packages/shiki/src/__tests__/custom-fonts/font-bold.json

@@ -0,0 +1,12 @@
+{
+  "tokenColors": [
+    {
+      "name": "Keyword",
+      "scope": "keyword",
+      "settings": {
+        "foreground": "#ffffff",
+        "fontStyle": "bold"
+      }
+    }
+  ]
+}

packages/shiki/src/__tests__/custom-fonts/font-italic.json

@@ -0,0 +1,12 @@
+{
+  "tokenColors": [
+    {
+      "name": "Keyword",
+      "scope": "keyword",
+      "settings": {
+        "foreground": "#ffffff",
+        "fontStyle": "italic"
+      }
+    }
+  ]
+}

packages/shiki/src/__tests__/custom-fonts/font-none.json

@@ -0,0 +1,11 @@
+{
+  "tokenColors": [
+    {
+      "name": "Keyword",
+      "scope": "keyword",
+      "settings": {
+        "foreground": "#ffffff"
+      }
+    }
+  ]
+}

packages/shiki/src/__tests__/fontStyle.test.ts

@@ -0,0 +1,47 @@
+import path from 'path'
+import { getHighlighter, loadTheme } from '../index'
+
+test('No font-style is applied if none is specified', async () => {
+  const fNone = await loadTheme(path.resolve(__dirname, './custom-fonts/font-none.json'))
+  const highlighter = await getHighlighter({
+    theme: fNone,
+    langs: ['js']
+  })
+  const out = highlighter.codeToHtml(`function() {return 1}`, { lang: 'js' })
+
+  expect(out).not.toContain('font-style:')
+})
+
+test('An italic font-style is applied if specified', async () => {
+  const fItalic = await loadTheme(path.resolve(__dirname, './custom-fonts/font-italic.json'))
+  const highlighter = await getHighlighter({
+    theme: fItalic,
+    langs: ['js']
+  })
+  const out = highlighter.codeToHtml(`function() {return 1}`, { lang: 'js' })
+
+  expect(out).toContain('font-style: italic')
+})
+
+test('A bold font-style is applied if specified', async () => {
+  const fBold = await loadTheme(path.resolve(__dirname, './custom-fonts/font-bold.json'))
+  const highlighter = await getHighlighter({
+    theme: fBold,
+    langs: ['js']
+  })
+  // console.log(JSON.stringify(highlighter.codeToThemedTokens(`function() {return 1}`, 'js'), null, 2))
+  const out = highlighter.codeToHtml(`function() {return 1}`, { lang: 'js' })
+
+  expect(out).toContain('font-weight: bold')
+})
+
+test('A bold fontStyle should not apply an italic font-style', async () => {
+  const fBold = await loadTheme(path.resolve(__dirname, './custom-fonts/font-bold.json'))
+  const highlighter = await getHighlighter({
+    theme: fBold,
+    langs: ['js']
+  })
+  const out = highlighter.codeToHtml(`function() {return 1}`, { lang: 'js' })
+
+  expect(out).not.toContain('font-style: italic')
+})