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

JavaPsiFacade.getInstance(project).getElementFactory() -> JavaPsiFacade.getElementFactory(project)

Browse Source
This commit is contained in:
Tagir Valeev
2018-10-05 14:01:24 +07:00
parent 422d8fad2f
commit 43b199c661
308 changed files with 492 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java
+1 -1
View File
@@ -145,7 +145,7 @@ public class ChainCompletionContext {
public Stream<PsiNamedElement> getQualifiers(@Nullable PsiClass targetClass) {
if (targetClass == null) return Stream.empty();
return getQualifiers(JavaPsiFacade.getInstance(myProject).getElementFactory().createType(targetClass));
return getQualifiers(JavaPsiFacade.getElementFactory(myProject).createType(targetClass));
}
public Stream<PsiNamedElement> getQualifiers(@NotNull PsiType targetType) {
java/debugger/impl/src/com/intellij/debugger/actions/PopFrameAction.java
+1 -1
View File
@@ -211,7 +211,7 @@ public class PopFrameAction extends DebuggerAction implements DumbAware {
while (tryStatement != null) {
PsiResourceList resourceList = tryStatement.getResourceList();
if (resourceList != null) {
PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
for (PsiResourceListElement listElement : resourceList) {
String varName = getResourceName(listElement);
if (varName != null) {
java/debugger/impl/src/com/intellij/debugger/codeinsight/JavaWithRuntimeCastSurrounder.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class JavaWithRuntimeCastSurrounder extends JavaExpressionSurrounder {
DebuggerInvocationUtil.invokeLater(project, () -> WriteCommandAction.writeCommandAction(project).withName(
CodeInsightBundle.message("command.name.surround.with.runtime.cast")).run(() -> {
try {
PsiElementFactory factory = JavaPsiFacade.getInstance(myElement.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(myElement.getProject());
PsiParenthesizedExpression parenth =
(PsiParenthesizedExpression)factory.createExpressionFromText("((" + type.getCanonicalText() + ")expr)", null);
//noinspection ConstantConditions
java/debugger/impl/src/com/intellij/debugger/engine/ContextUtil.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class ContextUtil {
buf.append('}');
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(element.getProject()).getElementFactory();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(element.getProject());
final PsiCodeBlock codeBlockFromText = elementFactory.createCodeBlockFromText(buf.toString(), element);
final PsiStatement[] statements = codeBlockFromText.getStatements();
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/CodeFragmentFactoryContextWrapper.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class CodeFragmentFactoryContextWrapper extends CodeFragmentFactory {
String text = markupVariables.getFirst();
if (!StringUtil.isEmpty(text)) {
PsiCodeBlock codeFragment =
JavaPsiFacade.getInstance(project).getElementFactory().createCodeBlockFromText("{" + text + "}", context);
JavaPsiFacade.getElementFactory(project).createCodeBlockFromText("{" + text + "}", context);
codeFragment.accept(new JavaRecursiveElementVisitor() {
@Override
public void visitLocalVariable(PsiLocalVariable variable) {
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/EvaluatorBuilderImpl.java
+1 -1
View File
@@ -578,7 +578,7 @@ public class EvaluatorBuilderImpl implements EvaluatorBuilder {
final PsiType lType = localVariable.getType();
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(localVariable.getProject()).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(localVariable.getProject());
try {
PsiExpression initialValue = elementFactory.createExpressionFromText(PsiTypesUtil.getDefaultValueOfType(lType), null);
Object value = JavaConstantExpressionEvaluator.computeConstantExpression(initialValue, true);
java/debugger/impl/src/com/intellij/debugger/impl/JavaEditorTextProviderImpl.java
+1 -1
View File
@@ -165,7 +165,7 @@ public class JavaEditorTextProviderImpl implements EditorTextProvider {
}
}
TextRange textRange = expression.getTextRange();
PsiElement psiExpression = JavaPsiFacade.getInstance(expression.getProject()).getElementFactory().createExpressionFromText(expression.getText(), context);
PsiElement psiExpression = JavaPsiFacade.getElementFactory(expression.getProject()).createExpressionFromText(expression.getText(), context);
return Pair.create(psiExpression, textRange);
}
catch (IncorrectOperationException e) {
java/debugger/impl/src/com/intellij/debugger/memory/utils/InstanceValueDescriptor.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class InstanceValueDescriptor extends ValueDescriptorImpl {
@Override
public PsiExpression getDescriptorEvaluation(DebuggerContext debuggerContext) throws EvaluateException {
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myProject).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(myProject);
ObjectReference ref = ((ObjectReference) getValue());
String name = NamesUtils.getUniqueName(ref).replace("@", "");
String presentation = String.format("%s_DebugLabel", name);
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ArgumentValueDescriptorImpl.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class ArgumentValueDescriptorImpl extends ValueDescriptorImpl{
@Override
public PsiExpression getDescriptorEvaluation(DebuggerContext context) throws EvaluateException {
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myProject).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(myProject);
try {
return elementFactory.createExpressionFromText(getName(), PositionUtil.getContextElement(context));
}
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ArrayElementDescriptorImpl.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class ArrayElementDescriptorImpl extends ValueDescriptorImpl implements A
@Override
public PsiExpression getDescriptorEvaluation(DebuggerContext context) throws EvaluateException {
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myProject).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(myProject);
try {
return elementFactory.createExpressionFromText("this[" + myIndex + "]", null);
}
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTreeNodeExpression.java
+2 -2
View File
@@ -153,7 +153,7 @@ public class DebuggerTreeNodeExpression {
}
else if(type instanceof PsiArrayType) {
LanguageLevel languageLevel = PsiUtil.getLanguageLevel(expressionWithThis);
if(thisClass == JavaPsiFacade.getInstance(expressionWithThis.getProject()).getElementFactory().getArrayClass(languageLevel)) {
if(thisClass == JavaPsiFacade.getElementFactory(expressionWithThis.getProject()).getArrayClass(languageLevel)) {
castNeeded = false;
}
}
@@ -175,7 +175,7 @@ public class DebuggerTreeNodeExpression {
}
try {
PsiExpression res = JavaPsiFacade.getInstance(howToEvaluateThis.getProject()).getElementFactory()
PsiExpression res = JavaPsiFacade.getElementFactory(howToEvaluateThis.getProject())
.createExpressionFromText(psiExpression.getText(), howToEvaluateThis.getContext());
res.putUserData(ADDITIONAL_IMPORTS_KEY, howToEvaluateThis.getUserData(ADDITIONAL_IMPORTS_KEY));
return res;
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/FieldDescriptorImpl.java
+1 -1
View File
@@ -162,7 +162,7 @@ public class FieldDescriptorImpl extends ValueDescriptorImpl implements FieldDes
@Override
public PsiExpression getDescriptorEvaluation(DebuggerContext context) throws EvaluateException {
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myProject).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(myProject);
String fieldName;
if(isStatic()) {
String typeName = myField.declaringType().name().replace('$', '.');
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/LocalVariableDescriptorImpl.java
+1 -1
View File
@@ -98,7 +98,7 @@ public class LocalVariableDescriptorImpl extends ValueDescriptorImpl implements
@Override
public PsiExpression getDescriptorEvaluation(DebuggerContext context) throws EvaluateException {
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myProject).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(myProject);
try {
return elementFactory.createExpressionFromText(getName(), PositionUtil.getContextElement(context));
}
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ThisDescriptorImpl.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class ThisDescriptorImpl extends ValueDescriptorImpl{
@Override
public PsiExpression getDescriptorEvaluation(DebuggerContext context) throws EvaluateException {
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myProject).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(myProject);
try {
return elementFactory.createExpressionFromText("this", null);
}
java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java
+1 -1
View File
@@ -185,7 +185,7 @@ public class ArrayRenderer extends NodeRendererImpl{
LOG.assertTrue(node.getDescriptor() instanceof ArrayElementDescriptorImpl, node.getDescriptor().getClass().getName());
ArrayElementDescriptorImpl descriptor = (ArrayElementDescriptorImpl)node.getDescriptor();
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(node.getProject()).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(node.getProject());
try {
LanguageLevel languageLevel = LanguageLevelProjectExtension.getInstance(node.getProject()).getLanguageLevel();
return elementFactory.createExpressionFromText("this[" + descriptor.getIndex() + "]", elementFactory.getArrayClass(languageLevel));
java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ClassRenderer.java
+1 -1
View File
@@ -222,7 +222,7 @@ public class ClassRenderer extends NodeRendererImpl{
public PsiElement getChildValueExpression(DebuggerTreeNode node, DebuggerContext context) throws EvaluateException {
FieldDescriptor fieldDescriptor = (FieldDescriptor)node.getDescriptor();
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(node.getProject()).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(node.getProject());
try {
return elementFactory.createExpressionFromText("this." + fieldDescriptor.getField().name(), DebuggerUtils.findClass(
fieldDescriptor.getObject().referenceType().name(), context.getProject(), context.getDebugProcess().getSearchScope())
java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundTypeRenderer.java
+1 -1
View File
@@ -151,7 +151,7 @@ public class CompoundTypeRenderer extends CompoundNodeRenderer {
protected final PsiElement getChildValueExpression(String text, DebuggerTreeNode node, DebuggerContext context) {
Project project = node.getProject();
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project);
return elementFactory.createExpressionFromText(text, getContext(project, context));
}
java/debugger/impl/src/org/jetbrains/java/debugger/JavaDebuggerEditorsProvider.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class JavaDebuggerEditorsProvider extends XDebuggerEditorsProviderBase {
if (contextType == null) {
PsiClass contextClass = PsiTreeUtil.getNonStrictParentOfType(context, PsiClass.class);
if (contextClass != null) {
contextType = JavaPsiFacade.getInstance(codeFragment.getProject()).getElementFactory().createType(contextClass);
contextType = JavaPsiFacade.getElementFactory(codeFragment.getProject()).createType(contextClass);
}
}
codeFragment.setThisType(contextType);
java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java
+1 -1
View File
@@ -393,7 +393,7 @@ public abstract class DebuggerUtils {
try {
if (getArrayClass(className) != null) {
return JavaPsiFacade.getInstance(project).getElementFactory().createTypeFromText(className, null);
return JavaPsiFacade.getElementFactory(project).createTypeFromText(className, null);
}
if (project.isDefault()) {
return null;
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/RemoveSuppressWarningAction.java
+2 -2
View File
@@ -119,7 +119,7 @@ public class RemoveSuppressWarningAction implements LocalQuickFix {
comment.delete();
}
else {
PsiComment newComment = JavaPsiFacade.getInstance(comment.getProject()).getElementFactory()
PsiComment newComment = JavaPsiFacade.getElementFactory(comment.getProject())
.createCommentFromText("// " + SuppressionUtilCore.SUPPRESS_INSPECTIONS_TAG_NAME +" "+newText, comment);
comment.replace(newComment);
}
@@ -135,7 +135,7 @@ public class RemoveSuppressWarningAction implements LocalQuickFix {
}
else if (newText != null) {
newText = "@" + SuppressionUtilCore.SUPPRESS_INSPECTIONS_TAG_NAME + " " + newText;
PsiDocTag newTag = JavaPsiFacade.getInstance(tag.getProject()).getElementFactory().createDocTagFromText(newText);
PsiDocTag newTag = JavaPsiFacade.getElementFactory(tag.getProject()).createDocTagFromText(newText);
tag.replace(newTag);
}
}
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
+4 -4
View File
@@ -314,14 +314,14 @@ public class GenericsHighlightUtil {
String description = JavaErrorMessages.message("interface.expected");
errorResult = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(element).descriptionAndTooltip(description).create();
PsiClassType type =
JavaPsiFacade.getInstance(aClass.getProject()).getElementFactory().createType(extendFrom, resolveResult.getSubstitutor());
JavaPsiFacade.getElementFactory(aClass.getProject()).createType(extendFrom, resolveResult.getSubstitutor());
QuickFixAction.registerQuickFixAction(errorResult, QUICK_FIX_FACTORY.createMoveBoundClassToFrontFix(aClass, type), null);
}
else if (referenceElements.length != 0 && element != referenceElements[0] && referenceElements[0].resolve() instanceof PsiTypeParameter) {
final String description = JavaErrorMessages.message("type.parameter.cannot.be.followed.by.other.bounds");
errorResult = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(element).descriptionAndTooltip(description).create();
PsiClassType type =
JavaPsiFacade.getInstance(aClass.getProject()).getElementFactory().createType(extendFrom, resolveResult.getSubstitutor());
JavaPsiFacade.getElementFactory(aClass.getProject()).createType(extendFrom, resolveResult.getSubstitutor());
QuickFixAction.registerQuickFixAction(errorResult, QUICK_FIX_FACTORY.createExtendsListFix(aClass, type, false), null);
}
return errorResult;
@@ -1096,7 +1096,7 @@ public class GenericsHighlightUtil {
return;
}
}
PsiClassType type = JavaPsiFacade.getInstance(holder.getProject()).getElementFactory().createType(containingClass);
PsiClassType type = JavaPsiFacade.getElementFactory(holder.getProject()).createType(containingClass);
HighlightMethodUtil.checkConstructorCall(type.resolveGenerics(), enumConstant, type, null, holder, javaSdkVersion);
}
@@ -1249,7 +1249,7 @@ public class GenericsHighlightUtil {
if (InheritanceUtil.isInheritorOrSelf((PsiClass)resolved, throwableClass, true)) {
String message = JavaErrorMessages.message("generic.extend.exception");
HighlightInfo info = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(refElement).descriptionAndTooltip(message).create();
PsiClassType classType = JavaPsiFacade.getInstance(klass.getProject()).getElementFactory().createType((PsiClass)resolved);
PsiClassType classType = JavaPsiFacade.getElementFactory(klass.getProject()).createType((PsiClass)resolved);
QuickFixAction.registerQuickFixAction(info, QUICK_FIX_FACTORY.createExtendsListFix(klass, classType, false));
return info;
}
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java
+2 -2
View File
@@ -477,7 +477,7 @@ public class HighlightClassUtil {
String message = JavaErrorMessages.message(mustBeInterface ? "interface.expected" : "no.interface.expected");
errorResult = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(ref).descriptionAndTooltip(message).create();
PsiClassType type =
JavaPsiFacade.getInstance(aClass.getProject()).getElementFactory().createType(ref);
JavaPsiFacade.getElementFactory(aClass.getProject()).createType(ref);
QuickFixAction.registerQuickFixAction(errorResult, QUICK_FIX_FACTORY.createChangeExtendsToImplementsFix(aClass, type));
}
return errorResult;
@@ -890,7 +890,7 @@ public class HighlightClassUtil {
if (PsiUtil.isInnerClass(targetClass)) {
PsiClass outerClass = targetClass.getContainingClass();
if (outerClass != null) {
PsiClassType outerType = JavaPsiFacade.getInstance(project).getElementFactory().createType(outerClass);
PsiClassType outerType = JavaPsiFacade.getElementFactory(project).createType(outerClass);
return HighlightUtil.checkAssignability(outerType, null, qualifier, qualifier);
}
} else {
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+3 -3
View File
@@ -1726,7 +1726,7 @@ public class HighlightUtil extends HighlightUtilBase {
PsiType type = resource.getType();
if (type == null) return null;
PsiElementFactory factory = JavaPsiFacade.getInstance(resource.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(resource.getProject());
PsiClassType autoCloseable = factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_AUTO_CLOSEABLE, resource.getResolveScope());
if (TypeConversionUtil.isAssignable(autoCloseable, type)) return null;
@@ -2610,7 +2610,7 @@ public class HighlightUtil extends HighlightUtilBase {
@Nullable
static HighlightInfo checkMustBeThrowable(@NotNull PsiType type, @NotNull PsiElement context, boolean addCastIntention) {
PsiElementFactory factory = JavaPsiFacade.getInstance(context.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(context.getProject());
PsiClassType throwable = factory.createTypeByFQClassName("java.lang.Throwable", context.getResolveScope());
if (!TypeConversionUtil.isAssignable(throwable, type)) {
HighlightInfo highlightInfo = createIncompatibleTypeHighlightInfo(throwable, type, context.getTextRange(), 0);
@@ -2632,7 +2632,7 @@ public class HighlightUtil extends HighlightUtilBase {
@Nullable
private static HighlightInfo checkMustBeThrowable(@NotNull PsiClass aClass, @NotNull PsiElement context) {
PsiClassType type = JavaPsiFacade.getInstance(aClass.getProject()).getElementFactory().createType(aClass);
PsiClassType type = JavaPsiFacade.getElementFactory(aClass.getProject()).createType(aClass);
return checkMustBeThrowable(type, context, false);
}
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java
+1 -1
View File
@@ -96,7 +96,7 @@ public class AddTypeArgumentsFix extends MethodArgumentFix {
mappings[i] = GenericsUtil.eliminateWildcards(substitution, false);
}
final PsiElementFactory factory = JavaPsiFacade.getInstance(expression.getProject()).getElementFactory();
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(expression.getProject());
PsiMethodCallExpression copy = (PsiMethodCallExpression)expression.copy();
final PsiReferenceExpression methodExpression = copy.getMethodExpression();
final PsiReferenceParameterList parameterList = methodExpression.getParameterList();
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class AddTypeCastFix extends LocalQuickFixAndIntentionActionOnPsiElement
if (type.equals(PsiType.NULL)) return null;
if (type instanceof PsiEllipsisType) type = ((PsiEllipsisType)type).toArrayType();
String text = "(" + type.getCanonicalText(false) + ")value";
PsiElementFactory factory = JavaPsiFacade.getInstance(original.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(original.getProject());
PsiTypeCastExpression typeCast = (PsiTypeCastExpression)factory.createExpressionFromText(text, original);
typeCast = (PsiTypeCastExpression)JavaCodeStyleManager.getInstance(project).shortenClassReferences(typeCast);
typeCast = (PsiTypeCastExpression)CodeStyleManager.getInstance(project).reformat(typeCast);
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeNewOperatorTypeFix.java
+2 -2
View File
@@ -61,7 +61,7 @@ public class ChangeNewOperatorTypeFix implements IntentionAction {
private static void changeNewOperatorType(PsiNewExpression originalExpression, PsiType toType, final Editor editor) throws IncorrectOperationException {
PsiNewExpression newExpression;
PsiElementFactory factory = JavaPsiFacade.getInstance(originalExpression.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(originalExpression.getProject());
int caretOffset;
TextRange selection;
CommentTracker commentTracker = new CommentTracker();
@@ -157,7 +157,7 @@ public class ChangeNewOperatorTypeFix implements IntentionAction {
if (lClass != null) {
PsiSubstitutor substitutor = getInheritorSubstitutorForNewExpression(lClass, rClass, lResolveResult.getSubstitutor(), expression);
if (substitutor != null) {
newType = JavaPsiFacade.getInstance(lClass.getProject()).getElementFactory().createType(rClass, substitutor);
newType = JavaPsiFacade.getElementFactory(lClass.getProject()).createType(rClass, substitutor);
}
}
}
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class ChangeStringLiteralToCharInMethodCallFix implements IntentionAction
public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
final Object value = myLiteral.getValue();
if (value != null && value.toString().length() == 1) {
final PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
final PsiExpression newExpression = factory.createExpressionFromText(quote(convertedValue(), ! isString(myLiteral.getType())),
myLiteral.getParent());
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ExtendsListFix.java
+2 -2
View File
@@ -42,7 +42,7 @@ public class ExtendsListFix extends LocalQuickFixAndIntentionActionOnPsiElement
}
public ExtendsListFix(@NotNull PsiClass aClass, @NotNull PsiClass classToExtendFrom, boolean toAdd) {
this(aClass, classToExtendFrom, JavaPsiFacade.getInstance(aClass.getProject()).getElementFactory().createType(classToExtendFrom), toAdd);
this(aClass, classToExtendFrom, JavaPsiFacade.getElementFactory(aClass.getProject()).createType(classToExtendFrom), toAdd);
}
private ExtendsListFix(@NotNull PsiClass aClass,
@@ -159,7 +159,7 @@ public class ExtendsListFix extends LocalQuickFixAndIntentionActionOnPsiElement
anchor = referenceElements[position - 1];
}
PsiJavaCodeReferenceElement classReferenceElement =
JavaPsiFacade.getInstance(extendsList.getProject()).getElementFactory().createReferenceElementByType(myTypeToExtendFrom);
JavaPsiFacade.getElementFactory(extendsList.getProject()).createReferenceElementByType(myTypeToExtendFrom);
PsiElement element;
if (anchor == null) {
if (referenceElements.length == 0) {
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MergeModuleStatementsFix.java
+1 -1
View File
@@ -45,7 +45,7 @@ public abstract class MergeModuleStatementsFix<T extends PsiStatement> extends L
LOG.assertTrue(!statementsToMerge.isEmpty());
final String text = getReplacementText(statementsToMerge);
final PsiStatement replacement = JavaPsiFacade.getInstance(project).getElementFactory().createModuleStatementFromText(text);
final PsiStatement replacement = JavaPsiFacade.getElementFactory(project).createModuleStatementFromText(text);
final T firstStatement = statementsToMerge.get(0);
final CommentTracker commentTracker = new CommentTracker();
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodThrowsFix.java
+2 -2
View File
@@ -54,7 +54,7 @@ public abstract class MethodThrowsFix extends LocalQuickFixOnPsiElement {
PsiJavaCodeReferenceElement[] referenceElements = myMethod.getThrowsList().getReferenceElements();
boolean alreadyThrows = Arrays.stream(referenceElements).anyMatch(referenceElement -> referenceElement.getCanonicalText().equals(myThrowsCanonicalText));
if (!alreadyThrows) {
final PsiElementFactory factory = JavaPsiFacade.getInstance(myMethod.getProject()).getElementFactory();
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(myMethod.getProject());
final PsiClassType type = (PsiClassType)factory.createTypeFromText(myThrowsCanonicalText, myMethod);
PsiJavaCodeReferenceElement ref = factory.createReferenceElementByType(type);
ref = (PsiJavaCodeReferenceElement)JavaCodeStyleManager.getInstance(project).shortenClassReferences(ref);
@@ -156,7 +156,7 @@ public abstract class MethodThrowsFix extends LocalQuickFixOnPsiElement {
public static PsiElement[] extractRefsToRemove(PsiMethod method, PsiType exceptionType) {
List<PsiElement> refs = new SmartList<>();
PsiJavaCodeReferenceElement[] referenceElements = method.getThrowsList().getReferenceElements();
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(method.getProject()).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(method.getProject());
Arrays.stream(referenceElements).filter(ref -> {
PsiType refType = elementFactory.createType(ref);
return exceptionType.isAssignableFrom(refType);
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableUtil.java
+1 -1
View File
@@ -130,7 +130,7 @@ public class RemoveUnusedVariableUtil {
static Boolean processUsage(PsiElement element, PsiVariable variable, List<? super PsiElement> sideEffects, @NotNull RemoveMode deleteMode)
throws IncorrectOperationException {
if (!element.isValid()) return null;
PsiElementFactory factory = JavaPsiFacade.getInstance(variable.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(variable.getProject());
while (element != null) {
if (element instanceof PsiAssignmentExpression) {
PsiAssignmentExpression expression = (PsiAssignmentExpression)element;
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapExpressionFix.java
+1 -1
View File
@@ -118,7 +118,7 @@ public class WrapExpressionFix implements IntentionAction {
assert type != null;
PsiMethod wrapper = findWrapper(type, myExpectedType, myPrimitiveExpected);
assert wrapper != null;
PsiElementFactory factory = JavaPsiFacade.getInstance(file.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(file.getProject());
@NonNls String methodCallText = "Foo." + wrapper.getName() + "()";
PsiMethodCallExpression call = (PsiMethodCallExpression)factory.createExpressionFromText(methodCallText,
null);
java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java
+1 -1
View File
@@ -198,7 +198,7 @@ public class GuessManagerImpl extends GuessManager {
for (PsiClass derivedClass : processor.getCollection()) {
if (derivedClass instanceof PsiAnonymousClass) continue;
PsiType derivedType = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory().createType(derivedClass);
PsiType derivedType = JavaPsiFacade.getElementFactory(manager.getProject()).createType(derivedClass);
set.add(derivedType);
}
}
java/java-analysis-impl/src/com/intellij/codeInspection/JavaSuppressionUtil.java
+3 -3
View File
@@ -259,7 +259,7 @@ public class JavaSuppressionUtil {
PsiAnnotation annotation,
@NotNull String id) throws IncorrectOperationException {
if (annotation == null) {
return JavaPsiFacade.getInstance(project).getElementFactory()
return JavaPsiFacade.getElementFactory(project)
.createAnnotationFromText("@" + SUPPRESS_INSPECTIONS_ANNOTATION_NAME + "(\"" + id + "\")", container);
}
final String currentSuppressedId = "\"" + id + "\"";
@@ -268,7 +268,7 @@ public class JavaSuppressionUtil {
if (attributes.length == 1) {
final String suppressedWarnings = attributes[0].getText();
if (suppressedWarnings.contains(currentSuppressedId)) return null;
return JavaPsiFacade.getInstance(project).getElementFactory().createAnnotationFromText(
return JavaPsiFacade.getElementFactory(project).createAnnotationFromText(
"@" + SUPPRESS_INSPECTIONS_ANNOTATION_NAME + "({" + suppressedWarnings + ", " + currentSuppressedId + "})", container);
}
@@ -278,7 +278,7 @@ public class JavaSuppressionUtil {
if (curlyBraceIndex > 0) {
final String oldSuppressWarning = annotation.getText().substring(0, curlyBraceIndex);
if (oldSuppressWarning.contains(currentSuppressedId)) return null;
return JavaPsiFacade.getInstance(project).getElementFactory().createAnnotationFromText(
return JavaPsiFacade.getElementFactory(project).createAnnotationFromText(
oldSuppressWarning + ", " + currentSuppressedId + "})", container);
}
else {
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaPsiType.java
+1 -1
View File
@@ -131,7 +131,7 @@ public class DfaPsiType {
for (PsiClassType type : types) {
PsiClass resolved = type.resolve();
if (resolved != null && processed.add(resolved)) {
PsiClassType classType = JavaPsiFacade.getInstance(aClass.getProject()).getElementFactory().createType(resolved);
PsiClassType classType = JavaPsiFacade.getElementFactory(aClass.getProject()).createType(resolved);
result.add(normalizeClassType(classType, processed));
}
}
java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java
+1 -1
View File
@@ -191,7 +191,7 @@ public class RedundantTypeArgsInspection extends GenericsInspectionToolBase {
final PsiReferenceParameterList typeArgumentList = (PsiReferenceParameterList)element;
try {
final PsiMethodCallExpression expr =
(PsiMethodCallExpression)JavaPsiFacade.getInstance(project).getElementFactory().createExpressionFromText("foo()", null);
(PsiMethodCallExpression)JavaPsiFacade.getElementFactory(project).createExpressionFromText("foo()", null);
typeArgumentList.replace(expr.getTypeArgumentList());
}
catch (IncorrectOperationException e) {
java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaManagerImpl.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class RefJavaManagerImpl extends RefJavaManager {
myRefManager = manager;
final Project project = manager.getProject();
final PsiManager psiManager = PsiManager.getInstance(project);
PsiElementFactory factory = JavaPsiFacade.getInstance(psiManager.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(psiManager.getProject());
myAppMainPattern = factory.createMethodFromText("void main(String[] args);", null);
myAppPremainPattern = factory.createMethodFromText("void premain(String[] args, java.lang.instrument.Instrumentation i);", null);
myAppAgentmainPattern = factory.createMethodFromText("void agentmain(String[] args, java.lang.instrument.Instrumentation i);", null);
java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaUtilImpl.java
+1 -1
View File
@@ -428,7 +428,7 @@ public class RefJavaUtilImpl extends RefJavaUtil {
if (containingClass != null) {
fqName = containingClass.getQualifiedName();
if (fqName != null) {
final PsiClassType methodOwnerType = JavaPsiFacade.getInstance(psiResolved.getProject()).getElementFactory()
final PsiClassType methodOwnerType = JavaPsiFacade.getElementFactory(psiResolved.getProject())
.createTypeByFQClassName(fqName, GlobalSearchScope.allScope(psiResolved.getProject()));
if (!usedType.equals(methodOwnerType)) {
refMethod.setCalledOnSubClass(true);
java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefMethodImpl.java
+1 -1
View File
@@ -450,7 +450,7 @@ public class RefMethodImpl extends RefJavaElementImpl implements RefMethod {
final PsiClass psiClass = ClassUtil.findPsiClass(manager, className);
if (psiClass == null) return null;
try {
PsiElementFactory factory = JavaPsiFacade.getInstance(psiClass.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(psiClass.getProject());
String methodSignature = externalName.substring(spaceIdx + 1);
PsiMethod patternMethod = factory.createMethodFromText(methodSignature, psiClass);
return psiClass.findMethodBySignature(patternMethod, false);
java/java-analysis-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrowsDeclarationInspection.java
+1 -1
View File
@@ -218,7 +218,7 @@ public class RedundantThrowsDeclarationInspection extends GlobalJavaBatchInspect
final PsiElement psiElement = ((ProblemDescriptor)problem).getPsiElement();
if (psiElement instanceof PsiJavaCodeReferenceElement) {
final PsiJavaCodeReferenceElement classRef = (PsiJavaCodeReferenceElement)psiElement;
final PsiType psiType = JavaPsiFacade.getInstance(psiManager.getProject()).getElementFactory().createType(classRef);
final PsiType psiType = JavaPsiFacade.getElementFactory(psiManager.getProject()).createType(classRef);
removeException(refMethod, psiType, refsToDelete, psiMethod);
} else {
final PsiReferenceList throwsList = psiMethod.getThrowsList();
java/java-analysis-impl/src/com/intellij/codeInspection/wrongPackageStatement/AdjustPackageNameFix.java
+2 -2
View File
@@ -54,10 +54,10 @@ public class AdjustPackageNameFix implements LocalQuickFix {
PsiPackage myTargetPackage = JavaDirectoryService.getInstance().getPackage(directory);
if (myTargetPackage == null) return;
PsiElementFactory factory = JavaPsiFacade.getInstance(myFile.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(myFile.getProject());
PsiPackageStatement myStatement = ((PsiJavaFile)myFile).getPackageStatement();
if (myTargetPackage.getQualifiedName().length() == 0) {
if (myTargetPackage.getQualifiedName().isEmpty()) {
if (myStatement != null) {
myStatement.delete();
}
java/java-analysis-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodUtil.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class ExtractMethodUtil {
throws IncorrectOperationException {
final PsiMethod newTarget = call.resolveMethod();
final PsiManager manager = oldTarget.getManager();
final PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(manager.getProject());
if (!manager.areElementsEquivalent(oldTarget, newTarget)) {
final PsiParameter[] oldParameters = oldTarget.getParameterList().getParameters();
if (oldParameters.length > 0) {
java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/ConditionalReturnStatementValue.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class ConditionalReturnStatementValue implements ReturnValue {
@Override
@Nullable
public PsiStatement createReplacement(@NotNull final PsiMethod extractedMethod, @NotNull PsiMethodCallExpression methodCallExpression, @Nullable PsiType returnType) throws IncorrectOperationException {
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(methodCallExpression.getProject()).getElementFactory();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(methodCallExpression.getProject());
PsiIfStatement statement;
if (myReturnValue == null) {
statement = (PsiIfStatement)elementFactory.createStatementFromText("if(a) return;", null);
java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/ExpressionReturnValue.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class ExpressionReturnValue implements ReturnValue {
@Nullable
public PsiStatement createReplacement(@NotNull final PsiMethod extractedMethod, @NotNull final PsiMethodCallExpression methodCallExpression, @Nullable PsiType returnType)
throws IncorrectOperationException {
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(methodCallExpression.getProject()).getElementFactory();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(methodCallExpression.getProject());
final CodeStyleManager styleManager = CodeStyleManager.getInstance(methodCallExpression.getProject());
PsiExpressionStatement expressionStatement;
expressionStatement = (PsiExpressionStatement)elementFactory.createStatementFromText("x = y();", null);
java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/FieldReturnValue.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class FieldReturnValue implements ReturnValue {
@Nullable
public PsiStatement createReplacement(@NotNull final PsiMethod extractedMethod, @NotNull final PsiMethodCallExpression methodCallExpression, @Nullable PsiType returnType) throws IncorrectOperationException {
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(methodCallExpression.getProject()).getElementFactory();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(methodCallExpression.getProject());
final CodeStyleManager styleManager = CodeStyleManager.getInstance(methodCallExpression.getProject());
PsiExpressionStatement expressionStatement;
expressionStatement = (PsiExpressionStatement)elementFactory.createStatementFromText("x = y();", null);
java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/GotoReturnValue.java
+1 -1
View File
@@ -29,7 +29,7 @@ public abstract class GotoReturnValue implements ReturnValue {
@Nullable
public PsiStatement createReplacement(@NotNull final PsiMethod extractedMethod, @NotNull final PsiMethodCallExpression methodCallExpression, @Nullable PsiType returnType) throws IncorrectOperationException {
if (!TypeConversionUtil.isBooleanType(extractedMethod.getReturnType())) return null;
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(methodCallExpression.getProject()).getElementFactory();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(methodCallExpression.getProject());
final PsiIfStatement statement = (PsiIfStatement)elementFactory.createStatementFromText(getGotoStatement(), null);
final PsiExpression condition = statement.getCondition();
assert condition != null;
java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/Match.java
+2 -2
View File
@@ -251,7 +251,7 @@ public final class Match {
statement = getReturnValue().createReplacement(extractedMethod, methodCallExpression, returnType);
}
if (statement == null) {
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(methodCallExpression.getProject()).getElementFactory();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(methodCallExpression.getProject());
PsiExpressionStatement expressionStatement = (PsiExpressionStatement) elementFactory.createStatementFromText("x();", null);
final CodeStyleManager styleManager = CodeStyleManager.getInstance(methodCallExpression.getManager());
expressionStatement = (PsiExpressionStatement)styleManager.reformat(expressionStatement);
@@ -306,7 +306,7 @@ public final class Match {
final String name = variable.getName();
LOG.assertTrue(name != null);
PsiDeclarationStatement statement =
JavaPsiFacade.getInstance(project).getElementFactory().createVariableDeclarationStatement(name, variable.getType(), null);
JavaPsiFacade.getElementFactory(project).createVariableDeclarationStatement(name, variable.getType(), null);
if (reassigned.contains(new ControlFlowUtil.VariableInfo(variable, null))) {
final PsiElement[] psiElements = statement.getDeclaredElements();
final PsiModifierList modifierList = ((PsiVariable)psiElements[0]).getModifierList();
java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/ReturnStatementReturnValue.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class ReturnStatementReturnValue implements ReturnValue {
@Override
@Nullable
public PsiStatement createReplacement(@NotNull final PsiMethod extractedMethod, @NotNull final PsiMethodCallExpression methodCallExpression,@Nullable PsiType returnType) throws IncorrectOperationException {
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(methodCallExpression.getProject()).getElementFactory();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(methodCallExpression.getProject());
final CodeStyleManager styleManager = CodeStyleManager.getInstance(methodCallExpression.getProject());
PsiReturnStatement returnStatement = (PsiReturnStatement)elementFactory.createStatementFromText("return x;", null);
returnStatement = (PsiReturnStatement) styleManager.reformat(returnStatement);
java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/VariableReturnValue.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class VariableReturnValue implements ReturnValue {
final PsiDeclarationStatement statement;
Project project = methodCallExpression.getProject();
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project);
final CodeStyleManager styleManager = CodeStyleManager.getInstance(project);
JavaCodeStyleManager javaStyleManager = JavaCodeStyleManager.getInstance(project);
PsiType type = returnType != null && returnType.isValid() ? returnType : myVariable.getType();
java/java-analysis-impl/src/org/jetbrains/java/generate/psi/PsiAdapter.java
+2 -2
View File
@@ -271,7 +271,7 @@ public class PsiAdapter {
* is thrown if there is an error creating the import statement.
*/
public static void addImportStatement(PsiJavaFile javaFile, String importStatementOnDemand) {
PsiElementFactory factory = JavaPsiFacade.getInstance(javaFile.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(javaFile.getProject());
PsiImportStatement is = factory.createImportStatementOnDemand(fixImportStatement(importStatementOnDemand));
// add the import to the file, and optimize the imports
@@ -410,7 +410,7 @@ public class PsiAdapter {
@Nullable
public static PsiComment addOrReplaceJavadoc(PsiMethod method, String javadoc, boolean replace) {
final Project project = method.getProject();
PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
PsiComment comment = factory.createCommentFromText(javadoc, null);
// does a method already exists?
java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
+5 -5
View File
@@ -463,7 +463,7 @@ public class ExpectedTypesProvider {
myResult.add(createInfoImpl(arrayType, arrayType));
PsiManager manager = statement.getManager();
PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(manager.getProject());
PsiClass iterableClass =
JavaPsiFacade.getInstance(manager.getProject()).findClass("java.lang.Iterable", statement.getResolveScope());
if (iterableClass != null && iterableClass.getTypeParameters().length == 1 && !PsiType.NULL.equals(type)) {
@@ -483,7 +483,7 @@ public class ExpectedTypesProvider {
}
PsiManager manager = statement.getManager();
PsiClassType enumType = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory().createTypeByFQClassName("java.lang.Enum", statement.getResolveScope());
PsiClassType enumType = JavaPsiFacade.getElementFactory(manager.getProject()).createTypeByFQClassName("java.lang.Enum", statement.getResolveScope());
myResult.add(createInfoImpl(enumType, enumType));
}
@@ -503,7 +503,7 @@ public class ExpectedTypesProvider {
@Override
public void visitSynchronizedStatement(@NotNull PsiSynchronizedStatement statement) {
PsiElementFactory factory = JavaPsiFacade.getInstance(statement.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(statement.getProject());
PsiType objectType = factory.createTypeByFQClassName(CommonClassNames.JAVA_LANG_OBJECT, myExpr.getResolveScope());
myResult.add(createInfoImpl(objectType, objectType));
}
@@ -906,7 +906,7 @@ public class ExpectedTypesProvider {
public void visitThrowStatement(@NotNull PsiThrowStatement statement) {
if (statement.getException() == myExpr) {
PsiManager manager = statement.getManager();
PsiType throwableType = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory().createTypeByFQClassName("java.lang.Throwable", myExpr.getResolveScope());
PsiType throwableType = JavaPsiFacade.getElementFactory(manager.getProject()).createTypeByFQClassName("java.lang.Throwable", myExpr.getResolveScope());
PsiElement container = PsiTreeUtil.getParentOfType(statement, PsiMethod.class, PsiLambdaExpression.class, PsiClass.class);
PsiType[] throwsTypes = PsiType.EMPTY_ARRAY;
if (container instanceof PsiMethod) {
@@ -920,7 +920,7 @@ public class ExpectedTypesProvider {
}
if (throwsTypes.length == 0) {
final PsiClassType exceptionType = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory().createTypeByFQClassName("java.lang.Exception", myExpr.getResolveScope());
final PsiClassType exceptionType = JavaPsiFacade.getElementFactory(manager.getProject()).createTypeByFQClassName("java.lang.Exception", myExpr.getResolveScope());
throwsTypes = new PsiClassType[]{exceptionType};
}
java/java-impl/src/com/intellij/codeInsight/completion/AbstractExpectedTypeSkipper.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class AbstractExpectedTypeSkipper extends CompletionPreselectSkipper {
final ExpectedTypeInfo[] infos = JavaCompletionUtil.EXPECTED_TYPES.getValue(location);
boolean isDefaultType = false;
if (infos != null) {
final PsiType type = JavaPsiFacade.getInstance(psiClass.getProject()).getElementFactory().createType(psiClass);
final PsiType type = JavaPsiFacade.getElementFactory(psiClass.getProject()).createType(psiClass);
for (final ExpectedTypeInfo info : infos) {
final PsiType infoType = TypeConversionUtil.erasure(info.getType().getDeepComponentType());
final PsiType defaultType = TypeConversionUtil.erasure(info.getDefaultType().getDeepComponentType());
java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java
+1 -1
View File
@@ -255,7 +255,7 @@ public class JavaSmartCompletionContributor extends CompletionContributor {
@NotNull
public static ExpectedTypeInfo[] getExpectedTypes(PsiElement position, boolean voidable) {
if (psiElement().withParent(psiElement(PsiReferenceExpression.class).withParent(PsiThrowStatement.class)).accepts(position)) {
final PsiElementFactory factory = JavaPsiFacade.getInstance(position.getProject()).getElementFactory();
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(position.getProject());
final PsiClassType classType = factory
.createTypeByFQClassName(CommonClassNames.JAVA_LANG_RUNTIME_EXCEPTION, position.getResolveScope());
final List<ExpectedTypeInfo> result = new SmartList<>();
java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java
+1 -1
View File
@@ -202,7 +202,7 @@ public class ReferenceExpressionCompletionContributor {
}
static PsiExpression createExpression(String text, PsiElement element) {
return JavaPsiFacade.getInstance(element.getProject()).getElementFactory().createExpressionFromText(text, element);
return JavaPsiFacade.getElementFactory(element.getProject()).createExpressionFromText(text, element);
}
static String getQualifierText(@Nullable final PsiElement qualifier) {
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java
+1 -1
View File
@@ -91,7 +91,7 @@ public class AccessStaticViaInstanceFix extends LocalQuickFixAndIntentionActionO
PsiClass containingClass = myMember.getContainingClass();
if (containingClass == null) return;
final PsiExpression qualifierExpression = myExpression.getQualifierExpression();
PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
if (qualifierExpression != null && !checkSideEffects(project, containingClass, qualifierExpression, factory, myExpression,editor)) return;
WriteAction.run(() -> {
try {
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddConstructorFix.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class AddConstructorFix implements LocalQuickFix, IntentionAction {
if (!FileModificationService.getInstance().preparePsiElementForWrite(myBeanClass.getContainingFile())) return;
PsiClass psiClass = myBeanClass.getElement();
if (psiClass == null) return;
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myBeanClass.getProject()).getElementFactory();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(myBeanClass.getProject());
final PsiMethod constructor = elementFactory.createConstructor();
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToCatchFix.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class AddExceptionToCatchFix extends BaseIntentionAction {
private static PsiCodeBlock addCatchStatement(PsiTryStatement tryStatement,
PsiClassType exceptionType,
PsiFile file) throws IncorrectOperationException {
PsiElementFactory factory = JavaPsiFacade.getInstance(tryStatement.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(tryStatement.getProject());
if (tryStatement.getTryBlock() == null) {
addTryBlock(tryStatement, factory);
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class AddMethodFix extends LocalQuickFixAndIntentionActionOnPsiElement {
@NotNull
private static PsiMethod createMethod(final String methodText, final PsiClass implClass) {
return JavaPsiFacade.getInstance(implClass.getProject()).getElementFactory().createMethodFromText(methodText, implClass);
return JavaPsiFacade.getElementFactory(implClass.getProject()).createMethodFromText(methodText, implClass);
}
private static PsiMethod reformat(Project project, PsiMethod result) throws IncorrectOperationException {
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddNewArrayExpressionFix.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class AddNewArrayExpressionFix implements IntentionAction {
public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
PsiManager manager = file.getManager();
PsiType type = getType();
PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(manager.getProject());
@NonNls String text = "new " + type.getCanonicalText() + "[]{}";
PsiNewExpression newExpr = (PsiNewExpression) factory.createExpressionFromText(text, null);
newExpr.getArrayInitializer().replace(myInitializer);
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class AddReturnFix implements IntentionAction {
@Override
public void invoke(@NotNull Project project, Editor editor, PsiFile file) {
String value = suggestReturnValue();
PsiElementFactory factory = JavaPsiFacade.getInstance(myMethod.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(myMethod.getProject());
PsiReturnStatement returnStatement = (PsiReturnStatement) factory.createStatementFromText("return " + value+";", myMethod);
PsiCodeBlock body = myMethod.getBody();
returnStatement = (PsiReturnStatement) body.addBefore(returnStatement, body.getRBrace());
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java
+3 -3
View File
@@ -105,7 +105,7 @@ public class BringVariableIntoScopeFix implements IntentionAction {
: myUnresolvedReference;
while(child.getParent() != commonParent) child = child.getParent();
PsiDeclarationStatement newDeclaration = (PsiDeclarationStatement)JavaPsiFacade.getInstance(manager.getProject()).getElementFactory().createStatementFromText("int i = 0", null);
PsiDeclarationStatement newDeclaration = (PsiDeclarationStatement)JavaPsiFacade.getElementFactory(manager.getProject()).createStatementFromText("int i = 0", null);
PsiVariable variable = (PsiVariable)newDeclaration.getDeclaredElements()[0].replace(myOutOfScopeVariable);
if (variable.getInitializer() != null) {
variable.getInitializer().delete();
@@ -126,7 +126,7 @@ public class BringVariableIntoScopeFix implements IntentionAction {
//Leave initializer assignment
PsiExpression initializer = myOutOfScopeVariable.getInitializer();
if (initializer != null) {
PsiExpressionStatement assignment = (PsiExpressionStatement)JavaPsiFacade.getInstance(manager.getProject()).getElementFactory().createStatementFromText(myOutOfScopeVariable
PsiExpressionStatement assignment = (PsiExpressionStatement)JavaPsiFacade.getElementFactory(manager.getProject()).createStatementFromText(myOutOfScopeVariable
.getName() + "= e;", null);
((PsiAssignmentExpression)assignment.getExpression()).getRExpression().replace(initializer);
assignment = (PsiExpressionStatement)CodeStyleManager.getInstance(manager.getProject()).reformat(assignment);
@@ -153,7 +153,7 @@ public class BringVariableIntoScopeFix implements IntentionAction {
private static void initialize(final PsiLocalVariable variable) throws IncorrectOperationException {
PsiType type = variable.getType();
String init = PsiTypesUtil.getDefaultValueOfType(type);
PsiElementFactory factory = JavaPsiFacade.getInstance(variable.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(variable.getProject());
PsiExpression initializer = factory.createExpressionFromText(init, variable);
variable.setInitializer(initializer);
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertCollectionToArrayFix.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class ConvertCollectionToArrayFix implements IntentionAction {
@Override
public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
String replacement = ParenthesesUtils.getText(myCollectionExpression, ParenthesesUtils.POSTFIX_PRECEDENCE) +
".toArray(" + myNewArrayText + ")";
myExpressionToReplace.replace(factory.createExpressionFromText(replacement, myCollectionExpression));
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateAnnotationMethodFromUsageFix.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class CreateAnnotationMethodFromUsageFix extends CreateFromUsageBaseFix {
PsiNameValuePair nameValuePair = getNameValuePair();
if (nameValuePair == null || isValidElement(nameValuePair)) return;
final PsiElementFactory factory = JavaPsiFacade.getInstance(nameValuePair.getProject()).getElementFactory();
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(nameValuePair.getProject());
final String methodName = nameValuePair.getName();
LOG.assertTrue(methodName != null);
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateCastExpressionFromInstanceofAction.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class CreateCastExpressionFromInstanceofAction extends CreateLocalVarFrom
@Nullable
private static PsiElement createAndInsertCast(final PsiInstanceOfExpression instanceOfExpression, Editor editor, PsiFile file) throws IncorrectOperationException {
PsiElementFactory factory = JavaPsiFacade.getInstance(instanceOfExpression.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(instanceOfExpression.getProject());
PsiExpressionStatement statement = (PsiExpressionStatement)factory.createStatementFromText("((a)b)", instanceOfExpression);
PsiParenthesizedExpression paren = (PsiParenthesizedExpression)statement.getExpression();
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java
+3 -3
View File
@@ -76,7 +76,7 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix {
protected void setupClassFromNewExpression(final PsiClass psiClass, final PsiNewExpression newExpression) {
assert ApplicationManager.getApplication().isWriteAccessAllowed();
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(newExpression.getProject()).getElementFactory();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(newExpression.getProject());
PsiClass aClass = psiClass;
if (aClass == null) return;
@@ -131,7 +131,7 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix {
@Nullable
public static PsiMethod setupSuperCall(PsiClass targetClass, PsiMethod constructor, TemplateBuilderImpl templateBuilder)
throws IncorrectOperationException {
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(targetClass.getProject()).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(targetClass.getProject());
PsiMethod supConstructor = null;
PsiClass superClass = targetClass.getSuperClass();
if (superClass != null && !CommonClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName()) &&
@@ -178,7 +178,7 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix {
PsiClass aClass = classType.resolve();
if (aClass == null) continue;
if (aClass.equals(targetClass) || aClass.hasModifierProperty(PsiModifier.FINAL)) continue;
PsiElementFactory factory = JavaPsiFacade.getInstance(aClass.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(aClass.getProject());
if (aClass.isInterface()) {
PsiReferenceList implementsList = targetClass.getImplementsList();
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromThisOrSuperFix.java
+1 -1
View File
@@ -72,7 +72,7 @@ public abstract class CreateConstructorFromThisOrSuperFix extends CreateFromUsag
protected void invokeImpl(PsiClass targetClass) {
final PsiFile callSite = myMethodCall.getContainingFile();
final Project project = myMethodCall.getProject();
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project);
IdeDocumentHistory.getInstance(project).includeCurrentPlaceAsChangePlace();
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorMatchingSuperFix.java
+1 -1
View File
@@ -126,7 +126,7 @@ public class CreateConstructorMatchingSuperFix extends BaseIntentionAction {
() -> {
try {
if (targetClass.getLBrace() == null) {
PsiClass psiClass = JavaPsiFacade.getInstance(targetClass.getProject()).getElementFactory().createClass("X");
PsiClass psiClass = JavaPsiFacade.getElementFactory(targetClass.getProject()).createClass("X");
targetClass.addRangeAfter(psiClass.getLBrace(), psiClass.getRBrace(), targetClass.getLastChild());
}
JVMElementFactory factory = JVMElementFactories.getFactory(targetClass.getLanguage(), project);
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateEnumConstantFromUsageFix.java
+2 -2
View File
@@ -51,7 +51,7 @@ public class CreateEnumConstantFromUsageFix extends CreateVarFromUsageFix implem
LOG.assertTrue(targetClass.isEnum());
final String name = myReferenceExpression.getReferenceName();
LOG.assertTrue(name != null);
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myReferenceExpression.getProject()).getElementFactory();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(myReferenceExpression.getProject());
PsiEnumConstant enumConstant = elementFactory.createEnumConstantFromText(name, null);
enumConstant = (PsiEnumConstant)targetClass.add(enumConstant);
@@ -148,7 +148,7 @@ public class CreateEnumConstantFromUsageFix extends CreateVarFromUsageFix implem
final List<PsiClass> classes = getTargetClasses(element);
if (classes.size() != 1 || !classes.get(0).isEnum()) return false;
ExpectedTypeInfo[] typeInfos = CreateFromUsageUtils.guessExpectedTypes(myReferenceExpression, false);
PsiType enumType = JavaPsiFacade.getInstance(myReferenceExpression.getProject()).getElementFactory().createType(classes.get(0));
PsiType enumType = JavaPsiFacade.getElementFactory(myReferenceExpression.getProject()).createType(classes.get(0));
for (final ExpectedTypeInfo typeInfo : typeInfos) {
if (ExpectedTypeUtil.matches(enumType, typeInfo)) return true;
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java
+1 -1
View File
@@ -426,7 +426,7 @@ public abstract class CreateFromUsageBaseFix extends BaseIntentionAction {
public static void setupGenericParameters(PsiClass targetClass, PsiJavaCodeReferenceElement ref) {
int numParams = ref.getTypeParameters().length;
if (numParams == 0) return;
final PsiElementFactory factory = JavaPsiFacade.getInstance(ref.getProject()).getElementFactory();
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(ref.getProject());
final Set<String> typeParamNames = new HashSet<>();
for (PsiType type : ref.getTypeParameters()) {
final PsiClass psiClass = PsiUtil.resolveClassInType(type);
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java
+1 -1
View File
@@ -393,7 +393,7 @@ public class CreateFromUsageUtils {
String name,
PsiJavaCodeReferenceElement referenceElement) {
PsiManager manager = psiClass.getManager();
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(manager.getProject());
PsiClass result = classKind == CreateClassKind.INTERFACE ? elementFactory.createInterface(name) :
classKind == CreateClassKind.CLASS ? elementFactory.createClass(name) :
classKind == CreateClassKind.ANNOTATION ? elementFactory.createAnnotationType(name) :
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromNewFix.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class CreateInnerClassFromNewFix extends CreateClassFromNewFix {
assert ref != null;
String refName = ref.getReferenceName();
LOG.assertTrue(refName != null);
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(newExpression.getProject()).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(newExpression.getProject());
PsiClass created = elementFactory.createClass(refName);
final PsiModifierList modifierList = created.getModifierList();
LOG.assertTrue(modifierList != null);
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java
+1 -1
View File
@@ -125,7 +125,7 @@ public class CreateInnerClassFromUsageFix extends CreateClassFromUsageBaseFix {
if (!FileModificationService.getInstance().preparePsiElementForWrite(aClass)) return;
String refName = ref.getReferenceName();
LOG.assertTrue(refName != null);
PsiElementFactory elementFactory = JavaPsiFacade.getInstance(aClass.getProject()).getElementFactory();
PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(aClass.getProject());
PsiClass created = myKind == CreateClassKind.INTERFACE
? elementFactory.createInterface(refName)
: myKind == CreateClassKind.CLASS ? elementFactory.createClass(refName) : elementFactory.createEnum(refName);
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalFromUsageFix.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class CreateLocalFromUsageFix extends CreateVarFromUsageFix {
}
final Project project = myReferenceExpression.getProject();
PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
final PsiFile targetFile = targetClass.getContainingFile();
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalVarFromInstanceofAction.java
+2 -2
View File
@@ -279,7 +279,7 @@ public class CreateLocalVarFromInstanceofAction extends BaseIntentionAction {
@Nullable
private static PsiDeclarationStatement createLocalVariableDeclaration(final PsiInstanceOfExpression instanceOfExpression,
final PsiStatement statementInside) throws IncorrectOperationException {
PsiElementFactory factory = JavaPsiFacade.getInstance(instanceOfExpression.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(instanceOfExpression.getProject());
PsiTypeCastExpression cast = (PsiTypeCastExpression)factory.createExpressionFromText("(a)b", instanceOfExpression);
PsiType castType = instanceOfExpression.getCheckType().getType();
cast.getCastType().replace(factory.createTypeElement(castType));
@@ -305,7 +305,7 @@ public class CreateLocalVarFromInstanceofAction extends BaseIntentionAction {
static PsiElement insertAtAnchor(final PsiInstanceOfExpression instanceOfExpression, PsiElement toInsert) throws IncorrectOperationException {
boolean negated = isNegated(instanceOfExpression);
PsiStatement statement = PsiTreeUtil.getParentOfType(instanceOfExpression, PsiStatement.class);
PsiElementFactory factory = JavaPsiFacade.getInstance(toInsert.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(toInsert.getProject());
PsiElement anchorAfter = null;
PsiBlockStatement emptyBlockStatement = (PsiBlockStatement)factory.createStatementFromText("{}", instanceOfExpression);
if (statement instanceof PsiIfStatement) {
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java
+1 -1
View File
@@ -237,7 +237,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageBaseFix {
CreateFromUsageUtils.setupMethodParameters(method, builder, context, substitutor, arguments);
final PsiTypeElement returnTypeElement = method.getReturnTypeElement();
if (returnTypeElement != null) {
new GuessTypeParameters(project, JavaPsiFacade.getInstance(project).getElementFactory(), builder, substitutor)
new GuessTypeParameters(project, JavaPsiFacade.getElementFactory(project), builder, substitutor)
.setupTypeElement(returnTypeElement, expectedTypes, context, targetClass);
}
PsiCodeBlock body = method.getBody();
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java
+2 -2
View File
@@ -182,7 +182,7 @@ public class CreatePropertyFromUsageFix extends CreateFromUsageBaseFix implement
protected void invokeImpl(PsiClass targetClass) {
PsiManager manager = myMethodCall.getManager();
final Project project = manager.getProject();
PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(manager.getProject());
boolean isStatic = false;
PsiExpression qualifierExpression = myMethodCall.getMethodExpression().getQualifierExpression();
@@ -283,7 +283,7 @@ public class CreatePropertyFromUsageFix extends CreateFromUsageBaseFix implement
CreatePropertyFromUsageFix.this.beforeTemplateFinished(aClass, field1);
return;
}
PsiElementFactory factory1 = JavaPsiFacade.getInstance(aClass.getProject()).getElementFactory();
PsiElementFactory factory1 = JavaPsiFacade.getElementFactory(aClass.getProject());
try {
PsiType type1 = factory1.createTypeFromText(fieldType, aClass);
try {
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java
+1 -1
View File
@@ -107,7 +107,7 @@ public class DeferFinalAssignmentFix implements IntentionAction {
List<PsiReferenceExpression> outerReferences = new ArrayList<>();
collectReferences(outerCodeBlock, variable, outerReferences);
PsiElementFactory factory = JavaPsiFacade.getInstance(variable.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(variable.getProject());
Project project = variable.getProject();
String tempName = suggestNewName(project, variable);
PsiDeclarationStatement tempVariableDeclaration = factory.createVariableDeclarationStatement(tempName, variable.getType(), null);
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GeneralizeCatchFix.java
+1 -1
View File
@@ -86,7 +86,7 @@ public class GeneralizeCatchFix implements IntentionAction {
@Override
public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
PsiElementFactory factory = JavaPsiFacade.getInstance(myElement.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(myElement.getProject());
PsiTypeElement type = factory.createTypeElement(myUnhandledException);
myCatchParameter.getTypeElement().replace(type);
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java
+1 -1
View File
@@ -136,7 +136,7 @@ public class GuessTypeParameters {
PsiSubstitutor substitutor = PsiSubstitutor.EMPTY;
while (currContext != null && !manager.areElementsEquivalent(currContext, targetClass)) {
PsiTypeParameter[] typeParameters = currContext.getTypeParameters();
substitutor = JavaPsiFacade.getInstance(project).getElementFactory().createRawSubstitutor(substitutor, typeParameters);
substitutor = JavaPsiFacade.getElementFactory(project).createRawSubstitutor(substitutor, typeParameters);
currContext = currContext.getContainingClass();
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java
+1 -1
View File
@@ -114,7 +114,7 @@ public class InitializeFinalFieldInConstructorFix implements IntentionAction {
}
final PsiManager psiManager = PsiManager.getInstance(project);
final PsiElementFactory factory = JavaPsiFacade.getInstance(psiManager.getProject()).getElementFactory();
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(psiManager.getProject());
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project);
final PsiExpressionStatement addedStatement = (PsiExpressionStatement)methodBody.add(codeStyleManager
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertConstructorCallFix.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class InsertConstructorCallFix implements IntentionAction, HighPriorityAc
@Override
public void invoke(@NotNull Project project, Editor editor, PsiFile file) {
PsiStatement superCall =
JavaPsiFacade.getInstance(myConstructor.getProject()).getElementFactory().createStatementFromText(myCall,null);
JavaPsiFacade.getElementFactory(myConstructor.getProject()).createStatementFromText(myCall,null);
PsiCodeBlock body = myConstructor.getBody();
PsiJavaToken lBrace = body.getLBrace();
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertMethodCallFix.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class InsertMethodCallFix implements IntentionAction, LowPriorityAction {
@Override
public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
PsiExpression methodExpression = myCall.getMethodExpression();
PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
String replacement = methodExpression.getText() + "." + myMethodName;
methodExpression.replace(factory.createExpressionFromText(replacement, methodExpression));
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertNewFix.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class InsertNewFix implements IntentionAction {
@Override
public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
PsiElementFactory factory = JavaPsiFacade.getInstance(myMethodCall.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(myMethodCall.getProject());
PsiNewExpression newExpression = (PsiNewExpression)factory.createExpressionFromText("new X()",null);
CommentTracker tracker = new CommentTracker();
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeClassInterfaceFix.java
+1 -1
View File
@@ -91,7 +91,7 @@ public class MakeClassInterfaceFix extends LocalQuickFixAndIntentionActionOnPsiE
private static void convertPsiClass(PsiClass aClass, final boolean makeInterface) throws IncorrectOperationException {
final IElementType lookFor = makeInterface? JavaTokenType.CLASS_KEYWORD : JavaTokenType.INTERFACE_KEYWORD;
final PsiKeyword replaceWith = JavaPsiFacade.getInstance(aClass.getProject()).getElementFactory().createKeyword(makeInterface? PsiKeyword.INTERFACE : PsiKeyword.CLASS);
final PsiKeyword replaceWith = JavaPsiFacade.getElementFactory(aClass.getProject()).createKeyword(makeInterface? PsiKeyword.INTERFACE : PsiKeyword.CLASS);
for (PsiElement psiElement : aClass.getChildren()) {
if (psiElement instanceof PsiKeyword) {
final PsiKeyword psiKeyword = (PsiKeyword)psiElement;
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java
+1 -1
View File
@@ -123,7 +123,7 @@ public class MethodParameterFix extends LocalQuickFixAndIntentionActionOnPsiElem
private ParameterInfoImpl[] getNewParametersInfo(PsiMethod method) throws IncorrectOperationException {
List<ParameterInfoImpl> result = new ArrayList<>();
PsiParameter[] parameters = method.getParameterList().getParameters();
PsiElementFactory factory = JavaPsiFacade.getInstance(method.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(method.getProject());
JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(method.getProject());
SuggestedNameInfo nameInfo = codeStyleManager.suggestVariableName(VariableKind.PARAMETER, null, null, myParameterType);
PsiParameter newParameter = factory.createParameter(nameInfo.names[0], myParameterType);
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnTypeFix.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class MethodReturnTypeFix extends LocalQuickFixAndIntentionActionOnPsiEle
final List<PsiMethod> affectedMethods = changeReturnType(myMethod, myReturnType);
PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
PsiReturnStatement statementToSelect = null;
if (!PsiType.VOID.equals(myReturnType)) {
final ReturnStatementAdder adder = new ReturnStatementAdder(factory, myReturnType);
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NegationBroadScopeFix.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class NegationBroadScopeFix implements IntentionAction {
PsiExpression operand = myPrefixExpression.getOperand();
PsiElement unnegated = myPrefixExpression.replace(operand);
PsiElement parent = unnegated.getParent();
PsiElementFactory factory = JavaPsiFacade.getInstance(file.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(file.getProject());
PsiPrefixExpression negated = (PsiPrefixExpression)factory.createExpressionFromText("!(xxx)", parent);
PsiParenthesizedExpression parentheses = (PsiParenthesizedExpression)negated.getOperand();
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceAddAllArrayToCollectionFix.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class ReplaceAddAllArrayToCollectionFix implements IntentionAction {
@Override
public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project);
final PsiExpression toReplace = elementFactory.createExpressionFromText(getCollectionsMethodCall(), myMethodCall);
JavaCodeStyleManager.getInstance(project).shortenClassReferences(myMethodCall.replace(toReplace));
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceIteratorForEachLoopWithIteratorForLoopFix.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class ReplaceIteratorForEachLoopWithIteratorForLoopFix implements Intenti
}
final PsiStatement forEachBody = myStatement.getBody();
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project);
final JavaCodeStyleManager javaStyleManager = JavaCodeStyleManager.getInstance(project);
final String name = javaStyleManager.suggestUniqueVariableName("it", myStatement, true);
PsiForStatement newForLoop = (PsiForStatement)elementFactory.createStatementFromText(
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceWithListAccessFix.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class ReplaceWithListAccessFix implements IntentionAction {
if (indexExpression == null) return;
final PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project);
final PsiElement parent = myArrayAccessExpression.getParent();
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReuseVariableDeclarationFix.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class ReuseVariableDeclarationFix implements IntentionAction {
}
PsiUtil.setModifierProperty(refVariable, PsiModifier.FINAL, false);
final PsiElementFactory factory = JavaPsiFacade.getInstance(myVariable.getProject()).getElementFactory();
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(myVariable.getProject());
final PsiElement statement = factory.createStatementFromText(myVariable.getName() + " = " + initializer.getText() + ";", null);
myVariable.getParent().replace(statement);
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java
+1 -1
View File
@@ -392,7 +392,7 @@ public class SimplifyBooleanExpressionFix extends LocalQuickFixOnPsiElement {
private static PsiExpression createExpression(final PsiManager psiManager, @NonNls String text) {
try {
return JavaPsiFacade.getInstance(psiManager.getProject()).getElementFactory().createExpressionFromText(text, null);
return JavaPsiFacade.getElementFactory(psiManager.getProject()).createExpressionFromText(text, null);
}
catch (IncorrectOperationException e) {
LOG.error(e);
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.java
+1 -1
View File
@@ -114,7 +114,7 @@ public class SurroundWithArrayFix extends PsiElementBaseIntentionAction {
@Override
public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException {
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project);
final PsiExpression expression = getExpression(element);
assert expression != null;
final PsiExpression toReplace = elementFactory.createExpressionFromText(getArrayCreation(expression), element);
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithQuotesAnnotationParameterValueFix.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class SurroundWithQuotesAnnotationParameterValueFix implements IntentionA
String newText = myValue.getText();
newText = StringUtil.unquoteString(newText);
newText = "\"" + newText + "\"";
PsiElement newToken = JavaPsiFacade.getInstance(project).getElementFactory().createExpressionFromText(newText, null);
PsiElement newToken = JavaPsiFacade.getElementFactory(project).createExpressionFromText(newText, null);
final PsiElement newElement = myValue.replace(newToken);
editor.getCaretModel().moveToOffset(newElement.getTextOffset() + newElement.getTextLength());
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java
+2 -2
View File
@@ -171,7 +171,7 @@ public class VariableAccessFromInnerClassFix implements IntentionAction {
variable.normalizeDeclaration();
PsiType type = variable.getType();
PsiElementFactory factory = JavaPsiFacade.getInstance(context.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(context.getProject());
PsiType newType = type.createArrayType();
PsiDeclarationStatement variableDeclarationStatement;
@@ -205,7 +205,7 @@ public class VariableAccessFromInnerClassFix implements IntentionAction {
private static void copyToFinal(PsiVariable variable, PsiElement context) throws IncorrectOperationException {
PsiManager psiManager = context.getManager();
final Project project = psiManager.getProject();
PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
PsiExpression initializer = factory.createExpressionFromText(variable.getName(), context);
String newName = suggestNewName(project, variable);
PsiType type = variable.getType();
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java
+1 -1
View File
@@ -100,7 +100,7 @@ public class VariableTypeFix extends LocalQuickFixAndIntentionActionOnPsiElement
final PsiTypeElement typeElement = myVariable.getTypeElement();
LOG.assertTrue(typeElement != null, myVariable.getClass());
final PsiTypeElement newTypeElement =
JavaPsiFacade.getInstance(file.getProject()).getElementFactory().createTypeElement(getReturnType());
JavaPsiFacade.getElementFactory(file.getProject()).createTypeElement(getReturnType());
typeElement.replace(newTypeElement);
JavaCodeStyleManager.getInstance(project).shortenClassReferences(myVariable);
UndoUtil.markPsiFileForUndo(file);
java/java-impl/src/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class DeclarationJoinLinesHandler implements JoinLinesHandlerDelegate {
return -1;
}
final PsiElementFactory factory = JavaPsiFacade.getInstance(psiManager.getProject()).getElementFactory();
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(psiManager.getProject());
final PsiExpression initializerExpression = getInitializerExpression(var, assignment);
if (initializerExpression == null) return -1;
java/java-impl/src/com/intellij/codeInsight/editorActions/moveUpDown/StatementMover.java
+1 -1
View File
@@ -44,7 +44,7 @@ class StatementMover extends LineMover {
if (document.getText().charAt(endOffset - 1) == '\n') endOffset--;
RangeMarker lineRangeMarker = document.createRangeMarker(startOffset, endOffset);
PsiElementFactory factory = JavaPsiFacade.getInstance(statement.getProject()).getElementFactory();
PsiElementFactory factory = JavaPsiFacade.getElementFactory(statement.getProject());
PsiCodeBlock codeBlock = factory.createCodeBlock();
codeBlock.add(statement);
PsiBlockStatement blockStatement = (PsiBlockStatement)factory.createStatementFromText("{}", statement);
java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java
+2 -2
View File
@@ -160,7 +160,7 @@ public class GenerateDelegateHandler implements LanguageCodeInsightActionHandler
call.append(");");
final PsiManager psiManager = method.getManager();
PsiStatement stmt = JavaPsiFacade.getInstance(psiManager.getProject()).getElementFactory().createStatementFromText(call.toString(), method);
PsiStatement stmt = JavaPsiFacade.getElementFactory(psiManager.getProject()).createStatementFromText(call.toString(), method);
stmt = (PsiStatement)CodeStyleManager.getInstance(psiManager.getProject()).reformat(stmt);
method.getBody().add(stmt);
@@ -185,7 +185,7 @@ public class GenerateDelegateHandler implements LanguageCodeInsightActionHandler
private void clearMethod(PsiMethod method) throws IncorrectOperationException {
LOG.assertTrue(!method.isPhysical());
PsiCodeBlock codeBlock = JavaPsiFacade.getInstance(method.getProject()).getElementFactory().createCodeBlock();
PsiCodeBlock codeBlock = JavaPsiFacade.getElementFactory(method.getProject()).createCodeBlock();
if (method.getBody() != null) {
method.getBody().replace(codeBlock);
}
java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHelper.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class GenerateEqualsHelper implements Runnable {
ContainerUtil.addAll(myNonNullSet, nonNullFields);
final PsiManager manager = PsiManager.getInstance(project);
myFactory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
myFactory = JavaPsiFacade.getElementFactory(manager.getProject());
mySuperHasHashCode = superMethodExists(getHashCodeSignature());
myCodeStyleManager = CodeStyleManager.getInstance(manager.getProject());

Some files were not shown because too many files have changed in this diff Show More