From aea523f98a483846d2860b6a44b92a4119dd9b9f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 26 Feb 2014 15:31:38 +0100 Subject: [PATCH] Cleanup (deprecated code; formatting) --- .../psi/impl/PsiElementFactoryImpl.java | 37 ++++++++++--------- .../TypeAnnotations.after.java | 6 +-- .../introduceVariable/TypeAnnotations.java | 6 +-- .../refactoring/IntroduceVariableTest.java | 12 +++--- .../MockIntroduceVariableHandler.java | 27 +++++++++++--- 5 files changed, 52 insertions(+), 36 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java index 00b27357fc17..b427f91648ca 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java @@ -543,7 +543,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps @NotNull @Override public PsiKeyword createKeyword(@NotNull final String text) throws IncorrectOperationException { - if (!JavaPsiFacade.getInstance(myManager.getProject()).getNameHelper().isKeyword(text)) { + if (!PsiNameHelper.getInstance(myManager.getProject()).isKeyword(text)) { throw new IncorrectOperationException("\"" + text + "\" is not a keyword."); } return new LightKeyword(myManager, text); @@ -579,7 +579,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps if (packageName.isEmpty()) { throw new IncorrectOperationException("Cannot create import statement for default package."); } - if (!JavaPsiFacade.getInstance(myManager.getProject()).getNameHelper().isQualifiedName(packageName)) { + if (!PsiNameHelper.getInstance(myManager.getProject()).isQualifiedName(packageName)) { throw new IncorrectOperationException("Incorrect package name: \"" + packageName + "\"."); } @@ -590,30 +590,38 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps @NotNull @Override - public PsiDeclarationStatement createVariableDeclarationStatement(@NotNull final String name, - @NotNull final PsiType type, - final PsiExpression initializer) throws IncorrectOperationException { - if (!JavaPsiFacade.getInstance(myManager.getProject()).getNameHelper().isIdentifier(name)) { + public PsiDeclarationStatement createVariableDeclarationStatement(@NotNull String name, + @NotNull PsiType type, + @Nullable PsiExpression initializer) throws IncorrectOperationException { + if (!isIdentifier(name)) { throw new IncorrectOperationException("\"" + name + "\" is not an identifier."); } if (PsiType.NULL.equals(type)) { throw new IncorrectOperationException("Cannot create variable with type \"null\"."); } - @NonNls final String text = "X " + name + (initializer != null ? " = x" : "") + ";"; + String text = "X " + name + (initializer != null ? " = x" : "") + ";"; + PsiDeclarationStatement statement = (PsiDeclarationStatement)createStatementFromText(text, null); - final PsiDeclarationStatement statement = (PsiDeclarationStatement)createStatementFromText(text, null); - final PsiVariable variable = (PsiVariable)statement.getDeclaredElements()[0]; + PsiVariable variable = (PsiVariable)statement.getDeclaredElements()[0]; replace(variable.getTypeElement(), createTypeElement(type), text); - PsiUtil.setModifierProperty(variable, PsiModifier.FINAL, - JavaCodeStyleSettingsFacade.getInstance(myManager.getProject()).isGenerateFinalLocals()); + + boolean generateFinalLocals = JavaCodeStyleSettingsFacade.getInstance(myManager.getProject()).isGenerateFinalLocals(); + PsiUtil.setModifierProperty(variable, PsiModifier.FINAL, generateFinalLocals); + if (initializer != null) { replace(variable.getInitializer(), initializer, text); } + GeneratedMarkerVisitor.markGenerated(statement); return statement; } + private static void replace(@Nullable PsiElement original, @NotNull PsiElement replacement, @NotNull String message) { + assert original != null : message; + original.replace(replacement); + } + @NotNull @Override public PsiDocTag createParamTag(@NotNull final String parameterName, @NonNls final String description) throws IncorrectOperationException { @@ -718,11 +726,6 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps return statements[0]; } - private static void replace(final PsiElement original, final PsiElement replacement, final String message) { - assert original != null : message; - original.replace(replacement); - } - private static final JavaParserUtil.ParserWrapper CATCH_SECTION = new JavaParserUtil.ParserWrapper() { @Override public void parse(final PsiBuilder builder) { @@ -782,6 +785,6 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps } private boolean isIdentifier(@NotNull String name) { - return JavaPsiFacade.getInstance(myManager.getProject()).getNameHelper().isIdentifier(name); + return PsiNameHelper.getInstance(myManager.getProject()).isIdentifier(name); } } diff --git a/java/java-tests/testData/refactoring/introduceVariable/TypeAnnotations.after.java b/java/java-tests/testData/refactoring/introduceVariable/TypeAnnotations.after.java index 13598a7525ca..965568ae15f8 100644 --- a/java/java-tests/testData/refactoring/introduceVariable/TypeAnnotations.after.java +++ b/java/java-tests/testData/refactoring/introduceVariable/TypeAnnotations.after.java @@ -1,9 +1,7 @@ import java.lang.annotation.*; -@Target({ElementType.TYPE_USE/*, ElementType.TYPE*/}) -@interface TA { - -} +@Target({ElementType.TYPE_USE}) +@interface TA { } class C { void foo () { diff --git a/java/java-tests/testData/refactoring/introduceVariable/TypeAnnotations.java b/java/java-tests/testData/refactoring/introduceVariable/TypeAnnotations.java index bba9d94fa887..7f7db71cdd96 100644 --- a/java/java-tests/testData/refactoring/introduceVariable/TypeAnnotations.java +++ b/java/java-tests/testData/refactoring/introduceVariable/TypeAnnotations.java @@ -1,9 +1,7 @@ import java.lang.annotation.*; -@Target({ElementType.TYPE_USE/*, ElementType.TYPE*/}) -@interface TA { - -} +@Target({ElementType.TYPE_USE}) +@interface TA { } class C { void foo () { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java index 09714d4b153e..fcadcd170588 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -28,7 +28,6 @@ import com.intellij.refactoring.introduceVariable.IntroduceVariableSettings; import com.intellij.refactoring.ui.TypeSelectorManagerImpl; import com.intellij.testFramework.LightCodeInsightTestCase; import com.intellij.util.containers.MultiMap; -import junit.framework.Assert; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -302,6 +301,7 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase { public void testNonExpression() throws Exception { doTest(new MockIntroduceVariableHandler("sum", true, true, false, "int")); } + public void testTypeAnnotations() throws Exception { doTest(new MockIntroduceVariableHandler("y1", true, false, false, "@TA C")); } @@ -362,8 +362,8 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase { InputValidator validator, PsiElement anchor, final OccurrencesChooser.ReplaceChoice replaceChoice) { final PsiType type = typeSelectorManager.getDefaultType(); - Assert.assertTrue(type.getPresentableText(), type.getPresentableText().equals(expectedTypeName)); - Assert.assertEquals("path", IntroduceVariableBase.getSuggestedName(type, expr).names[0]); + assertTrue(type.getPresentableText(), type.getPresentableText().equals(expectedTypeName)); + assertEquals("path", IntroduceVariableBase.getSuggestedName(type, expr).names[0]); return super.getSettings(project, editor, expr, occurrences, typeSelectorManager, declareFinalIfAll, anyAssignmentLHS, validator, anchor, replaceChoice); } @@ -381,7 +381,7 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase { InputValidator validator, PsiElement anchor, final OccurrencesChooser.ReplaceChoice replaceChoice) { final PsiType type = typeSelectorManager.getDefaultType(); - Assert.assertTrue(type.getPresentableText(), type.getPresentableText().equals("B")); + assertTrue(type.getPresentableText(), type.getPresentableText().equals("B")); return super.getSettings(project, editor, expr, occurrences, typeSelectorManager, declareFinalIfAll, anyAssignmentLHS, validator, anchor, replaceChoice); } @@ -428,7 +428,7 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase { } public void testLambdaExpr() throws Exception { - + doTest(new MockIntroduceVariableHandler("c", false, false, false, "SAM")); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MockIntroduceVariableHandler.java b/java/java-tests/testSrc/com/intellij/refactoring/MockIntroduceVariableHandler.java index 008f3f93a53f..9de7ab87c6d6 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MockIntroduceVariableHandler.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MockIntroduceVariableHandler.java @@ -1,17 +1,35 @@ +/* + * Copyright 2000-2014 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; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; -import com.intellij.psi.*; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiExpression; +import com.intellij.psi.PsiType; import com.intellij.refactoring.introduce.inplace.OccurrencesChooser; import com.intellij.refactoring.introduceVariable.InputValidator; import com.intellij.refactoring.introduceVariable.IntroduceVariableBase; import com.intellij.refactoring.introduceVariable.IntroduceVariableSettings; import com.intellij.refactoring.ui.TypeSelectorManagerImpl; import com.intellij.util.containers.MultiMap; -import junit.framework.Assert; import org.jetbrains.annotations.NonNls; +import static org.junit.Assert.assertTrue; + /** * @author dsl */ @@ -26,7 +44,6 @@ class MockIntroduceVariableHandler extends IntroduceVariableBase { public MockIntroduceVariableHandler(@NonNls final String name, final boolean replaceAll, final boolean declareFinal, final boolean replaceLValues, @NonNls final String expectedTypeCanonicalName) { - this(name, replaceAll, declareFinal, replaceLValues, expectedTypeCanonicalName, false); } @@ -52,7 +69,7 @@ class MockIntroduceVariableHandler extends IntroduceVariableBase { PsiElement anchor, final OccurrencesChooser.ReplaceChoice replaceChoice) { final PsiType type = myLookForType ? findType(typeSelectorManager.getTypesForAll(), typeSelectorManager.getDefaultType()) : typeSelectorManager.getDefaultType(); - Assert.assertTrue(type.getInternalCanonicalText(), type.getInternalCanonicalText().equals(myExpectedTypeCanonicalName)); + assertTrue(type.getInternalCanonicalText(), type.getInternalCanonicalText().equals(myExpectedTypeCanonicalName)); IntroduceVariableSettings introduceVariableSettings = new IntroduceVariableSettings() { @Override public String getEnteredName() { @@ -90,7 +107,7 @@ class MockIntroduceVariableHandler extends IntroduceVariableBase { } protected void assertValidationResult(final boolean validationResult) { - Assert.assertTrue(validationResult); + assertTrue(validationResult); } @Override