Skip to content

Commit fa24d08

Browse files
committed
Рефакторинг
1 parent ce8ead8 commit fa24d08

File tree

2 files changed

+99
-218
lines changed

2 files changed

+99
-218
lines changed

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

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,25 @@ public final class MultilingualStringAnalyser {
8888
WHITE_SPACE_REGEX
8989
);
9090

91+
@SuppressWarnings("NullAway.Init")
92+
private BSLParser.GlobalMethodCallContext globalMethodCallContext;
93+
private boolean isParentTemplate;
94+
private @Nullable String variableName;
95+
private final ArrayList<String> expectedLanguages;
96+
private final Set<String> expandedMultilingualString = new HashSet<>();
97+
private ArrayList<String> missingLanguages = new ArrayList<>();
98+
99+
/**
100+
* Создать анализатор многоязычных строк.
101+
*
102+
* @param declaredLanguages Строка с объявленными языками через запятую
103+
*/
104+
public MultilingualStringAnalyser(String declaredLanguages) {
105+
Matcher matcher = WHITE_SPACE_PATTERN.matcher(declaredLanguages);
106+
this.expectedLanguages = new ArrayList<>(Arrays.asList(matcher.replaceAll("").split(",")));
107+
}
108+
109+
91110
/**
92111
* Запись для хранения позиции совпадения в строке.
93112
*
@@ -156,24 +175,6 @@ public static List<MatchPosition> findPlaceholderPositions(String text) {
156175
return positions;
157176
}
158177

159-
@SuppressWarnings("NullAway.Init")
160-
private BSLParser.GlobalMethodCallContext globalMethodCallContext;
161-
private boolean isParentTemplate;
162-
private @Nullable String variableName;
163-
private final ArrayList<String> expectedLanguages;
164-
private final Set<String> expandedMultilingualString = new HashSet<>();
165-
private ArrayList<String> missingLanguages = new ArrayList<>();
166-
167-
/**
168-
* Создать анализатор многоязычных строк.
169-
*
170-
* @param declaredLanguages Строка с объявленными языками через запятую
171-
*/
172-
public MultilingualStringAnalyser(String declaredLanguages) {
173-
Matcher matcher = WHITE_SPACE_PATTERN.matcher(declaredLanguages);
174-
this.expectedLanguages = new ArrayList<>(Arrays.asList(matcher.replaceAll("").split(",")));
175-
}
176-
177178
private static boolean isNotMultilingualString(BSLParser.GlobalMethodCallContext globalMethodCallContext) {
178179
String firstParameterMultilingualString = getMultilingualString(globalMethodCallContext);
179180

@@ -291,10 +292,10 @@ public String getMissingLanguages() {
291292
*/
292293
public boolean isParentTemplate() {
293294
Objects.requireNonNull(globalMethodCallContext, "Call parse method first");
294-
return isParentTemplate || istVariableUsingInTemplate();
295+
return isParentTemplate || isVariableUsedInTemplate();
295296
}
296297

297-
private boolean istVariableUsingInTemplate() {
298+
private boolean isVariableUsedInTemplate() {
298299
if (variableName == null) {
299300
return false;
300301
}

0 commit comments

Comments
 (0)