Merge branch 'release/v1.6.2'

1c-syntax · Jul 12, 2016 · 937c07c · 937c07c
2 parents 42a98a2 + 7800ca7
commit 937c07c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.6.2
+
+* Исправлена некорректная работа всплывающей подсказки в VSC 1.3.0
+
 ## 1.6.1
 
 * Исправлен показ параметров в синтаксис-помощнике

diff --git 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.6.1",
+  "version": "1.6.2",
   "publisher": "xDrivenDevelopment",
   "galleryBanner": {
     "color": "#0000FF",
@@ -22,7 +22,7 @@
     "Languages"
   ],
   "engines": {
-    "vscode": "^1.0.0"
+    "vscode": "^1.3.0"
   },
   "main": "./out/src/extension",
   "scripts": {
@@ -148,7 +148,7 @@
   },
   "devDependencies": {
     "typescript": "1.8.10",
-    "vscode": "^0.11.10"
+    "vscode": "^0.11.14"
   },
   "dependencies": {
     "filequeue": "^0.5.0",

diff --git a/src/features/hoverProvider.ts b/src/features/hoverProvider.ts
@@ -75,7 +75,7 @@ export default class GlobalHoverProvider extends AbstractProvider implements vsc
         for (let element in signature) {
             let re = new RegExp("\\(.*\\):\\s*.*", "g");
             let retValue = re.exec(signature[element].СтрокаПараметров) ? "Функция " : "Процедура ";
-            description.push({ language: "1C (BSL)", value: retValue + entry.name + signature[element].СтрокаПараметров });
+            description.push({ language: "bsl", value: retValue + entry.name + signature[element].СтрокаПараметров });
             // description.push("Параметры");
             for (let param in signature[element].Параметры) {
                 description.push("***" + param + "***: " + signature[element].Параметры[param]);
@@ -98,7 +98,7 @@ export default class GlobalHoverProvider extends AbstractProvider implements vsc
         methodDescription = methodDescription + (arraySignature.fullRetState ? arraySignature.fullRetState : "");
         description.push(methodContext);
         description.push(methodDescription);
-        description.push({language: "1C (BSL)", value: (entry.isproc ? "Процедура " : "Функция ") + entry.name + arraySignature.paramsString + (arraySignature.strRetState ? ": " + arraySignature.strRetState : "")});
+        description.push({language: "bsl", value: (entry.isproc ? "Процедура " : "Функция ") + entry.name + arraySignature.paramsString + (arraySignature.strRetState ? ": " + arraySignature.strRetState : "")});
         for (let param in entry._method.Params) {
             let documentationParam = this._global.GetDocParam(arraySignature.description, entry._method.Params[param]);
             description.push("***" + entry._method.Params[param] + "***: " + documentationParam.descriptionParam);