Релиз 0.24

.github/workflows/gh-pages.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.6'
+        python-version: '3.12'
         architecture: 'x64'
 
     - name: Install dependencies

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Make image
 
 on:
     release:
-        types: [published, edited]
+        types: [published]
 
 jobs:
     build:
@@ -25,4 +25,4 @@ jobs:
           with:
             files: './build/libs/*.jar'
             repo-token: ${{ secrets.GITHUB_TOKEN }}
-
+

.gitignore

@@ -69,3 +69,4 @@ gen/
 *.orig
 /.idea/misc.xml
 *.tokens
+/.idea/inspectionProfiles/Project_Default.xml

build.gradle.kts

@@ -44,25 +44,20 @@ gitVersioning.apply {
 }
 val isSnapshot = gitVersioning.gitVersionDetails.refType != GitRefType.TAG
 
-val antlrVersion = "4.9.0"
-val antlrGroupId = "com.tunnelvisionlabs"
-val antlrArtifactId = "antlr4"
-
 dependencies {
-    implementation(antlrGroupId, antlrArtifactId, antlrVersion)
-    antlr(antlrGroupId, antlrArtifactId, antlrVersion)
-
-    implementation("com.github.1c-syntax", "utils", "0.5.1")
-
-    testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.6.1")
-    testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.6.1")
-    testImplementation("org.assertj", "assertj-core", "3.14.0")
+    antlr("com.tunnelvisionlabs", "antlr4", "4.9.0")
 
-    // https://mvnrepository.com/artifact/commons-io/commons-io
-    implementation("commons-io", "commons-io", "2.6")
+    implementation("io.github.1c-syntax", "bsl-parser-core", "0.1.0")
 
     // stat analysis
     compileOnly("com.google.code.findbugs", "jsr305", "3.0.2")
+
+    // testing
+    testImplementation("io.github.1c-syntax", "bsl-parser-testing", "0.1.1")
+    testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.10.1")
+    testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.10.1")
+    testImplementation("org.junit.jupiter", "junit-jupiter-params", "5.10.1")
+    testImplementation("org.assertj", "assertj-core", "3.25.0")
 }
 
 java {
@@ -95,7 +90,6 @@ sourceSets.jmh {
 // [bug] https://youtrack.jetbrains.com/issue/KT-46165
 tasks.named<org.gradle.jvm.tasks.Jar>("sourcesJar") {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
-
     dependsOn(tasks.generateGrammarSource)
 }
 

src/jmh/java/com/github/_1c_syntax/bsl/parser/JMXBSLLexerTest.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2023
+ * Copyright (c) 2018-2024
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

src/jmh/java/com/github/_1c_syntax/bsl/parser/JMXBSLParserTest.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2023
+ * Copyright (c) 2018-2024
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionTokenizer.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2023
+ * Copyright (c) 2018-2024
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
@@ -23,9 +23,12 @@
 
 import org.antlr.v4.runtime.CharStreams;
 
-public class BSLMethodDescriptionTokenizer extends Tokenizer<BSLMethodDescriptionParser.MethodDescriptionContext, BSLMethodDescriptionParser> {
+public class BSLMethodDescriptionTokenizer
+  extends Tokenizer<BSLMethodDescriptionParser.MethodDescriptionContext, BSLMethodDescriptionParser> {
   public BSLMethodDescriptionTokenizer(String content) {
-    super(content + "\n", new BSLMethodDescriptionLexer(CharStreams.fromString(""), true), BSLMethodDescriptionParser.class);
+    super(content + "\n",
+      new BSLMethodDescriptionLexer(CharStreams.fromString(""), true),
+      BSLMethodDescriptionParser.class);
   }
 
   @Override

src/main/java/com/github/_1c_syntax/bsl/parser/BSLTokenizer.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2023
+ * Copyright (c) 2018-2024
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
@@ -26,7 +26,7 @@
 
 public class BSLTokenizer extends Tokenizer<BSLParser.FileContext, BSLParser> {
   public BSLTokenizer(String content) {
-    super(content, new BSLLexer(CharStreams.fromString(""), true), BSLParser.class);
+    this(content, new BSLLexer(CharStreams.fromString(""), true));
   }
 
   public BSLTokenizer(String content, Lexer lexer) {