Merge pull request #36 from denco/fix/34

fix #34

Author: denco

.github/workflows/cd.yml

@@ -7,11 +7,13 @@ on:
   #   types:
   #     - completed
   push:
+    branches:
+      - "!*"
     tags:
-      - "*"
+      - '[0-9]+.[0-9]+.[0-9]+'
+      # - "*"
 # https://stackoverflow.com/questions/58457140/dependencies-between-workflows-on-github-actions
 # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#workflow_run
-# https://github.com/actions/create-release
 
 jobs:
   publish:
@@ -25,6 +27,23 @@ jobs:
           node-version: 14.x
       - name: Install Dependencies
         run: npm ci
+      - name: Build extension package
+        run: npm run build
+      # https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions
+      - name: Get release version
+        run: echo "::set-output name=version::${GITHUB_REF#refs/*/}
+        id: release-version
+      - name: Create release notes for version ${{ steps.release-version.outputs.version }}
+        run: npm run --silent changelog > RELEASE_NOTES_${{ steps.release-version.outputs.version }}.md
+      # https://github.com/ncipollo/release-action
+      - name: Create github release
+        uses: ncipollo/release-action@v1
+        with:
+          name: ${{ steps.release-version.outputs.version }}
+          artifact: "confluence-markup-${{ steps.release-version.outputs.version }}.vsix"
+          artifactContentType: application/zip
+          bodyFile: "RELEASE_NOTES_${{ steps.release-version.outputs.version }}.md"
+          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish to Visual Studio Marketplace
         run: ./node_modules/.bin/vsce publish -p ${{ secrets.VSCE_PAT }}
       - name: Publish to Open VSX Registry

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Confluence Wiki Markup
 
