Skip to content

Commit 5d691b9

Browse files
committed
Merge branch 'release/v1.23.0'
2 parents ec167e0 + fbdeb25 commit 5d691b9

File tree

5 files changed

+94
-47
lines changed

5 files changed

+94
-47
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ addons:
1717

1818

1919
jdk:
20-
- oraclejdk8
20+
- openjdk11
2121

2222
git:
2323
depth: false

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## 1.23.0
4+
5+
* Добавлена настройка `bsl.trace.log`, позволяющая включить логирование обмена между VSCode и BSL Language Server с клиентской стороны (в отличие от `traceLog` в конфигурационном файле BSL Language Server). Логирование осуществается в отдельный канал вывода "BSL Language Server Trace Log"
6+
* Исправлена распаковка zip-архива BSL Language Server
7+
38
## 1.22.0
49

510
* Добавлена настройка `language-1c-bsl.downloadLanguageServer`, позволяющая отключить автоматические скачивание BSL Language Server с GitHub

package-lock.json

Lines changed: 66 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "Language 1C (BSL)",
44
"description": "Syntax highlighting for 1C:Enterprise 8.",
55
"icon": "images/1c-syntax.png",
6-
"version": "1.22.0",
6+
"version": "1.23.0",
77
"publisher": "1c-syntax",
88
"galleryBanner": {
99
"color": "#0000FF",
@@ -198,6 +198,22 @@
198198
"type": "string",
199199
"default": ".bsl-language-server.json"
200200
},
201+
"bsl.trace.server": {
202+
"type": "string",
203+
"scope": "window",
204+
"enum": [
205+
"off",
206+
"messages",
207+
"verbose"
208+
],
209+
"enumDescriptions": [
210+
"No traces",
211+
"Error only",
212+
"Full log"
213+
],
214+
"default": "off",
215+
"description": "Trace requests to the BSL Language Server"
216+
},
201217
"language-1c-bsl.downloadLanguageServer": {
202218
"description": "Download the BSL Language Server from GitHub",
203219
"type": "boolean",
@@ -371,7 +387,7 @@
371387
"dependencies": {
372388
"alignment": "0.0.1",
373389
"cross-spawn": "^7.0.3",
374-
"extract-zip": "^2.0.1",
390+
"extract-zip": "1.7.0",
375391
"fast-xml-parser": "3.17.4",
376392
"filequeue": "^0.5.0",
377393
"fs-extra": "^9.0.1",

src/features/languageClientProvider.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,10 @@ export default class LanguageClientProvider {
159159
],
160160
synchronize: {
161161
fileEvents: vscode.workspace.createFileSystemWatcher("**/*.{os,bsl}")
162-
}
162+
},
163+
traceOutputChannel: vscode.window.createOutputChannel(
164+
"BSL Language Server Trace Log"
165+
)
163166
};
164167

165168
return new LanguageClient("bsl", "BSL Language Server", serverOptions, clientOptions);

0 commit comments

Comments
 (0)