X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
index b023981..a4d6700 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java
@@ -740,9 +740,16 @@ public class PreferenceConstants {
    * <p>
    * Value is of type <code>Boolean</code>.
    * </p>
-   * @since 2.1
    */
-  public final static String EDITOR_CLOSE_STRINGS_PHP = "closeStringsPHP"; //$NON-NLS-1$
+  public final static String EDITOR_CLOSE_STRINGS_DQ_PHP = "closeStringsPHPDQ"; //$NON-NLS-1$
+  /**
+   * A named preference that controls whether the 'close strings' feature
+   *  is   enabled in PHP mode
+   * <p>
+   * Value is of type <code>Boolean</code>.
+   * </p>
+   */
+  public final static String EDITOR_CLOSE_STRINGS_SQ_PHP = "closeStringsPHPSQ"; //$NON-NLS-1$
 
   /**
    * A named preference that controls whether the 'close brackets' feature is
@@ -773,7 +780,17 @@ public class PreferenceConstants {
 	 * @since 3.0
 	 */
 	public final static String EDITOR_ESCAPE_STRINGS= "escapeStrings"; //$NON-NLS-1$
-	
+	/**
+	 * A named preference that controls if content assist inserts the common
+	 * prefix of all proposals before presenting choices.
+	 * <p>
+	 * Value is of type <code>Boolean</code>.
+	 * </p>
+	 * 
+	 * @since 3.0
+	 */
+	public final static String CODEASSIST_PREFIX_COMPLETION= "content_assist_prefix_completion"; //$NON-NLS-1$
+
   /**
    * A named preference that controls whether the 'close braces' feature is
    * enabled.
@@ -1088,7 +1105,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t
   	 * @see org.eclipse.jface.resource.StringConverter
   	 * @see org.eclipse.jface.preference.PreferenceConverter
   	 */
-  public final static String EDITOR_JAVA_TAG_COLOR = IPreferenceConstants.PHP_TAG;
+  public final static String EDITOR_PHP_TAG_COLOR = IPreferenceConstants.PHP_TAG;
 
   /**
    * A named preference that controls whether php start and stop tags are rendered in bold.
@@ -1096,7 +1113,7 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t
    * Value is of type <code>Boolean</code>.
    * </p>
    */
-  public final static String EDITOR_JAVA_TAG_BOLD = IPreferenceConstants.PHP_TAG + EDITOR_BOLD_SUFFIX;
+  public final static String EDITOR_PHP_TAG_BOLD = IPreferenceConstants.PHP_TAG + EDITOR_BOLD_SUFFIX;
 
   /**
    * A named preference that holds the color used to render php keywords.
@@ -1560,6 +1577,14 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t
 	 * @since 3.0
 	 */	
 	public static final String EDITOR_SMART_SEMICOLON= "smart_semicolon"; //$NON-NLS-1$
+	/**
+	 * A named preference that controls the smart backspace behavior.
+	 * <p>
+	 * Value is of type <code>Boolean</code>.
+	 * 
+	 * @since 3.0
+	 */
+	public static final String EDITOR_SMART_BACKSPACE= "smart_backspace"; //$NON-NLS-1$
 	
 	/**
 	 * A named preference that controls the "smart opening brace" smart typing handler
@@ -2304,8 +2329,8 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t
     PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR, new RGB(63, 127, 95));
     store.setDefault(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_BOLD, false);
 
-    PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_TAG_COLOR, new RGB(255, 0, 128));
-    store.setDefault(PreferenceConstants.EDITOR_JAVA_TAG_BOLD, true);
+    PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_PHP_TAG_COLOR, new RGB(255, 0, 128));
+    store.setDefault(PreferenceConstants.EDITOR_PHP_TAG_BOLD, true);
 
     PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR, new RGB(127, 0, 85));
     store.setDefault(PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD, true);
@@ -2360,11 +2385,13 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t
     store.setDefault(PreferenceConstants.CODEASSIST_INSERT_COMPLETION, true);
     store.setDefault(PreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES, false);
     store.setDefault(PreferenceConstants.CODEASSIST_GUESS_METHOD_ARGUMENTS, true);
-	
+    store.setDefault(PreferenceConstants.CODEASSIST_PREFIX_COMPLETION, false);
+
     store.setDefault(PreferenceConstants.EDITOR_SMART_HOME_END, true);
 	store.setDefault(PreferenceConstants.EDITOR_SUB_WORD_NAVIGATION, true);
     store.setDefault(PreferenceConstants.EDITOR_SMART_PASTE, true);
-    store.setDefault(PreferenceConstants.EDITOR_CLOSE_STRINGS_PHP, true);
+    store.setDefault(PreferenceConstants.EDITOR_CLOSE_STRINGS_DQ_PHP, true);
+    store.setDefault(PreferenceConstants.EDITOR_CLOSE_STRINGS_SQ_PHP, true);
     store.setDefault(PreferenceConstants.EDITOR_CLOSE_BRACKETS_PHP, true);
     store.setDefault(PreferenceConstants.EDITOR_CLOSE_BRACES, true);
     store.setDefault(PreferenceConstants.EDITOR_CLOSE_JAVADOCS, true);
@@ -2409,12 +2436,14 @@ public final static String EDITOR_TEXT_FONT= "net.sourceforge.phpdt.ui.editors.t
 	
 	// folding
 	store.setDefault(PreferenceConstants.EDITOR_FOLDING_ENABLED, true);
-	store.setDefault(PreferenceConstants.EDITOR_FOLDING_PROVIDER, "org.eclipse.jdt.ui.text.defaultFoldingProvider"); //$NON-NLS-1$
-	store.setDefault(PreferenceConstants.EDITOR_FOLDING_JAVADOC, false);
+	store.setDefault(PreferenceConstants.EDITOR_FOLDING_PROVIDER,  "net.sourceforge.phpdt.ui.text.defaultFoldingProvider"); //$NON-NLS-1$
+	store.setDefault(PreferenceConstants.EDITOR_FOLDING_JAVADOC, true);
 	store.setDefault(PreferenceConstants.EDITOR_FOLDING_INNERTYPES, true);
 	store.setDefault(PreferenceConstants.EDITOR_FOLDING_METHODS, false);
-	store.setDefault(PreferenceConstants.EDITOR_FOLDING_IMPORTS, true);
+	store.setDefault(PreferenceConstants.EDITOR_FOLDING_IMPORTS, false);
 
+	store.setDefault(PreferenceConstants.EDITOR_SMART_BACKSPACE, true);
+	
     // do more complicated stuff
     //	NewJavaProjectPreferencePage.initDefaults(store);	
   }