+## [0.1.12](https://github.com/denco/vscode-confluence-markup/releases/tag/0.1.12)
+
+- fix monospace with digits [Monospaced Text does not seem to be supported](https://github.com/denco/vscode-confluence-markup/issues/34)
+- add check for undefined panel and webview
+- fix regex for line-through and italic formats
+
 ## [0.1.11](https://github.com/denco/vscode-confluence-markup/releases/tag/0.1.11)
 
 - enchange color macro with support for rgb and hex colors [Support to {color:}](https://github.com/denco/vscode-confluence-markup/issues/32)

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "confluence-markup",
 	"displayName": "Confluence markup",
-	"version": "0.1.11",
+	"version": "0.1.12",
 	"publisher": "denco",
 	"description": "Confluence markup language support for Visual Studio Code",
 	"keywords": [
@@ -121,6 +121,7 @@
 		}
 	},
 	"scripts": {
+		"build": "npm run package",
 		"vscode:prepublish": "npm run compile",
 		"compile": "tsc -p ./",
 		"watch": "tsc -watch -p ./",
@@ -132,7 +133,8 @@
 		"prepackage": "npm run clean && npm run compile",
 		"package": "vsce package",
 		"clean": "rimraf -rf ./out",
-		"clean-all": "rimraf -f ./confluence-markup*.vsix; rimraf -rf ./.vscode-test; rimraf -rf ./out; rimraf -rf ./node_modules"
+		"clean:all": "rimraf -f ./confluence-markup*.vsix; rimraf -rf ./.vscode-test; rimraf -rf ./out; rimraf -rf ./node_modules",
+		"changelog": "if [ $((grep \"$(grep -m1 'version' package.json | cut -d '\"' -f 4)\" -n CHANGELOG.md || echo 0) | cut -d ':' -f 1) -eq 3 ]; then awk '/##/{++c;next} c==1' CHANGELOG.md | awk '!/^$/'; else >&2 echo 'Unchecked version'; exit 1; fi"
 	},
 	"devDependencies": {
 		"@types/glob": "^7.1.1",

src/extension.ts

@@ -12,32 +12,34 @@ import { cssUri } from './markupParser';
 
 function getRenderedContent(contentProvider: ConfluenceContentProvider, uri: vscode.Uri, panel: vscode.WebviewPanel) {
 	contentProvider.provideTextDocumentContent(packConfluenceUri(uri)).then((renderedContent) => {
-		// Security
-		// https://code.visualstudio.com/api/extension-guides/webview#security
-
-		const cssFile = cssUri('confluence.css')
-		let cssLink = ""
-		if (cssFile) {
-			const cssUrl = panel.webview.asWebviewUri(cssFile)
-			cssLink = `<link rel="stylesheet" href="${cssUrl}">`
-		}
+		if (panel && panel.webview) {
+			// Security
+			// https://code.visualstudio.com/api/extension-guides/webview#security
+
+			const cssFile = cssUri('confluence.css')
+			let cssLink = ""
+			if (cssFile) {
+				const cssUrl = panel.webview.asWebviewUri(cssFile)
+				cssLink = `<link rel="stylesheet" href="${cssUrl}">`
+			}
 
-		panel.webview.html = `<!DOCTYPE html>
-			<html>
-			<head>
-				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
-				<meta name="viewport" content="width=device-width, initial-scale=1.0">
-				<meta http-equiv="Content-Security-Policy"
-					content="default-src 'none';
-					img-src self vscode-resource: https:;
-					script-src self vscode-resource:;
-					style-src 'unsafe-inline' self vscode-resource:;"/>
-				${cssLink}
-			</head>
-			<body>
-				${renderedContent}
-			</body>
-			</html>`;
+			panel.webview.html = `<!DOCTYPE html>
+				<html>
+				<head>
+					<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+					<meta name="viewport" content="width=device-width, initial-scale=1.0">
+					<meta http-equiv="Content-Security-Policy"
+						content="default-src 'none';
+						img-src self vscode-resource: https:;
+						script-src self vscode-resource:;
+						style-src 'unsafe-inline' self vscode-resource:;"/>
+					${cssLink}
+				</head>
+				<body>
+					${renderedContent}
+				</body>
+				</html>`;
+		}
 	}, (reason) => {
 		vscode.window.showErrorMessage(reason);
 	});

src/markupParser.ts

@@ -73,7 +73,7 @@ export function parseMarkup(sourceUri: vscode.Uri, sourceText: string) {
 			tag = tag.replace(/\+([^+]*)\+/g, "<u>$1</u>");
 			tag = tag.replace(/\^([^^]*)\^/g, "<sup>$1</sup>");
 			tag = tag.replace(/~([^~]*)~/g, "<sub>$1</sub>");
-			tag = tag.replace(/\{{2}([^{{2}]*)\}{2}/g, `<code style='font-family: ${MONOSPACE_FONT_FAMILY}'>$1</code>`);
+			tag = tag.replace(/\\}/g, "&rbrace;").replace(/\{{2}(.*?)\}{2}/g, `<code style='font-family: ${MONOSPACE_FONT_FAMILY}'>$1</code>`);
 			tag = tag.replace(/\?{2}(.*)\?{2}/g, "<cite>$1</cite>");
 			tag = tag.replace(/\{color:([^}]+)\}/g, "<span style='color:$1;'>").replace(/\{color\}/g, '</span>');
 
@@ -285,8 +285,10 @@ export function parseMarkup(sourceUri: vscode.Uri, sourceText: string) {
 			tag = tag.replace(/\*([^*]*)\*/g, "<strong>$1</strong>");
 			// line-through
 			if ((!html_tag) && (!tag.match('<img')) && (!listFlag)) {
-				tag = tag.replace(/\B-([^-]*)-\B/g, " <span style='text-decoration: line-through;'>$1</span> ");
-				tag = tag.replace(/_([^_]*)_/g, "<i>$1</i>");
+				// tag = tag.replace(/\B-([^-]*)-\B/g, " <span style='text-decoration: line-through;'>$1</span> ");
+				// tag = tag.replace(/_([^_]*)_/g, "<i>$1</i>");
+				tag = tag.replace(/\B-((\([^)]*\)|{[^}]*}|\[[^]]+\]){0,3})(\S.*?\S|\S)-\B/g," <span style='text-decoration: line-through;'>$3</span> ");
+				tag = tag.replace(/(?:\b)_((\([^)]*\)|{[^}]*}|\[[^]]+\]){0,3})(\S.*?\S|\S)_(?:\b)/g, "<i>$3</i>");
 			}
 		} else {
 			if (tag !== `<pre><code style='font-family: ${MONOSPACE_FONT_FAMILY}'>`) {

src/test/suite/fixtures/expected/issues.html

@@ -211,4 +211,17 @@ <h3>third header</h3>
 <p>
 	<span style='color:rgb(222,150,212);'>rgb(222,150,212)</span>or
 	<span style='color:#12FFFE;'>hex#12FFFE</span>
+</p>
+<p>
+	<a href='https://github.com/denco/vscode-confluence-markup/issues/34'>#34</a>
+</p>
+<p>
+ 	<code style='font-family: Menlo, Monaco, Consolas, monospace'>h244000c8</code>
+</p>
+<p>
+ 	<code style='font-family: Menlo, Monaco, Consolas, monospace'>text</code>
+</p>
+<p>h244000c8</p>
+<p>
+	<code style='font-family: Menlo, Monaco, Consolas, monospace'>monospace</code>
 </p>

src/test/suite/fixtures/expected/test.html

@@ -129,8 +129,7 @@ <h2>
 	<i>emphasis</i>
 </p>
 <p>
-	<i>italics</i>: Thing
-	<i>x</i>
+	<i>italics</i>: Thing_x_
 </p>
 <p>
 	<i>italics with spaces</i>

src/test/suite/fixtures/testfiles/nix/issues.confluence

@@ -100,3 +100,13 @@ yet _another_ line
 {color:cyan}cyan{color}
 
 {color:rgb(222,150,212)}rgb(222,150,212){color} or {color:#12FFFE}hex#12FFFE{color}
+
+[#34|https://github.com/denco/vscode-confluence-markup/issues/34]
+
+{{h244000c8}}
+
+{{text}}
+
+h244000c8
+
+{{monospace}}

src/test/suite/fixtures/testfiles/win/issues.confluence

@@ -100,3 +100,13 @@ yet _another_ line
 {color:cyan}cyan{color}
 
 {color:rgb(222,150,212)}rgb(222,150,212){color} or {color:#12FFFE}hex#12FFFE{color}
+
+[#34|https://github.com/denco/vscode-confluence-markup/issues/34]
+
+{{h244000c8}}
+
+{{text}}
+
+h244000c8
+
+{{monospace}}