wip

1c-syntax · Jul 9, 2021 · 9f8d05b · 9f8d05b · github-actions · Jul 11, 2021
1 parent 069d091
commit 9f8d05b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java
@@ -23,7 +23,7 @@
 
 import com.github._1c_syntax.bsl.languageserver.utils.MdoRefBuilder;
 import com.github._1c_syntax.mdclasses.Configuration;
-import com.github._1c_syntax.mdclasses.mdo.AbstractMDObjectBase;
+import com.github._1c_syntax.mdclasses.mdo.AbstractMDObjectBSL;
 import com.github._1c_syntax.mdclasses.mdo.MDCommonModule;
 import com.github._1c_syntax.mdclasses.mdo.support.MDOModule;
 import com.github._1c_syntax.mdclasses.mdo.support.ModuleType;
@@ -166,9 +166,9 @@ public Configuration getConfiguration() {
     return configurationMetadata.getOrCompute();
   }
 
-  public Set<AbstractMDObjectBase> getGlobalModules() {
+  public Set<AbstractMDObjectBSL> getGlobalModules() {
 
-    Set<AbstractMDObjectBase> globalModules = new HashSet<>();
+    Set<AbstractMDObjectBSL> globalModules = new HashSet<>();
 
     getConfiguration().getCommonModules().values().stream()
       .filter(MDCommonModule::isGlobal)

diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndex.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndex.java
@@ -28,6 +28,8 @@
 import com.github._1c_syntax.bsl.languageserver.context.symbol.SymbolTree;
 import com.github._1c_syntax.bsl.languageserver.utils.MdoRefBuilder;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
+import com.github._1c_syntax.mdclasses.mdo.AbstractMDObjectBSL;
+import com.github._1c_syntax.mdclasses.mdo.support.MDOModule;
 import com.github._1c_syntax.mdclasses.mdo.support.ModuleType;
 import lombok.RequiredArgsConstructor;
 import lombok.Synchronized;
@@ -50,6 +52,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Component
 @RequiredArgsConstructor
@@ -204,11 +207,19 @@ private Optional<SourceDefinedSymbol> getSourceDefinedSymbol(MultiKey<String> mu
     ModuleType moduleType = ModuleType.valueOf(multikey.getKey(1));
     String symbolName = multikey.getKey(2);
 
-    return serverContext.getDocument(mdoRef, moduleType)
+    Stream<DocumentContext> reffedModules = serverContext.getDocument(mdoRef, moduleType).stream();
+    Stream<DocumentContext> globalModules = serverContext.getGlobalModules().stream()
+      .map(AbstractMDObjectBSL::getModules)
+      .flatMap(Collection::stream)
+      .map(MDOModule::getUri)
+      .map(serverContext::getDocument);
+
+    return Stream.concat(reffedModules, globalModules)
       .map(DocumentContext::getSymbolTree)
-      // TODO: SymbolTree#getSymbol(Position)?
-      //  Для поиска не только методов, но и переменных, которые могут иметь одинаковые имена
-      .flatMap(symbolTree -> symbolTree.getMethodSymbol(symbolName));
+      .flatMap(symbolTree -> symbolTree.getMethodSymbol(symbolName).stream())
+      .map(SourceDefinedSymbol.class::cast)
+      .findAny();
+
   }
 
   private SourceDefinedSymbol getFromSymbol(URI uri, Position position) {

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/references/ReferenceIndexTest.java
@@ -174,7 +174,7 @@ void testGetReferenceToGlobalMethodFromApplicationModule() {
     // then
     assertThat(reference.getFrom()).isEqualTo(methodSymbol);
     assertThat(reference.getSymbol()).isEqualTo(calledMethodSymbol);
-    assertThat(reference.getSelectionRange()).isEqualTo(Ranges.create(5, 4, 41));
+    assertThat(reference.getSelectionRange()).isEqualTo(Ranges.create(5, 4, 29));
     assertThat(reference.getUri()).isEqualTo(uri);
   }
 
@@ -215,7 +215,7 @@ void testGetReferencesFromLocalMethodSymbol() {
 
     // then
     assertThat(references)
-      .hasSize(3)
+      .hasSize(5)
       .contains(Reference.of(localMethodSymbol, localMethodSymbol, locationLocal))
       .contains(Reference.of(localMethodSymbol, commonModuleMethodSymbol, locationCommonModule))
       .contains(Reference.of(localMethodSymbol, managerModuleMethodSymbol, locationManagerModule))