From f1f98eb91cccfdd92f5cf0257d5cf65781b57d86 Mon Sep 17 00:00:00 2001 From: salexdv Date: Fri, 29 Jul 2022 17:39:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D1=81=D0=BA=D0=B0=D0=B7?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=B1=D1=8A=D0=B5?= =?UTF-8?q?=D0=BA=D1=82=D0=B0=20=D0=BC=D0=B5=D1=82=D0=B0=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D0=BD=D1=8B=D1=85=20-=20=D1=80=D0=B5=D0=BA=D0=B2=D0=B8=D0=B7?= =?UTF-8?q?=D0=B8=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bslMetadata.js | 3 ++- src/bsl_helper.js | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/bslMetadata.js b/src/bslMetadata.js index 62ba09e..3ac5102 100644 --- a/src/bslMetadata.js +++ b/src/bslMetadata.js @@ -864,7 +864,8 @@ define([], function () { "name_en":"Attributes", "description":"Коллекция объектов метаданных, описывающих реквизиты данного объекта метаданных.", "ref":"types.КоллекцияОбъектовМетаданных", - "list": "properties" + "list": "properties", + "type": "metadataObjectCollection.Реквизит" }, "СерииКодов":{ "name":"СерииКодов", diff --git a/src/bsl_helper.js b/src/bsl_helper.js index d33397b..33d2de3 100644 --- a/src/bsl_helper.js +++ b/src/bsl_helper.js @@ -1420,6 +1420,9 @@ class bslHelper { else if (itemName == 'universalObjects' && this.objectHasProperties(bslGlobals, itemName, subItemName)) { this.getUniversalObjectSuggestions(suggestions, bslGlobals[itemName][subItemName], parentRef); } + else if (itemName == 'metadataObjectCollection' && this.objectHasProperties(bslGlobals, itemName, subItemName)) { + this.getUniversalObjectSuggestions(suggestions, bslGlobals[itemName][subItemName], parentRef); + } else { if (isQueryMode() || isDCSMode()) { @@ -1828,12 +1831,13 @@ class bslHelper { ref = pvalue.ref; if (pvalue.hasOwnProperty('list') && item) { - let list_name = pvalue.list; + let list_name = pvalue.list; + let type = pvalue.hasOwnProperty('type') ? pvalue.type : ''; if (item.child.hasOwnProperty(list_name)) { for (const [lkey, lvalue] of Object.entries(item.child[list_name])) { list.push({ name: lkey, - ref: '', + ref: type, kind: monaco.languages.CompletionItemKind.Field, }); };