upd grammar, support new IJ versions

.github/workflows/build.yml

@@ -42,7 +42,7 @@ jobs:
 
       # Set up Java environment for the next steps
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 17
@@ -89,7 +89,7 @@ jobs:
 
       # Store already-built plugin as an artifact for downloading
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.artifact.outputs.filename }}
           path: ./build/distributions/content/*/*
@@ -107,7 +107,7 @@ jobs:
 
       # Set up Java environment for the next steps
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 17
@@ -125,14 +125,14 @@ jobs:
       # Collect Tests Result of failed tests
       - name: Collect Tests Result
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: tests-result
           path: ${{ github.workspace }}/build/reports/tests
 
       # Upload the Kover report to CodeCov
       - name: Upload Code Coverage Report
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         with:
           files: ${{ github.workspace }}/build/reports/kover/report.xml
 
@@ -160,7 +160,7 @@ jobs:
 
       # Set up Java environment for the next steps
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 17
@@ -191,7 +191,7 @@ jobs:
 
       # Set up Java environment for the next steps
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 17
@@ -216,7 +216,7 @@ jobs:
       # Collect Plugin Verifier Result
       - name: Collect Plugin Verifier Result
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pluginVerifier-result
           path: ${{ github.workspace }}/build/reports/pluginVerifier
@@ -238,7 +238,7 @@ jobs:
 
       # Set up Java environment for the next steps
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 17

CHANGELOG.md

@@ -4,15 +4,11 @@
 
 ### Added
 
-- LibSL project generation and detection
-- LibSL Tools dynamic actions 
-- File templates
-- Folding
+- LibSL grammar upd
+- support new versions of IJ
 
 ### Changed
 
 ### Fixed
 
-- Intents for params
-
 [Unreleased]: https://github.com/kechinvv/LibSLPluginIJ/commits

build.gradle.kts

@@ -31,8 +31,8 @@ dependencies {
     antlr("org.antlr:antlr4:4.13.1")
     implementation("org.antlr:antlr4-intellij-adaptor:0.1")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.4")
 }
 
 

gradle.properties

@@ -4,19 +4,19 @@ pluginGroup = com.github.kechinvv.libslpluginij
 pluginName = LibSL Support
 pluginRepositoryUrl = https://github.com/kechinvv/LibSLPluginIJ
 # SemVer format -> https://semver.org
-pluginVersion = 0.1.0
+pluginVersion = 0.1.1
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 223
-pluginUntilBuild = 241.*
+pluginUntilBuild = 251.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = IC
-platformVersion = 2023.3
+platformVersion = 2024.3.3
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = com.intellij.java
+platformPlugins = com.intellij.java, PsiViewer:243.7768
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 gradleVersion = 8.5

src/main/antlr/LibSLLexer.g4

@@ -1,6 +1,5 @@
 lexer grammar LibSLLexer;
 
-
 SEMICOLON : ';' ;
 
 ASSIGN_OP : '=' ;
@@ -253,6 +252,55 @@ NULL
    :   'null'
    ;
 
+IN
+   :   'in'
+   ;
+
+OUT
+   :   'out'
+   ;
+
+WHERE
+   :   'where'
+   ;
+
+IntegerLiteral:
+    DecimalIntegerLiteral
+    | HexIntegerLiteral
+    | OctalIntegerLiteral
+    | BinaryIntegerLiteral
+;
+
+fragment DecimalIntegerLiteral: DecimalNumeral IntegerTypeSuffix?;
+
+fragment HexIntegerLiteral: HexNumeral IntegerTypeSuffix?;
+
+fragment OctalIntegerLiteral: OctalNumeral IntegerTypeSuffix?;
+
+fragment BinaryIntegerLiteral: BinaryNumeral IntegerTypeSuffix?;
+
+fragment DecimalNumeral: '0' | NonZeroDigit (Digits?);
+
+fragment IntegerTypeSuffix: [lLxsu] | 'ux' | 'us' | 'uL';
+
+FloatingPointLiteral: DecimalFloatingPointLiteral;
+
+fragment DecimalFloatingPointLiteral:
+    Digits '.' Digits? ExponentPart? FloatTypeSuffix?
+    | Digits ExponentPart FloatTypeSuffix?
+    | Digits FloatTypeSuffix
+;
+
+fragment ExponentPart: ExponentIndicator SignedInteger;
+
+fragment ExponentIndicator: [eE];
+
+fragment SignedInteger: Sign? Digits;
+
+fragment Sign: [+-];
+
+fragment FloatTypeSuffix: [fFdD];
+
 Identifier
    :   [a-zA-Z_$][a-zA-Z0-9_$]*
    |   '`' .*? '`'
@@ -271,19 +319,43 @@ CHARACTER
    |   '\'' EscapeSequence '\''
    ;
 
-fragment
-SingleCharacter
+fragment SingleCharacter
     :   ~['\\\r\n]
     ;
 
-fragment
-EscapeSequence
-    :   '\\u' Hex Hex Hex Hex Hex Hex Hex Hex
+fragment EscapeSequence
+    :   '\\' [btnfr"'\\]
+        | UnicodeEscape
+        | OctalEscape
     ;
 
+fragment UnicodeEscape: '\\' 'u'+ Hex Hex Hex Hex;
+
+fragment OctalEscape:
+    '\\' OctalDigit
+    | '\\' OctalDigit OctalDigit
+    | '\\' ZeroToThree OctalDigit OctalDigit
+;
+
+fragment ZeroToThree: [0-3];
+
+fragment Digits: Digit+;
+
 Digit: ('0'..'9');
 
-Hex: Digit | ('A'..'F');
+fragment NonZeroDigit: [1-9];
+
+fragment Hex: Digit | [a-fA-F];
+
+fragment HexNumeral: '0' [xX] Hex+;
+
+fragment OctalNumeral: '0' OctalDigit+;
+
+fragment OctalDigit: [0-7];
+
+fragment BinaryNumeral: '0' [bB] BinaryDigit+;
+
+fragment BinaryDigit: [01];
 
 fragment
 NEWLINE
@@ -309,6 +381,10 @@ LINE_COMMENT
    :   ('//' ~[\r\n]*) -> channel(HIDDEN)
    ;
 
+UNBOUNDED
+   :   '?'
+   ;
+
 BAD_CHARACTER
-   :   .
-   ;
+  :   .
+  ;