Merge pull request #16 from denco/0.1.7

0.1.7

Author: denco

CHANGELOG.md

@@ -1,49 +1,58 @@
 # Confluence Wiki Markup
 
-## 0.1.6
-* fix using css and render of emoticons rendering `Content-Security-Policy`
-* skip render empty lines
-* extend documentation
-* merge [Improvement to CSS + Ability to Change Monospace Font for Preview](https://github.com/denco/vscode-confluence-markup/pull/14), thanks to [macintacos](https://github.com/macintacos) for contributing:
-  * Add configuration property: `confluenceMarkup.monospaceFont` for monospace font, default: `Menlo, Monaco, Consolas, monospace`
-  * wrap all tags with paragraf
+## [0.1.7](https://github.com/denco/vscode-confluence-markup/releases/tag/0.1.7)
 
-## 0.1.5
-* use webview api for rendering in vscode 1.33.x
-* refactor confluence snippets
-* new logo
-* preview unsaved files
+- fix skip empty lines
+- extend content security policy for inline styles
+- enhance testing
 
-## 0.1.4
-* fix [List indenting @win](https://github.com/denco/vscode-confluence-markup/issues/6)
-* restructure
-* win/nix test files
+## [0.1.6](https://github.com/denco/vscode-confluence-markup/releases/tag/0.1.6)
 
-## 0.1.3
+- fix using css and render of emoticons rendering `Content-Security-Policy`
+- skip render empty lines
+- extend documentation
+- merge [Improvement to CSS + Ability to Change Monospace Font for Preview](https://github.com/denco/vscode-confluence-markup/pull/14), thanks to [macintacos](https://github.com/macintacos) for contributing:
+  - Add configuration property: `confluenceMarkup.monospaceFont` for monospace font, default: `Menlo, Monaco, Consolas, monospace`
+  - wrap all tags with paragraf
 
-* fix [nested lists](https://github.com/denco/vscode-confluence-markup/issues/7)
-* fix [headless table](https://github.com/denco/vscode-confluence-markup/issues/5)
-* rendering tables with row headers
+## [0.1.5](https://github.com/denco/vscode-confluence-markup/releases/tag/0.1.5)
 
-## 0.1.2
+- use webview api for rendering in vscode 1.33.x
+- refactor confluence snippets
+- new logo
+- preview unsaved files
 
-* fix rendering of tag inside of code macro
-* fix [noformat issue](https://github.com/denco/vscode-confluence-markup/issues/3)
-* fix strikethrough and italic text
-* add table rendering
+## [0.1.4](https://github.com/denco/vscode-confluence-markup/releases/tag/0.1.4)
 
-## 0.1.1
+- fix [List indenting @win](https://github.com/denco/vscode-confluence-markup/issues/6)
+- restructure
+- win/nix test files
 
-* fix simple link
-* fix keyboard shorcuts, activate only for confluence language id
-* add simple css
+## [0.1.3](https://github.com/denco/vscode-confluence-markup/releases/tag/0.1.3)
 
-## 0.1.0
+- fix [nested lists](https://github.com/denco/vscode-confluence-markup/issues/7)
+- fix [headless table](https://github.com/denco/vscode-confluence-markup/issues/5)
+- rendering tables with row headers
 
-* add preview action
-* add support for confluence emoticons
-* change language id from: confluence-markup to confluence
+## [0.1.2](https://github.com/denco/vscode-confluence-markup/releases/tag/0.1.2)
 
-## 0.0.1 - First Release
+- fix rendering of tag inside of code macro
+- fix [noformat issue](https://github.com/denco/vscode-confluence-markup/issues/3)
+- fix strikethrough and italic text
+- add table rendering
 
-* convert Textmate bundle to Visual Studio Code format.
+## [0.1.1](https://github.com/denco/vscode-confluence-markup/releases/tag/0.1.1)
+
+- fix simple link
+- fix keyboard shorcuts, activate only for confluence language id
+- add simple css
+
+## [0.1.0](https://github.com/denco/vscode-confluence-markup/releases/tag/0.1.0)
+
+- add preview action
+- add support for confluence emoticons
+- change language id from: confluence-markup to confluence
+
+## [0.0.1](https://github.com/denco/vscode-confluence-markup/releases/tag/0.0.1) - First Release
+
+- convert Textmate bundle to Visual Studio Code format.

README.md

@@ -6,38 +6,42 @@
 [![Rating](https://vsmarketplacebadge.apphb.com/rating-short/denco.confluence-markup.svg?style=flat-square)](https://marketplace.visualstudio.com/items?itemName=denco.confluence-markup)
 
 ## Description
-Provide preview for Confluence Markup while editing them in VSCode
 
-Adds syntax highlighting, snippets and preview for Confluence® Wiki files in Visual Studio Code.
+Provide preview for Confluence® and Jira® Markup while editing them in Visual Studio Code.
+
+Provide syntax highlighting and snippets.
 
 ## Supported file extentions
+
 LanguageID: `confluence`
 
 Defaulft supported file extentions:
+
 - `.confluence`
 - `.wiki`
 - `.jira`
 - `.markup`
 
 The extension can be activated in two ways
 
-* Toggle Preview
-  * Linux & Windows: `ctrl+shift+v`
-  * MAC: `cmd+shift+v` or `ctrl+shift+v`
-* Open|Close Preview to the Side
-  * Linux & Windows: `ctrl+k v`
-  * MAC: `cmd+k v` or `ctrl+k v`
+- Toggle Preview
+  - Linux & Windows: `ctrl+shift+v`
+  - MAC: `cmd+shift+v` or `ctrl+shift+v`
+- Open|Close Preview to the Side
+  - Linux & Windows: `ctrl+k v`
+  - MAC: `cmd+k v` or `ctrl+k v`
 
 ## Configuration properties
-  * *confluenceMarkup.monospaceFont* = `Menlo, Monaco, Consolas, monospace`
 
+- `confluenceMarkup.monospaceFont` = `Menlo, Monaco, Consolas, monospace`
 
 ## Confluence documentation
-* [Wiki MarkUp](https://confluence.atlassian.com/doc/confluence-wiki-markup-251003035.html)
-* [Storage Format](https://confluence.atlassian.com/doc/confluence-storage-format-790796544.html)
+
+- [MarkUp](https://confluence.atlassian.com/doc/confluence-wiki-markup-251003035.html)
+- [Storage Format](https://confluence.atlassian.com/doc/confluence-storage-format-790796544.html)
 
 Originally syntax from the [Confluence® Textmate Bundle](https://github.com/alkemist/Confluence.tmbundle).
 
 ----
 
-> Confluence® is registered trademark owned by [Atlassian](https://www.atlassian.com/)
+> Confluence® and Jira® is registered trademark owned by [Atlassian](https://www.atlassian.com/)

media/emoticons/tongue.png media/emoticons/cheeky.pngmedia/emoticons/tongue.png renamed to media/emoticons/cheeky.png

@@ -1,7 +1,7 @@
 {
 	"name": "confluence-markup",
 	"displayName": "Confluence markup",
-	"version": "0.1.6",
+	"version": "0.1.7",
 	"publisher": "denco",
 	"description": "Confluence markup language support for Visual Studio Code",
 	"keywords": [
@@ -125,19 +125,19 @@
 		"compile": "tsc -p ./",
 		"watch": "tsc -watch -p ./",
 		"postinstall": "node ./node_modules/vscode/bin/install",
-		"test": "npm run compile && node ./node_modules/vscode/bin/test",
+		"test": "npm run clean && npm run compile && node ./node_modules/vscode/bin/test",
 		"package": "./node_modules/.bin/vsce package",
-		"clean": "rm -rfv ./out",
-		"clean-all": "rm ./confluence-markup*.vsix; rm -rf ./.vscode-test; rm -rfv ./out; rm -rfv ./node_modules"
+		"clean": "rm -rf ./out",
+		"clean-all": "rm -f ./confluence-markup*.vsix; rm -rf ./.vscode-test; rm -rf ./out; rm -rf ./node_modules"
 	},
 	"devDependencies": {
-		"@types/mocha": "^5.2.6",
+		"@types/mocha": "^5.2.7",
 		"@types/node": "^11.13.9",
 		"eslint": "^5.16.0",
-		"tslint": "^5.16.0",
-		"typescript": "^3.3.0",
+		"tslint": "^5.18.0",
+		"typescript": "^3.5.3",
 		"vsce": "^1.66.0",
-		"vscode": "^1.1.23"
+		"vscode": "^1.1.36"
 	},
 	"__metadata": {
 		"publisherDisplayName": "denco"

media/emoticons/error.png media/emoticons/cross.pngmedia/emoticons/error.png renamed to media/emoticons/cross.png

@@ -51,7 +51,7 @@ export class ConfluenceContentProvider implements vscode.TextDocumentContentProv
 			<html>
 			<head>
 				<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
-				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-resource: https:; script-src vscode-resource:; style-src vscode-resource:;"/>
+				<meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'self' 'unsafe-inline'; img-src vscode-resource: https:; script-src vscode-resource:; style-src vscode-resource:;"/>
 				<link rel="stylesheet" href="${cssLink}">
 			</head>
 			<body>

media/emoticons/thumbs_down.png media/emoticons/thumbs-down.pngmedia/emoticons/thumbs_down.png renamed to media/emoticons/thumbs-down.png

@@ -45,7 +45,7 @@ export function parseMarkup(sourceUri: vscode.Uri, sourceText: string) {
 	var result = '';
 	let listTag = '';
 	let listStyle = '';
-	let codeTagFlag = 0;
+	let codeTagFlag = false;
 	let tableFlag = false;
 	let listFlag = false;
 	let listArr: string[] = [];
@@ -54,11 +54,15 @@ export function parseMarkup(sourceUri: vscode.Uri, sourceText: string) {
 		let tag = entry;
 		let html_tag = false;
 
-		if (tag.length === 0 ) {
+		if ((tag.length === 0 )
+			&& (! listFlag)
+			&& (! tableFlag)
+			&& (! codeTagFlag)
+			) {
 			continue;
 		}
 
-		if (codeTagFlag == 0) {
+		if (! codeTagFlag) {
 			tag = tag.replace(/h(\d+)\.\s([^\n]+)/g, "<h$1>$2</h$1>");
 
 			// tag = tag.replace(/_([^_]*)_/g, "<em>$1</em>");
@@ -75,14 +79,14 @@ export function parseMarkup(sourceUri: vscode.Uri, sourceText: string) {
 
 			tag = tag.replace(/:\)/g, '<img alt="(smile)" src="' + emoticonUri('smile.png') + '"/>');
 			tag = tag.replace(/:\(/g, '<img alt="(sad)" src="' + emoticonUri('sad.png') + '"/>');
-			tag = tag.replace(/:P/g, '<img alt="(cheeky)" src="' + emoticonUri('tongue.png') + '"/>');
+			tag = tag.replace(/:P/g, '<img alt="(cheeky)" src="' + emoticonUri('cheeky.png') + '"/>');
 			tag = tag.replace(/:D/g, '<img alt="(laugh)" src="' + emoticonUri('biggrin.png') + '"/>');
 			tag = tag.replace(/;\)/g, '<img alt="(wink)" src="' + emoticonUri('wink.png') + '"/>');
-			tag = tag.replace(/\(y\)/g, '<img alt="(thumbs-up)" src="' + emoticonUri('thumbs_up.png') + '"/>');
-			tag = tag.replace(/\(n\)/g, '<img alt="(thumbs-down)" src="' + emoticonUri('thumbs_down.png') + '"/>');
+			tag = tag.replace(/\(y\)/g, '<img alt="(thumbs-up)" src="' + emoticonUri('thumbs-up.png') + '"/>');
+			tag = tag.replace(/\(n\)/g, '<img alt="(thumbs-down)" src="' + emoticonUri('thumbs-down.png') + '"/>');
 			tag = tag.replace(/\(i\)/g, '<img alt="(information)" src="' + emoticonUri('information.png') + '"/>');
-			tag = tag.replace(/\(\/\)/g, '<img alt="(tick)" src="' + emoticonUri('check.png') + '"/>');
-			tag = tag.replace(/\(x\)/g, '<img alt="(cross)" src="' + emoticonUri('error.png') + '"/>');
+			tag = tag.replace(/\(\/\)/g, '<img alt="(tick)" src="' + emoticonUri('tick.png') + '"/>');
+			tag = tag.replace(/\(x\)/g, '<img alt="(cross)" src="' + emoticonUri('cross.png') + '"/>');
 			tag = tag.replace(/\(!\)/g, '<img alt="(warning)" src="' + emoticonUri('warning.png') + '"/>');
 
 			tag = tag.replace(/\\\\/gi, '<br/>');
@@ -133,16 +137,16 @@ export function parseMarkup(sourceUri: vscode.Uri, sourceText: string) {
 		let re = /\{[(code)|(noformat)].*\}/;
 		let match = tag.match(re);
 		if (match) {
-			if (codeTagFlag === 0) {
+			if (! codeTagFlag) {
 				tag = `<pre><code style='font-family: ${MONOSPACE_FONT_FAMILY}'>`;
-				codeTagFlag = 1;
+				codeTagFlag = true;
 			} else {
 				tag = '</pre></code>';
-				codeTagFlag = 0;
+				codeTagFlag = false;
 			}
 		}
 
-		if (codeTagFlag === 0) {
+		if (! codeTagFlag) {
 			// lists
 			re = /^([-|\*|#]+)\s(.*)/;
 			match = tag.match(re);