Skip to content

Commit 18d2b55

Browse files
authored
Merge pull request #3322 from 1c-syntax/feature/optimyze110724
фикс для обновления mdclasses
2 parents 52c9f43 + 82a076e commit 18d2b55

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

build.gradle.kts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ repositories {
3232
mavenCentral()
3333
maven(url = "https://jitpack.io")
3434
maven(url = "https://projectlombok.org/edge-releases")
35+
maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots")
3536
}
3637

3738
group = "io.github.1c-syntax"
@@ -88,9 +89,11 @@ dependencies {
8889
exclude("org.antlr", "antlr-runtime")
8990
}
9091
api("io.github.1c-syntax", "utils", "0.6.1")
91-
api("io.github.1c-syntax", "mdclasses", "0.13.0")
92-
api("io.github.1c-syntax", "bsl-common-library", "0.6.0")
93-
api("io.github.1c-syntax", "supportconf", "0.14.0")
92+
api("io.github.1c-syntax", "mdclasses", "0.14.0")
93+
api("io.github.1c-syntax", "bsl-common-library", "0.7.0")
94+
api("io.github.1c-syntax", "supportconf", "0.14.0") {
95+
exclude("io.github.1c-syntax", "bsl-common-library")
96+
}
9497
api("io.github.1c-syntax", "bsl-parser-core", "0.1.0")
9598

9699
// JLanguageTool

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DeprecatedMethodCallDiagnostic.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ public void check() {
5656
.filter(reference -> reference.getSymbol().isDeprecated())
5757
.filter(reference -> !reference.getFrom().isDeprecated())
5858
.forEach((Reference reference) -> {
59-
Symbol deprecatedSymbol = reference.getSymbol();
60-
String deprecationInfo = getDeprecationInfo(deprecatedSymbol);
61-
String message = info.getMessage(deprecatedSymbol.getName(), deprecationInfo);
59+
var deprecatedSymbol = reference.getSymbol();
60+
var deprecationInfo = getDeprecationInfo(deprecatedSymbol);
61+
var message = info.getMessage(deprecatedSymbol.getName(), deprecationInfo);
6262
diagnosticStorage.addDiagnostic(reference.getSelectionRange(), message);
6363
});
6464
}

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MissedRequiredParameterDiagnostic.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,4 @@ private static class MethodCall {
120120
Boolean[] parameters;
121121
Range range;
122122
}
123-
}
123+
}

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/RefOveruseDiagnostic.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
import com.github._1c_syntax.bsl.types.MdoReference;
3838
import com.github._1c_syntax.utils.CaseInsensitivePattern;
3939
import edu.umd.cs.findbugs.annotations.Nullable;
40-
import lombok.AllArgsConstructor;
41-
import lombok.Value;
4240
import org.antlr.v4.runtime.tree.ParseTree;
4341
import org.eclipse.lsp4j.Range;
4442

@@ -160,8 +158,8 @@ private Map<String, List<String>> calcDataSourceWithTabularSectionNames(
160158
.map(dataSourceContext -> new TabularSectionTable(getTableNameOrAlias(dataSourceContext),
161159
getTabularSectionNames(dataSourceContext)))
162160
.collect(Collectors.toMap(
163-
TabularSectionTable::getTableNameOrAlias,
164-
TabularSectionTable::getTabularSectionNames,
161+
TabularSectionTable::tableNameOrAlias,
162+
TabularSectionTable::tabularSectionNames,
165163
(existing, replacement) -> existing));
166164
}
167165

@@ -322,10 +320,6 @@ private static List<ParseTree> extractFirstMetadataTypeName(SDBLParser.ColumnCon
322320
return children.subList(1, children.size() - 1);
323321
}
324322

325-
@Value
326-
@AllArgsConstructor
327-
private static class TabularSectionTable {
328-
String tableNameOrAlias;
329-
List<String> tabularSectionNames;
323+
private record TabularSectionTable(String tableNameOrAlias, List<String> tabularSectionNames) {
330324
}
331325
}

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnusedLocalVariableDiagnostic.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ public void check() {
6666
documentContext.getSymbolTree().getVariables().stream()
6767
.filter(variable -> CHECKING_VARIABLE_KINDS.contains(variable.getKind()))
6868
.filter(variable -> !variable.isExport())
69-
.filter(variable -> referenceIndex.getReferencesTo(variable).stream().filter(ref -> ref.getOccurrenceType() == OccurrenceType.REFERENCE).findFirst().isEmpty())
70-
.forEach(variable -> diagnosticStorage.addDiagnostic(variable.getSelectionRange(), info.getMessage(variable.getName())));
69+
.filter(variable -> referenceIndex.getReferencesTo(variable).stream()
70+
.filter(ref -> ref.getOccurrenceType() == OccurrenceType.REFERENCE).findFirst().isEmpty()
71+
)
72+
.forEach(variable -> diagnosticStorage.addDiagnostic(
73+
variable.getSelectionRange(), info.getMessage(variable.getName()))
74+
);
7175
}
7276
}

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/WrongDataPathForFormElementsDiagnostic.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ protected void check() {
6464
}
6565

6666
private static boolean wrongDataPath(FormItem formItem) {
67-
return formItem.getDataPath().getSegments().startsWith("~");
67+
return formItem.getDataPath().segments().startsWith("~");
6868
}
6969

7070
private static boolean haveFormModules(Form form) {

0 commit comments

Comments
 (0)