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

platform: rename usages function -> lambda (to use the old icon)

Browse Source 
GitOrigin-RevId: 1e0d0ff3139521ec2168e611956a7e7467d4487f
This commit is contained in:
anstarovoyt
2019-06-04 15:58:58 +03:00
committed by intellij-monorepo-bot
parent 98891cf103
commit a1055d6567
8 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java
View File

@@ -99,7 +99,7 @@ public class FunctionalExpressionCompletionProvider extends CompletionProvider<C
LookupElementBuilder.create(functionalInterfaceMethod, paramsString + " -> ") LookupElementBuilder.create(functionalInterfaceMethod, paramsString + " -> ")
.withPresentableText(paramsString + " -> {}") .withPresentableText(paramsString + " -> {}")
.withTypeText(functionalInterfaceType.getPresentableText()) .withTypeText(functionalInterfaceType.getPresentableText())
.withIcon(AllIcons.Nodes.Function); .withIcon(AllIcons.Nodes.Lambda);
builder.putUserData(LAMBDA_ITEM, true); builder.putUserData(LAMBDA_ITEM, true);
result.consume(builder.withAutoCompletionPolicy(AutoCompletionPolicy.NEVER_AUTOCOMPLETE)); result.consume(builder.withAutoCompletionPolicy(AutoCompletionPolicy.NEVER_AUTOCOMPLETE));
} }

2
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java
View File

@@ -264,6 +264,6 @@ public class PsiLambdaExpressionImpl extends JavaStubPsiElement<FunctionalExpres
@Nullable @Nullable
@Override @Override
public Icon getIcon(int flags) { public Icon getIcon(int flags) {
return AllIcons.Nodes.Function; return AllIcons.Nodes.Lambda;
} }
} }

2
java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaLambdaNodeProvider.java
View File

@@ -56,7 +56,7 @@ public class JavaLambdaNodeProvider
@NotNull @NotNull
@Override @Override
public ActionPresentation getPresentation() { public ActionPresentation getPresentation() {
return new ActionPresentationData(getCheckBoxText(), null, AllIcons.Nodes.Function); return new ActionPresentationData(getCheckBoxText(), null, AllIcons.Nodes.Lambda);
} }
@NotNull @NotNull

2
java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaLambdaTreeElement.java
View File

@@ -87,6 +87,6 @@ public class JavaLambdaTreeElement extends JavaClassTreeElementBase<PsiLambdaExp
@Override @Override
public Icon getIcon(boolean open) { public Icon getIcon(boolean open) {
return AllIcons.Nodes.Function; return AllIcons.Nodes.Lambda;
} }
} }

2
platform/script-debugger/debugger-ui/src/VariableView.kt
View File

@@ -440,7 +440,7 @@ class VariableView(override val variableName: String, private val variable: Vari
fun getIcon(value: Value): Icon { fun getIcon(value: Value): Icon {
val type = value.type val type = value.type
return when (type) { return when (type) {
ValueType.FUNCTION -> AllIcons.Nodes.Function ValueType.FUNCTION -> AllIcons.Nodes.Lambda
ValueType.ARRAY -> AllIcons.Debugger.Db_array ValueType.ARRAY -> AllIcons.Debugger.Db_array
else -> if (type.isObjectType) AllIcons.Debugger.Value else AllIcons.Debugger.Db_primitive else -> if (type.isObjectType) AllIcons.Debugger.Value else AllIcons.Debugger.Db_primitive
} }

2
plugins/sh/src/com/intellij/sh/ShStructureViewFactory.java
View File

@@ -130,7 +130,7 @@ public class ShStructureViewFactory implements PsiStructureViewFactory {
public Icon getIcon(boolean open) { public Icon getIcon(boolean open) {
if (!myElement.isValid()) return null; if (!myElement.isValid()) return null;
if (myElement instanceof ShFunctionDefinition) { if (myElement instanceof ShFunctionDefinition) {
return AllIcons.Nodes.Function; return AllIcons.Nodes.Lambda;
} }
return myElement.getIcon(0); return myElement.getIcon(0);
} }

3
python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
View File

@@ -2,6 +2,7 @@
package com.jetbrains.python.psi.impl; package com.jetbrains.python.psi.impl;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.intellij.icons.AllIcons;
import com.intellij.lang.ASTNode; import com.intellij.lang.ASTNode;
import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.ItemPresentation;
import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Key;
@@ -128,7 +129,7 @@ public class PyFunctionImpl extends PyBaseElementImpl<PyFunctionStub> implements
if (getContainingClass() != null) { if (getContainingClass() != null) {
return PlatformIcons.METHOD_ICON; return PlatformIcons.METHOD_ICON;
} }
return PythonIcons.Python.Function; return AllIcons.Nodes.Function;
} }
@Override @Override

4
python/src/com/jetbrains/python/testing/pyTestFixtures/PyTestFixtureAsParameterProvider.kt
View File

@@ -1,16 +1,16 @@
package com.jetbrains.python.testing.pyTestFixtures package com.jetbrains.python.testing.pyTestFixtures
import com.intellij.icons.AllIcons
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.jetbrains.python.psi.PyFunction import com.jetbrains.python.psi.PyFunction
import com.jetbrains.python.psi.types.TypeEvalContext import com.jetbrains.python.psi.types.TypeEvalContext
import com.jetbrains.python.testing.PyTestFunctionParameter import com.jetbrains.python.testing.PyTestFunctionParameter
import com.jetbrains.python.testing.PyTestFunctionParameterProvider import com.jetbrains.python.testing.PyTestFunctionParameterProvider
import icons.PythonIcons
/** /**
* Test fixtures for pytest tests and other fixtures * Test fixtures for pytest tests and other fixtures
*/ */
internal object PyTestFixtureAsParameterProvider : PyTestFunctionParameterProvider { internal object PyTestFixtureAsParameterProvider : PyTestFunctionParameterProvider {
override fun getArguments(function: PyFunction, evalContext: TypeEvalContext, module: Module) = override fun getArguments(function: PyFunction, evalContext: TypeEvalContext, module: Module) =
getFixtures(module, function, evalContext).map { PyTestFunctionParameter(it.name, PythonIcons.Python.Function) } getFixtures(module, function, evalContext).map { PyTestFunctionParameter(it.name, AllIcons.Nodes.Function) }
} }