Skip to content

Commit 6a5c90d

Browse files
committed
1 parent d8f956c commit 6a5c90d

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/QuickFixSupplier.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import com.github._1c_syntax.bsl.languageserver.diagnostics.BSLDiagnostic;
2525
import com.github._1c_syntax.bsl.languageserver.diagnostics.QuickFixProvider;
26-
import com.github._1c_syntax.bsl.languageserver.diagnostics.infrastructure.DiagnosticConfiguration;
26+
import com.github._1c_syntax.bsl.languageserver.diagnostics.infrastructure.DiagnosticObjectProvider;
2727
import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCode;
2828
import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
2929
import lombok.RequiredArgsConstructor;
@@ -38,7 +38,7 @@
3838
public class QuickFixSupplier {
3939

4040
private final Map<String, DiagnosticInfo> diagnosticInfos;
41-
private final DiagnosticConfiguration diagnosticConfiguration;
41+
private final DiagnosticObjectProvider diagnosticObjectProvider;
4242

4343
// TODO: Рефакторинг апи квик-фиксов.
4444
// Нужно как-то связать, что квик-фикс исправляет диагностику с таким-то кодом.
@@ -59,7 +59,7 @@ public <T extends Either<String, Integer>> Optional<Class<? extends QuickFixProv
5959
@SuppressWarnings("unchecked")
6060
public QuickFixProvider getQuickFixInstance(Class<? extends QuickFixProvider> quickFixProviderClass) {
6161
final Class<? extends BSLDiagnostic> diagnosticClass = (Class<? extends BSLDiagnostic>) quickFixProviderClass;
62-
return (QuickFixProvider) diagnosticConfiguration.diagnostic(diagnosticClass);
62+
return (QuickFixProvider) diagnosticObjectProvider.get(diagnosticClass);
6363
}
6464

6565
}
+2-6
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,15 @@
2424
import com.github._1c_syntax.bsl.languageserver.diagnostics.BSLDiagnostic;
2525
import lombok.RequiredArgsConstructor;
2626
import org.springframework.context.ApplicationContext;
27-
import org.springframework.context.annotation.Bean;
2827
import org.springframework.context.annotation.Configuration;
29-
import org.springframework.context.annotation.Scope;
3028

3129
@Configuration
3230
@RequiredArgsConstructor
33-
public class DiagnosticConfiguration {
31+
public class DiagnosticObjectProvider {
3432

3533
private final ApplicationContext applicationContext;
3634

37-
@Bean
38-
@Scope("prototype")
39-
public <T extends BSLDiagnostic> T diagnostic(Class<T> clazz) {
35+
public <T extends BSLDiagnostic> T get(Class<T> clazz) {
4036
return applicationContext.getBean(clazz);
4137
}
4238

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
public abstract class DiagnosticsConfiguration {
5555

5656
private final LanguageServerConfiguration configuration;
57-
private final DiagnosticConfiguration diagnosticConfiguration;
57+
private final DiagnosticObjectProvider diagnosticObjectProvider;
5858

5959
@Bean
6060
@Scope("prototype")
@@ -78,7 +78,7 @@ public List<BSLDiagnostic> diagnostics(DocumentContext documentContext) {
7878
.filter(info -> correctModuleType(info, moduleType, fileType))
7979
.filter(info -> passedCompatibilityMode(info, compatibilityMode))
8080
.map(DiagnosticInfo::getDiagnosticClass)
81-
.map(diagnosticConfiguration::diagnostic)
81+
.map(diagnosticObjectProvider::get)
8282
.collect(Collectors.toList());
8383
} else {
8484
return Collections.emptyList();

src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractDiagnosticTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
2525
import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
2626
import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
27-
import com.github._1c_syntax.bsl.languageserver.diagnostics.infrastructure.DiagnosticConfiguration;
27+
import com.github._1c_syntax.bsl.languageserver.diagnostics.infrastructure.DiagnosticObjectProvider;
2828
import com.github._1c_syntax.bsl.languageserver.util.TestUtils;
2929
import com.github._1c_syntax.utils.Absolute;
3030
import lombok.SneakyThrows;
@@ -49,7 +49,7 @@
4949
abstract class AbstractDiagnosticTest<T extends BSLDiagnostic> {
5050

5151
@Autowired
52-
private DiagnosticConfiguration diagnosticConfiguration;
52+
private DiagnosticObjectProvider diagnosticObjectProvider;
5353
@Autowired
5454
protected ServerContext context;
5555
@Autowired
@@ -64,7 +64,7 @@ abstract class AbstractDiagnosticTest<T extends BSLDiagnostic> {
6464

6565
@PostConstruct
6666
public void init() {
67-
diagnosticInstance = diagnosticConfiguration.diagnostic(diagnosticClass);
67+
diagnosticInstance = diagnosticObjectProvider.get(diagnosticClass);
6868
context.clear();
6969
configuration.reset();
7070
}

0 commit comments

Comments
 (0)