From 854bc6ae7b3c818c09379edc3d8c421deada3a98 Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Tue, 8 Feb 2011 14:05:04 +0300 Subject: [PATCH 1/4] Rename. --- .../jetbrains/python/refactoring/RefactoringProvider.java | 4 ++-- .../refactoring/introduce/field/FieldIntroduceHandler.java | 4 ++-- ...ntroduceHandler.java => PyIntroduceVariableHandler.java} | 4 ++-- .../python/refactoring/PyIntroduceVariableTest.java | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) rename python/src/com/jetbrains/python/refactoring/introduce/variable/{VariableIntroduceHandler.java => PyIntroduceVariableHandler.java} (93%) diff --git a/python/src/com/jetbrains/python/refactoring/RefactoringProvider.java b/python/src/com/jetbrains/python/refactoring/RefactoringProvider.java index f948d29739a6..c0b317bc853d 100644 --- a/python/src/com/jetbrains/python/refactoring/RefactoringProvider.java +++ b/python/src/com/jetbrains/python/refactoring/RefactoringProvider.java @@ -13,7 +13,7 @@ import com.jetbrains.python.refactoring.classes.pushDown.PyPushDownHandler; import com.jetbrains.python.refactoring.extractmethod.PyExtractMethodHandler; import com.jetbrains.python.refactoring.introduce.constant.ConstantIntroduceHandler; import com.jetbrains.python.refactoring.introduce.field.FieldIntroduceHandler; -import com.jetbrains.python.refactoring.introduce.variable.VariableIntroduceHandler; +import com.jetbrains.python.refactoring.introduce.variable.PyIntroduceVariableHandler; /** * @author Alexey.Ivanov @@ -21,7 +21,7 @@ import com.jetbrains.python.refactoring.introduce.variable.VariableIntroduceHand public class RefactoringProvider extends RefactoringSupportProvider { @Override public RefactoringActionHandler getIntroduceVariableHandler() { - return new VariableIntroduceHandler(); + return new PyIntroduceVariableHandler(); } @Override diff --git a/python/src/com/jetbrains/python/refactoring/introduce/field/FieldIntroduceHandler.java b/python/src/com/jetbrains/python/refactoring/introduce/field/FieldIntroduceHandler.java index a4c244cdd780..9e9a5daa55dc 100644 --- a/python/src/com/jetbrains/python/refactoring/introduce/field/FieldIntroduceHandler.java +++ b/python/src/com/jetbrains/python/refactoring/introduce/field/FieldIntroduceHandler.java @@ -17,7 +17,7 @@ import com.jetbrains.python.actions.AddFieldQuickFix; import com.jetbrains.python.psi.*; import com.jetbrains.python.psi.impl.PyFunctionBuilder; import com.jetbrains.python.refactoring.introduce.IntroduceHandler; -import com.jetbrains.python.refactoring.introduce.variable.VariableIntroduceHandler; +import com.jetbrains.python.refactoring.introduce.variable.PyIntroduceVariableHandler; import com.jetbrains.python.testing.PythonUnitTestUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -83,7 +83,7 @@ public class FieldIntroduceHandler extends IntroduceHandler { } else if (initInConstructor == InitPlace.SET_UP) { return addFieldToSetUp(project, clazz, declaration); } - return VariableIntroduceHandler.doIntroduceVariable(expression, declaration, occurrences, replaceAll); + return PyIntroduceVariableHandler.doIntroduceVariable(expression, declaration, occurrences, replaceAll); } private boolean inConstructor(@Nullable PyClass clazz, @NotNull PsiElement expression) { diff --git a/python/src/com/jetbrains/python/refactoring/introduce/variable/VariableIntroduceHandler.java b/python/src/com/jetbrains/python/refactoring/introduce/variable/PyIntroduceVariableHandler.java similarity index 93% rename from python/src/com/jetbrains/python/refactoring/introduce/variable/VariableIntroduceHandler.java rename to python/src/com/jetbrains/python/refactoring/introduce/variable/PyIntroduceVariableHandler.java index 9085ca011808..af3a4b6dbe90 100644 --- a/python/src/com/jetbrains/python/refactoring/introduce/variable/VariableIntroduceHandler.java +++ b/python/src/com/jetbrains/python/refactoring/introduce/variable/PyIntroduceVariableHandler.java @@ -12,8 +12,8 @@ import java.util.List; /** * @author Alexey.Ivanov */ -public class VariableIntroduceHandler extends IntroduceHandler { - public VariableIntroduceHandler() { +public class PyIntroduceVariableHandler extends IntroduceHandler { + public PyIntroduceVariableHandler() { super(new VariableValidator(), PyBundle.message("refactoring.introduce.variable.dialog.title")); } diff --git a/python/testSrc/com/jetbrains/python/refactoring/PyIntroduceVariableTest.java b/python/testSrc/com/jetbrains/python/refactoring/PyIntroduceVariableTest.java index 4dd4668a2be0..ba1cf2f7dc88 100644 --- a/python/testSrc/com/jetbrains/python/refactoring/PyIntroduceVariableTest.java +++ b/python/testSrc/com/jetbrains/python/refactoring/PyIntroduceVariableTest.java @@ -4,7 +4,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.jetbrains.python.fixtures.PyLightFixtureTestCase; import com.jetbrains.python.psi.PyCallExpression; import com.jetbrains.python.psi.PyExpression; -import com.jetbrains.python.refactoring.introduce.variable.VariableIntroduceHandler; +import com.jetbrains.python.refactoring.introduce.variable.PyIntroduceVariableHandler; import java.util.Collection; @@ -42,7 +42,7 @@ public class PyIntroduceVariableTest extends PyLightFixtureTestCase { private void doTestSuggestions(Class parentClass, String... expectedNames) { myFixture.configureByFile("/refactoring/introduceVariable/" + getTestName(true) + ".py"); - VariableIntroduceHandler handler = new VariableIntroduceHandler(); + PyIntroduceVariableHandler handler = new PyIntroduceVariableHandler(); PyExpression expr = PsiTreeUtil.getParentOfType(myFixture.getFile().findElementAt(myFixture.getEditor().getCaretModel().getOffset()), parentClass); final Collection names = handler.getSuggestedNames(expr); for (String expectedName : expectedNames) { @@ -52,7 +52,7 @@ public class PyIntroduceVariableTest extends PyLightFixtureTestCase { private void doTest() { myFixture.configureByFile("/refactoring/introduceVariable/" + getTestName(true) + ".py"); - VariableIntroduceHandler handler = new VariableIntroduceHandler(); + PyIntroduceVariableHandler handler = new PyIntroduceVariableHandler(); handler.performAction(myFixture.getProject(), myFixture.getEditor(), myFixture.getFile(), "a", true, false, false); myFixture.checkResultByFile("/refactoring/introduceVariable/" + getTestName(true) + ".after.py"); } From df696400fea2ab0ab65ec0365b930ae12115571e Mon Sep 17 00:00:00 2001 From: Oleg Shpynov Date: Mon, 14 Feb 2011 18:32:24 +0300 Subject: [PATCH 2/4] Extract haml plugin and haml common parts for RubyMine build --- python/build/pycharm_build.gant | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant index 08f9065a0be1..e919ccd5d8b6 100644 --- a/python/build/pycharm_build.gant +++ b/python/build/pycharm_build.gant @@ -1,7 +1,7 @@ import org.jetbrains.jps.Jps +import org.jetbrains.jps.LayoutInfo import org.jetbrains.jps.Module import static org.jetbrains.jps.idea.IdeaProjectLoader.guessHome -import org.jetbrains.jps.LayoutInfo includeTargets << new File("${guessHome(this as Script)}/community/build/scripts/utils.gant") includeTargets << new File("${guessHome(this)}/build/scripts/libLicenses.gant") @@ -24,7 +24,9 @@ setProperty("pluginFilter", [ "JSInspections", "JSIntentionPowerPack", "SpellChecker", "spellchecker", - "less", "sass", "haml", + "less", "sass", + "yaml", "yaml-plugin", + "haml", "haml-plugin", "hg4idea", "tasks", "tasks-core", "tasks-api", "jira-connector", "github", @@ -48,7 +50,6 @@ private List platformImplementationModules() { "xml", "lvcs-impl", "images", - "yaml", "dom-impl" ] } From 529f620b3ba4a74b714db628c3e9a7aac9618e48 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 14 Feb 2011 13:36:39 +0100 Subject: [PATCH 3/4] do not ignore .pyc in generator --- python/helpers/generator3.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/helpers/generator3.py b/python/helpers/generator3.py index c1fa09832227..52b58bf7dffb 100644 --- a/python/helpers/generator3.py +++ b/python/helpers/generator3.py @@ -1922,8 +1922,9 @@ class ModuleRedeclarator(object): def hasRegularPythonExt(name): - "Does name end with .py or .pyc?" - return name.endswith(".py") or name.endswith(".pyc") + "Does name end with .py?" + return name.endswith(".py") # Note that the standard library on MacOS X 10.6 is shipped only as .pyc files, so we need to + # have them processed by the generator in order to have any code insight for the standard library. def buildOutputName(subdir, name): global action From 529e2272c34f7e1818866fca4dd1dccf299fe619 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 14 Feb 2011 18:43:54 +0100 Subject: [PATCH 4/4] branch number 106 --- python/build/pycharm_build.gant | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant index e919ccd5d8b6..5817cbbdebdd 100644 --- a/python/build/pycharm_build.gant +++ b/python/build/pycharm_build.gant @@ -7,7 +7,7 @@ includeTargets << new File("${guessHome(this as Script)}/community/build/scripts includeTargets << new File("${guessHome(this)}/build/scripts/libLicenses.gant") includeTool << Jps -requireProperty("buildNumber", requireProperty("build.number", "104.SNAPSHOT")) +requireProperty("buildNumber", requireProperty("build.number", "106.SNAPSHOT")) setProperty("ch", "$home/community") setProperty("dryRun", false)