Skip to content

Commit f8d4e10

Browse files
committed
Merge branch 'develop' into DenyIncomplete-230
2 parents cde6f98 + 1c83f52 commit f8d4e10

File tree

768 files changed

+798
-776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

768 files changed

+798
-776
lines changed

.github/ISSUE_TEMPLATE/NewDiagnostic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ assignees: ''
5050
* [ ] `LOCALIZE` - "Проблемы локализации"
5151

5252
### Время на исправление (минут)
53-
<!-- Сколько времени необходим на исправление замечания разработчику, например: 1 минута -->
53+
<!-- Сколько времени необходимо на исправление замечания разработчику, например: 1 минута -->
5454

5555
## Дополнительная информация
5656
<!-- Можно добавить любую информацию, которая может быть полезной при реализации -->
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# This workflow was added by CodeSee. Learn more at https://codesee.io/
2+
# This is v2.0 of this workflow file
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
pull_request_target:
8+
types: [opened, synchronize, reopened]
9+
10+
name: CodeSee
11+
12+
permissions: read-all
13+
14+
jobs:
15+
codesee:
16+
runs-on: ubuntu-latest
17+
continue-on-error: true
18+
name: Analyze the repo with CodeSee
19+
steps:
20+
- uses: Codesee-io/codesee-action@v2
21+
with:
22+
codesee-token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
cp -R temp/site/. public/dev/en
146146
147147
- name: Deploy
148-
uses: peaceiris/actions-gh-pages@v3.9.1
148+
uses: peaceiris/actions-gh-pages@v3.9.2
149149
with:
150150
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
151151
publish_branch: gh-pages

.github/workflows/qodana.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v3
2222
- name: 'Qodana Scan'
23-
uses: JetBrains/qodana-action@v2022.3.0
23+
uses: JetBrains/qodana-action@v2022.3.4
2424
with:
2525
linter: jetbrains/qodana-jvm-community
2626
- uses: github/codeql-action/upload-sarif@v2
2727
with:
2828
sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json
2929
- name: Deploy to GitHub Pages
3030
if: github.event_name == 'push'
31-
uses: peaceiris/actions-gh-pages@v3.9.1
31+
uses: peaceiris/actions-gh-pages@v3.9.2
3232
with:
3333
github_token: ${{ secrets.GITHUB_TOKEN }}
3434
publish_dir: ${{ runner.temp }}/qodana/results/report

.github/workflows/rebase.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
token: ${{ secrets.GITHUB_TOKEN }}
1515
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
1616
- name: Automatic Rebase
17-
uses: cirrus-actions/rebase@1.7
17+
uses: cirrus-actions/rebase@1.8
1818
env:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle.kts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ plugins {
99
signing
1010
id("org.cadixdev.licenser") version "0.6.1"
1111
id("org.sonarqube") version "3.5.0.2730"
12-
id("io.freefair.lombok") version "6.6"
13-
id("io.freefair.javadoc-links") version "6.6"
14-
id("io.freefair.javadoc-utf-8") version "6.6"
15-
id("io.freefair.aspectj.post-compile-weaving") version "6.6"
16-
id("io.freefair.maven-central.validate-poms") version "6.6"
17-
id("me.qoomon.git-versioning") version "6.3.7"
18-
id("com.github.ben-manes.versions") version "0.44.0"
12+
id("io.freefair.lombok") version "6.6.1"
13+
id("io.freefair.javadoc-links") version "6.6.1"
14+
id("io.freefair.javadoc-utf-8") version "6.6.1"
15+
id("io.freefair.aspectj.post-compile-weaving") version "6.6.1"
16+
id("io.freefair.maven-central.validate-poms") version "6.6.1"
17+
id("me.qoomon.git-versioning") version "6.4.0"
18+
id("com.github.ben-manes.versions") version "0.45.0"
1919
id("org.springframework.boot") version "2.7.5"
2020
id("io.spring.dependency-management") version "1.1.0"
2121
id("io.github.1c-syntax.bslls-dev-tools") version "0.7.2"
@@ -55,7 +55,7 @@ val languageToolVersion = "5.6"
5555

5656
dependencyManagement {
5757
imports {
58-
mavenBom("io.sentry:sentry-bom:6.9.2")
58+
mavenBom("io.sentry:sentry-bom:6.13.1")
5959
}
6060
}
6161

@@ -66,7 +66,7 @@ dependencies {
6666
// spring
6767
api("org.springframework.boot:spring-boot-starter")
6868
api("org.springframework.boot:spring-boot-starter-websocket")
69-
api("info.picocli:picocli-spring-boot-starter:4.7.0")
69+
api("info.picocli:picocli-spring-boot-starter:4.7.1")
7070

7171
// lsp4j core
7272
api("org.eclipse.lsp4j", "org.eclipse.lsp4j", "0.19.0")

docs/diagnostics/UseSystemInformation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Блоки выше заполняются автоматически, не трогать -->
44
## Описание диагностики
55

6-
Объект `СистемнаяИнформация` предоставляет данные о компьютере и конфигурации в 1С, которая может быть использована в злонамерянных целях.
6+
Объект `СистемнаяИнформация` предоставляет данные о компьютере и конфигурации в 1С, которая может быть использована в злонамеренных целях.
77

88
## Примеры
99
<!-- В данном разделе приводятся примеры, на которые диагностика срабатывает, а также можно привести пример, как можно исправить ситуацию -->

src/jmh/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/VariableSymbolCreate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of BSL Language Server.
33
*
4-
* Copyright (c) 2018-2022
4+
* Copyright (c) 2018-2023
55
* Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/languageserver/AnalyzeProjectOnStart.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of BSL Language Server.
33
*
4-
* Copyright (c) 2018-2022
4+
* Copyright (c) 2018-2023
55
* Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/languageserver/AutoServerInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of BSL Language Server.
33
*
4-
* Copyright (c) 2018-2022
4+
* Copyright (c) 2018-2023
55
* Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

0 commit comments

Comments
 (0)