qfFix

Author: asosnoviy

src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/diagnostics/SubsystemFilter.java

@@ -24,6 +24,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Set;
 import java.util.TreeSet;
 
 /**
@@ -32,6 +33,6 @@
 @Data
 @NoArgsConstructor
 public class SubsystemFilter {
-  private TreeSet<String> include = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
-  private TreeSet<String> exclude = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+  private Set<String> include = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+  private Set<String> exclude = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
 }

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/infrastructure/DiagnosticsConfiguration.java

@@ -31,9 +31,9 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCompatibilityMode;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticScope;
-import com.github._1c_syntax.bsl.languageserver.utils.MdoRefBuilder;
 import com.github._1c_syntax.mdclasses.common.CompatibilityMode;
 import com.github._1c_syntax.mdclasses.mdo.AbstractMDO;
+import com.github._1c_syntax.mdclasses.mdo.MDSubsystem;
 import com.github._1c_syntax.mdclasses.mdo.support.ModuleType;
 import com.github._1c_syntax.mdclasses.supportconf.SupportConfiguration;
 import com.github._1c_syntax.mdclasses.supportconf.SupportVariant;
@@ -50,6 +50,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Configuration
 @RequiredArgsConstructor
@@ -107,7 +108,7 @@ private static boolean filterSubsystems(DocumentContext documentContext, Diagnos
       return true;
     }
 
-    var stringStream = MdoRefBuilder.subsystemFlatList(mdoObject.get().getIncludedSubsystems()).stream()
+    var stringStream = subsystemFlatList(mdoObject.get().getIncludedSubsystems()).stream()
       .map(AbstractMDO::getName)
       .collect(Collectors.toList());
 
@@ -230,4 +231,11 @@ private static boolean passedCompatibilityMode(
     return CompatibilityMode.compareTo(compatibilityMode.getCompatibilityMode(), contextCompatibilityMode) >= 0;
   }
 
+  // todo перенести в mdClasses
+  private static List<MDSubsystem> subsystemFlatList(Collection<MDSubsystem> subsystems) {
+    return subsystems.stream()
+      .flatMap(subsys -> Stream.concat(Stream.of(subsys), subsystemFlatList(subsys.getIncludedSubsystems()).stream()))
+      .collect(Collectors.toList());
+  }
+
 }

src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/MdoRefBuilder.java

@@ -95,13 +95,6 @@ public String getMdoRef(
     return stringInterner.intern(mdoRef.get());
   }
 
-  // todo перенести в mdClasses
-  public static List<MDSubsystem> subsystemFlatList(Collection<MDSubsystem> subsystems) {
-    return subsystems.stream()
-      .flatMap(subsys -> Stream.concat(Stream.of(subsys), subsystemFlatList(subsys.getIncludedSubsystems()).stream()))
-      .collect(Collectors.toList());
-  }
-
   private Optional<String> getCommonModuleMdoRef(DocumentContext documentContext, String commonModuleName) {
     return documentContext.getServerContext()
       .getConfiguration()