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

Rewrite JetPsiFactory to kotlin, make project a property

Browse Source 
Instead of passing to every function
All static methods are now member functions
This commit is contained in:
Pavel V. Talanov
2014-07-14 18:59:56 +04:00
parent 307522ddd2
commit 7269e383cf
147 changed files with 905 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java
+1
View File
@@ -30,6 +30,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.PsiPackage;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.usageView.UsageInfo;
idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt
+3 -4
View File
@@ -68,15 +68,14 @@ private fun JavaCodeInsightTestFixture.configureByCodeFragment(filePath: String)
private fun createCodeFragment(filePath: String, contextElement: PsiElement): JetCodeFragment {
val fileForFragment = File(filePath + ".fragment")
val codeFragmentText = FileUtil.loadFile(fileForFragment, true).trim()
val psiFactory = JetPsiFactory(contextElement.getProject())
if (fileForFragment.readLines().size == 1) {
return JetPsiFactory.createExpressionCodeFragment(
contextElement.getProject(),
return psiFactory.createExpressionCodeFragment(
codeFragmentText,
KotlinCodeFragmentFactory.getContextElement(contextElement)
)
}
return JetPsiFactory.createBlockCodeFragment(
contextElement.getProject(),
return psiFactory.createBlockCodeFragment(
codeFragmentText,
KotlinCodeFragmentFactory.getContextElement(contextElement)
)
idea/tests/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureTest.java
+2 -2
View File
@@ -28,7 +28,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.Visibilities;
import org.jetbrains.jet.lang.psi.JetElement;
import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.plugin.KotlinCodeInsightTestCase;
@@ -42,6 +41,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.jet.plugin.refactoring.changeSignature.ChangeSignaturePackage.getChangeSignatureDialog;
public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
@@ -102,7 +102,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
JetChangeInfo changeInfo = getChangeInfo();
changeInfo.setNewVisibility(Visibilities.PROTECTED);
JetParameterInfo newParameter = new JetParameterInfo(-1, "x", KotlinBuiltIns.getInstance().getAnyType(),
null, JetPsiFactory.createValOrVarNode(getProject(), "val"));
null, JetPsiFactory(getProject()).createValOrVarNode("val"));
newParameter.setDefaultValueText("12");
changeInfo.addParameter(newParameter);
doTest(changeInfo);
idea/tests/org/jetbrains/jet/psi/AbstractJetPsiMatcherTest.java
+8 -4
View File
@@ -29,6 +29,8 @@ import org.jetbrains.jet.plugin.util.JetPsiMatcher;
import java.io.File;
import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory;
public abstract class AbstractJetPsiMatcherTest extends JetLiteFixture {
public void doTestExpressions(@NotNull String path) throws Exception {
String fileText = FileUtil.loadFile(new File(path), true);
@@ -36,8 +38,9 @@ public abstract class AbstractJetPsiMatcherTest extends JetLiteFixture {
boolean equalityExpected = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// NOT_EQUAL") == null;
JetExpression expr = JetPsiFactory.createExpression(getProject(), fileText);
JetExpression expr2 = JetPsiFactory.createExpression(getProject(), fileText2);
JetPsiFactory psiFactory = JetPsiFactory(getProject());
JetExpression expr = psiFactory.createExpression(fileText);
JetExpression expr2 = psiFactory.createExpression(fileText2);
assertTrue(
"JetPsiMatcher.checkElementMatch() should return " + equalityExpected,
@@ -51,8 +54,9 @@ public abstract class AbstractJetPsiMatcherTest extends JetLiteFixture {
boolean equalityExpected = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// NOT_EQUAL") == null;
JetTypeReference typeRef = JetPsiFactory.createProperty(getProject(), fileText).getTypeRef();
JetTypeReference typeRef2 = JetPsiFactory.createProperty(getProject(), fileText2).getTypeRef();
JetPsiFactory psiFactory = JetPsiFactory(getProject());
JetTypeReference typeRef = psiFactory.createProperty(fileText).getTypeRef();
JetTypeReference typeRef2 = psiFactory.createProperty(fileText2).getTypeRef();
assertNotNull(typeRef);
assertNotNull(typeRef2);