Merge branch 'release/0.0.2' into main

Konafets · Jun 12, 2022 · 07e6c09 · 07e6c09
2 parents 93844f7 + 900c26a
commit 07e6c09
Show file tree

Hide file tree

Showing 53 changed files with 3,407 additions and 2,180 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,38 +16,63 @@ name: Build
 on:
   # Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g. for dependabot pull requests)
   push:
-    branches: [main]
+    branches: [main, develop]
   # Trigger the workflow on any pull request
   pull_request:
 
 jobs:
-
   # Run Gradle Wrapper Validation Action to verify the wrapper's checksum
+  gradleValidation:
+    name: Gradle Wrapper
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout the current repository
+      - name: Fetch Sources
+        uses: actions/checkout@v3
+
+      # Validate wrapper
+      - name: Gradle Wrapper Validation
+        uses: gradle/wrapper-validation-action@v1.0.4
+
   # Run verifyPlugin, IntelliJ Plugin Verifier, and test Gradle tasks
   # Build plugin and provide the artifact for the next workflow jobs
   build:
     name: Build
+    needs: gradleValidation
     runs-on: ubuntu-latest
     outputs:
+      name: ${{ steps.properties.outputs.name }}
       version: ${{ steps.properties.outputs.version }}
       changelog: ${{ steps.properties.outputs.changelog }}
-    steps:
-
-      # Check out current repository
-      - name: Fetch Sources
-        uses: actions/checkout@v2.4.0
-
-      # Validate wrapper
-      - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v1.0.4
 
+    steps:
       # Setup Java 11 environment for the next steps
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3.3.0
         with:
           distribution: zulu
           java-version: 11
-          cache: gradle
+
+      # Check out current repository
+      - name: Fetch Sources
+        uses: actions/checkout@v3
+
+      # Cache Gradle Dependencies
+      - name: Setup Gradle Dependencies Cache
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', 'gradle.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', 'gradle.properties') }}
+            ${{ runner.os }}-gradle-caches
+
+      # Cache Gradle Wrapper
+      - name: Setup Gradle Wrapper Cache
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
 
       # Set environment variables
       - name: Export Properties
@@ -83,7 +108,7 @@ jobs:
 
       # Cache Plugin Verifier IDEs
       - name: Setup Plugin Verifier IDEs Cache
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3
         with:
           path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides
           key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
@@ -95,14 +120,14 @@ jobs:
       # Collect Plugin Verifier Result
       - name: Collect Plugin Verifier Result
         if: ${{ always() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: pluginVerifier-result
           path: ${{ github.workspace }}/build/reports/pluginVerifier
 
       # Run Qodana inspections
       - name: Qodana - Code Inspection
-        uses: JetBrains/qodana-action@v4.2.5
+        uses: JetBrains/qodana-action@v5.1.0
 
       # Prepare plugin archive content for creating artifact
       - name: Prepare Plugin Artifact
@@ -117,7 +142,7 @@ jobs:
 
       # Store already-built plugin as an artifact for downloading
       - name: Upload artifact
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.artifact.outputs.filename }}
           path: ./build/distributions/content/*/*
@@ -133,7 +158,7 @@ jobs:
 
       # Check out current repository
       - name: Fetch Sources
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
 
       # Remove old release drafts by using the curl request for the available releases with draft flag
       - name: Remove Old Release Drafts

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,21 @@
 # Antlers Language Support Changelog
 
 ## [Unreleased]
+### Added
+- Support commenting code 
+  - `Code | Comment with Line Comment`
+  - `Code | Comment with Block Comment`
+- Autocomplete and remove closing single and double quote  
+- Highlight all sort of brackets, parenthesis and braces as well Antlers' node delimiters 
+- Add autocompletion for Antlers delimiters. Type `{{` and the closing `}}` will be added automatically.
+- Support for scopes in the grammar #2 
+- Autocomplete Antlers core modifiers
+- Add support for modifiers in conditionals #3
+
+### Changed
+- Add support for older IDE versions down to 2021.2 
 
+## [0.0.1] - 2022-05-25
 ### Added
 - Infrastructure
   - Initial scaffold created from [IntelliJ Platform Plugin Template](https://github.com/JetBrains/intellij-platform-plugin-template)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -134,7 +134,7 @@ tasks {
 
     publishPlugin {
         dependsOn("patchChangelog")
-        token.set(System.getenv("ANTLERS_LANGUAGE_SUPPORT_PUBLISH_TOKEN"))
+        token.set(System.getenv("PUBLISH_TOKEN"))
         // pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
         // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
         // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel

diff --git a/gradle.properties b/gradle.properties
@@ -4,20 +4,20 @@
 pluginGroup = de.arrobait.antlers
 pluginName = Antlers Language Support
 # SemVer format -> https://semver.org
-pluginVersion = 0.0.1
+pluginVersion = 0.0.2
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 221
+pluginSinceBuild = 212
 pluginUntilBuild = 221.*
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = IU
-platformVersion = 221.5591.52
+platformVersion = 221.5787.30
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = com.jetbrains.php:221.5080.224, org.intellij.intelliLang, PsiViewer:221-SNAPSHOT
+platformPlugins = com.jetbrains.php:221.5787.33, org.intellij.intelliLang, PsiViewer:221-SNAPSHOT
 
 # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
 javaVersion = 11

diff --git a/qodana.yml b/qodana.yml
@@ -4,3 +4,7 @@
 version: 1.0
 profile:
   name: qodana.recommended
+exclude:
+  - name: All
+    paths:
+      - src/main/gen/