MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

TreeElementPattern.withSuperParent returned true if there was no parent of that level

Browse Source 
gradle completion contributor should only work in .gradle files
This commit is contained in:
peter
2013-10-31 18:03:48 +01:00
parent f328160ede
commit 364a57e811
3 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
java/java-tests/testSrc/com/intellij/patterns/VirtualFilePatternsTest.groovy Normal file
View File

@@ -0,0 +1,31 @@
/*
* Copyright 2000-2013 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.patterns
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
/**
* @author peter
*/
public class VirtualFilePatternsTest extends LightCodeInsightFixtureTestCase {
public void testWithSuperParent() {
def file = myFixture.addFileToProject("foo/bar.txt", "").virtualFile
assert PlatformPatterns.virtualFile().withSuperParent(1, PlatformPatterns.virtualFile().withName("foo")).accepts(file)
assert !PlatformPatterns.virtualFile().withSuperParent(1, PlatformPatterns.virtualFile().withName("bar")).accepts(file)
assert !PlatformPatterns.virtualFile().withSuperParent(2, PlatformPatterns.virtualFile().withName("bar")).accepts(file)
assert !PlatformPatterns.virtualFile().withSuperParent(10, PlatformPatterns.virtualFile().withName("bar")).accepts(file)
assert !PlatformPatterns.virtualFile().withSuperParent(10, PlatformPatterns.virtualFile().withName("foo")).accepts(file)
}
}

2
platform/core-api/src/com/intellij/patterns/TreeElementPattern.java
View File

@@ -118,7 +118,7 @@ public abstract class TreeElementPattern<ParentType, T extends ParentType, Self
PairProcessor<ParentType, ProcessingContext> processor) {
ParentType parent = t;
for (int i = 0; i < level; i++) {
if (parent == null) return false;
if (parent == null) return true;
parent = getParent(parent);
}
return processor.process(parent, context);

6
plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/completion/MavenDependenciesGradleCompletionContributor.java
View File

@@ -22,6 +22,7 @@ import com.intellij.icons.AllIcons;
import com.intellij.patterns.ElementPattern;
import com.intellij.patterns.PatternCondition;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.util.ProcessingContext;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -53,6 +54,11 @@ public class MavenDependenciesGradleCompletionContributor extends CompletionCont
new PatternCondition<GrMethodCallExpression>("withInvokedExpressionText") {
@Override
public boolean accepts(@NotNull GrMethodCallExpression expression, ProcessingContext context) {
PsiFile file = expression.getContainingFile();
if (!file.getName().endsWith(".gradle")) {
return false;
}
GrExpression grExpression = expression.getInvokedExpression();
return grExpression != null && "dependencies".equals(grExpression.getText());
}