Исправление поиска начала метода при наличии аннотаций

1c-syntax · Nov 2, 2024 · 9faef4b · 9faef4b
1 parent 810c04a
commit 9faef4b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/.../java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java b/.../java/com/github/_1c_syntax/bsl/languageserver/context/computer/MethodSymbolComputer.java
@@ -89,6 +89,10 @@ public ParseTree visitFunction(BSLParser.FunctionContext ctx) {
       return ctx;
     }
 
+    if (!declaration.annotation().isEmpty()) {
+      startNode = declaration.annotation().get(0).AMPERSAND();
+    }
+
     MethodSymbol methodSymbol = createMethodSymbol(
       startNode,
       stopNode,
@@ -119,6 +123,10 @@ public ParseTree visitProcedure(BSLParser.ProcedureContext ctx) {
       return ctx;
     }
 
+    if (!declaration.annotation().isEmpty()) {
+      startNode = declaration.annotation().get(0).AMPERSAND();
+    }
+
     MethodSymbol methodSymbol = createMethodSymbol(
       startNode,
       stopNode,

diff --git a/...ithub/_1c_syntax/bsl/languageserver/context/symbol/description/MethodDescriptionTest.java b/...ithub/_1c_syntax/bsl/languageserver/context/symbol/description/MethodDescriptionTest.java
@@ -44,18 +44,24 @@ void prepare() {
       var documentContext = TestUtils.getDocumentContextFromFile("./src/test/resources/context/symbol/MethodDescription.bsl");
       var methods = documentContext.getSymbolTree().getMethods();
 
-      assertThat(methods.size()).isEqualTo(14);
+      assertThat(methods).hasSize(15);
 
       methodsWithDescription = methods.stream()
         .map(MethodSymbol::getDescription)
         .filter(Optional::isPresent)
         .map(Optional::get)
-        .collect(Collectors.toList());
+        .toList();
 
-      assertThat(methodsWithDescription.size()).isEqualTo(13);
+      assertThat(methodsWithDescription.size()).isEqualTo(14);
     }
   }
 
+  @Test
+  void testMethodWithAnnotation() {
+    var method = methodsWithDescription.get(13);
+    assertThat(method.getDescription()).isEqualTo("// Описание процедуры");
+  }
+
   @Test
   void testMethod13() {
     var method = methodsWithDescription.get(12);

diff --git a/src/test/resources/context/symbol/MethodDescription.bsl b/src/test/resources/context/symbol/MethodDescription.bsl
@@ -143,3 +143,8 @@
 //
 Функция BUG_1495(Ссылки, Знач Реквизиты, ВыбратьРазрешенные = Ложь) Экспорт
 КонецФункции
+
+// Описание процедуры
+&Аннотация("Параметр")
+Процедура ПроцедураСАннотацией()
+КонецПроцедуры