azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: add missing static imports for PsiPackage.JetPsiFactory

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-07-14 21:49:04 +04:00
parent ee036770c3
commit fc164d5ca0
10 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionImpl.java
+3 -1
View File
@@ -22,6 +22,8 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetNodeType;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
public abstract class JetExpressionImpl extends JetElementImpl implements JetExpression {
public JetExpressionImpl(@NotNull ASTNode node) {
super(node);
@@ -46,7 +48,7 @@ public abstract class JetExpressionImpl extends JetElementImpl implements JetExp
PsiElement parent = getParent();
if (parent instanceof JetExpression && newElement instanceof JetExpression &&
JetPsiUtil.areParenthesesNecessary((JetExpression) newElement, this, (JetExpression) parent)) {
return super.replace(PsiPackage.JetPsiFactory(this).createExpression("(" + newElement.getText() + ")"));
return super.replace(JetPsiFactory(this).createExpression("(" + newElement.getText() + ")"));
}
return super.replace(newElement);
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionImplStub.java
+3 -1
View File
@@ -23,6 +23,8 @@ import com.intellij.psi.stubs.StubElement;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
public abstract class JetExpressionImplStub<T extends StubElement> extends JetElementImplStub<T> implements JetExpression {
public JetExpressionImplStub(@NotNull T stub, @NotNull IStubElementType nodeType) {
super(stub, nodeType);
@@ -44,7 +46,7 @@ public abstract class JetExpressionImplStub<T extends StubElement> extends JetEl
PsiElement parent = getParent();
if (parent instanceof JetExpression && newElement instanceof JetExpression &&
JetPsiUtil.areParenthesesNecessary((JetExpression) newElement, this, (JetExpression) parent)) {
return super.replace(PsiPackage.JetPsiFactory(this).createExpression("(" + newElement.getText() + ")"));
return super.replace(JetPsiFactory(this).createExpression("(" + newElement.getText() + ")"));
}
return super.replace(newElement);
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclarationName.java
+3 -1
View File
@@ -26,6 +26,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lexer.JetTokens;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
public class JetObjectDeclarationName extends JetExpressionImpl {
public JetObjectDeclarationName(@NotNull ASTNode node) {
super(node);
@@ -49,7 +51,7 @@ public class JetObjectDeclarationName extends JetExpressionImpl {
}
public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException {
return getNameIdentifier().replace(PsiPackage.JetPsiFactory(this).createNameIdentifier(name));
return getNameIdentifier().replace(JetPsiFactory(this).createNameIdentifier(name));
}
@Override
idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java
+7 -2
View File
@@ -33,7 +33,10 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassKind;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.Modality;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetClassBody;
import org.jetbrains.jet.lang.psi.JetNamedFunction;
import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.plugin.JetBundle;
@@ -45,6 +48,8 @@ import javax.swing.*;
import java.util.ArrayList;
import java.util.List;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
/**
* Changes method signature to one of provided signatures.
* Based on {@link JetAddImportAction}
@@ -82,7 +87,7 @@ public class JetAddFunctionToClassifierAction implements QuestionAction {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
JetPsiFactory psiFactory = PsiPackage.JetPsiFactory(classifierDeclaration);
JetPsiFactory psiFactory = JetPsiFactory(classifierDeclaration);
JetClassBody body = classifierDeclaration.getBody();
if (body == null) {
PsiElement whitespaceBefore = classifierDeclaration.add(psiFactory.createWhiteSpace());
idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java
+3 -2
View File
@@ -31,7 +31,6 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetNamedFunction;
import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.lang.psi.PsiPackage;
import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils;
import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
@@ -41,6 +40,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
/**
* Changes method signature to one of provided signatures.
* Based on {@link JetAddImportAction}
@@ -126,7 +127,7 @@ public class JetChangeFunctionSignatureAction implements QuestionAction {
PsiDocumentManager.getInstance(project).commitAllDocuments();
final JetPsiFactory psiFactory = PsiPackage.JetPsiFactory(element);
final JetPsiFactory psiFactory = JetPsiFactory(element);
CommandProcessor.getInstance().executeCommand(project, new Runnable() {
@Override
public void run() {
idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
+3 -1
View File
@@ -51,6 +51,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
@NotNull
@Override
@@ -264,7 +266,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
}
private static void addTypeAnnotationSilently(Project project, JetNamedDeclaration namedDeclaration, PsiElement anchor) {
JetPsiFactory psiFactory = PsiPackage.JetPsiFactory(namedDeclaration);
JetPsiFactory psiFactory = JetPsiFactory(namedDeclaration);
namedDeclaration.addAfter(psiFactory.createType("Any"), anchor);
namedDeclaration.addAfter(psiFactory.createColon(), anchor);
}
idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java
+2 -1
View File
@@ -42,6 +42,7 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import java.util.List;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.jet.lang.resolve.BindingContext.DECLARATION_TO_DESCRIPTOR;
public class ConvertMemberToExtension extends BaseIntentionAction {
@@ -114,7 +115,7 @@ public class ConvertMemberToExtension extends BaseIntentionAction {
(returnTypeRef != null ? ": " + returnTypeRef.getText() : "") +
body(member);
JetPsiFactory psiFactory = PsiPackage.JetPsiFactory(member);
JetPsiFactory psiFactory = JetPsiFactory(member);
JetDeclaration extension = psiFactory.<JetDeclaration>createDeclaration(extensionText);
PsiElement added = file.addAfter(extension, outermostParent);
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java
+3 -1
View File
@@ -45,6 +45,8 @@ import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.LinkedList;
import java.util.List;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
public class ChangeVariableTypeFix extends JetIntentionAction<JetVariableDeclaration> {
private final static Logger LOG = Logger.getInstance(ChangeVariableTypeFix.class);
@@ -83,7 +85,7 @@ public class ChangeVariableTypeFix extends JetIntentionAction<JetVariableDeclara
SpecifyTypeExplicitlyAction.removeTypeAnnotation(element);
PsiElement nameIdentifier = element.getNameIdentifier();
assert nameIdentifier != null : "ChangeVariableTypeFix applied to variable without name";
JetPsiFactory psiFactory = PsiPackage.JetPsiFactory(file);
JetPsiFactory psiFactory = JetPsiFactory(file);
element.addAfter(psiFactory.createType(renderedType), nameIdentifier);
element.addAfter(psiFactory.createColon(), nameIdentifier);
idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java
+3 -1
View File
@@ -24,6 +24,8 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.plugin.JetBundle;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
public abstract class ReplaceOperationInBinaryExpressionFix<T extends JetExpression> extends JetIntentionAction<T> {
private final String operation;
@@ -44,7 +46,7 @@ public abstract class ReplaceOperationInBinaryExpressionFix<T extends JetExpress
JetExpression left = ((JetBinaryExpressionWithTypeRHS) element).getLeft();
JetTypeReference right = ((JetBinaryExpressionWithTypeRHS) element).getRight();
if (right != null) {
JetExpression expression = PsiPackage.JetPsiFactory(file).createExpression(left.getText() + operation + right.getText());
JetExpression expression = JetPsiFactory(file).createExpression(left.getText() + operation + right.getText());
element.replace(expression);
}
}
idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinChangePropertyActions.java
+3 -3
View File
@@ -17,10 +17,10 @@
package org.jetbrains.jet.plugin.refactoring.introduce.introduceVariable;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.project.Project;
import org.jetbrains.jet.lang.psi.JetProperty;
import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.lang.psi.PsiPackage;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
public class KotlinChangePropertyActions {
private KotlinChangePropertyActions() {
@@ -28,7 +28,7 @@ public class KotlinChangePropertyActions {
public static void declareValueOrVariable(boolean isVariable, JetProperty property) {
ASTNode node;
JetPsiFactory psiFactory = PsiPackage.JetPsiFactory(property);
JetPsiFactory psiFactory = JetPsiFactory(property);
if (isVariable) {
node = psiFactory.createVarNode();
}