Merge branch 'release/v1.8.5'

1c-syntax · Dec 11, 2016 · d9c17c6 · d9c17c6
2 parents b1cd9f6 + 0ed1c6f
commit d9c17c6
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@ node_modules
 .vscode-test
 coverage
 .nyc_output
+.sonar
+.sonarlint
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,5 +6,6 @@
 	"search.exclude": {
 		"out": true // set this to false to include "out" folder in search results
 	},
+	"editor.trimAutoWhitespace": true,
 	"typescript.tsdk": "./node_modules/typescript/lib" // we want to use the TS server from our node_modules folder to control its version
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.5
+
+* Исправлена ошибка открытия Синтакс-помощника по функции под курсором
+
 ## 1.8.4
 
 * Исправлена работа всплывающей подсказки после наведения на глобальные функции

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.8.4",
+  "version": "1.8.5",
   "publisher": "xDrivenDevelopment",
   "galleryBanner": {
     "color": "#0000FF",

diff --git a/src/extension.ts b/src/extension.ts
@@ -376,7 +376,7 @@ export function activate(context: vscode.ExtensionContext) {
         if (vscode.window.activeTextEditor.document.fileName.endsWith(".bsl") && globalMethod) {
             for (let element in bslGlobals.structureGlobContext()["global"]) {
                 let segment = bslGlobals.structureGlobContext()["global"][element];
-                if (segment[globalMethod.name] === "" || segment[globalMethod.name] === "") {
+                if (segment[globalMethod.name] !== "" || segment[globalMethod.name] !== "") {
                     // let target = (segment[globalMethod.name] === "") ? segment[globalMethod.name] : segment[globalMethod.alias];
                     global.methodForDescription = { label: globalMethod.name, description: "1С/Глобальный контекст/" + element };
                     syntaxHelper.update(previewUri);
@@ -387,7 +387,7 @@ export function activate(context: vscode.ExtensionContext) {
         } else if (vscode.window.activeTextEditor.document.fileName.endsWith(".os") && globalMethod) {
             for (let element in oscriptStdLib.globalContextOscript()) {
                 let segment = oscriptStdLib.globalContextOscript()[element];
-                if (segment["methods"][globalMethod.name] === "" || segment["methods"][globalMethod.alias] === "") {
+                if (segment["methods"][globalMethod.name] !== "" || segment["methods"][globalMethod.alias] !== "") {
                     // let target = (segment["methods"][globalMethod.name] === "") ? segment["methods"][globalMethod.name] : segment["methods"][globalMethod.alias];
                     global.methodForDescription = { label: globalMethod.name, description: "OneScript/Глобальный контекст/" + element };
                     syntaxHelper.update(previewUri);

diff --git a/src/features/bslGlobals.ts b/src/features/bslGlobals.ts
@@ -1,5 +1,8 @@
 
 /* tslint:disable:quotemark */
+/* tslint:disable:max-line-length */
+/* tslint:disable:object-literal-sort-keys */
+/* tslint:disable:trailing-comma */
 
 export function globalfunctions(): any {
     let data = {
@@ -4693,7 +4696,7 @@ export function globalvariables() {
 
 export function keywords() {
     return {
-        "ru": {
+        ru: {
             Процедура: {},
             Функция: {},
             Экспорт: {},
@@ -4728,7 +4731,7 @@ export function keywords() {
             ИЛИ: {},
             NULL: {}
         },
-        "en": {
+        en: {
             Procedure: {},
             Function: {},
             Export: {},
@@ -8816,7 +8819,7 @@ export function classes() {
 
 export function structureGlobContext() {
     return {
-        "global": {
+        global: {
             "Свойства": {
                 "WSСсылки": "",
                 "БиблиотекаКартинок": "",
@@ -9243,7 +9246,7 @@ export function structureGlobContext() {
                 "ПолучитьСоставСтандартногоИнтерфейсаOData": "",
             },
             "Процедуры и функции работы с двоичными данными": {
-                "СоединитьБуферыДвоичныхДанных ": ""
+                "СоединитьБуферыДвоичныхДанных": ""
             },
             "Прочие процедуры и функции": {
                 "Мин": "",
@@ -9279,7 +9282,7 @@ export function structureGlobContext() {
                 "ПродолжитьВызов": ""
             }
         },
-        "classes": {
+        classes: {
             "Универсальные коллекции": {
                 "Массив": "",
                 "Соответствие": "",
@@ -9322,7 +9325,6 @@ export function structureGlobContext() {
     };
 }
 
-
 export function systemEnum() {
     return {
         "КодировкаТекста": {