Merge pull request #54 from dirkgroot/rework-lexer-parser

Rework lexer parser and add some new features

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+### Changed
+
+- Reworked the lexer and parser to be more generic, which should make it a bit easier to support future changes to the
+  Structurizr DSL
+- Syntax highlighting is now mostly annotator based instead of lexer based
+
+### Added
+
+- Matching curly braces are now highlighted in the editor
+- Code can now be commented with the "Comment with line/block comment" commands
+- Code is automatically indented correctly while editing
+
 ## [0.2.1] - 2023-03-31
 
 ### Changed

README.md

@@ -34,6 +34,8 @@ using [Simon Brown](https://twitter.com/simonbrown)'s [C4 model](https://c4model
 * Basic syntax highlighting for the Structurizr DSL language. Files with the `.dsl` extension are considered to be
   Structurizr DSL files.
 * Automatically indent and normalize spacing with IntelliJ's "Reformat Code" command.
+* Automatically indent new code while typing
+* Comment code using the "Comment with line/block comment" commands
 * More to come! Please refer to the [TODO section](https://github.com/dirkgroot/structurizr-dsl-intellij-plugin#todo) of
   the README for a list of features that will likely be added.
 
@@ -42,9 +44,8 @@ using [Simon Brown](https://twitter.com/simonbrown)'s [C4 model](https://c4model
 - For now, arguments of statements are all treated as (un)quoted strings, so "true", "false", integers, (un)quoted text
   will all get the same syntax highlighting.
 - The following blocks are treated as property blocks, containing (un)quoted string pairs:
-  - branding
-  - terminology
-  - configuration
+  - perspectives
+  - properties
   - users
 - All arguments of view declarations are highlighted as (un)quoted strings. Correct highlighting of these arguments will
   most likely be implemented using
@@ -68,11 +69,11 @@ Search for "Structurizr" in the marketplace, and install the plugin. Please refe
 
 ### Features
 
-- ☑️ syntax highlighting
+- ✅ syntax highlighting
   - ✅ token based
-  - 🔳 annotator based
+  - ✅ annotator based
 - ✅ reformat code
-- 🔳 auto indentation
+- ✅ auto indentation
 - 🔳 go to definition
 - 🔳 rename refactoring for identifiers
 - 🔳 code validation

build.gradle.kts

@@ -49,6 +49,7 @@ koverReport {
 sourceSets["main"].java.srcDirs("src/main/gen")
 
 dependencies {
+    testImplementation(kotlin("test"))
     testImplementation("io.kotest:kotest-runner-junit5:5.6.2")
     testImplementation("io.kotest:kotest-assertions-core:5.6.2")
     testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.25")

gradle.properties

@@ -4,7 +4,7 @@ pluginGroup = nl.dirkgroot.structurizr-dsl-plugin
 pluginName = Structurizr DSL Language Support
 pluginRepositoryUrl = https://github.com/dirkgroot/structurizr-dsl-intellij-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 0.2.2
+pluginVersion = 0.3.1
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 223