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: fix repeated substitution variable with nested match matching problem

Browse Source
This commit is contained in:
Bas Leijdekkers
2016-10-21 18:59:53 +02:00
parent 620bdaaea5
commit a3970e6a5a
2 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/SubstitutionHandler.java
+28 -9
View File
@@ -1,3 +1,18 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.structuralsearch.impl.matcher.handlers;
import com.intellij.dupLocator.iterators.FilteringNodeIterator;
@@ -119,22 +134,26 @@ public class SubstitutionHandler extends MatchingHandler {
return false;
}
MatchResultImpl result = context.getResult().findSon(name);
MatchResultImpl result = context.hasResult() ? context.getResult().findSon(name) : null;
if (result == null && context.getPreviousResult() != null) {
result = context.getPreviousResult().findSon(name);
}
if (result!=null) {
if (result != null) {
if (minOccurs == 1 && maxOccurs == 1) {
// check if they are the same
return validateOneMatch(match, start, end, result,context);
} else if (maxOccurs > 1 && totalMatchedOccurs!=-1) {
final int size = result.getAllSons().size();
if (matchedOccurs >= size) {
return false;
} else if (maxOccurs > 1 && totalMatchedOccurs != -1) {
if (result.isMultipleMatch()) {
final int size = result.getAllSons().size();
if (matchedOccurs >= size) {
return false;
}
if (size != 0) {
result = (MatchResultImpl)result.getAllSons().get(matchedOccurs);
}
}
result = size == 0 ?result:(MatchResultImpl)result.getAllSons().get(matchedOccurs);
// check if they are the same
return validateOneMatch(match, start, end, result, context);
}
@@ -241,7 +260,7 @@ public class SubstitutionHandler extends MatchingHandler {
}
boolean validate(MatchContext context, Class elementContext) {
MatchResult substitution = context.getResult().findSon(name);
MatchResult substitution = context.hasResult() ? context.getResult().findSon(name) : null;
if (minOccurs >= 1 &&
( substitution == null ||
platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
+8
View File
@@ -2389,5 +2389,13 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
"}";
assertEquals("find super call", 1, findMatchesCount(source, "super.'_m()"));
assertEquals("find super and non super call", 2, findMatchesCount(source, "'_q:[regex( super|this )].'_m()"));
String source2 = "class A {" +
" public boolean equals(Object o) {" +
" return super.equals(o);" +
" }" +
"}";
assertEquals("find method with super call and matching parameter", 1,
findMatchesCount(source2, "'_rt '_m('_t '_p*) { return super.'_m('_p); }"));
}
}