[pull] develop from 1c-syntax:develop

.devcontainer/devcontainer.json

@@ -0,0 +1,41 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/java
+{
+	"name": "Java",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/java:1-17-bookworm",
+
+	"features": {
+		"ghcr.io/devcontainers/features/java:1": {
+			"version": "none",
+			"installMaven": "false",
+			"installGradle": "true"
+		},
+		"ghcr.io/devcontainers/features/python:1": {}
+	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"vscjava.vscode-gradle",
+				"GitHub.vscode-github-actions",
+				"astrizhachuk.1c-extension-pack",
+				"zhuangtongfa.Material-theme",
+				"GitHub.copilot",
+				"GitHub.copilot-chat",
+				"github.vscode-github-actions"
+			]
+		}
+	}
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "java -version",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.git-blame-ignore-revs

@@ -0,0 +1,5 @@
+# happy new year 2025
+e84a3f81035a6e76c042b406d5ad6e986a91d8e1
+# happy new year 2024
+654c64ee05d943de550defda931b10ad6067171d
+

.github/ISSUE_TEMPLATE/NewDiagnostic.md

@@ -50,7 +50,7 @@ assignees: ''
 * [ ] `LOCALIZE` - "Проблемы локализации"
 
 ### Время на исправление (минут)
-<!-- Сколько времени необходим на исправление замечания разработчику, например: 1 минута -->
+<!-- Сколько времени необходимо на исправление замечания разработчику, например: 1 минута -->
 
 ## Дополнительная информация
 <!-- Можно добавить любую информацию, которая может быть полезной при реализации -->

.github/dependabot.yml

@@ -9,7 +9,15 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    groups:
+      freefair:
+        patterns:
+          - "io.freefair.*"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "devcontainers"
+    directory: "/"
+    schedule:
+      interval: weekly

.github/scripts/benchmark.py

@@ -20,6 +20,8 @@ def some_func(arg):
     cmdArgs.append('-a')
     cmdArgs.append('-s')
     cmdArgs.append('ssl')
+    cmdArgs.append('-r')
+    cmdArgs.append('sarif')
     cmdArgs.append('-c')
     cmdArgs.append(pathToConfig)
     cmd = ' '.join(cmdArgs) 

.github/scripts/build-jpackage.py

@@ -0,0 +1,73 @@
+import ntpath
+import os
+import platform
+import re
+import shutil
+import sys
+
+
+def build_image(base_dir, image_prefix, executable_file):
+    path_to_jar = get_bsl_ls_jar(base_dir)
+    if path_to_jar is None:
+        exit()
+
+    cmd_args = [
+        'jpackage',
+        '--name', 'bsl-language-server',
+        '--input', 'build/libs',
+        '--main-jar', path_to_jar]
+
+    if is_windows():
+        cmd_args.append('--win-console')
+
+    cmd_args.append('--type')
+    cmd_args.append('app-image')
+    cmd_args.append('--java-options')
+    cmd_args.append('-Xmx3g')
+
+    cmd = ' '.join(cmd_args)
+    os.system(cmd)
+
+    shutil.make_archive(
+        "bsl-language-server_" + image_prefix,
+        'zip',
+        './',
+        executable_file)
+
+
+def is_windows():
+    return platform.system() == 'Windows'
+
+
+def get_base_dir():
+    if is_windows():
+        base_dir = os.getcwd() + "\\build\\libs"
+    else:
+        base_dir = os.getcwd() + "/build/libs"
+    return base_dir
+
+
+def get_bsl_ls_jar(dir_name):
+    pattern = r"bsl.+\.jar"
+    names = os.listdir(dir_name)
+    for name in names:
+        fullname = os.path.join(dir_name, name)
+        if os.path.isfile(fullname) and re.search(pattern, fullname) and fullname.find('exec.jar') != -1:
+            return ntpath.basename(fullname)
+
+    return None
+
+
+if __name__ == "__main__":
+    # directory with build project
+    arg_base_dir = get_base_dir()
+
+    # image prefix: `win`, `nic` or `mac`
+    arg_image_prefix = sys.argv[1]
+
+    # executable file: `bsl-language-server` or `bsl-language-server.app`
+    arg_executable_file = sys.argv[2]
+
+    build_image(base_dir=get_base_dir(),
+                image_prefix=sys.argv[1],
+                executable_file=sys.argv[2])

.github/workflows/benchmark.yml

@@ -29,16 +29,17 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
+          cache: gradle
 
       - name: Build with Gradle
         run: ./gradlew bootJar
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.7"
 
