Переход к модулю

Author: asosnoviy

src/main/java/com/github/_1c_syntax/bsl/languageserver/references/OSModulesReferenceFinder.java renamed to src/main/java/com/github/_1c_syntax/bsl/languageserver/references/OscriptReferenceFinder.java

@@ -22,13 +22,15 @@
 package com.github._1c_syntax.bsl.languageserver.references;
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.ModuleType;
 import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
 import com.github._1c_syntax.bsl.languageserver.providers.SelectionRangeProvider;
 import com.github._1c_syntax.bsl.languageserver.references.model.OccurrenceType;
 import com.github._1c_syntax.bsl.languageserver.references.model.Reference;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import lombok.RequiredArgsConstructor;
+import org.antlr.v4.runtime.tree.TerminalNode;
 import org.eclipse.lsp4j.Position;
 import org.springframework.stereotype.Component;
 
@@ -38,7 +40,7 @@
 
 @Component
 @RequiredArgsConstructor
-public class OSModulesReferenceFinder implements ReferenceFinder {
+public class OscriptReferenceFinder implements ReferenceFinder {
 
   private final ServerContext serverContext;
 
@@ -56,28 +58,33 @@ public Optional<Reference> findReference(URI uri, Position position) {
       return Optional.empty();
     }
 
-    if (!(node.get().getParent() instanceof BSLParser.TypeNameContext)) {
-      return Optional.empty();
-    }
+    return serverContext.getDocuments().values().stream()
+      .filter(documentContext -> documentContext.getTypeName().equals(node.get().getText()))
+      .filter(d -> filterByType(node, d.getModuleType()))
+      .map(documentContext -> new Reference(
+        documentContext.getSymbolTree().getModule(),
+        documentContext.getSymbolTree().getModule(),
+        documentContext.getUri(),
+        Ranges.create(0, 0, 0, 0),
+        OccurrenceType.DEFINITION)
+      ).findAny();
 
-    var className = node.get().getText();
+  }
 
-    var dd = serverContext.getDocuments().values().stream()
-      .filter(d -> d.getTypeName().equals(className))
-      .findFirst();
+  private boolean filterByType(Optional<TerminalNode> node, ModuleType moduleType) {
 
-    if (dd.isEmpty()) {
-      return Optional.empty();
+    if (node.isEmpty()) {
+      return false;
     }
 
-    return Optional.of(new Reference(
-        dd.get().getSymbolTree().getModule(),
-        dd.get().getSymbolTree().getModule(),
-        dd.get().getUri(),
-        Ranges.create(0, 0, 0, 0),
-        OccurrenceType.DEFINITION
-      )
-    );
+    if ((node.get().getParent() instanceof BSLParser.TypeNameContext)
+      && moduleType == ModuleType.Class) {
+      return true;
+    } else {
+      return (node.get().getParent() instanceof BSLParser.ComplexIdentifierContext)
+        && moduleType == ModuleType.Module;
+    }
 
   }
+
 }

src/test/java/com/github/_1c_syntax/bsl/languageserver/references/OSModulesReferenceFinderTest.java renamed to src/test/java/com/github/_1c_syntax/bsl/languageserver/references/OscriptReferenceFinderTest.java

@@ -32,10 +32,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest
-class OSModulesReferenceFinderTest {
+class OscriptReferenceFinderTest {
 
   @Autowired
-  private OSModulesReferenceFinder referenceFinder;
+  private OscriptReferenceFinder referenceFinder;
 
   @Autowired
   private ServerContext serverContext;
@@ -45,21 +45,31 @@ void testFindReferenceToClass() {
     // given
     serverContext.setConfigurationRoot(Absolute.path("src/test/resources/metadata/oscript"));
     serverContext.populateContext();
-    var documentContext = TestUtils.getDocumentContextFromFile("./src/test/resources/metadata/oscript/Классы/ТестовыйКласс.os");
     var mainOsContext = TestUtils.getDocumentContextFromFile("./src/test/resources/metadata/oscript/main.os");
 
     // when
-    var optionalReference = referenceFinder.findReference(
-      mainOsContext.getUri(),
-      new Position(1, 25)
-    );
+    var optionalReference = referenceFinder.findReference(mainOsContext.getUri(), new Position(1, 25));
 
     // then
-    assertThat(optionalReference)
-      .isPresent()
-//      .hasValueSatisfying(reference -> assertThat(reference.getSymbol().getSymbolKind()).isEqualTo())
-    ;
+    assertThat(optionalReference).isPresent();
   }
 
+  @Test
+  void testFindReferenceToModule() {
+    // given
+    serverContext.setConfigurationRoot(Absolute.path("src/test/resources/metadata/oscript"));
+    serverContext.populateContext();
+    var mainOsContext = TestUtils.getDocumentContextFromFile("./src/test/resources/metadata/oscript/main.os");
+
+    // when
+    var optionalReference = referenceFinder.findReference(mainOsContext.getUri(), new Position(3, 17));
+    // then
+    assertThat(optionalReference).isPresent();
+
+    // when
+    var variable = referenceFinder.findReference(mainOsContext.getUri(), new Position(3, 53));
+    // then
+    assertThat(variable).isEmpty();
+  }
 
 }

src/test/resources/metadata/oscript/main.os

@@ -1,4 +1,4 @@
 
 ТестовыйКласс = Новый ТестовыйКласс;
 
-Другая = 1 + ТестовыйКласс;
+Другая = ТестовыйМодуль.ЭкспортныйМетод() + ТестовыйКласс;

src/test/resources/metadata/oscript/Модули/ТестовыйМодуль.os

@@ -0,0 +1,8 @@
+
+Процедура ПростоМетод() 
+
+КонецПроцедуры
+
+Процедура ЭкспортныйМетод() Экспорт
+	ПростоМетод();
+КонецПроцедуры