Merge pull request #13 from denco/0.1.5

0.1.5

Author: denco

.vscode/launch.json

@@ -3,7 +3,7 @@
 	"version": "0.1.0",
 	"configurations": [
 		{
-			"name": "Extension",
+			"name": "Debug extension Extension",
 			"type": "extensionHost",
 			"request": "launch",
 			"runtimeExecutable": "${execPath}",
@@ -17,6 +17,22 @@
 			],
 			"preLaunchTask": "npm: watch"
 		},
+		{
+			"name": "Debug extension OSS",
+			"type": "extensionHost",
+			"request": "launch",
+			// path to VSCode executable
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"/usr/lib/code/",
+				"--extensionDevelopmentPath=${workspaceRoot}",
+				"${workspaceRoot}/src/test/testfiles/",
+				],
+			"stopOnEntry": false,
+			"sourceMaps": true,
+			"outFiles": ["${workspaceRoot}/out"],
+			"preLaunchTask": "npm: watch"
+		},
 		{
 			"name": "Extension Tests",
 			"type": "extensionHost",

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Confluence Wiki Markup
 
+## 0.1.5
+* use webview api for rendering in vscode 1.33.x
+* refactor confluence snippets
+* new logo
+* preview unsaved files
+
 ## 0.1.4
 * fix [List indenting @win](https://github.com/denco/vscode-confluence-markup/issues/6)
 * restructure

README.md

@@ -7,7 +7,15 @@
 
 Adds syntax highlighting, snippets and preview for Confluence® Wiki files in Visual Studio Code.
 
-Adds Preview for Confluence Markup while editing them in VSCode
+Preview for Confluence Markup while editing them in VSCode
+
+LanguageID: `confluence`
+
+Defaulft supported file extentions:
+- `.confluence`
+- `.wiki`
+- `.jira`
+- `.markup`
 
 The extension can be activated in two ways
 

media/logo/confluence-markup.png

@@ -1,7 +1,7 @@
 {
 	"name": "confluence-markup",
 	"displayName": "Confluence markup",
-	"version": "0.1.4",
+	"version": "0.1.5",
 	"publisher": "denco",
 	"description": "Confluence markup language support for Visual Studio Code",
 	"keywords": [
@@ -30,7 +30,7 @@
 	"license": "MIT",
 	"homepage": "https://github.com/denco/vscode-confluence-markup/blob/master/README.md",
 	"engines": {
-		"vscode": "^1.20.0"
+		"vscode": "^1.25.0"
 	},
 	"activationEvents": [
 		"onCommand:confluence.showPreview",
@@ -46,11 +46,13 @@
 					"Confluence",
 					"markup",
 					"wiki",
+					"jira",
 					"Confluence Markup"
 				],
 				"extensions": [
 					".confluence",
 					".wiki",
+					".jira",
 					".markup"
 				],
 				"configuration": "./language-configuration.json"
@@ -74,13 +76,13 @@
 				"command": "confluence.showPreview",
 				"key": "ctrl+shift+v",
 				"mac": "cmd+shift+v",
-				"when": "resourceLangId == confluence"
+				"when": "editorLangId == confluence"
 			},
 			{
 				"command": "confluence.showPreviewToSide",
 				"key": "ctrl+k v",
 				"mac": "cmd+k v",
-				"when": "resourceLangId == confluence"
+				"when": "editorLangId == confluence"
 			}
 		],
 		"commands": [
@@ -99,11 +101,11 @@
 			"editor/title": [
 				{
 					"command": "confluence.showPreview",
-					"when": "resourceLangId == confluence"
+					"when": "editorLangId == confluence"
 				},
 				{
 					"command": "confluence.showPreviewToSide",
-					"when": "resourceLangId == confluence"
+					"when": "editorLangId == confluence"
 				}
 			]
 		}
@@ -113,16 +115,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 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"
 	},
 	"devDependencies": {
-		"@types/mocha": "^5.2.5",
-		"@types/node": "^10.10.1",
-		"eslint": "^5.6.0",
-		"tslint": "^5.11.0",
-		"typescript": "^3.0.3",
-		"vsce": "^1.51.0",
-		"vscode": "^1.1.21"
+		"@types/mocha": "^5.2.6",
+		"@types/node": "^11.13.9",
+		"eslint": "^5.16.0",
+		"tslint": "^5.16.0",
+		"typescript": "^3.3.0",
+		"vsce": "^1.60.0",
+		"vscode": "^1.1.23"
 	},
 	"__metadata": {
 		"publisherDisplayName": "denco"