Сортировка возвращаемых результатов callHierarchy, убраны мусорные пе…

…ременные из outgoingCalls
1c-syntax · Feb 21, 2025 · f51eae5 · f51eae5
1 parent ae97c9a
commit f51eae5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/CallHierarchyProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/CallHierarchyProvider.java
@@ -23,10 +23,12 @@
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.SourceDefinedSymbol;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.Symbol;
 import com.github._1c_syntax.bsl.languageserver.references.ReferenceIndex;
 import com.github._1c_syntax.bsl.languageserver.references.ReferenceResolver;
 import com.github._1c_syntax.bsl.languageserver.references.model.Reference;
 import com.github._1c_syntax.bsl.languageserver.utils.MdoRefBuilder;
+import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import lombok.RequiredArgsConstructor;
 import org.eclipse.lsp4j.CallHierarchyIncomingCall;
 import org.eclipse.lsp4j.CallHierarchyIncomingCallsParams;
@@ -35,14 +37,15 @@
 import org.eclipse.lsp4j.CallHierarchyOutgoingCallsParams;
 import org.eclipse.lsp4j.CallHierarchyPrepareParams;
 import org.eclipse.lsp4j.Position;
+import org.eclipse.lsp4j.SymbolKind;
 import org.springframework.stereotype.Component;
 
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.mapping;
@@ -55,6 +58,10 @@ public class CallHierarchyProvider {
   private final ReferenceResolver referenceResolver;
   private final ReferenceIndex referenceIndex;
 
+  private final Comparator<CallHierarchyItem> callHierarchyItemComparator = Comparator
+    .comparing(CallHierarchyItem::getDetail)
+    .thenComparing(CallHierarchyItem::getSelectionRange, Ranges::compare);
+
   public List<CallHierarchyItem> prepareCallHierarchy(
     DocumentContext documentContext,
     CallHierarchyPrepareParams params
@@ -65,8 +72,7 @@ public List<CallHierarchyItem> prepareCallHierarchy(
       .flatMap(Reference::getSourceDefinedSymbol)
       .map(CallHierarchyProvider::getCallHierarchyItem)
       .map(Collections::singletonList)
-      .orElse(Collections.emptyList())
-      ;
+      .orElse(Collections.emptyList());
   }
 
   public List<CallHierarchyIncomingCall> incomingCalls(
@@ -90,8 +96,8 @@ public List<CallHierarchyIncomingCall> incomingCalls(
       .entrySet()
       .stream()
       .map(entry -> new CallHierarchyIncomingCall(getCallHierarchyItem(entry.getKey()), entry.getValue()))
-      .collect(Collectors.toList());
-
+      .sorted((o1, o2) -> callHierarchyItemComparator.compare(o1.getFrom(), o2.getFrom()))
+      .toList();
   }
 
   public List<CallHierarchyOutgoingCall> outgoingCalls(
@@ -101,22 +107,22 @@ public List<CallHierarchyOutgoingCall> outgoingCalls(
 
     URI uri = documentContext.getUri();
     Position position = params.getItem().getSelectionRange().getStart();
-
     return referenceResolver.findReference(uri, position)
       .flatMap(Reference::getSourceDefinedSymbol)
       .stream()
       .map(referenceIndex::getReferencesFrom)
       .flatMap(Collection::stream)
       .filter(Reference::isSourceDefinedSymbolReference)
+      .filter(reference -> isSymbolSupported(reference.getSymbol()))
       .collect(groupingBy(
         reference -> reference.getSourceDefinedSymbol().orElseThrow(),
         mapping(Reference::getSelectionRange, toCollection(ArrayList::new)))
       )
       .entrySet()
       .stream()
       .map(entry -> new CallHierarchyOutgoingCall(getCallHierarchyItem(entry.getKey()), entry.getValue()))
-      .collect(Collectors.toList());
-
+      .sorted((o1, o2) -> callHierarchyItemComparator.compare(o1.getTo(), o2.getTo()))
+      .toList();
   }
 
   private static CallHierarchyItem getCallHierarchyItem(SourceDefinedSymbol sourceDefinedSymbol) {
@@ -133,4 +139,8 @@ private static CallHierarchyItem getCallHierarchyItem(SourceDefinedSymbol source
 
     return item;
   }
+
+  private static boolean isSymbolSupported(Symbol symbol) {
+    return symbol.getSymbolKind() == SymbolKind.Method;
+  }
 }
diff --git a/...st/java/com/github/_1c_syntax/bsl/languageserver/providers/CallHierarchyProviderTest.java b/...st/java/com/github/_1c_syntax/bsl/languageserver/providers/CallHierarchyProviderTest.java
@@ -52,7 +52,7 @@ class CallHierarchyProviderTest {
 
   private final Position firstProcedureDeclarationPosition = new Position(0, 15);
   private final Position firstFunctionCallPosition = new Position(1, 15);
-  private final Position secondFunctionDeclarationPosition = new Position(14, 15);
+  private final Position secondFunctionDeclarationPosition = new Position(16, 15);
   private final Position secondFunctionCallPosition = new Position(2, 15);
 
   @BeforeEach

diff --git a/src/test/resources/providers/callHierarchy.bsl b/src/test/resources/providers/callHierarchy.bsl
@@ -5,6 +5,8 @@
 КонецПроцедуры
 
 Функция ПерваяФункция()
+    Перем А;
+    Б = 1;
     ВтораяПроцедура();
     ВтораяФункция();
     ВтораяПроцедура();