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 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 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 0d2fe323..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", @@ -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" diff --git a/src/extension.ts b/src/extension.ts index ea033e4f..fe10163b 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"); @@ -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";