Skip to content

Commit

Permalink
Merge branch 'release/v1.8.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
nixel2007 committed Dec 4, 2016
2 parents b9ce666 + ae5249f commit c0f03dd
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
out
node_modules
node_modules
.vscode-test
coverage
.nyc_output
8 changes: 5 additions & 3 deletions .vscodeignore
Original file line number Diff line number Diff line change
@@ -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/**
tslint.json
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.8.3 [VSC]

* Исправлена редкая ошибка формирования комментариев к функциям

## 1.8.2

* Исправлена ошибка подсветки нескольких переменных через одно ключевое слово `Перем`
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -83,7 +83,7 @@ export function activate(context: vscode.ExtensionContext) {
if (isFunc) {
comment += "//\n";
comment += ((aL === "en") ? "// Returns:\n" : "// Возвращаемое значение:\n");
comment += ((aL === "en") ? "// <Type.Subtype> - <returned value description>" : "// <Тип.Вид> - <описание возвращаемого значения>");
comment += ((aL === "en") ? "// <Type.Subtype> - <returned value description>" : "// <Тип.Вид> - <описание возвращаемого значения>");
comment += "\n";
}
comment += "//\n";
Expand Down

0 comments on commit c0f03dd

Please sign in to comment.