From 5931df0fac340dd90cbacfb85eb1cab042834ab8 Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Sun, 27 Nov 2016 19:03:09 +0300 Subject: [PATCH 1/6] Update deps --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 0d2fe323..d0036ea4 100644 --- a/package.json +++ b/package.json @@ -172,9 +172,8 @@ }, "devDependencies": { "@types/mocha": "^2.2.33", - "@types/node": "^6.0.46", + "@types/node": "^6.0.51", "@types/should": "^8.1.30", - "mocha": "^2.3.3", "should": "^11.1.1", "typescript": "^2.0.10", "vscode": "^1.0.3" From 3bc36f19169357a8120d8bf28813a6ca28c970f3 Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Mon, 28 Nov 2016 10:28:21 +0300 Subject: [PATCH 2/6] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=20=D0=B2=20=D0=B8=D0=B3=D0=BD=D0=BE=D1=80=20?= =?UTF-8?q?=D1=81=D0=BB=D1=83=D0=B6=D0=B5=D0=B1=D0=BD=D1=8B=D0=B5=20=D0=BA?= =?UTF-8?q?=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=B8=20=D0=BA=D0=B0=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B4=D0=B6=D0=B0=20=D0=B8=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8e5962ee..8bae4305 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ out -node_modules \ No newline at end of file +node_modules +.vscode-test +coverage +.nyc_output From adf37e6a43bd9bb65d6cf0b1f32ea3d3d6d62c16 Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Mon, 28 Nov 2016 10:39:01 +0300 Subject: [PATCH 3/6] =?UTF-8?q?=D0=A3=D1=82=D0=BE=D1=87=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=20=D0=B8=D0=B3=D0=BD=D0=BE=D1=80=20=D0=B4=D0=BB=D1=8F=20=D1=81?= =?UTF-8?q?=D0=B1=D0=BE=D1=80=D0=B0=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscodeignore | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.vscodeignore b/.vscodeignore index 82c40d51..9666f079 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -1,10 +1,12 @@ +.nyc_output/** .vscode/** -typings/** +.vscode-test/** +coverage/** out/test/** test/** src/** **/*.map .gitignore +.travis.yml tsconfig.json -vsc-extension-quickstart.md -screenshots/** \ No newline at end of file +tslint.json From 0215f8bb5afa67b6be08b38df3762a124e156eab Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Sun, 4 Dec 2016 14:56:02 +0300 Subject: [PATCH 4/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0?= =?UTF-8?q?=D1=80=D0=B8=D0=B5=D0=B2=20=D0=BA=20=D0=BF=D1=80=D0=BE=D1=86?= =?UTF-8?q?=D0=B5=D0=B4=D1=83=D1=80=D0=B0=D0=BC.=20Fix=20https://github.co?= =?UTF-8?q?m/xDrivenDevelopment/1c-syntax/issues/240?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/extension.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension.ts b/src/extension.ts index ea033e4f..0825ebe3 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -70,7 +70,7 @@ export function activate(context: vscode.ExtensionContext) { methodDescription = (isFunc) ? "Описание функции" : "Описание процедуры"; } comment += "// <" + methodDescription + ">\n"; - let params = global.getCacheLocal(editor.document.fileName, matchMethod[2], editor.document.getText())[0]._method.Params; + let params = global.getCacheLocal(editor.document.fileName, matchMethod[2], editor.document.getText(), false, false)[0]._method.Params; if (params.length > 0) { comment += "//\n"; comment += ((aL === "en") ? "// Parameters:\n" : "// Параметры:\n"); From d09a65219dc3f366555d2d16f31895e047b4ba4c Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Sun, 4 Dec 2016 14:58:03 +0300 Subject: [PATCH 5/6] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF?= =?UTF-8?q?=D1=8B=20=D0=B2=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B8=20=D0=B2=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=89=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC=D1=8B=D1=85=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/extension.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension.ts b/src/extension.ts index 0825ebe3..fe10163b 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -83,7 +83,7 @@ export function activate(context: vscode.ExtensionContext) { if (isFunc) { comment += "//\n"; comment += ((aL === "en") ? "// Returns:\n" : "// Возвращаемое значение:\n"); - comment += ((aL === "en") ? "// - " : "// <Тип.Вид> - <описание возвращаемого значения>"); + comment += ((aL === "en") ? "// - " : "// <Тип.Вид> - <описание возвращаемого значения>"); comment += "\n"; } comment += "//\n"; From ae5249fd4be01623b52a4dfaa08fdfdc459c67d3 Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Sun, 4 Dec 2016 15:04:05 +0300 Subject: [PATCH 6/6] Changelog 1.8.3 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46556930..e13db553 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.8.3 [VSC] + +* Исправлена редкая ошибка формирования комментариев к функциям + ## 1.8.2 * Исправлена ошибка подсветки нескольких переменных через одно ключевое слово `Перем` diff --git a/package.json b/package.json index d0036ea4..3f083e98 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Language 1C (BSL)", "description": "Syntax highlighting for 1C:Enterprise 8.", "icon": "images/xDDIcon.png", - "version": "1.8.2", + "version": "1.8.3", "publisher": "xDrivenDevelopment", "galleryBanner": { "color": "#0000FF",