@@ -51,6 +52,12 @@ jobs:
       - name: Analyze ssl
         run: pytest .github/scripts/benchmark.py --benchmark-min-rounds=3 --benchmark-timer=time.time --benchmark-json=output.json --benchmark-verbose
 
+      - name: Archive results in SARIF
+        uses: actions/upload-artifact@v4
+        with:
+          name: "SARIF report"
+          path: bsl-ls.sarif
+
       - name: Generation badge benchmark
         if: github.event_name == 'push'
         run: python .github/scripts/gen-bandge.py

.github/workflows/check-package.yml

@@ -0,0 +1,51 @@
+name: Check making image
+
+on:
+    push:
+        branches:
+            - develop
+            - feature/check-package
+
+
+jobs:
+    build:
+        strategy:
+            fail-fast: true
+            matrix:
+               os: [windows-latest, ubuntu-latest, macOS-latest]
+               include:
+                    - os: windows-latest
+                      displayName: Windows
+                      prefix: win
+                      app-image: bsl-language-server
+                    - os: ubuntu-latest
+                      displayName: Linux
+                      prefix: nix
+                      app-image: bsl-language-server
+                    - os: macOS-latest
+                      displayName: MacOS
+                      prefix: mac
+                      app-image: bsl-language-server.app
+        runs-on: ${{ matrix.os }}
+        name: (${{ matrix.displayName }}) create image app version
+
+        steps:
+            - name: Checkout source
+              uses: actions/checkout@v4
+
+            - name: Set up JDK
+              uses: actions/setup-java@v4
+              with:
+                java-version: 23
+                distribution: 'temurin'
+                cache: gradle
+
+            - name: Build bootJar with Gradle
+              run: ./gradlew check build
+
+            - name: Build jpackage application image
+              run: python .github/scripts/build-jpackage.py ${{ matrix.prefix }} ${{ matrix.app-image }}
+
+
+
+

.github/workflows/codeql-analysis.yml

@@ -23,21 +23,22 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'temurin'
+        cache: gradle
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       # Override language selection by uncommenting this and choosing your languages
       with:
         languages: java
@@ -52,4 +53,4 @@ jobs:
     - run: ./gradlew jar
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/codesee-arch-diagram.yml

@@ -0,0 +1,22 @@
+# This workflow was added by CodeSee. Learn more at https://codesee.io/
+# This is v2.0 of this workflow file
+on:
+  push:
+    branches:
+      - develop
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+name: CodeSee
+
+permissions: read-all
+
+jobs:
+  codesee:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    name: Analyze the repo with CodeSee
+    steps:
+      - uses: Codesee-io/codesee-action@v2
+        with:
+          codesee-token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}

.github/workflows/gh-pages.yml

@@ -17,21 +17,22 @@ jobs:
   build-deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'temurin'
+        cache: gradle
 
     - name: Build javadoc
       run: ./gradlew --no-daemon javadoc
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.6'
+        python-version: '3.7.15'
         architecture: 'x64'
 
     - name: Install dependencies
@@ -145,7 +146,7 @@ jobs:
         cp -R temp/site/. public/dev/en
 
     - name: Deploy
-      uses: peaceiris/actions-gh-pages@v3.9.0
+      uses: peaceiris/actions-gh-pages@v4.0.0
       with:
         deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
         publish_branch: gh-pages

.github/workflows/gradle.yml

@@ -18,20 +18,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['11', '17']
+        java_version: ['17', '21', '23']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.java_version }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java_version }}
         distribution: 'temurin'
+        cache: gradle
     - name: Build with Gradle
       run: ./gradlew check --stacktrace
     - name: Archive test results
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
         path: build/reports/tests/test

.github/workflows/javadoc.yml

@@ -17,11 +17,12 @@ jobs:
     needs: gatekeeper
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: 'temurin'
+        cache: gradle
     - name: Check javadoc build
       run: ./gradlew javadoc --stacktrace

.github/workflows/pre-qa.yml

@@ -21,7 +21,7 @@ jobs:
       run: echo ${{ github.event.number }} > PR_NUMBER.txt
     - name: Archive PR number
       if: github.event_name == 'pull_request'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: PR_NUMBER
         path: PR_NUMBER.txt

.github/workflows/publish-to-sonatype.yml

@@ -12,12 +12,13 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
+          cache: gradle
       - name: Publish to Sonatype
         run: ./gradlew publishMavenPublicationToSonatypeRepository -PsimplifyVersion
         env: