Merge branch 'develop'

.gitattributes

@@ -2,4 +2,5 @@
 *.bsl eol=lf
 *.xml eol=lf
 *.md eol=lf
+*.json eol=lf
 *.bat eol=crlf

.github/ISSUE_TEMPLATE/NewDiagnostic.md

@@ -19,6 +19,7 @@ assignees: ''
 <!-- Можно поставить x (на латинице) либо после сохранения кликнуть мышкой -->
 * [ ] :ant: Ошибка
 * [ ] :cop: Уязвимость
+* [ ] :guardsman: Потенциальная уязвимость
 * [ ] :poop: Качество кода
 * [ ] :trollface: Другое
 
@@ -46,6 +47,7 @@ assignees: ''
 * [ ] `UNPREDICTABLE` - "Непредсказуемо работающий код"
 * [ ] `DEPRECATED` - "Устаревшая функциональность"
 * [ ] `ERROR` - "Ошибочная конструкция"
+* [ ] `LOCALIZE` - "Проблемы локализации"
 
 ### Время на исправление (минут)
 <!-- Сколько времени необходим на исправление замечания разработчику, например: 1 минута -->

.github/workflows/gh-pages.yml

@@ -7,6 +7,9 @@ on:
     - develop
     paths:
     - 'docs/**'
+    - 'src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/**'
+    - 'mkdocs.yml'
+    - 'mkdocs.en.yml'
 
 jobs:
   build-deploy:
@@ -58,6 +61,8 @@ jobs:
         mkdir temp
         cp mkdocs.yml temp
         cp -R docs/. temp/docs
+        mkdir temp/docs/configuration
+        cp -R src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/. temp/docs/configuration
         rm -rf temp/docs/en
         cd temp
         mkdocs build
@@ -83,6 +88,8 @@ jobs:
         cp -R docs/en/. temp/docs
         mkdir temp/docs/assets
         cp -R docs/assets/. temp/docs/assets
+        mkdir temp/docs/configuration
+        cp -R src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/. temp/docs/configuration
         cd temp
         mkdocs build
         

.github/workflows/gradle.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['1.8', '11']
+        java_version: ['11', '13']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
     - uses: actions/checkout@v1

.github/workflows/publish.yml

@@ -0,0 +1,22 @@
+name: Publish to m2
+
+on:
+  push:
+  release:
+      types: [published]
+
+jobs:
+  gpr:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2-beta
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Github Package Registry publish
+        run: ./gradlew publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GPR_DEPLOY_KEY: ${{ secrets.GPR_DEPLOY_KEY }}
+          GPR_USER: ${{ github.actor }}

.github/workflows/qa.yml

@@ -8,11 +8,15 @@ on:
   pull_request:
 
 jobs:
-  build:
+  QA:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: ''
+    - run: |
+        git fetch --prune --unshallow
     - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:

.github/workflows/release.yml

