Merge pull request #9 from nils-a/develop

v0.2.0

.gitignore

@@ -2,3 +2,4 @@ node_modules/
 out/
 *.vsix
 bin
+/src/fs-lang/js

LICENSE.md

@@ -1,6 +1,6 @@
 # Microsoft Public License (MS-PL)
 
-Copyright (c) 2019 Nils Andresen
+Copyright (c) 2019,2020 Nils Andresen
 
 This license governs use of the accompanying software. 
 If you use the software, you accept this license. 

readme.md

@@ -25,4 +25,4 @@ This extension adds FirstSpirit Templating-Language support.
 ## TODO
 in no particular order:
 
- * better highlighting, folding, auto-complete
+ * better highlighting, auto-complete

src/fs-lang/CHANGELOG.md

@@ -6,8 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.0] - 2020-01-08
+### Added
+- "getting started" in readme
+### Changed
+- better folding (using a foldingProvider instead of declarative regex)
+
 ## [0.1.0] - 2019-07-04
 ### Added
 - Language grammar
 - code-snippets
 
+[Unreleased]: https://github.com/nils-a/vscode-firstspirit/compare/master...develop
+[0.2.0]: https://github.com/nils-a/vscode-firstspirit/compare/master@%7B2019-07-04%7D...v0.2.0
+[0.1.0]: https://github.com/nils-a/vscode-firstspirit/tree/master@%7B2019-07-04%7D

src/fs-lang/LICENSE.md

@@ -1,6 +1,6 @@
 # Microsoft Public License (MS-PL)
 
-Copyright (c) 2019 Nils Andresen
+Copyright (c) 2019,2020 Nils Andresen
 
 This license governs use of the accompanying software. 
 If you use the software, you accept this license. 

src/fs-lang/README.md

@@ -1,20 +1,34 @@
 ## FirstSpirit for Visual Studio Code
 
-![GitHub](https://img.shields.io/github/license/nils-a/vscode-firstspirit.svg) ![Azure DevOps builds](https://img.shields.io/azure-devops/build/nils-andresen/10aa4f78-64ea-4ea1-888b-c7bd518743a5/2.svg)
+![GitHub](https://img.shields.io/github/license/nils-a/vscode-firstspirit.svg) ![Azure DevOps builds](https://img.shields.io/azure-devops/build/nils-andresen/10aa4f78-64ea-4ea1-888b-c7bd518743a5/2.svg) [![Marketplace Version](https://vsmarketplacebadge.apphb.com/version-short/nilsa.fs-lang.svg)](https://marketplace.visualstudio.com/items?itemName=nilsa.fs-lang) [![Installs](https://vsmarketplacebadge.apphb.com/installs-short/nilsa.fs-lang.svg)](https://marketplace.visualstudio.com/items?itemName=nilsa.fs-lang)
 
 The FirstSpirit extension for Visual Studio Code provides the following features inside VS Code:
 
 * Syntax-Highlighting of FirstSpirit template-tags
 * Code-Snippets
+* Code-Folding
 
 ### Get Started 
 
-TODO: Add some images and stuff
-explain why there is no file-extensions..
+#### Switch to FirstSpirit highlighting
+* Using the shortcut for language mode (`Cmd+K M` or `Ctrl+K M`), type `fs`, select `FirstSpirit (fs)`
+* Using the command palette (`Cmd+Shift+P` or `Ctrl+Shift+P`) then select `Change Language Mode`, type `fs`, select `FirstSpirit (fs)`
+* Using the language mode switcher at the bottom right of VS Code, type `fs`, select `FirstSpirit (fs)`
+
+#### Switch back from FirstSpirit highlighting
+* Using the shortcut for language mode (`Cmd+K M` or `Ctrl+K M`), select `Auto Detect`
+* Using the command palette (`Cmd+Shift+P` or `Ctrl+Shift+P`) then select `Change Language Mode`, select `Auto Detect`
+* Using the language mode switcher at the bottom right of VS Code, select `Auto Detect`.
+
+#### Why is FirstSpirit not auto-detected
+Well, there is no FirstSpirit file-type, is there? 
+
+The files are always "something" like `html` (with FS-templating) or `XML` (with FS-templating) or `fop` (with FS-templating).
+There's always some "content" and that is what's auto-detected (mostly depending on file-extensions). This way you can easily switch from content to templating.
+
 
 ### What's to come
 
 * Hover/Tooltips/Signature-Help
 * Auto-complete
-* better folding
 * support for external sychronization

src/fs-lang/language-configuration.json

@@ -24,11 +24,5 @@
         ["(", ")"],
         ["\"", "\""],
         ["'", "'"]
-    ],
-    "folding": {
-        "markers": {
-            "start": "^.*\\$CMS_(?!END)[^\\$]+\\$.*$",
-            "end": "^.*\\$CMS_END_[^\\$]+\\$.*$"
-        }
-      }
+    ]
 }