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

Optional support for ChainCallExtractor (fixes IDEA-169782)

Browse Source
This commit is contained in:
Tagir Valeev
2017-03-20 12:34:14 +07:00
parent 189ba6eb30
commit 06d02befe0
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/chainCall/OptionalChainCallExtractor.java
+40
View File
@@ -0,0 +1,40 @@
/*
* Copyright 2000-2017 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.refactoring.chainCall;
import com.intellij.psi.*;
import com.siyeh.ig.callMatcher.CallMatcher;
import org.jetbrains.annotations.NotNull;
/**
* @author Tagir Valeev
*/
public class OptionalChainCallExtractor implements ChainCallExtractor {
private static final CallMatcher NEXT_CALL =
CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_OPTIONAL, "ifPresent", "map", "flatMap").parameterCount(1);
@Override
public boolean canExtractChainCall(@NotNull PsiMethodCallExpression call, PsiExpression expression, PsiType expressionType) {
if (expressionType instanceof PsiPrimitiveType) return false;
PsiExpression qualifier = call.getMethodExpression().getQualifierExpression();
return qualifier != null && NEXT_CALL.test(call);
}
@Override
public String getMethodName(PsiVariable variable, PsiExpression expression, PsiType expressionType) {
return "map";
}
}
resources/src/META-INF/IdeaPlugin.xml
+1
View File
@@ -1900,6 +1900,7 @@
<java.refactoring.chainCallExtractor implementation="com.intellij.refactoring.chainCall.CollectionChainCallExtractor"/>
<java.refactoring.chainCallExtractor implementation="com.intellij.refactoring.chainCall.CompletionStageChainCallExtractor"/>
<java.refactoring.chainCallExtractor implementation="com.intellij.refactoring.chainCall.GuavaFluentIterableChainCallExtractor"/>
<java.refactoring.chainCallExtractor implementation="com.intellij.refactoring.chainCall.OptionalChainCallExtractor"/>
<diff.lang.DiffIgnoredRangeProvider implementation="com.intellij.diff.lang.JavaDiffIgnoredRangeProvider"/>