diff --git a/python/src/com/jetbrains/python/PyBundle.properties b/python/src/com/jetbrains/python/PyBundle.properties index 1c97f3f02175..a33392b75cf6 100644 --- a/python/src/com/jetbrains/python/PyBundle.properties +++ b/python/src/com/jetbrains/python/PyBundle.properties @@ -971,6 +971,12 @@ windowWithActions.closeWindow=Close window # "Stop" button title windowWithActions.stopProcess=Stop currently running process +formatter.imports.panel.title=Imports +formatter.imports.panel.optimize.imports=Optimize Imports +formatter.imports.panel.sort.alphabetically=Sort import statements alphabetically +formatter.imports.panel.sort.names.in.from.imports=Sort names in "from ... import ..." imports +formatter.imports.panel.join.from.imports.with.same.source=Join "from ... import ..." from the same source + formatter.panel.dict.alignment.do.not.align=Do not align formatter.panel.dict.alignment.align.on.colon=Align on colon formatter.panel.dict.alignment.align.on.value=Align on value diff --git a/python/src/com/jetbrains/python/formatter/PyImportsCodeStylePanel.form b/python/src/com/jetbrains/python/formatter/PyImportsCodeStylePanel.form index e4395d2e21cd..ca48ee06f690 100644 --- a/python/src/com/jetbrains/python/formatter/PyImportsCodeStylePanel.form +++ b/python/src/com/jetbrains/python/formatter/PyImportsCodeStylePanel.form @@ -22,14 +22,14 @@ - + - + @@ -37,7 +37,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/python/src/com/jetbrains/python/formatter/PyImportsCodeStylePanel.java b/python/src/com/jetbrains/python/formatter/PyImportsCodeStylePanel.java index 1c1173f8750f..baac8ee6e4b9 100644 --- a/python/src/com/jetbrains/python/formatter/PyImportsCodeStylePanel.java +++ b/python/src/com/jetbrains/python/formatter/PyImportsCodeStylePanel.java @@ -22,6 +22,7 @@ import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.options.ConfigurationException; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.ui.components.JBCheckBox; +import com.jetbrains.python.PyBundle; import com.jetbrains.python.PythonFileType; import com.jetbrains.python.PythonLanguage; import org.jetbrains.annotations.NotNull; @@ -47,7 +48,7 @@ public class PyImportsCodeStylePanel extends CodeStyleAbstractPanel { @Override protected String getTabTitle() { - return "Imports"; + return PyBundle.message("formatter.imports.panel.title"); } @NotNull diff --git a/python/testData/optimizeImports/joinFromImportsAndRelativeImports.after.py b/python/testData/optimizeImports/joinFromImportsAndRelativeImports.after.py index 044b56da884b..1a7439689988 100644 --- a/python/testData/optimizeImports/joinFromImportsAndRelativeImports.after.py +++ b/python/testData/optimizeImports/joinFromImportsAndRelativeImports.after.py @@ -1,11 +1,7 @@ -from .module import b -from ..module import a -from ..module import c -from .module import d -from . import module1 -from . import module2 -from .. import pkg1 -from .. import pkg2 +from . import module1, module2 +from .module import b, d +from .. import pkg1, pkg2 +from ..module import a, c print(a, b, c, d, module1, module2, pkg1, pkg2)