Skip to content

Commit 3818e14

Browse files
dencodenco
authored
Merge pull request #1 from denco/release-0.1.0
Release 0.1.0
2 parents 0127d73 + ffe9905 commit 3818e14

28 files changed

+840
-262
lines changed

‎.gitignore‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,17 @@ typings/
5757
# dotenv environment variables file
5858
.env
5959

60+
# tslint
61+
tslint.json
62+
63+
# Compiled
64+
package-lock.json
65+
out
66+
67+
# VSCode packages
68+
.vscode-test
69+
*.vsix
70+
71+
# Local Backups
72+
*.bak
73+
*.save

‎.vscode/launch.json‎

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,37 @@
1-
// A launch configuration that launches the extension inside a new window
1+
// A launch configuration that compiles the extension and then opens it inside a new window
22
{
3-
"version": "0.1.0",
4-
"configurations": [
5-
{
6-
"name": "Launch Extension",
7-
"type": "extensionHost",
8-
"request": "launch",
9-
"runtimeExecutable": "${execPath}",
10-
"args": ["--extensionDevelopmentPath=${workspaceRoot}" ]
11-
}
12-
]
3+
"version": "0.1.0",
4+
"configurations": [
5+
{
6+
"name": "Extension",
7+
"type": "extensionHost",
8+
"request": "launch",
9+
"runtimeExecutable": "${execPath}",
10+
"args": [
11+
"--extensionDevelopmentPath=${workspaceRoot}"
12+
],
13+
"stopOnEntry": false,
14+
"sourceMaps": true,
15+
"outFiles": [
16+
"out"
17+
],
18+
"preLaunchTask": "npm: watch"
19+
},
20+
{
21+
"name": "Extension Tests",
22+
"type": "extensionHost",
23+
"request": "launch",
24+
"runtimeExecutable": "${execPath}",
25+
"args": [
26+
"--extensionDevelopmentPath=${workspaceRoot}",
27+
"--extensionTestsPath=${workspaceRoot}/out/test"
28+
],
29+
"stopOnEntry": false,
30+
"sourceMaps": true,
31+
"outFiles": [
32+
"out"
33+
],
34+
"preLaunchTask": "npm: test"
35+
}
36+
]
1337
}

‎.vscode/settings.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Place your settings in this file to overwrite default and user settings.
2+
{
3+
"editor.tabSize": 4,
4+
"editor.renderWhitespace": "all",
5+
"editor.cursorStyle": "line",
6+
"editor.insertSpaces": false,
7+
"editor.useTabStops": true,
8+
"editor.trimAutoWhitespace": true,
9+
10+
"files.exclude": {
11+
"out": true,
12+
"node_modules": true,
13+
".vscode*": true
14+
},
15+
"files.trimTrailingWhitespace": true,
16+
17+
"search.exclude": {
18+
"out": true,
19+
"node_modules": true,
20+
".vscode*": true
21+
},
22+
23+
"typescript.tsdk": "./node_modules/typescript/lib" // we want to use the TS server from our node_modules folder to control its version
24+
}

‎.vscode/tasks.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// See https://go.microsoft.com/fwlink/?LinkId=733558
2+
// for the documentation about the tasks.json format
3+
{
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"type": "npm",
8+
"script": "watch",
9+
"problemMatcher": "$tsc-watch",
10+
"isBackground": true,
11+
"presentation": {
12+
"reveal": "never"
13+
},
14+
"group": {
15+
"kind": "build",
16+
"isDefault": true
17+
}
18+
},
19+
{
20+
"type": "npm",
21+
"script": "test",
22+
"problemMatcher": []
23+
},
24+
{
25+
"type": "npm",
26+
"script": "compile",
27+
"problemMatcher": []
28+
}
29+
]
30+
}

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# Confluence Wiki Markup
2+
3+
## 0.1.0
4+
5+
* add preview action
6+
* add support for confluence emoticons
7+
* change language id from: confluence-markup to confluence
8+
19
## 0.0.1 - First Release
210

311
* convert Textmate bundle to Visual Studio Code format.

‎README.md‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
1-
# Confluence® markup language support for Visual Studio Code.
1+
# Confluence® markup language support for Visual Studio Code
22

