MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

SSR: don't forget unmatched class content (Java)

Browse Source
This commit is contained in:
Bas Leijdekkers
2015-06-03 22:50:09 +02:00
parent 0761b6dfc3
commit b2e25c361e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/compiler/JavaCompilingVisitor.java
+1 -1
View File
@@ -368,7 +368,7 @@ public class JavaCompilingVisitor extends JavaRecursiveElementWalkingVisitor {
String name = CompiledPattern.ALL_CLASS_UNMATCHED_CONTENT_VAR_ARTIFICIAL_NAME;
psiClass.putUserData(JavaCompiledPattern.ALL_CLASS_CONTENT_VAR_NAME_KEY, name);
MatchOptions options = myCompilingVisitor.getContext().getOptions();
if (options.getVariableConstraint(name) == null) {
if (pattern.getHandler(name) == null) {
pattern.createSubstitutionHandler(name, name, false, 0, Integer.MAX_VALUE, true);
MatchVariableConstraint constraint = new MatchVariableConstraint(true);
constraint.setName(name);
platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SearchDialog.java
+2
View File
@@ -37,6 +37,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.SearchScope;
import com.intellij.structuralsearch.*;
import com.intellij.structuralsearch.impl.matcher.CompiledPattern;
import com.intellij.structuralsearch.impl.matcher.MatcherImpl;
import com.intellij.structuralsearch.plugin.StructuralSearchPlugin;
import com.intellij.ui.ComboboxSpeedSearch;
@@ -831,6 +832,7 @@ public class SearchDialog extends DialogWrapper {
variableNames.add(variable.getName());
}
variableNames.add(Configuration.CONTEXT_VAR_NAME);
variableNames.add(CompiledPattern.ALL_CLASS_UNMATCHED_CONTENT_VAR_ARTIFICIAL_NAME);
configuration.getMatchOptions().retainVariableConstraints(variableNames);
}