Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28692/src/org/python/pydev/plugin
Modified Files:
PyCodeFormatterPage.java PydevPrefsInitializer.java
Log Message:
- Improved code formatter to deal with operators (+, -, *, etc)
- Improved code formatter to handle '=' differently inside function calls / keyword args
Index: PyCodeFormatterPage.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/PyCodeFormatterPage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PyCodeFormatterPage.java 24 Feb 2007 19:28:10 -0000 1.5
--- PyCodeFormatterPage.java 19 Jul 2008 19:53:31 -0000 1.6
***************
*** 17,27 ****
--- 17,43 ----
public class PyCodeFormatterPage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+ //a, b, c
public static final String USE_SPACE_AFTER_COMMA = "USE_SPACE_AFTER_COMMA";
public static final boolean DEFAULT_USE_SPACE_AFTER_COMMA = true;
+
+ //call( a )
public static final String USE_SPACE_FOR_PARENTESIS = "USE_SPACE_FOR_PARENTESIS";
public static final boolean DEFAULT_USE_SPACE_FOR_PARENTESIS = false;
+
+
+ //call(a = 1)
+ public static final String USE_ASSIGN_WITH_PACES_INSIDER_PARENTESIS = "USE_ASSIGN_WITH_PACES_INSIDER_PARENTESIS";
+
+ public static final boolean DEFAULT_USE_ASSIGN_WITH_PACES_INSIDE_PARENTESIS = false;
+
+
+ //operators =, !=, <, >, //, etc.
+ public static final String USE_OPERATORS_WITH_SPACE = "USE_OPERATORS_WITH_SPACE";
+
+ public static final boolean DEFAULT_USE_OPERATORS_WITH_SPACE = true;
+
public PyCodeFormatterPage() {
***************
*** 39,42 ****
--- 55,62 ----
addField(new BooleanFieldEditor(USE_SPACE_FOR_PARENTESIS, "Use space before and after parenthesis?", p));
+
+ addField(new BooleanFieldEditor(USE_ASSIGN_WITH_PACES_INSIDER_PARENTESIS, "Use space before and after assign for keyword arguments?", p));
+
+ addField(new BooleanFieldEditor(USE_OPERATORS_WITH_SPACE, "Use space before and after operators? (+, -, /, *, //, **, etc.)", p));
}
***************
*** 55,57 ****
--- 75,85 ----
}
+ public static boolean useAssignWithSpacesInsideParenthesis() {
+ return PydevPrefs.getPreferences().getBoolean(USE_ASSIGN_WITH_PACES_INSIDER_PARENTESIS);
+ }
+
+ public static boolean useOperatorsWithSpace() {
+ return PydevPrefs.getPreferences().getBoolean(USE_OPERATORS_WITH_SPACE);
+ }
+
}
Index: PydevPrefsInitializer.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/PydevPrefsInitializer.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** PydevPrefsInitializer.java 18 May 2008 20:02:17 -0000 1.20
--- PydevPrefsInitializer.java 19 Jul 2008 19:53:31 -0000 1.21
***************
*** 110,113 ****
--- 110,115 ----
//code formatting
+ node.putBoolean(PyCodeFormatterPage.USE_ASSIGN_WITH_PACES_INSIDER_PARENTESIS, PyCodeFormatterPage.DEFAULT_USE_ASSIGN_WITH_PACES_INSIDE_PARENTESIS);
+ node.putBoolean(PyCodeFormatterPage.USE_OPERATORS_WITH_SPACE, PyCodeFormatterPage.DEFAULT_USE_OPERATORS_WITH_SPACE);
node.putBoolean(PyCodeFormatterPage.USE_SPACE_AFTER_COMMA, PyCodeFormatterPage.DEFAULT_USE_SPACE_AFTER_COMMA);
node.putBoolean(PyCodeFormatterPage.USE_SPACE_FOR_PARENTESIS, PyCodeFormatterPage.DEFAULT_USE_SPACE_FOR_PARENTESIS);
|
