Skip to content

Commit aea805f

Browse files
theshadowcotheshadowco
committed
bump libraries
1 parent 0196b26 commit aea805f

File tree

114 files changed

+194
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+194
-262
lines changed

‎build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ dependencies {
7272
exclude("org.glassfish", "javax.json")
7373
}
7474
api("com.github.1c-syntax", "utils", "0.4.0")
75-
api("com.github.1c-syntax", "mdclasses", "0.9.5")
75+
api("io.github.1c-syntax", "bsl-common-library", "31ba49780f9fcd0cbf2c5ed631d43e879375bff0")
76+
api("com.github.1c-syntax", "mdclasses", "0.10.3")
77+
api("io.github.1c-syntax", "supportconf", "0.1.1")
7678

7779
// JLanguageTool
7880
implementation("org.languagetool", "languagetool-core", languageToolVersion)

‎src/main/java/com/github/_1c_syntax/bsl/languageserver/cfg/ConditionalVertex.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.github._1c_syntax.bsl.parser.BSLParser;
2525
import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
2626
import lombok.EqualsAndHashCode;
27+
2728
import java.util.Optional;
2829

2930
@EqualsAndHashCode(callSuper = true)

‎src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/GenerateStandardRegionsSupplier.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@
2525
import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
2626
import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
2727
import com.github._1c_syntax.bsl.languageserver.context.FileType;
28-
import com.github._1c_syntax.bsl.languageserver.context.ModuleType;
2928
import com.github._1c_syntax.bsl.languageserver.context.symbol.RegionSymbol;
3029
import com.github._1c_syntax.bsl.languageserver.utils.Regions;
31-
import com.github._1c_syntax.mdclasses.Configuration;
32-
import com.github._1c_syntax.mdclasses.common.ConfigurationSource;
33-
import com.github._1c_syntax.mdclasses.mdo.support.ScriptVariant;
30+
import com.github._1c_syntax.bsl.mdo.support.ScriptVariant;
31+
import com.github._1c_syntax.bsl.types.ConfigurationSource;
3432
import org.eclipse.lsp4j.CodeAction;
3533
import org.eclipse.lsp4j.CodeActionKind;
3634
import org.eclipse.lsp4j.CodeActionParams;
@@ -73,8 +71,8 @@ public GenerateStandardRegionsSupplier(LanguageServerConfiguration languageServe
7371
@Override
7472
public List<CodeAction> getCodeActions(CodeActionParams params, DocumentContext documentContext) {
7573

76-
ModuleType moduleType = documentContext.getModuleType();
77-
FileType fileType = documentContext.getFileType();
74+
var moduleType = documentContext.getModuleType();
75+
var fileType = documentContext.getFileType();
7876

7977
ScriptVariant regionsLanguage = getRegionsLanguage(documentContext, fileType);
8078
Set<String> neededStandardRegions;
@@ -100,14 +98,14 @@ public List<CodeAction> getCodeActions(CodeActionParams params, DocumentContext
10098
String result = neededStandardRegions.stream()
10199
.map(s -> String.format(regionFormat, s))
102100
.collect(Collectors.joining("\n"));
103-
TextEdit textEdit = new TextEdit(calculateFixRange(params.getRange()), result);
101+
var textEdit = new TextEdit(calculateFixRange(params.getRange()), result);
104102

105-
WorkspaceEdit edit = new WorkspaceEdit();
103+
var edit = new WorkspaceEdit();
106104
Map<String, List<TextEdit>> changes = Map.of(documentContext.getUri().toString(),
107105
Collections.singletonList(textEdit));
108106
edit.setChanges(changes);
109107

110-
CodeAction codeAction = new CodeAction("Generate missing regions");
108+
var codeAction = new CodeAction("Generate missing regions");
111109
codeAction.setDiagnostics(new ArrayList<>());
112110
codeAction.setKind(CodeActionKind.Refactor);
113111
codeAction.setEdit(edit);
@@ -117,7 +115,7 @@ public List<CodeAction> getCodeActions(CodeActionParams params, DocumentContext
117115
private ScriptVariant getRegionsLanguage(DocumentContext documentContext, FileType fileType) {
118116

119117
ScriptVariant regionsLanguage;
120-
Configuration configuration = documentContext.getServerContext().getConfiguration();
118+
var configuration = documentContext.getServerContext().getConfiguration();
121119
if (configuration.getConfigurationSource() == ConfigurationSource.EMPTY || fileType == FileType.OS) {
122120
regionsLanguage = getScriptVariantFromConfigLanguage();
123121
} else {

‎src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,16 @@
3434
import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
3535
import com.github._1c_syntax.bsl.languageserver.context.symbol.SymbolTree;
3636
import com.github._1c_syntax.bsl.languageserver.utils.Trees;
37+
import com.github._1c_syntax.bsl.mdo.support.ScriptVariant;
3738
import com.github._1c_syntax.bsl.parser.BSLLexer;
3839
import com.github._1c_syntax.bsl.parser.BSLParser;
3940
import com.github._1c_syntax.bsl.parser.BSLTokenizer;
4041
import com.github._1c_syntax.bsl.parser.SDBLTokenizer;
41-
import com.github._1c_syntax.mdclasses.common.ConfigurationSource;
42+
import com.github._1c_syntax.bsl.supconf.SupportConfiguration;
43+
import com.github._1c_syntax.bsl.support.SupportVariant;
44+
import com.github._1c_syntax.bsl.types.ConfigurationSource;
45+
import com.github._1c_syntax.bsl.types.ModuleType;
4246
import com.github._1c_syntax.mdclasses.mdo.AbstractMDObjectBase;
43-
import com.github._1c_syntax.mdclasses.mdo.support.ScriptVariant;
44-
import com.github._1c_syntax.mdclasses.supportconf.SupportConfiguration;
45-
import com.github._1c_syntax.mdclasses.supportconf.SupportVariant;
4647
import com.github._1c_syntax.utils.Lazy;
4748
import lombok.Getter;
4849
import lombok.RequiredArgsConstructor;
@@ -244,7 +245,8 @@ public Map<SupportConfiguration, SupportVariant> getSupportVariants() {
244245
}
245246

246247
public Optional<AbstractMDObjectBase> getMdObject() {
247-
return Optional.ofNullable(getServerContext().getConfiguration().getModulesByObject().get(getUri()));
248+
return Optional
249+
.ofNullable((AbstractMDObjectBase) getServerContext().getConfiguration().getModulesByObject().get(getUri()));
248250
}
249251

250252
public List<SDBLTokenizer> getQueries() {

‎src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ModuleType.java

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
package com.github._1c_syntax.bsl.languageserver.context;
2323

2424
import com.github._1c_syntax.bsl.languageserver.utils.MdoRefBuilder;
25+
import com.github._1c_syntax.bsl.types.ModuleType;
2526
import com.github._1c_syntax.mdclasses.Configuration;
2627
import com.github._1c_syntax.utils.Absolute;
2728
import com.github._1c_syntax.utils.Lazy;
@@ -145,7 +146,7 @@ public DocumentContext addDocument(TextDocumentItem textDocumentItem) {
145146
}
146147

147148
public void removeDocument(URI uri) {
148-
URI absoluteURI = Absolute.uri(uri);
149+
var absoluteURI = Absolute.uri(uri);
149150
removeDocumentMdoRefByUri(absoluteURI);
150151
documents.remove(absoluteURI);
151152
}
@@ -166,12 +167,12 @@ public Configuration getConfiguration() {
166167

167168
@SneakyThrows
168169
private DocumentContext createDocumentContext(File file, int version) {
169-
String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
170+
var content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
170171
return createDocumentContext(file.toURI(), content, version);
171172
}
172173

173174
private DocumentContext createDocumentContext(URI uri, String content, int version) {
174-
URI absoluteURI = Absolute.uri(uri);
175+
var absoluteURI = Absolute.uri(uri);
175176

176177
var documentContext = lookupDocumentContext(absoluteURI);
177178
documentContext.rebuild(content, version);

‎src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ModuleSymbolComputer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
package com.github._1c_syntax.bsl.languageserver.context.computer;
2323

2424
import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
25-
import com.github._1c_syntax.bsl.languageserver.context.ModuleType;
2625
import com.github._1c_syntax.bsl.languageserver.context.symbol.ModuleSymbol;
2726
import com.github._1c_syntax.bsl.languageserver.utils.MdoRefBuilder;
2827
import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
2928
import com.github._1c_syntax.bsl.parser.BSLLexer;
29+
import com.github._1c_syntax.bsl.types.ModuleType;
3030
import org.antlr.v4.runtime.Token;
3131
import org.eclipse.lsp4j.SymbolKind;
3232

‎src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ModuleTypeComputer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
2525
import com.github._1c_syntax.bsl.languageserver.context.FileType;
26-
import com.github._1c_syntax.bsl.languageserver.context.ModuleType;
26+
import com.github._1c_syntax.bsl.types.ModuleType;
2727

2828
import java.nio.file.Path;
2929

@@ -50,24 +50,24 @@ public ModuleType computeModuleType() {
5050
}
5151

5252
private ModuleType computeBSL() {
53-
com.github._1c_syntax.mdclasses.mdo.support.ModuleType type = documentContext.getServerContext()
53+
var type = documentContext.getServerContext()
5454
.getConfiguration().getModuleType(documentContext.getUri());
5555
return ModuleType.valueOf(type.name());
5656
}
5757

5858
private ModuleType computeOS() {
5959
if (documentContext.getUri().getPath().contains("Модули")) {
60-
return ModuleType.Module;
60+
return ModuleType.OScriptModule;
6161
} else if (documentContext.getUri().getPath().contains("Классы")) {
62-
return ModuleType.Class;
62+
return ModuleType.OScriptClass;
6363
} else {
6464
return ModuleType.UNKNOWN;
6565
}
6666
}
6767

6868
public String computeTypeName() {
69-
if (documentContext.getModuleType() == ModuleType.Module
70-
|| documentContext.getModuleType() == ModuleType.Class) {
69+
if (documentContext.getModuleType() == ModuleType.OScriptModule
70+
|| documentContext.getModuleType() == ModuleType.OScriptClass) {
7171
return Path.of(documentContext.getUri()).getFileName().toString().replace(".os", "");
7272
}
7373
return "";

‎src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractMetadataDiagnostic.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
*/
2222
package com.github._1c_syntax.bsl.languageserver.diagnostics;
2323

24-
import com.github._1c_syntax.bsl.languageserver.context.ModuleType;
2524
import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
25+
import com.github._1c_syntax.bsl.types.MDOType;
26+
import com.github._1c_syntax.bsl.types.ModuleType;
2627
import com.github._1c_syntax.mdclasses.mdo.AbstractMDObjectBSL;
2728
import com.github._1c_syntax.mdclasses.mdo.AbstractMDObjectBase;
28-
import com.github._1c_syntax.mdclasses.mdo.support.MDOType;
2929
import org.checkerframework.checker.nullness.qual.NonNull;
3030
import org.eclipse.lsp4j.Range;
3131

@@ -111,7 +111,7 @@ private void checkMetadataWithModules() {
111111
documentContext.getMdObject().ifPresent((AbstractMDObjectBase mdo) -> {
112112
if (mdo instanceof AbstractMDObjectBSL) {
113113
var modules = ((AbstractMDObjectBSL) mdo).getModules().stream()
114-
.filter(mdoModule -> OBJECT_MODULES.contains(ModuleType.valueOf(mdoModule.getModuleType())))
114+
.filter(mdoModule -> OBJECT_MODULES.contains(mdoModule.getModuleType()))
115115
.collect(Collectors.toList());
116116

117117
// чтобы не анализировать несколько раз, выберем только один модуль, например модуль менеджера
@@ -131,10 +131,10 @@ private void checkMetadataWithModules() {
131131
*/
132132
private void checkMetadataWithoutModules() {
133133
documentContext.getServerContext().getConfiguration().getChildren().stream()
134-
.filter(mdo -> filterMdoTypes.contains(mdo.getType()))
134+
.filter(mdo -> filterMdoTypes.contains(mdo.getMdoType()))
135135
.filter(mdo -> !(mdo instanceof AbstractMDObjectBSL)
136136
|| (((AbstractMDObjectBSL) mdo).getModules().stream()
137-
.noneMatch(module -> OBJECT_MODULES.contains(ModuleType.valueOf(module.getModuleType())))))
137+
.noneMatch(module -> OBJECT_MODULES.contains(module.getModuleType()))))
138138
.forEach(this::checkMetadata);
139139
}
140140
}

‎src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/BadWordsDiagnostic.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,15 @@
2222
package com.github._1c_syntax.bsl.languageserver.diagnostics;
2323

2424
import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticMetadata;
25-
import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
25+
import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticParameter;
2626
import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticSeverity;
2727
import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticTag;
28-
import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticParameter;
29-
28+
import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
3029
import com.github._1c_syntax.utils.CaseInsensitivePattern;
3130

3231
import java.util.Map;
33-
import java.util.regex.Pattern;
3432
import java.util.regex.Matcher;
33+
import java.util.regex.Pattern;
3534

3635
@DiagnosticMetadata(
3736
type = DiagnosticType.CODE_SMELL,

0 commit comments

Comments
 (0)