MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-18 20:41:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

SSR: split utility class to make testing easier

Browse Source 
GitOrigin-RevId: 4cfbc0832ff5b223fa8b60a238e74dc2e9f3067f
This commit is contained in:
Bas Leijdekkers
2022-08-24 15:20:40 +02:00
committed by intellij-monorepo-bot
parent 597deabb24
commit c7c709a23a
15 changed files with 129 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java
View File

@@ -671,7 +671,7 @@ public final class JavaStructuralSearchProfile extends StructuralSearchProfile {
@Override
public void visitElement(@NotNull PsiElement element) {
final String type = element.getText();
if (StructuralSearchUtil.isTypedVariable(type)) {
if (MatchUtil.isTypedVariable(type)) {
final ParameterInfo typeInfo = builder.findParameterization(element);
if (typeInfo != null) {
typeInfo.setArgumentContext(false);

9
java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java
View File

@@ -14,6 +14,7 @@ import com.intellij.psi.util.JavaPsiPatternUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.structuralsearch.MatchOptions;
import com.intellij.structuralsearch.MatchUtil;
import com.intellij.structuralsearch.StructuralSearchUtil;
import com.intellij.structuralsearch.impl.matcher.handlers.LiteralWithSubstitutionHandler;
import com.intellij.structuralsearch.impl.matcher.handlers.MatchingHandler;
@@ -106,8 +107,8 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
myMatchingVisitor.setResult(handler.match(comment, other, myMatchingVisitor.getMatchContext()));
}
else {
myMatchingVisitor.setResult(myMatchingVisitor.matchText(StructuralSearchUtil.normalize(JavaMatchUtil.getCommentText(comment)),
StructuralSearchUtil.normalize(JavaMatchUtil.getCommentText(other))));
myMatchingVisitor.setResult(myMatchingVisitor.matchText(MatchUtil.normalize(JavaMatchUtil.getCommentText(comment)),
MatchUtil.normalize(JavaMatchUtil.getCommentText(other))));
}
}
@@ -1218,8 +1219,8 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
if ((value1 instanceof String || value1 instanceof Character) && (value2 instanceof String || value2 instanceof Character)) {
String patternValue = value1.toString();
if (!patternValue.isEmpty() && patternValue.equals(patternValue.trim())) {
myMatchingVisitor.setResult(myMatchingVisitor.matchText(StructuralSearchUtil.normalize(patternValue),
StructuralSearchUtil.normalize(value2.toString())));
myMatchingVisitor.setResult(myMatchingVisitor.matchText(MatchUtil.normalize(patternValue),
MatchUtil.normalize(value2.toString())));
}
else {
myMatchingVisitor.setResult(myMatchingVisitor.matchText(patternValue, value2.toString()));

4
java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/compiler/JavaCompilingVisitor.java
View File

@@ -15,8 +15,8 @@ import com.intellij.psi.search.searches.ClassInheritorsSearch;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.structuralsearch.MalformedPatternException;
import com.intellij.structuralsearch.MatchUtil;
import com.intellij.structuralsearch.SSRBundle;
import com.intellij.structuralsearch.StructuralSearchUtil;
import com.intellij.structuralsearch.impl.matcher.CompiledPattern;
import com.intellij.structuralsearch.impl.matcher.JavaCompiledPattern;
import com.intellij.structuralsearch.impl.matcher.JavaMatchUtil;
@@ -508,7 +508,7 @@ public class JavaCompilingVisitor extends JavaRecursiveElementWalkingVisitor {
final SubstitutionHandler substitutionHandler =
new SubstitutionHandler("__" + referenceText.replace('.', '_'), false, classQualifier ? 0 : 1, 1, true);
final boolean caseSensitive = myCompilingVisitor.getContext().getOptions().isCaseSensitiveMatch();
substitutionHandler.setPredicate(new RegExpPredicate(StructuralSearchUtil.shieldRegExpMetaChars(referenceText),
substitutionHandler.setPredicate(new RegExpPredicate(MatchUtil.shieldRegExpMetaChars(referenceText),
caseSensitive, null, false, false));
myCompilingVisitor.getContext().getPattern().setHandler(expr, substitutionHandler);
}

6
java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/predicates/ExprTypePredicate.java
View File

@@ -3,7 +3,7 @@ package com.intellij.structuralsearch.impl.matcher.predicates;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.structuralsearch.StructuralSearchUtil;
import com.intellij.structuralsearch.MatchUtil;
import com.intellij.structuralsearch.impl.matcher.MatchContext;
import com.intellij.util.SmartList;
import com.intellij.util.containers.ContainerUtil;
@@ -42,14 +42,14 @@ public class ExprTypePredicate extends MatchPredicate {
while (true) {
int index = types.indexOf('|', pos);
if (index == -1) break;
String token = StructuralSearchUtil.normalizeWhiteSpace(types.substring(pos, index));
String token = MatchUtil.normalizeWhiteSpace(types.substring(pos, index));
if (!token.isEmpty()) {
result.add(token);
}
pos = index + 1;
}
if (pos < types.length()) {
result.add(StructuralSearchUtil.normalizeWhiteSpace(types.substring(pos)));
result.add(MatchUtil.normalizeWhiteSpace(types.substring(pos)));
}
return result;
}