From 15b9d8e7dea79c12ba8b228a833ff276f7a7788a Mon Sep 17 00:00:00 2001 From: Ivanov Eduard Date: Sun, 17 Jul 2022 14:02:47 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BE=D0=B1=D1=85=D0=BE=D0=B4=20=D0=BF=D0=BE=20=D0=B4?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B2=D1=83=20=D0=B4=D0=BB=D1=8F=20=D0=BE?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B9=20=D0=BE=D0=BF=D0=BE?= =?UTF-8?q?=D0=B2=D0=B5=D1=89=D0=B5=D0=BD=D0=B8=D1=8F.=20=D0=A0=D0=B0?= =?UTF-8?q?=D0=BD=D0=B5=D0=B5=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BC=D1=8B=20?= =?UTF-8?q?=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D1=8F=D0=BB=D0=B8,?= =?UTF-8?q?=20=D1=87=D1=82=D0=BE=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=20=D1=81=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=D0=BC=20=D0=BE=D0=BF=D0=BE=D0=B2=D0=B5=D1=89=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=B1=D1=85=D0=BE=D0=B4=20=D0=B2=20?= =?UTF-8?q?=D0=B3=D0=BB=D1=83=D0=B1=D1=8C=20=D0=BF=D0=BE=20=D0=B4=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B2=D1=83=20=D0=BE=D1=81=D1=82=D0=B0=D0=BD=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B8=D0=B2=D0=B0=D0=BB=D1=81=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsl/languageserver/references/ReferenceIndexFiller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexFiller.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexFiller.java index 44d42a458f7..93cbce7187a 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexFiller.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexFiller.java @@ -146,7 +146,7 @@ public BSLParserRuleContext visitNewExpression(BSLParser.NewExpressionContext ct ); } - return ctx; + return super.visitNewExpression(ctx); } return super.visitNewExpression(ctx); From 6619bb1ced2b853ac962fc1225f78926c536ed85 Mon Sep 17 00:00:00 2001 From: Ivanov Eduard Date: Mon, 18 Jul 2022 00:10:15 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=82=D0=B5=D1=81=D1=82=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=85=D0=BE=D0=B4=D0=B0=20=D0=BF=D0=BE=20=D0=B4=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=B2=D1=83=20=D0=B2=20=D0=B3=D0=BB=D1=83=D0=B1=D0=B8?= =?UTF-8?q?=D0=BD=D1=83=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B9=20=D0=BE=D0=BF=D0=BE=D0=B2=D0=B5=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../references/ReferenceIndexFillerTest.java | 6 ++++++ .../references/ReferenceIndexNotifyDescription.bsl | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexFillerTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexFillerTest.java index 2deabff118c..0652d6bf8fd 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexFillerTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexFillerTest.java @@ -93,6 +93,12 @@ void testFindNotifyDescription() { assertThat(method).isPresent(); references = referenceIndex.getReferencesTo(method.get()); assertThat(references).hasSize(1); + + // Проверяем обход дерева в глубину для NewExpression если это описание оповещения + method = documentContext.getSymbolTree().getMethodSymbol("ДополнительныеПараметрыОповещения"); + assertThat(method).isPresent(); + references = referenceIndex.getReferencesTo(method.get()); + assertThat(references).hasSize(1); } @Test diff --git a/src/test/resources/references/ReferenceIndexNotifyDescription.bsl b/src/test/resources/references/ReferenceIndexNotifyDescription.bsl index 3274c8670ef..322a92f42b8 100644 --- a/src/test/resources/references/ReferenceIndexNotifyDescription.bsl +++ b/src/test/resources/references/ReferenceIndexNotifyDescription.bsl @@ -4,7 +4,7 @@ ОписаниеОповещения1 = Новый ОписаниеОповещения( "ОбработчикОписаниеОповещения", ЭтотОбъект, - , + ДополнительныеПараметрыОповещения(), // Проверим ловится ли ссылка на вложенный метод "ОшибкаОписаниеОповещения", ЭтотОбъект ); @@ -30,6 +30,12 @@ КонецПроцедуры +Функция ДополнительныеПараметрыОповещения() + + Возврат Новый Структура("Тест", "Тест"); + +КонецФункции + Процедура ОбработчикОписаниеОповещения(Ответ, ДопПараметры) Экспорт // Тут какой-то код