@@ -0,0 +1,141 @@
+name: Make image
+
+on:
+    release:
+        types: [published, edited]
+
+jobs:
+    build:
+        strategy:
+            fail-fast: true
+            matrix:
+               os: [windows-latest, ubuntu-latest, macOS-latest]
+               include:
+                    - os: windows-latest
+                      displayName: Windows
+                      prefix: win
+                      jpackageDownload: https://download.java.net/java/early_access/jdk14/27/GPL/openjdk-14-ea+27_windows-x64_bin.zip
+                      jdk14Path: /jdk-14
+                      app-image: bsl-language-server
+                    - os: ubuntu-latest
+                      displayName: Linux
+                      prefix: nix
+                      jpackageDownload: https://download.java.net/java/early_access/jdk14/27/GPL/openjdk-14-ea+27_linux-x64_bin.tar.gz
+                      jdk14Path: /jdk-14
+                      app-image: bsl-language-server
+                    - os: macOS-latest
+                      displayName: MacOS
+                      prefix: mac
+                      jpackageDownload: https://download.java.net/java/early_access/jdk14/27/GPL/openjdk-14-ea+27_osx-x64_bin.tar.gz
+                      jdk14Path: /jdk-14.jdk/Contents/Home
+                      app-image: bsl-language-server.app
+        runs-on: ${{ matrix.os }}
+        name: (${{ matrix.displayName }}) create image app version
+
+        steps:
+            - name: Checkout source
+              uses: actions/checkout@v2             
+            - name: Set up JDK
+              uses: actions/setup-java@v1
+              with:
+                java-version: 13
+            - name: Build with Gradle
+              run: ./gradlew build
+            - name: Download jpackage
+                # We need to download jpackage from https://jdk.java.net/jpackage/
+              run: |
+                  import tarfile
+                  import zipfile
+                  import sys
+                  if sys.version_info[0] >= 3:
+                    from urllib.request import urlretrieve
+                  else:
+                    from urllib import urlretrieve
+
+                  url = "${{ matrix.jpackageDownload }}"
+                  tmpfile, headers = urlretrieve(url)
+                  if (url.endswith("tar.gz")):
+                    tar = tarfile.open(tmpfile)
+                    tar.extractall()
+                    tar.close()
+                  elif (url.endswith("zip")):
+                    zip = zipfile.ZipFile(tmpfile)
+                    zip.extractall()
+                    zip.close()
+              shell: python
+            - name: Build jpackage app-image
+              run: |
+                    import os
+                    import platform
+                    import re
+                    import ntpath
+                    import shutil
+
+                    pattern = r"bsl.+\.jar"
+                    thisPlatform = platform.system();
+                    isWindows = False
+                    if thisPlatform == 'Windows':
+                        isWindows = True
+                        
+                    if isWindows:
+                        jpackage = os.getcwd() + "\\" + "${{ matrix.jdk14Path }}" + '\\bin\\jpackage.exe'
+                        dirName = os.getcwd() + "\\build\\libs"
+                    else:
+                        jpackage = os.getcwd() + "${{ matrix.jdk14Path }}" + '/bin/jpackage'
+                        dirName = os.getcwd() + "/build/libs"    
+
+                    def start():
+                        fullname = get_bslls_jar(dirName)
+                        if (fullname == None):
+                            exit
+                        
+                        cmdArgs = [jpackage]
+                        cmdArgs.append('--name')
+                        cmdArgs.append('bsl-language-server')
+                        cmdArgs.append('--input')
+                        cmdArgs.append('build/libs')
+                        cmdArgs.append('--main-jar')
+                        cmdArgs.append(fullname)
+                        if isWindows:
+                            cmdArgs.append('--win-console')
+                        cmdArgs.append('--type')
+                        cmdArgs.append('app-image')
+                        cmdArgs.append('--java-options')
+                        cmdArgs.append('-Xmx2g')
+
+                        cmd = ' '.join(cmdArgs) 
+                        os.system(cmd)
+                          
+                        shutil.make_archive("bsl-language-server_" + "${{ matrix.prefix }}", 'zip', './',"${{ matrix.app-image }}")
+
+                    def get_bslls_jar(dir):
+                        names = os.listdir(dir)
+                        for name in names:
+                            fullname = os.path.join(dir, name)
+                            if os.path.isfile(fullname) and re.search(pattern, fullname):
+                                return ntpath.basename(fullname)
+                        return None
+
+                    def run_jpackage():
+                        cmd = jpackage + ' @jpackage.cfg'
+                        print(cmd)
+                        os.system(cmd)
+
+                    start()
+              shell: python
+            - name: Upload artifact
+              uses: actions/upload-artifact@master
+              with:
+                name: bsl-language-server_${{ matrix.prefix }}.zip
+                path: ./${{ matrix.app-image }}
+            - name: Upload assets to release
+              uses: AButler/[email protected]
+              with:
+                  files: './bsl-language-server_${{ matrix.prefix }}.zip'
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+            - name: Upload jar to release
+              if: matrix.prefix == 'nix'
+              uses: AButler/[email protected]
+              with:
+                  files: './build/libs/*.jar'
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}