Skip to content

Commit adad907

Browse files
authored
Merge pull request #1673 from 1c-syntax/develop
0.18.1
2 parents 30af044 + 863cd4a commit adad907

28 files changed

+540
-49
lines changed

.github/workflows/benchmark.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: self-hosted
2727
steps:
2828
- name: Checkout project
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v2.3.4
3030

3131
- name: Setup JDK
3232
uses: actions/setup-java@v2
@@ -38,7 +38,7 @@ jobs:
3838
run: ./gradlew bootJar
3939

4040
- name: Set up Python
41-
uses: actions/setup-python@v2
41+
uses: actions/setup-python@v2.2.2
4242
with:
4343
python-version: "3.7"
4444

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,12 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v2.3.4
2020
with:
2121
# We must fetch at least the immediate parents so that if this is
2222
# a pull request then we can checkout the head.
2323
fetch-depth: 2
2424

25-
# If this run was triggered by a pull request event, then checkout
26-
# the head of the pull request instead of the merge commit.
27-
- run: git checkout HEAD^2
28-
if: ${{ github.event_name == 'pull_request' }}
29-
3025
- name: Set up JDK 11
3126
uses: actions/setup-java@v2
3227
with:

.github/workflows/gh-pages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
build-deploy:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v1
20+
- uses: actions/checkout@v2.3.4
2121

2222
- name: Setup JDK
2323
uses: actions/setup-java@v2
@@ -29,7 +29,7 @@ jobs:
2929
run: ./gradlew --no-daemon javadoc
3030

3131
- name: Set up Python
32-
uses: actions/setup-python@v1
32+
uses: actions/setup-python@v2.2.2
3333
with:
3434
python-version: '3.6'
3535
architecture: 'x64'

.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
java_version: ['11', '16']
1212
os: [ubuntu-latest, windows-latest, macOS-latest]
1313
steps:
14-
- uses: actions/checkout@v1
14+
- uses: actions/checkout@v2.3.4
1515
- name: Set up JDK ${{ matrix.java_version }}
1616
uses: actions/setup-java@v2
1717
with:

.github/workflows/javadoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v1
9+
- uses: actions/checkout@v2.3.4
1010
- name: Set up JDK
1111
uses: actions/setup-java@v2
1212
with:

.github/workflows/qa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v2.3.4
1616
with:
1717
fetch-depth: ''
1818
- run: |

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
steps:
3030
- name: Checkout source
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v2.3.4
3232
- name: Set up JDK
3333
uses: actions/setup-java@v2
3434
with:

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
`maven-publish`
99
jacoco
1010
id("net.kyori.indra.license-header") version "1.3.1"
11-
id("org.sonarqube") version "3.1.1"
11+
id("org.sonarqube") version "3.2.0"
1212
id("io.freefair.lombok") version "6.0.0-m2"
1313
id("me.qoomon.git-versioning") version "4.2.0"
1414
id("com.github.ben-manes.versions") version "0.38.0"
@@ -58,7 +58,7 @@ dependencies {
5858
api("org.eclipse.lsp4j", "org.eclipse.lsp4j", "0.12.0")
5959

6060
// 1c-syntax
61-
api("com.github.1c-syntax", "bsl-parser", "0.18.0") {
61+
api("com.github.1c-syntax", "bsl-parser", "0.19.3") {
6262
exclude("com.tunnelvisionlabs", "antlr4-annotations")
6363
exclude("com.ibm.icu", "*")
6464
exclude("org.antlr", "ST4")

docs/diagnostics/IncorrectLineBreak.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44
:-: | :-: | :-: | :-: | :-: | :-:
55
`Дефект кода` | `BSL`<br>`OS` | `Информационный` | `Да` | `2` | `standard`<br>`badpractice`
66

7+
## Параметры
8+
9+
Имя | Тип | Описание | Значение по умолчанию
10+
:-: | :-: | :-- | :-:
11+
`checkFirstSymbol` | `Булево` | ```Проверять начало строки на некорректные символы``` | ```true```
12+
`listOfIncorrectFirstSymbol` | `Строка` | ```Символы через вертикальную черту, с которых не должна начинаться строка (специальные символы должны быть экранированы)``` | ```\)|;|,|\);```
13+
`checkLastSymbol` | `Булево` | ```Проверять конец строки на некорректные символы``` | ```true```
14+
`listOfIncorrectLastSymbol` | `Строка` | ```Символы через вертикальную черту, на которые не должна заканчиваться строка (специальные символы должны быть экранированы)``` | ```ИЛИ|И|OR|AND|\+|-|/|%|\*```
15+
716
<!-- Блоки выше заполняются автоматически, не трогать -->
817
## Описание диагностики
918
<!-- Описание диагностики заполняется вручную. Необходимо понятным языком описать смысл и схему работу -->
@@ -52,5 +61,10 @@
5261
### Параметр конфигурационного файла
5362

5463
```json
55-
"IncorrectLineBreak": false
64+
"IncorrectLineBreak": {
65+
"checkFirstSymbol": true,
66+
"listOfIncorrectFirstSymbol": "\\)|;|,|\\);",
67+
"checkLastSymbol": true,
68+
"listOfIncorrectLastSymbol": "ИЛИ|И|OR|AND|\\+|-|/|%|\\*"
69+
}
5670
```

docs/en/diagnostics/IncorrectLineBreak.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44
:-: | :-: | :-: | :-: | :-: | :-:
55
`Code smell` | `BSL`<br>`OS` | `Info` | `Yes` | `2` | `standard`<br>`badpractice`
66

7+
## Parameters
8+
9+
Name | Type | Description | Default value
10+
:-: | :-: | :-- | :-:
11+
`checkFirstSymbol` | `Boolean` | ```Check beginning of line for invalid characters``` | ```true```
12+
`listOfIncorrectFirstSymbol` | `String` | ```Vertical bar-separated characters that should not start the line (special characters must be escaped)``` | ```\)|;|,|\);```
13+
`checkLastSymbol` | `Boolean` | ```Check end of line for invalid characters``` | ```true```
14+
`listOfIncorrectLastSymbol` | `String` | ```Vertical bar-separated characters that must not end in the line (special characters must be escaped)``` | ```ИЛИ|И|OR|AND|\+|-|/|%|\*```
15+
716
<!-- Блоки выше заполняются автоматически, не трогать -->
817
## Description
918

@@ -51,5 +60,10 @@ AmountDocument = AmountWithoutDiscount +
5160
### Parameter for config
5261

5362
```json
54-
"IncorrectLineBreak": false
63+
"IncorrectLineBreak": {
64+
"checkFirstSymbol": true,
65+
"listOfIncorrectFirstSymbol": "\\)|;|,|\\);",
66+
"checkLastSymbol": true,
67+
"listOfIncorrectLastSymbol": "ИЛИ|И|OR|AND|\\+|-|/|%|\\*"
68+
}
5569
```

0 commit comments

Comments
 (0)