3-
Adds syntax highlighting and snippets to Confluence® Wiki files in Visual Studio Code.
3+
[![The MIT License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](https://github.com/denco/vscode-confluence-markup/blob/master/LICENSE)
4+
[![Version](https://vsmarketplacebadge.apphb.com/version/denco.confluence-markup.svg?style=flat-square)](https://marketplace.visualstudio.com/items?itemName=denco.confluence-markup)
5+
[![Installs](https://vsmarketplacebadge.apphb.com/installs-short/denco.confluence-markup.svg?style=flat-square)](https://marketplace.visualstudio.com/items?itemName=denco.confluence-markup)
6+
[![Ratings](https://vsmarketplacebadge.apphb.com/rating/denco.confluence-markdown.svg?style=flat-square)](https://marketplace.visualstudio.com/items?itemName=denco.confluence-markup)
47

5-
Originally syntax from the [Confluence® Textmate Bundle](https://github.com/alkemist/Confluence.tmbundle).
8+
Adds syntax highlighting, snippets and preview for Confluence® Wiki files in Visual Studio Code.
9+
10+
Adds Preview for Confluence Markup while editing them in VSCode
11+
12+
The extension can be activated in two ways
613

7-
Please log any issue as Github issue [here](https://github.com/denco/vscode-confluence-markup/issues) to get improvement/fixes.
14+
* Toggle Preview
15+
* Linux & Windows: `ctrl+shift+v`
16+
* MAC: `cmd+shift+v` or `ctrl+shift+v`
17+
* Open|Close Preview to the Side
18+
* Linux & Windows: `ctrl+k v`
19+
* MAC: `cmd+k v` or `ctrl+k v`
820

9-
Licence [MIT](https://github.com/denco/vscode-confluence-markup/LICENSE)
21+
Confluence Documentation
22+
23+
* [Wiki MarkUp](https://confluence.atlassian.com/doc/confluence-wiki-markup-251003035.html)
24+
* [Storage Format](https://confluence.atlassian.com/doc/confluence-storage-format-790796544.html)
25+
26+
Originally syntax from the [Confluence® Textmate Bundle](https://github.com/alkemist/Confluence.tmbundle).
1027

11-
---------------------
28+
----
1229

1330
> Confluence® is registered trademark owned by [Atlassian](https://www.atlassian.com/)

‎language-configuration.json‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
{
2-
"comments": {
3-
// symbol used for single line comment. Remove this entry if your language does not support line comments
4-
"lineComment": "//",
5-
// symbols used for start and end a block comment. Remove this entry if your language does not support block comments
6-
"blockComment": [ "/*", "*/" ]
7-
},
8-
// symbols used as brackets
9-
"brackets": [
10-
["{", "}"],
11-
["[", "]"],
12-
["(", ")"]
13-
],
14-
// symbols that are auto closed when typing
15-
"autoClosingPairs": [
16-
["{", "}"],
17-
["[", "]"],
18-
["(", ")"],
19-
["\"", "\""],
20-
["'", "'"]
21-
],
22-
// symbols that that can be used to surround a selection
23-
"surroundingPairs": [
24-
["{", "}"],
25-
["[", "]"],
26-
["(", ")"],
27-
["\"", "\""],
28-
["'", "'"]
29-
]
2+
"comments": {
3+
// symbol used for single line comment. Remove this entry if your language does not support line comments
4+
"lineComment": "//",
5+
// symbols used for start and end a block comment. Remove this entry if your language does not support block comments
6+
"blockComment": [ "/*", "*/" ]
7+
},
8+
// symbols used as brackets
9+
"brackets": [
10+
["{", "}"],
11+
["[", "]"],
12+
["(", ")"]
13+
],
14+
// symbols that are auto closed when typing
15+
"autoClosingPairs": [
16+
["{", "}"],
17+
["[", "]"],
18+
["(", ")"],
19+
["\"", "\""],
20+
["'", "'"]
21+
],
22+
// symbols that that can be used to surround a selection
23+
"surroundingPairs": [
24+
["{", "}"],
25+
["[", "]"],
26+
["(", ")"],
27+
["\"", "\""],
28+
["'", "'"]
29+
]
3030
}

0 commit comments

Comments
 (0)