Skip to content

Commit

Permalink
Merge pull request #17 from fastly/acme/hash-comments
Browse files Browse the repository at this point in the history
Use # for comments rather than //
  • Loading branch information
acme authored Oct 5, 2023
2 parents 60804ab + 754e6a2 commit afc1f28
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 13 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ All notable changes to the "vscode-fastly-vcl" extension will be documented in t

Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.

## UNRELEASED
## [2.0.1] - 2023-10-03

### Changed

- "Toggle Line Comment" now adds `#` rather than `//`.

## [2.0.0] - 2023-09-23

### Added

Expand Down
20 changes: 10 additions & 10 deletions language-configuration.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"comments": {
// symbol used for single line comment
"lineComment": "//",
"lineComment": "#",
// symbols used for start and end a block comment.
"blockComment": ["/*", "*/"]
},
Expand All @@ -13,9 +13,9 @@
],
// symbols that are auto closed when typing
"autoClosingPairs": [
{ "open": "{", "close": "}"},
{ "open": "[", "close": "]"},
{ "open": "(", "close": ")"},
{ "open": "{", "close": "}" },
{ "open": "[", "close": "]" },
{ "open": "(", "close": ")" },
{ "open": "\"", "close": "\"", "notIn": ["string"] },
{ "open": "'", "close": "'", "notIn": ["string", "comment"] }
],
Expand All @@ -29,14 +29,14 @@
],
// folding ranges
"folding": {
"markers": {
"start": "^\\s*//\\s*#?region\\b",
"end": "^\\s*//\\s*#?endregion\\b"
}
"markers": {
"start": "^\\s*//\\s*#?region\\b",
"end": "^\\s*//\\s*#?endregion\\b"
}
},
// auto-indentation
"indentationRules": {
"increaseIndentPattern": "^((?!\\/\\/).)*(\\{[^}\"'`]*|\\([^)\"'`]*|\\[[^\\]\"'`]*)$",
"decreaseIndentPattern": "^((?!.*?\\/\\*).*\\*/)?\\s*[\\)\\}\\]].*$"
"increaseIndentPattern": "^((?!\\/\\/).)*(\\{[^}\"'`]*|\\([^)\"'`]*|\\[[^\\]\"'`]*)$",
"decreaseIndentPattern": "^((?!.*?\\/\\*).*\\*/)?\\s*[\\)\\}\\]].*$"
}
}
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,16 @@
"type": "git",
"url": "https://github.com/fastly/vscode-fastly-vcl.git"
},
"version": "2.0.0",
"version": "2.0.1",
"engines": {
"vscode": "^1.82.0",
"node": ">=18"
},
"activationEvents": [],
"main": "./client/out/extension",
"workspaces": [ "./client" ],
"workspaces": [
"./client"
],
"scripts": {
"test": "node ./test/runTest.mjs",
"vscode:prepublish": "npm run compile",
Expand Down

0 comments on commit afc1f28

Please sign in to comment.